2583
2584 - narrower diff with alt/batch
2584 - similarly update alt/batch-by-line
2585 - purge redundant alternative