Refactor NL parser.
More fixes.
Implement NLParser.