Guessing these whitespace changes weren't intentional, but probably not directly relevant to this PR. Can you remove or at least rebase into another commit?