issue #20254: tweaks.