Avoid Function#call unless context is provided.

Fix #1554.
Merge pull request #1557 from braddunbar/iterator-context

Avoid Function#call unless context is provided.