OK, I'll avoid unrelated cosmetic changes in the future.  In any case, for this PR, I only performed them on the files I was already editing for other reasons.