Fix batch mode handle usage.

(Logical change 1.169)
7 files changed