No trailing whitespace, please.

But I can merge it, then fix that.