Ah awesome, I didn't know about that :-) I'll rewrite this code to use that iterator, this was a concern I had when writing this too.