Simplify major modes too, while we're at it.
Whitespace cleanup.