I'm not sure I agree with *any* of the changes in this file. I certainly feel that, if you want to proceed with them, they should be split into a separate PR.