Replace GenericPair with a Tuple<T1, T2>