Refine string constants on behalf of David