TypeSwap now swaps pops too.