A bit of cleanup, as a preparation for an official release.