This looks like pure whitespace change so I kind of think this PR is busted (github is telling me it won't merge cleanly). Wut?