Bugfix: entity iterators do not have a 'type' method

I think they used to have one, back in the day of the EntityIterator
class.

Transformed the surrounding loop to range-based-for syntax
while I am there.