Escape characters correctly accounted for in Parser.
Some small cleanup.