Make Desugar polymorphic again

`Desugar a` changed to `Desugar l a` to allow the desugaring to happen
with any annotation type