Cleanup

These are all cosmetic changes only. Feel free to reject any commit. Most of all I'd like to see a1a173e merged.