Allow overriding of default batch size. Remove cruft.