Adds desugar indirection