Also clean up some white space
mentioned in commit 4131356c
mentioned in commit 0f77a6a9
mentioned in commit e165aa5b
mentioned in commit 047a2481