Cleanup

Various miscellaneous cleanup activities, including a big honking space commit mercifully rebased into a sensible place in the commit lists.  Woot!