This series started as a fix to PR c++/29896, but while investigating that, I found a few other minor cleanups to be done. Regression tested on x86-64 Fedora 34. Tom