Fix TypeInvestigationService to include types that are nested more than one level down.