issue #21605: Minor refactor