Moved more magic strings to constants