minor reorg of fisher_yates_shuffle