Random code-cleanup.  Still more work to do here.