Radically simply the map parsing logic