A bunch of minor cleanups.