issue #21359: tweaks.