introduced map to Desugar, cleaned up the Desugar syntax.