More work on Proxy/iterator compatibility