It would be nice to extract changes like this to a separate pull request to the `master` branch.