Modifications to fastSwapWithUncle -- still appear to be several
problems.