Janitor: Replace std::vector<std::pair with std::map

[magnesj]

We use the construct std::vector<std::pair<T, U>> several places in the code. Consider replace with simpler structure std::unordered_map<T, U> if no sorting is required. Also investigate if std::map can be replaced with std::unordered_map