More changes regarding strings and constants.