Note that the i == r check was never reached in the original code but may be
in the new variant. Since a shuffled list may well have one or two elements
retain their absolute position once in a while, this should not be a problem.

tests with 2- and 3-element lists show an even distribution amongst all
elements.