Thanks, Pádraig, for fixing that. And thanks, Larry, for reporting that.

> The existing tests are sufficient to catch this.

Yes, evidently I forgot to run 'make check', which I usually do. I'll 
try to not forget next time....

I installed the attached further patches to (1) coalesce duplicate code 
and explain why it's needed and (2) tweak performance a tiny bit.