Completed implementation of new parser.