More work on desugaring