Merge "Fix another duplicate maps parser."