I can't believe this multitude of minor style issues are enough to hold up merging these changes.
Your focus on style over substance is hard to understand.