Thanks for chiming in!  I certainly don't mind reverting the whitespace changes given that reasoning.

@bnoordhuis thoughts on the bandaid approach as a subsequent commit suggested here, followed by addition of e.g. vim modelines to help enforce consistency?