CSPACE-6000: Substitute constants for bare strings in string replacement. Add clarity to log statements.