Less temporary variables in desugaring

OK