nitpick: the whitespace changes in this PR are pretty non-uniform.