Issue #AR-4-delinter_fixes:  simplify replace