The old naive check fails if an argument starts with '-B'. Now we use a regular expression, which should correctly match if batch mode was already supplied, and add it if not.