Cleaning up whitespace

This fixes problems pointed out by Niklas in
https://gerrit.wikimedia.org/r/#/c/52376/