Revert "grammar.STRCONST: simplified expression"

It causes greedy string matching so '"a" "b"' is not parsed as two strings.