Merge "Remove conflicting parser function alias"