Add support for other shuffle variants.