Modified whitespace to make the diffs look simpler. Slightly pedantic.