Cleanup.

- Removes need for except StopIteration.