Merge parser fixes from private branch.