Some more minor cleanups.