fix a bunch of desugaring errors