[Locator] Got rid of scattered GroupType typedefs.