Fix CB SWAP.  Passes all tests now.