more consistent with other parts of the code and faster:

`if not batch:`