issue #20438: Clean up.