Do shuflfe blocks still walk through this code path? If no, I would just throw an exception if it is a shuffle block here.