Fixing compilation issues.

Apparently iterator_extend_base caused more issues than it solved,
so it is gone now.

Also, access to the underlying iterator has been made less roundabout.