A bit more housekeeping in preparation for 0.6 release.