issue #22072: Tweaks.