Largely cosmetic code cleanups.
2 files changed