I may have to put in a separate pull request for correct pluralisation here, although I appreciate it’s a weird edge case for a batch system.