Patch from Jos Backus -- Fix breakage from dev_t to DEV64_T in batch