Fix build failure on Natasha due to typedef'ing iterator a second time in a nested class of Grid.