Intermediate commit on the way to bigger and brighter things.  I guess.
A few loose ends that I missed.