Fix how batches work and how they are configured. Now we use MessageThreshold.