issue #19296: cleanup

This is a merged version of Ben's pull.