A bunch of little clean-up things.