Some more minor housekeeping changes.

This usually happens when I am looking around and see stuff that isn't following our current conventions.