Removing recent use of std::hash_map in favor of std::unordered_map