commented last remaining instance of special-casing batch_size==1