More fixes to NewParser.
More improvements to NewParser.