Revert to existing "proper" coding style

The rule is simple: don't try to change the coding style of the
existing codebase.