Housekeeping

Closes various small maintenance stories.  See individual commits for details.