issue #21672: Spit and polish.