issue #20734: Housekeeping.