Reworked creation of TypePairSort instances.
Re-order TypePair constructor parameters for consistancy reasons.