More work on NewParser.