set_iterator() and other small changes to serializer.