update for desugaring and typechecking changes