Fix for mozilla/rust@21990cd

See also mozilla/rust#10622 - Removed unneccessary `_iter` suffixes from the various APIs
Fix compilation errors "last argument in `do` call has non-procedure type"