Use a std::pair for the value of the MapParser. Remove the need for additional braces