I think that putting cleanups in a separate commit in a PR is OK. But, that isn't the case on this one. It helps when digging through source code history.