issue #20734: Simplify things a bit.