https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71891 says the issue was
fixed in aff9ac968840e9c86719fb613bd2ed3c39b9905c, but to avoid
conflicts (which I don't know how to resolve, not knowing scheme), also
pull in 5e6288c9304b60f1875a44808ee3858e3d6efc83
0dab58fc2a6ac6a8354439749d598f8c24f57ddd and
e45b70dcded37eb77e71ec30445b12040b6bb1b7.
