Added quoting of tokens to Grammar