Fixd make_pair for certain uses.