OK.  (I think the way I'll respond to these is to create new commits to
address each of them, and then do another round of history rewriting before
sending upstream.)