Please avoid incidental whitespace changes in commits that aren't simply whitespace changes.