issue #21672: Clean up, clean up, everybody everywhere.