Optimize shuffle and fix comment

Why even bother with this test? You're dong `n` comparisons to save 1 assignment. Doesn't seem worth it to me.