issue #19456: Lots and lots of rework.