Added finer-grained string lexing