To ease code reviews, please split out those kind of refactoring in a separate pull request.