Remove duplicate enums, fix whitespace, fix typos, both new and old.