Misc cleanups in sight of v0.7...