Fix keyword vs. map-key handling in conflict detection.