object2.c cleanup part 1.

Lines 1 to 2000.
object2.c cleanup part 2.

Lines 2001 to 3000.
object2.c cleanup part 3.

Lines 3001-4000.
object2.c cleanup part 4.

Lines 4001-end.