fixed handling of ArrayIterator, cosmetics