Raise an exception on already desugared s-let and s-var in desugar
Add some more annotations to resolve-scope