Further cleanups I've been sitting on to tag a new version