Some cleanups in prep of rewrite release

The commits tell the tale - nothing too major here.