Thanks, Nick. I'm used to doing my own commits, so I figured the
patch here was more to be read than to be applied. I certainly hate
munged patches, and I think in this case the munging was on my end.
I'll avoid that in the future to be sure.
I've applied it to the 2.23 branch now too.
Thanks,
Roland