Issue #21978: More refactoring fun