Improve string and single-character parsing