(a) Tests for Iterables.
(b) A few refactors.