Issue #20842: simpler code.