Replace `ComputeAllScopes` in /Import/ImportScopeCalculation with more coherent scopes
Replace
ComputeAllScopesin /Import/ImportScopeCalculation with more coherent scopes