Refactored PortPairs as optional.