Thanks for all the improvements.
However, one of them introduced a bug that caused many new
"make check" failures.  I have fixed it with this just-pushed patch: