RE: reduce needs for InScopeSets?