minor: adds type information to nodeIterator
Cleans up unused imports