Minor cleanup in ShuffleBlockManager