update for typechecking and desugaring changes