Well, I found some more code in need of fixing while doing the whitespace
commit. This should be the last one. Can we please try to remain
consistent the style when committing to this file so I don't have to do
this again? :-)