Makepatch doesn't always include quite the right changes

Bugs
6

@rsmith I can confirm that your patch does still pass all the existing regressions.

If you play with my Experimental bazel branch builds will work a little better.