batch_run: simplify, make more extensible, and merge existing batches into a single batch