Minor changes in the scoping impl