Fixes in Iterator interface. More use cases.