Do a bit of misc cleanup.