I agree tooling should be improved, but the change should be legible in more than one tool. Chances are good that someone will end up looking at the diff in th

I agree tooling should be improved, but the change should be legible in more than one tool. Chances are good that someone will end up looking at the diff in the future in their favorite IDE, on the command line, or in who knows what else tool. The simplest and clearest solution is to split out the changes in separate commits.