Tentative checkin of tuxdev's "Object improvement patch, part 1"