Misc cleanup from a previous commit.
3 files changed