Removed tuple instantiation in BaseSwap.