I don't think this type of reformatting really improves readability. Also gratuitous, and too numerous - I had to look through all the noop reformatting changes in this file (including manually re-parsing concatenation of strings, etc) to find and review the actual functionality changes in here (hope I didn't miss any). Best to keep gratuitous reformatting in its own commits/pull requests if you can.