Sorry for un-fixed-up PR merge

[Kenneth Knowles]

I want to apologize for leaving fixup commits in a PR merge I just
performed. I'm leaving as-is rather than mess about with `git push -f` to
rewrite a prettier history. Just don't want anyone to think that I would
normally go about like that.

Kenn