Miscellaneous cleanups.