Re-write the grammar to simplify using multi-char delimiters, and test double-quote counting