Optimization for shuffle

dig it or will this have issues with strings in legacy ie?
@jdalton how do you like this change?