minor improvements
desugar mapping