Make more use of the grid iterator