Fix retry batching, sort-of