Shuffle methods take 2, much cleaner

This ended up much cleaner than I expected because we didn't need most of the `Helpers`.

@tmertens, please take a look.