Miscelaneous cleanups.