More tweaks to number of arguments for _collect_jobs