More refactoring

Make _consistentShuffle aware of list context.  Swap values without
using a temp scalar.  Add some more tests.