2

A bit of cleanup.  The class I've set up will surely change a lot before
I'm done.