Remove some uses of STRING_* constants.