Revert many code-style changes:
They’d only make it a pain to merge back.
Merge branch 'master' into Xcode5-noSign