Miscellaneous cleanup.