A few cleanups.