Small code readability improvement.
More work on NewParser.