Improves handling of strings