Require string terminator to be followed by a separator, to try to detect stray, unescaped quotes
Merge branch 'parsing_improvements'