Remove linked vars + simplify types to a general Expr type