I wrote it this way since the feature flag is intended to be removed with minimal overhead once this feature is considered stable. It's also explicitly a separate pathway. If you have a strong preference, I'll switch over.
(By the way, I added a TODO to consolidateShuffleFiles to remove it when the feature is stable.)