Merge in code changes for all of the new parser.