Refactoring TuplestoreIterator to extent AbstractIterator