Cleanup and extend batch mode.

(Logical change 1.169)
1 file changed