Use make_pair in place of std::pair.