updated make_id_expr, make_un_expr