Hacking on new desugaring