Yea I would add an assert there at least. Also to make the non-consolidated path faster, perhaps we can check blockId.isShuffle && consolidationOn rather than just blockId.isShuffle