Very valid change, but unrelated to this PR. Please put it into a different one.