Purely formatting cleanups.

  I hate "bad" hanging brace style.