Made the iterators more Ruby like.