Convert loop to use a BP iterator.
Remove TODO when it gets TODONE