Fixup whitespace damage in the two previous commits