More progress on batching.