Clean up trivial package refactor TODOs

Several TODOs were wrapped up as part of other work, but not cleaned up
properly.

Also fixes some toString methods which were incorrectly copy-pasted.

Bug: 160868823

Test: manual build, mostly non-functional changes

Change-Id: I577786f1ee178922a8d9a0d6c2708589b1b8dc37