Fix remaining (hopefully) whitespace diff issues