Misc cleanup

Miscellaneous bits I felt the urge to clean up while reading code.