Improve string parsing.