Convert PairCallback into a typedef. #9