Change eltype defs to Type{...} and some iterator cleanup (#1824)

Change eltype defs to Type{...} and some iterator cleanup (#1824) #2642