Replace all remaining usage of Infinispan batching API with ours.