Fixups in shuffle_block.