Miscellaneous cleanups.

:sheep: