Add some more annotations to resolve-scope