Cosmetic fixes and cull the cruft.