Temporarily parameterize BatchIterator.
First pass at improved batch format (issue #30).