Miscellaneous small cleanup things.