Optimize use of collect()

[starpit]

We are using collect() all over the place where perhaps we could be using impl Iterator