Some clean-up
Mitigate differences found in the git.wikimedia.org version