Fix desugarings