Miscellaneous cleanups

@cpennington pure goodness, right?