make sure shuffling doesn't cause nested indices to be overwritten
make sure index changes can be propagated through conditional sections
Merge pull request #1460 from evs-chris/gh-1457

Make sure shuffling doesn't cause index changes to propagate to levels referencing a deeper index