Cleanup and modernize code prior to working on Issue 11747.
1 file changed