Cleanup

* Miscellaneous cleanups I saw while learning the codebase.
* Zero functional changes.