Also handle loose imports, fixes deeper.