Fixed desugar of decorators
It was a merge related problem, with the new scope
the solution is way cleaner!