You probably shouldn't have made this chnage...  `cpp_pair` is less ambiguous than pair