Merge parser changes to the new API