Votes on some commits

There are other commits I have not yet reviewed for possible application to
maint-5.20.