Remove unused map.itypes; use g->itypes where needed.

It was only two places.
Merge removal of map::itypes.