Issue #15502: Refactor some code.
3 files changed