Miscellaneous cleanup.
Miscellaneous cleanup.