We did the same sanity cleanup for all other code.  Easier on the
eyes and easier to fork.  ;)

Discussed with: ad@