Generally should avoid unrelated changes in a PR, like this one.