Cosmetic changes to reduce diff noise for the pull request