Fix remaining (hopefully) whitespace diff issues - take 2