Tweak some shuffle_array callers.

Remove two more uses of the two-argument version; and use a range-
based for loop in one of those cases.
Whitespace fix