Add resolve-scope as a step after desugaring