Add coalesced reshuffling to both version 1 and 3.