Moved ternary operator to Expr