Comment 9 for bug 1772260

All these have been fixed already in 6.0, but I think we're close enough to the 5.0 end-game that I'd rather not introduce any risk by backporting them.