No unrelated whitespace changes, please. (There are some more at the bottom of this file)