Previous fix patches added a bunch of trailing whitespace, which git-applymbox complained loudly about.