reorganize Expr and UntypedExpr