@boinger The fact that you have to say that indicates that you should split this commit into two commits, one with whitespace fixes and one with content.