Make batching and data frequency asynchronous.

[adrianomg]

Batching and data frequency mechanisms may interfere with each other and lead to undesirable effects, mainly with time-based batches.
Both mechanisms should work independently.