I tried a few times to clear up the whitespace diffs here to no avail.