Additional changes to try to get fastSwapWithUncle to work with only
hmm2 calls.