diff --git a/.github/workflows/stubs.yml b/.github/workflows/stubs.yml
index 453bcde64..79577b414 100644
--- a/.github/workflows/stubs.yml
+++ b/.github/workflows/stubs.yml
@@ -90,7 +90,6 @@ jobs:
       - name: Install Ruff
         uses: astral-sh/ruff-action@v3
         with:
-          version: "0.14.11"
           args: "--version"
 
       - name: Lint type stubs
diff --git a/src/pyscipopt/scip.pyi b/src/pyscipopt/scip.pyi
index 379e569f0..32bc939ce 100644
--- a/src/pyscipopt/scip.pyi
+++ b/src/pyscipopt/scip.pyi
@@ -4,7 +4,7 @@ from typing import Any, AnyStr, ClassVar, Literal, SupportsFloat, Union, overloa
 
 import numpy as np
 from _typeshed import Incomplete
-from typing_extensions import CapsuleType, disjoint_base
+from typing_extensions import CapsuleType, Self, disjoint_base
 
 CONST: Term
 EventNames: dict
@@ -20,21 +20,37 @@ _core_dot: Incomplete
 _core_dot_2d: Incomplete
 _core_sum: Incomplete
 buildGenExprObj: Incomplete
-cos: Incomplete
-exp: Incomplete
 expr_to_array: Incomplete
 expr_to_nodes: Incomplete
 is_memory_freed: Incomplete
-log: Incomplete
 print_memory_in_use: Incomplete
 quickprod: Incomplete
 quicksum: Incomplete
 readStatistics: Incomplete
-sin: Incomplete
-sqrt: Incomplete
 str_conversion: Incomplete
 value_to_array: Incomplete
 
+@overload
+def exp(x: float | Expr | GenExpr) -> UnaryExpr: ...
+@overload
+def exp(x: list | tuple | np.ndarray | MatrixExpr) -> MatrixGenExpr: ...
+@overload
+def log(x: float | Expr | GenExpr) -> UnaryExpr: ...
+@overload
+def log(x: list | tuple | np.ndarray | MatrixExpr) -> MatrixGenExpr: ...
+@overload
+def sqrt(x: float | Expr | GenExpr) -> UnaryExpr: ...
+@overload
+def sqrt(x: list | tuple | np.ndarray | MatrixExpr) -> MatrixGenExpr: ...
+@overload
+def sin(x: float | Expr | GenExpr) -> UnaryExpr: ...
+@overload
+def sin(x: list | tuple | np.ndarray | MatrixExpr) -> MatrixGenExpr: ...
+@overload
+def cos(x: float | Expr | GenExpr) -> UnaryExpr: ...
+@overload
+def cos(x: list | tuple | np.ndarray | MatrixExpr) -> MatrixGenExpr: ...
+
 @disjoint_base
 class Benders:
     model: Incomplete
@@ -236,6 +252,9 @@ class Conshdlr:
 class Constant(GenExpr):
     number: Incomplete
     def __init__(self, *args: Incomplete, **kwargs: Incomplete) -> None: ...
+    def __pow__(  # type: ignore[override]
+        self, other: float | Constant, mod: Incomplete = ..., /
+    ) -> Constant: ...
 
 @disjoint_base
 class Constraint:
@@ -335,19 +354,25 @@ class ExprLike:
         *args: Incomplete,
         **kwargs: Incomplete,
     ) -> Incomplete: ...
-    def __radd__(self, other: object, /) -> Incomplete: ...
-    def __sub__(self, other: object, /) -> Incomplete: ...
-    def __rsub__(self, other: object, /) -> Incomplete: ...
-    def __rmul__(self, other: object, /) -> Incomplete: ...
-    def __rtruediv__(self, other: object, /) -> GenExpr: ...
-    def __neg__(self, /) -> Union[Expr, GenExpr]: ...
-    def __pos__(self, /) -> Union[Expr, GenExpr]: ...
-    def __abs__(self) -> GenExpr: ...
-    def exp(self) -> GenExpr: ...
-    def log(self) -> GenExpr: ...
-    def sqrt(self) -> GenExpr: ...
-    def sin(self) -> GenExpr: ...
-    def cos(self) -> GenExpr: ...
+    def __pos__(self, /) -> Self: ...
+    def __abs__(self, /) -> UnaryExpr: ...
+    def exp(self) -> UnaryExpr: ...
+    def log(self) -> UnaryExpr: ...
+    def sqrt(self) -> UnaryExpr: ...
+    def sin(self) -> UnaryExpr: ...
+    def cos(self) -> UnaryExpr: ...
+    @overload
+    def __le__(self, other: float | ExprLike, /) -> ExprCons: ...
+    @overload
+    def __le__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExprCons: ...  # type: ignore[misc]
+    @overload
+    def __ge__(self, other: float | ExprLike, /) -> ExprCons: ...
+    @overload
+    def __ge__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExprCons: ...  # type: ignore[misc]
+    @overload  # type: ignore[override]
+    def __eq__(self, other: float | ExprLike, /) -> ExprCons: ...
+    @overload
+    def __eq__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExprCons: ...
 
 @disjoint_base
 class Expr(ExprLike):
@@ -355,20 +380,49 @@ class Expr(ExprLike):
     def __init__(self, terms: Incomplete = ...) -> None: ...
     def degree(self) -> Incomplete: ...
     def normalize(self) -> Incomplete: ...
-    def __add__(self, other: Incomplete, /) -> Incomplete: ...
-    def __eq__(self, other: object, /) -> bool: ...
-    def __ge__(self, other: object, /) -> bool: ...
+    def __neg__(self, /) -> Expr: ...
+    @overload
+    def __add__(self, other: float | Expr, /) -> Expr: ...
+    @overload
+    def __add__(self, other: GenExpr, /) -> SumExpr: ...
+    @overload
+    def __add__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __radd__(self, other: float, /) -> Expr: ...
+    @overload
+    def __sub__(self, other: float | Expr, /) -> Expr: ...
+    @overload
+    def __sub__(self, other: GenExpr, /) -> SumExpr: ...
+    @overload
+    def __sub__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rsub__(self, other: float, /) -> Expr: ...
+    @overload
+    def __mul__(self, other: float | Expr, /) -> Expr: ...
+    @overload
+    def __mul__(self, other: GenExpr, /) -> ProdExpr: ...
+    @overload
+    def __mul__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rmul__(self, other: float, /) -> Expr: ...
+    @overload
+    def __truediv__(self, other: float, /) -> Expr: ...
+    @overload
+    def __truediv__(self, other: Expr | GenExpr, /) -> ProdExpr: ...
+    @overload
+    def __truediv__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rtruediv__(self, other: float, /) -> ProdExpr: ...
+    # __pow__'s return type depends on the value of `other`:
+    # non-negative integers (including integer-valued floats) yield Expr,
+    # negative integers and non-integers yield PowExpr
+    # We annotate the int case as Expr to handle the common case (e.g. x**2)
+    # knowing it might be wrong in some cases, and likewise the float case as
+    # PowExpr can be wrong. We aim to make the stubs useful in common cases
+    # even though the type system cannot fully express the real types.
+    @overload
+    def __pow__(self, other: int, mod: Incomplete = ..., /) -> Expr: ...
+    @overload
+    def __pow__(self, other: float, mod: Incomplete = ..., /) -> PowExpr: ...
+    def __rpow__(self, other: float, /) -> UnaryExpr: ...
     def __getitem__(self, index: Incomplete, /) -> Incomplete: ...
-    def __gt__(self, other: object, /) -> bool: ...
-    def __iadd__(self, other: Incomplete, /) -> Incomplete: ...  # noqa: PYI034
     def __iter__(self) -> Incomplete: ...
-    def __le__(self, other: object, /) -> bool: ...
-    def __lt__(self, other: object, /) -> bool: ...
-    def __mul__(self, other: Incomplete, /) -> Incomplete: ...
-    def __ne__(self, other: object, /) -> bool: ...
-    def __pow__(self, other: Incomplete, modulo: Incomplete = ..., /) -> Incomplete: ...
-    def __rpow__(self, other: Incomplete, /) -> Incomplete: ...
-    def __truediv__(self, other: Incomplete, /) -> Incomplete: ...
 
 @disjoint_base
 class ExprCons:
@@ -380,12 +434,8 @@ class ExprCons:
     ) -> None: ...
     def normalize(self) -> Incomplete: ...
     def __bool__(self) -> bool: ...
-    def __eq__(self, other: object, /) -> bool: ...
-    def __ge__(self, other: object, /) -> bool: ...
-    def __gt__(self, other: object, /) -> bool: ...
-    def __le__(self, other: object, /) -> bool: ...
-    def __lt__(self, other: object, /) -> bool: ...
-    def __ne__(self, other: object, /) -> bool: ...
+    def __ge__(self, other: float, /) -> ExprCons: ...
+    def __le__(self, other: float, /) -> ExprCons: ...
 
 @disjoint_base
 class GenExpr(ExprLike):
@@ -394,17 +444,29 @@ class GenExpr(ExprLike):
     def __init__(self) -> None: ...
     def degree(self) -> Incomplete: ...
     def getOp(self) -> Incomplete: ...
-    def __add__(self, other: Incomplete, /) -> Incomplete: ...
-    def __eq__(self, other: object, /) -> bool: ...
-    def __ge__(self, other: object, /) -> bool: ...
-    def __gt__(self, other: object, /) -> bool: ...
-    def __le__(self, other: object, /) -> bool: ...
-    def __lt__(self, other: object, /) -> bool: ...
-    def __mul__(self, other: Incomplete, /) -> Incomplete: ...
-    def __ne__(self, other: object, /) -> bool: ...
-    def __pow__(self, other: Incomplete, modulo: Incomplete = ..., /) -> Incomplete: ...
-    def __rpow__(self, other: Incomplete, /) -> Incomplete: ...
-    def __truediv__(self, other: Incomplete, /) -> Incomplete: ...
+    def __neg__(self, /) -> ProdExpr: ...
+    @overload
+    def __add__(self, other: float | ExprLike, /) -> SumExpr: ...
+    @overload
+    def __add__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __radd__(self, other: float, /) -> SumExpr: ...
+    @overload
+    def __sub__(self, other: float | ExprLike, /) -> SumExpr: ...
+    @overload
+    def __sub__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rsub__(self, other: float, /) -> SumExpr: ...
+    @overload
+    def __mul__(self, other: float | ExprLike, /) -> ProdExpr: ...
+    @overload
+    def __mul__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rmul__(self, other: float, /) -> ProdExpr: ...
+    @overload
+    def __truediv__(self, other: float | ExprLike, /) -> ProdExpr: ...
+    @overload
+    def __truediv__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...
+    def __rtruediv__(self, other: float, /) -> ProdExpr: ...
+    def __pow__(self, other: float | Constant, mod: Incomplete = ..., /) -> PowExpr: ...
+    def __rpow__(self, other: float, mod: Incomplete = ..., /) -> UnaryExpr: ...
 
 @disjoint_base
 class Heur:
@@ -534,6 +596,38 @@ class MatrixExpr(np.ndarray):
         *args: Incomplete,
         **kwargs: Incomplete,
     ) -> Incomplete: ...
+    def __neg__(self, /) -> MatrixExpr: ...
+    def __abs__(self, /) -> MatrixExpr: ...
+    def __add__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExpr: ...
+    def __radd__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __sub__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExpr: ...
+    def __rsub__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __mul__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExpr: ...
+    def __rmul__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __truediv__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExpr: ...
+    def __rtruediv__(self, other: float, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __eq__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExprCons: ...
+    def __le__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExprCons: ...
+    def __ge__(  # type: ignore[override]
+        self, other: float | ExprLike | np.ndarray | MatrixExpr, /
+    ) -> MatrixExprCons: ...
+    def __matmul__(self, other: np.ndarray | MatrixExpr, /) -> MatrixExpr: ...  # type: ignore[override]
+    def __pow__(  # type: ignore[override]
+        self, other: float | np.ndarray, mod: Incomplete = ..., /
+    ) -> MatrixExpr: ...
+    def __rpow__(self, other: float, mod: Incomplete = ..., /) -> MatrixExpr: ...  # type: ignore[override]
 
 class MatrixExprCons(np.ndarray):
     def __array_ufunc__(
@@ -543,7 +637,8 @@ class MatrixExprCons(np.ndarray):
         *args: Incomplete,
         **kwargs: Incomplete,
     ) -> Incomplete: ...
-    def __eq__(self, other: object, /) -> bool: ...
+    def __ge__(self, other: float | np.ndarray, /) -> MatrixExprCons: ...  # type: ignore[override]
+    def __le__(self, other: float | np.ndarray, /) -> MatrixExprCons: ...  # type: ignore[override]
 
 class MatrixGenExpr(MatrixExpr): ...
 
@@ -562,6 +657,7 @@ class MatrixVariable(MatrixExpr):
     def isInLP(self) -> Incomplete: ...
     def varMayRound(self, direction: Incomplete = ...) -> Incomplete: ...
     def vtype(self) -> Incomplete: ...
+    def __pos__(self, /) -> MatrixExpr: ...  # type: ignore[override]
 
 @disjoint_base
 class Model:
@@ -2241,7 +2337,6 @@ class Term:
 
 class UnaryExpr(GenExpr):
     def __init__(self, *args: Incomplete, **kwargs: Incomplete) -> None: ...
-    def __abs__(self) -> GenExpr: ...
 
 @disjoint_base
 class VarExpr(GenExpr):
diff --git a/stubs/allowlist b/stubs/allowlist
index a9747c848..dc849f74c 100644
--- a/stubs/allowlist
+++ b/stubs/allowlist
@@ -1,3 +1,9 @@
 .*.__reduce_cython__
 .*.__setstate_cython__
 pyscipopt.scip.__test__
+# These exist at runtime but aren't useful in the stubs, they are added to the child classes
+pyscipopt.scip.ExprLike.__radd__
+pyscipopt.scip.ExprLike.__rmul__
+pyscipopt.scip.ExprLike.__rsub__
+pyscipopt.scip.ExprLike.__rtruediv__
+pyscipopt.scip.ExprLike.__sub__
diff --git a/stubs/baseline.sh b/stubs/baseline.sh
index b71ebdc28..4ea23a165 100755
--- a/stubs/baseline.sh
+++ b/stubs/baseline.sh
@@ -9,5 +9,8 @@ python "$REPO_ROOT"/scripts/generate_expr_type_tests.py
 for test_file in "$REPO_ROOT"/tests/@types/*.py; do
     echo "Updating mypy baseline for $test_file"
     output_file="${test_file%.*}.mypy.out"
-    python -m mypy "$test_file" --warn-unused-ignores | grep "error:" > "$output_file"
+    # write to a temp file first to avoid truncating the output file if mypy fails
+    tmp=$(mktemp)
+    python -m mypy "$test_file" --warn-unused-ignores | grep "error:" > "$tmp"
+    mv "$tmp" "$output_file"
 done
diff --git a/tests/@types/expr.mypy.out b/tests/@types/expr.mypy.out
index 35cdc1d15..9b4d0a53a 100644
--- a/tests/@types/expr.mypy.out
+++ b/tests/@types/expr.mypy.out
@@ -1,126 +1,21 @@
-tests/@types/expr.py:26: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:28: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:30: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:32: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:34: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:36: error: Expression is of type "GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:40: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:42: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:64: error: Expression is of type "Expr | GenExpr", not "Variable"  [assert-type]
-tests/@types/expr.py:65: error: Expression is of type "Expr | GenExpr", not "Expr"  [assert-type]
-tests/@types/expr.py:66: error: Expression is of type "GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:67: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:68: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:69: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:70: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:71: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:78: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:79: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:80: error: Expression is of type "ndarray[tuple[Any, ...], dtype[floating[Any]]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:81: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:82: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:83: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:84: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:85: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
 tests/@types/expr.py:86: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:87: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:91: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:92: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:93: error: Expression is of type "ndarray[tuple[Any, ...], dtype[floating[Any]]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:94: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:95: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:96: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:97: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:98: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
 tests/@types/expr.py:99: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:100: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:104: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
+tests/@types/expr.py:104: error: No overload variant of "exp" matches argument type "Term"  [call-overload]
 tests/@types/expr.py:105: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
+tests/@types/expr.py:105: error: No overload variant of "log" matches argument type "Term"  [call-overload]
 tests/@types/expr.py:106: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
+tests/@types/expr.py:106: error: No overload variant of "sqrt" matches argument type "Term"  [call-overload]
 tests/@types/expr.py:107: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
+tests/@types/expr.py:107: error: No overload variant of "sin" matches argument type "Term"  [call-overload]
 tests/@types/expr.py:108: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
-tests/@types/expr.py:118: error: Expression is of type "Expr | GenExpr", not "Constant"  [assert-type]
-tests/@types/expr.py:119: error: Expression is of type "Expr | GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:120: error: Expression is of type "GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:121: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:122: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:123: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:124: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:125: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:132: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:133: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:134: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:135: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:136: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:137: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:138: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:139: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:141: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:142: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:146: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:147: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:148: error: Expression is of type "ndarray[tuple[Any, ...], dtype[floating[Any]]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:149: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:150: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:151: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:152: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
-tests/@types/expr.py:153: error: Expression is of type "Any", not "MatrixGenExpr"  [assert-type]
+tests/@types/expr.py:108: error: No overload variant of "cos" matches argument type "Term"  [call-overload]
 tests/@types/expr.py:154: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:155: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:159: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:160: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:161: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:162: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:163: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:164: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:165: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:166: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:168: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:169: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:173: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:174: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:175: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:176: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:177: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:178: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:179: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:180: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:182: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:183: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:187: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:188: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:189: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:190: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:191: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:192: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:193: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:194: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:196: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:197: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:201: error: Expression is of type "Expr | GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:202: error: Expression is of type "Expr | GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:203: error: Expression is of type "GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:204: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:205: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:206: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:207: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:208: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:215: error: Expression is of type "Expr | GenExpr", not "VarExpr"  [assert-type]
-tests/@types/expr.py:216: error: Expression is of type "Expr | GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:217: error: Expression is of type "GenExpr", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:218: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:219: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:220: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:221: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:222: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:229: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:230: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:231: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:232: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:233: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:234: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:235: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:236: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:242: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:243: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:244: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:245: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:246: error: Unused "type: ignore" comment  [unused-ignore]
@@ -129,154 +24,32 @@ tests/@types/expr.py:248: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:249: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:250: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:251: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:259: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:260: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:261: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:262: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:263: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:264: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:265: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:267: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:268: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:269: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:270: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:275: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:276: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:277: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:278: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:279: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:280: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:281: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:283: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:284: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:285: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:286: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:287: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:291: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:292: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:293: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:294: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:295: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:296: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:297: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:299: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:300: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:301: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:302: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:303: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:307: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:308: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:309: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:310: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:311: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:312: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:313: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:314: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:315: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:316: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:317: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:322: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:323: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:324: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:325: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:326: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:327: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:328: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:330: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:331: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:332: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:333: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:338: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:339: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:340: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:341: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:342: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:343: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:344: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:346: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:347: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:348: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:349: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:350: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:354: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:355: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:356: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:357: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:358: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:359: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:360: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:362: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:363: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:364: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:365: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:366: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:370: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:371: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:372: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:373: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:374: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:375: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:376: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:378: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:379: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:380: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:381: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:382: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:386: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:387: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:388: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:389: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:390: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:391: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:392: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:394: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:395: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:396: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:397: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:398: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:402: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:403: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:404: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:405: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:406: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:407: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:408: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:410: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:411: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:412: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:413: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:414: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:418: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:419: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:420: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:421: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:422: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:423: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:424: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:426: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:427: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:428: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:429: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:434: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:435: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:436: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:437: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:438: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:439: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:440: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:442: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:443: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:444: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:445: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:450: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:451: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:452: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:453: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:454: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:455: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:456: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:457: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:458: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:459: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:460: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:465: error: Unused "type: ignore" comment  [unused-ignore]
@@ -290,242 +63,98 @@ tests/@types/expr.py:472: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:473: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:474: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:475: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:480: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:481: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:482: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:483: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:484: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:485: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:486: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:487: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:489: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:490: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:476: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:491: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:496: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:497: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:498: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:499: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:500: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:501: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:502: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:503: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:505: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:506: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:507: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:512: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:512: error: No overload variant of "__add__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:513: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:513: error: No overload variant of "__sub__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:514: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:514: error: No overload variant of "__mul__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:515: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:516: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:517: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:515: error: No overload variant of "__pow__" of "Expr" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:516: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:516: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:517: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:517: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:518: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:520: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:521: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:522: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:523: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:528: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:529: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:530: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:531: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:532: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:533: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:534: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:535: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:537: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:538: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:532: error: Expression is of type "PowExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:539: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:544: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:545: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:546: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:547: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:544: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:545: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:546: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:547: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:548: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:549: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:550: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:551: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:549: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:550: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:551: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:553: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:554: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:555: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:556: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:560: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:561: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:562: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:563: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:564: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:565: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:566: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:568: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:569: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:570: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:571: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:572: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:576: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:577: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:578: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:579: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:580: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:581: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:582: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:584: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:585: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:586: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:587: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:588: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:592: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:593: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:594: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:595: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:596: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:597: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:598: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:600: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:601: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:602: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:603: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:604: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:608: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:609: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:610: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:611: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:612: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:613: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:614: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:615: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "Expr"  [assert-type]
+tests/@types/expr.py:615: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:617: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:618: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:619: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:620: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:624: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:625: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:626: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:627: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:628: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:629: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:630: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:631: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:633: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:634: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:635: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:636: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:640: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:641: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:642: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:643: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:644: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:645: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:646: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:648: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:640: error: Unsupported operand types for + ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:641: error: Unsupported operand types for - ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:642: error: Unsupported operand types for * ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:643: error: Unsupported operand types for / ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:644: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:645: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:646: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:649: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:650: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:651: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:652: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:656: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:657: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:658: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:659: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:660: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:661: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:662: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:664: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:665: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:666: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:667: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:668: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:672: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:673: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:674: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:675: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:676: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:677: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:678: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:680: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:681: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:682: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:683: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:684: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:688: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:689: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:690: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:691: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:692: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:693: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:694: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:695: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:697: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:698: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:699: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:700: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:704: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:705: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:706: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:707: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:708: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:709: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:710: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:712: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:713: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:714: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:715: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:716: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:720: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:721: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:722: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:723: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:724: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:725: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:726: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:728: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:729: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:730: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:731: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:732: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:736: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:737: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:738: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:739: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:740: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:741: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:742: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:744: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:745: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:746: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:747: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:748: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:752: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:753: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:754: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:755: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:756: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:757: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:758: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:760: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:761: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:762: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:763: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:764: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:768: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:769: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:770: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:771: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:772: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:773: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:774: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:776: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:777: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:778: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:779: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:780: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:784: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:785: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:786: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:788: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:789: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:790: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:791: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:792: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:793: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:794: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:795: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:799: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:800: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:801: error: Unused "type: ignore" comment  [unused-ignore]
@@ -538,246 +167,92 @@ tests/@types/expr.py:807: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:808: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:809: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:810: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:814: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:815: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:816: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:817: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:818: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:819: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:820: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:821: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:823: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:824: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:825: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:826: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:830: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:831: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:832: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:833: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:834: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:835: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:836: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:837: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:839: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:840: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:841: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:842: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:846: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:846: error: Unsupported operand types for + ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:847: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:847: error: Unsupported operand types for - ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:848: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:848: error: Unsupported operand types for * ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:849: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:850: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:851: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:852: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:854: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:849: error: Unsupported operand types for ** ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:850: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:850: error: Unsupported operand types for <= ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:851: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:851: error: Unsupported operand types for >= ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:852: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:855: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:856: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:857: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:858: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:862: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:863: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:864: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:865: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:866: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:867: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:868: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:869: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:871: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:872: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:873: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:874: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:878: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:879: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:880: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:881: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:882: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:883: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:884: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:885: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:887: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:888: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:890: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:894: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:895: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:896: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:897: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:898: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:899: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:900: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:901: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:902: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:902: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:904: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:905: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:906: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:910: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:911: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:912: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:913: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:914: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:915: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:916: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:917: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:918: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:920: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:921: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:922: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:926: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:927: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:928: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:929: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:930: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:931: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:932: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:934: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:935: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:936: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:937: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:938: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:942: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:943: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:944: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:945: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:946: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:947: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:948: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:949: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:951: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:952: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:953: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:954: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:958: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:959: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:960: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:961: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:962: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:963: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:964: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:965: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:967: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:968: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:969: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:970: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:974: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:975: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:976: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:977: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:978: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:979: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:980: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:982: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:974: error: Unsupported operand types for + ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:975: error: Unsupported operand types for - ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:976: error: Unsupported operand types for * ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:977: error: Unsupported operand types for / ("MatrixVariable" and "Term")  [operator]
+tests/@types/expr.py:978: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:979: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:980: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:983: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:984: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:985: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:986: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:990: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:991: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:992: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:993: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:994: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:995: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:996: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:998: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:999: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1000: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1001: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1002: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1006: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1007: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1008: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1009: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1010: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1011: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1012: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1014: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1015: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1016: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1017: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1018: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1022: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1023: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1024: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1025: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1026: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1027: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1028: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1029: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:1031: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1032: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1033: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1034: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1038: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1039: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1040: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1041: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1042: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1043: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1044: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1046: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1047: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1048: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1049: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1050: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1054: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1055: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1056: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1057: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1058: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1059: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1060: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1062: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1063: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1064: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1065: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1066: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1070: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1071: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1072: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1073: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1074: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1075: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1076: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1078: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1079: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1080: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1081: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1082: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1086: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1087: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1088: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1089: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1090: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1091: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1092: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1094: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1095: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1096: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1097: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1098: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1102: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1103: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1104: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1105: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1106: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1107: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1108: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1110: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1111: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1112: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1113: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1114: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1118: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1119: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1120: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1121: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1122: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1123: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1124: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1125: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1126: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1127: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1128: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1129: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1133: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1134: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1135: error: Unused "type: ignore" comment  [unused-ignore]
@@ -790,116 +265,58 @@ tests/@types/expr.py:1141: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1142: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1143: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1144: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1148: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1149: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1150: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1151: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1152: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1153: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1154: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1155: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1157: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1158: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1159: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1160: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1164: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1165: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1166: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1167: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1168: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1169: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1170: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1171: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1173: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1174: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1175: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1176: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1180: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1180: error: Unsupported operand types for + ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:1181: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1181: error: Unsupported operand types for - ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:1182: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1182: error: Unsupported operand types for * ("MatrixVariable" and "Decimal")  [operator]
 tests/@types/expr.py:1183: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1184: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1185: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1186: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1188: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1183: error: Unsupported operand types for ** ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:1184: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:1184: error: Unsupported operand types for <= ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:1185: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:1185: error: Unsupported operand types for >= ("MatrixVariable" and "Decimal")  [operator]
+tests/@types/expr.py:1186: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1189: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1190: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1191: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1192: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1196: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1197: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1198: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1199: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1200: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1201: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1202: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1203: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1205: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1206: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1207: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1208: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1212: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1213: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1214: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1215: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1216: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1217: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1218: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1219: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1221: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1222: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1223: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1224: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1228: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1229: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1230: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1231: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1232: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1233: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1234: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1235: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1236: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:1238: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1239: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1240: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1244: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1245: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1246: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1247: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1248: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1249: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1250: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1251: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1252: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:1254: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1255: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1256: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1263: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1264: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1265: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1266: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1267: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1268: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1269: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1270: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1271: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1276: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1277: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1278: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1276: error: Unsupported operand types for + ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:1277: error: Unsupported operand types for - ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:1278: error: Unsupported operand types for / ("Term" and "MatrixVariable")  [operator]
 tests/@types/expr.py:1279: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1280: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1284: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1285: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1286: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1287: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1288: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1292: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1293: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1294: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1292: error: Unsupported operand types for + ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:1293: error: Unsupported operand types for - ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:1294: error: Unsupported operand types for / ("Term" and "MatrixVariable")  [operator]
 tests/@types/expr.py:1295: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1296: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1300: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1301: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1302: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1303: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1304: error: Unused "type: ignore" comment  [unused-ignore]
@@ -907,87 +324,38 @@ tests/@types/expr.py:1316: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1317: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1318: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1319: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1327: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1328: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1329: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1330: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1331: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1332: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1333: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1334: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1335: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1340: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1341: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1343: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1344: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1345: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1346: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1347: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1348: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1349: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1350: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1351: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1352: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1356: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1357: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1358: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:1356: error: Unsupported operand types for + ("Term" and "MatrixExpr")  [operator]
+tests/@types/expr.py:1357: error: Unsupported operand types for - ("Term" and "MatrixExpr")  [operator]
+tests/@types/expr.py:1358: error: Unsupported operand types for / ("Term" and "MatrixExpr")  [operator]
 tests/@types/expr.py:1359: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1360: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1364: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1365: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1366: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1367: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1368: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1372: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1373: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1375: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1376: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1377: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1378: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1379: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1380: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1381: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1382: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1383: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1384: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1388: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1389: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1391: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1392: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1393: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1394: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1395: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1396: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1397: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1398: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1399: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1400: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1404: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1405: error: Expression is of type "Any", not "bool"  [assert-type]
-tests/@types/expr.py:1407: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1408: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1409: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1410: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1411: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1412: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1413: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1414: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1415: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1416: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1423: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1424: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1425: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1426: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1427: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1428: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1429: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1430: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1431: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1439: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1440: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1441: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1442: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1443: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1444: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1445: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1446: error: Unused "type: ignore" comment  [unused-ignore]
@@ -996,10 +364,16 @@ tests/@types/expr.py:1460: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1461: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1462: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1463: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1471: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1472: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1473: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1474: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1475: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1476: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1477: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1478: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1479: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1480: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1492: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1493: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1494: error: Unused "type: ignore" comment  [unused-ignore]
@@ -1054,154 +428,32 @@ tests/@types/expr.py:1589: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1590: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1591: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1592: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1596: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1597: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1598: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1599: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1600: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1601: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1602: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1604: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1605: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1606: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1607: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1612: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1613: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1614: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1615: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1616: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1617: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1618: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1620: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1621: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1622: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1623: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1624: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1628: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1629: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1630: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1631: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1632: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1633: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1634: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1636: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1637: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1638: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1639: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1640: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1644: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1645: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1646: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1647: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1648: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1649: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1650: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1651: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1652: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1653: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1654: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1659: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1660: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1661: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1662: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1663: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:1664: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1665: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1666: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1668: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1669: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1670: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1675: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1676: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1677: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1678: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1679: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1680: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1681: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1683: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1684: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1685: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1686: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1687: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1691: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1692: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1693: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1694: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1695: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1696: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1697: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1699: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1700: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1701: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1702: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1703: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1707: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1708: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1709: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1710: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1711: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1712: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1713: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1715: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1716: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1717: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1718: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1719: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1723: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1724: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1725: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1726: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1727: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1728: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1729: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1731: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1732: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1733: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1734: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1735: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1739: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1740: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1741: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1742: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1743: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1744: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1745: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1747: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1748: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1749: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1750: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1751: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1755: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1756: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1757: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1758: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1759: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1760: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1761: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1763: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1764: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1765: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1766: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1771: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1772: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1773: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1774: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1775: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1776: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1777: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1779: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1780: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1781: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1782: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1788: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1789: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1790: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1791: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1793: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1794: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1795: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1796: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1797: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1802: error: Unused "type: ignore" comment  [unused-ignore]
@@ -1215,242 +467,66 @@ tests/@types/expr.py:1809: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1810: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1811: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1812: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1817: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1818: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1819: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1820: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1821: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:1822: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1823: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1824: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1826: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1827: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:1813: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1828: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1833: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1834: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1835: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1836: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1837: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:1838: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1839: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1840: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1842: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1843: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1844: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1849: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1850: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1849: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1849: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:1850: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1850: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:1851: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1853: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1854: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1855: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1856: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1857: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1858: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1859: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1860: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1865: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1866: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1867: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1868: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1869: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:1870: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1871: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1872: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1874: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1875: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1876: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1881: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1882: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1883: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1884: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1885: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1886: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1887: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1881: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:1882: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:1883: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:1884: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:1885: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1886: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:1887: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:1889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1890: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1891: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1892: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1893: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1897: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1898: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1899: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1900: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1901: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1902: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1903: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1905: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1906: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1907: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1908: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1909: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1913: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1914: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1915: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1916: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1917: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1918: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1919: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:1921: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1922: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1923: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1924: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1925: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1929: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:1930: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:1931: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:1932: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1933: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1934: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1935: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1937: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1938: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1939: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1940: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1941: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1945: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1946: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1947: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1948: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1949: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1950: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1951: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1953: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1954: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1955: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1956: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1957: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1961: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1962: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1963: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1964: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:1965: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1966: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1967: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:1969: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1970: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1971: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1972: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1973: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1977: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1978: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1979: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1980: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1981: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1982: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1983: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1984: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1985: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1986: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:1987: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1988: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:1992: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1993: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:1994: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1995: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:1996: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1997: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:1998: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2000: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2001: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2002: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2003: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2004: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2008: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2009: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2010: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2011: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2012: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2013: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2014: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2016: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2017: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2018: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2020: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2024: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2025: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2026: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2027: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2028: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2029: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2030: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2032: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2033: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2034: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2035: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2036: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2040: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2041: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2042: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2043: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2044: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2045: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2046: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2048: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2049: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2050: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2051: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2052: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2056: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2057: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2058: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2059: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2060: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2061: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2062: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2064: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2065: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2066: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2067: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2068: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2072: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2073: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2074: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2075: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2076: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2077: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2078: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2080: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2081: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2082: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2083: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2084: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2088: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2089: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2090: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2091: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2092: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2093: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2094: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2096: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2097: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2098: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2099: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2104: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2105: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2106: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2107: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2108: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2109: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2110: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2112: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2113: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2114: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2115: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2116: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2120: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2121: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2122: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2123: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2124: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2125: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2126: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2127: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2128: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2129: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2130: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2131: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2135: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2136: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2137: error: Unused "type: ignore" comment  [unused-ignore]
@@ -1463,246 +539,98 @@ tests/@types/expr.py:2143: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2144: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2145: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2146: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2150: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2151: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2152: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2153: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2154: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2155: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2156: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2157: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2159: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2160: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2161: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2162: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2166: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2167: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2168: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2169: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2170: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2171: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2172: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2173: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2175: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2176: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2177: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2178: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2182: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:2182: error: No overload variant of "__add__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2183: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:2183: error: No overload variant of "__sub__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2184: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:2184: error: No overload variant of "__mul__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2185: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:2185: error: No overload variant of "__pow__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2186: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2186: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2187: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2188: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2190: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2191: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2192: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:2187: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:2188: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:2193: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2194: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2198: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2199: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2200: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2201: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2202: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2203: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2204: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2205: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2207: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2208: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:2202: error: Expression is of type "PowExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:2209: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2210: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2214: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2215: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2216: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2217: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:2214: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:2215: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:2216: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
+tests/@types/expr.py:2217: error: Expression is of type "MatrixExpr", not "Expr"  [assert-type]
 tests/@types/expr.py:2218: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:2219: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2220: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2221: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2219: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2220: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2221: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:2223: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2224: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2225: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2226: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2230: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2231: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2232: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2233: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2234: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2235: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2236: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2238: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2239: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2240: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2241: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2242: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2246: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2247: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2248: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2249: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2250: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2251: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2252: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2254: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2255: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2256: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2257: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2258: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2262: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2263: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2264: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2265: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2266: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2267: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2268: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2270: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2271: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2272: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2273: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2274: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2278: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2279: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2280: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2281: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2282: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2283: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2284: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2285: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:2287: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2288: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2289: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2290: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2294: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2295: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2296: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2297: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2298: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2299: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2300: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2301: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:2303: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2304: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2305: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2306: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2310: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2311: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2312: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2313: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2314: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2315: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2316: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2318: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:2310: error: Unsupported operand types for + ("MatrixExpr" and "Term")  [operator]
+tests/@types/expr.py:2311: error: Unsupported operand types for - ("MatrixExpr" and "Term")  [operator]
+tests/@types/expr.py:2312: error: Unsupported operand types for * ("MatrixExpr" and "Term")  [operator]
+tests/@types/expr.py:2313: error: Unsupported operand types for / ("MatrixExpr" and "Term")  [operator]
+tests/@types/expr.py:2314: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:2315: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:2316: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2319: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2320: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2321: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2322: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2326: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2327: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2328: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2329: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2330: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2331: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2332: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2334: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2335: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2336: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2337: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2338: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2342: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2343: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2344: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2345: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2346: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2347: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2348: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2350: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2351: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2352: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2353: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2354: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2358: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2359: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2360: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2361: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2362: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2363: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2364: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2365: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:2367: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2368: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2369: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2370: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2374: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2375: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2376: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2377: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2378: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2379: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2380: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2382: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2383: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2384: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2385: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2386: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2390: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2391: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2392: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2393: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2394: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2395: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2396: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2398: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2399: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2400: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2401: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2402: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2406: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2407: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2408: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2409: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2410: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2411: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2412: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2414: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2415: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2416: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2417: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2418: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2422: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2423: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2424: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2425: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2426: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2427: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2428: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2430: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2431: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2432: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2433: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2434: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2438: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2439: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2440: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2441: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2442: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2443: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2444: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2446: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2447: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2448: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2449: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2450: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2454: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2455: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2456: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2457: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2458: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2459: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2460: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2461: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2462: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2463: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2464: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2465: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2469: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2470: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2471: error: Unused "type: ignore" comment  [unused-ignore]
@@ -1715,246 +643,69 @@ tests/@types/expr.py:2477: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2478: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2479: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2480: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2484: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2485: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2486: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2487: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2488: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2489: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2490: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2491: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2493: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2494: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2495: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2496: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2500: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2501: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2502: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2503: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2504: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2505: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2506: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2507: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2509: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2510: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2511: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2512: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2516: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:2516: error: Unsupported operand types for + ("MatrixExpr" and "Decimal")  [operator]
 tests/@types/expr.py:2517: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:2517: error: Unsupported operand types for - ("MatrixExpr" and "Decimal")  [operator]
 tests/@types/expr.py:2518: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:2518: error: Unsupported operand types for * ("MatrixExpr" and "Decimal")  [operator]
 tests/@types/expr.py:2519: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2520: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2521: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2522: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2524: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:2519: error: Unsupported operand types for ** ("MatrixExpr" and "Decimal")  [operator]
+tests/@types/expr.py:2520: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:2520: error: Unsupported operand types for <= ("MatrixExpr" and "Decimal")  [operator]
+tests/@types/expr.py:2521: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:2521: error: Unsupported operand types for >= ("MatrixExpr" and "Decimal")  [operator]
+tests/@types/expr.py:2522: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2525: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2526: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2527: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2528: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2532: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2533: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2534: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2535: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2536: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2537: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2538: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2539: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2541: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2542: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2543: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2544: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2548: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2549: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2550: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2551: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2552: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2553: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2554: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2555: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2557: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2558: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2559: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2560: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2564: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2565: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2566: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2567: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2568: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2569: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2570: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2571: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2572: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:2574: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2575: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2576: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2580: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2581: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2582: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2583: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2584: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2585: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2586: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2587: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2588: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:2590: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2591: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2592: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2596: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2597: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2598: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2599: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2600: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2601: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2602: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2604: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2605: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2606: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2607: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2608: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2612: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2613: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2614: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2615: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2616: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2617: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2618: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2620: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2621: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2622: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2623: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2624: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2628: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2629: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2630: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2631: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2632: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2633: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2634: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2636: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2637: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2638: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2639: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2640: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2644: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2645: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2646: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2647: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2648: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2649: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2650: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2651: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2652: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2653: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2654: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2655: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2659: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2660: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2661: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2662: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2663: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2664: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2665: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2666: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2668: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2669: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2670: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2671: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2675: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2676: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2677: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2678: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2679: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2680: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2681: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2683: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2684: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2685: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2686: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2687: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2691: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2692: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2693: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2694: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2695: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2696: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2697: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2699: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2700: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2701: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2702: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2703: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2707: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2708: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2709: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2710: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2711: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2712: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2713: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2715: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2716: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2717: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2718: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2719: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2723: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2724: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2725: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2726: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2727: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2728: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2729: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2731: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2732: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2733: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2734: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2735: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2739: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2740: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2741: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2742: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2743: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2744: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2745: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2747: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2748: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2749: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2750: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2751: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2755: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2756: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2757: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2758: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2759: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2760: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2761: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2763: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2764: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2765: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2766: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2767: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2771: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2772: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2773: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2774: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2775: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2776: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2777: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2779: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2780: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2781: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2782: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2783: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2788: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2789: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2790: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2791: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2793: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2794: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2795: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2796: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2797: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2798: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2802: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2803: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2804: error: Unused "type: ignore" comment  [unused-ignore]
@@ -1967,246 +718,67 @@ tests/@types/expr.py:2810: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2811: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2812: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2813: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2817: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2818: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2819: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2820: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2821: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2822: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2823: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2824: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2826: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2827: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2828: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2829: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2833: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2834: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2835: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2836: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2837: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2838: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2839: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2840: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2842: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2843: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2844: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2845: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2849: error: Expression is of type "Any", not "PowExpr"  [assert-type]
+tests/@types/expr.py:2849: error: Unsupported operand types for ** ("SumExpr" and "Decimal")  [operator]
 tests/@types/expr.py:2850: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2850: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:2851: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2852: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2854: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2855: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2856: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2857: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2858: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2859: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:2851: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:2852: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:2860: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2861: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2865: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2866: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2867: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2868: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2869: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2870: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2871: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2872: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2874: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2875: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2876: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2877: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2881: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2882: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2883: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2884: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2885: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2886: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2887: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2881: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:2882: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:2883: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:2884: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:2885: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2886: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:2887: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:2889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2890: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2891: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2892: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2893: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2897: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2898: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2899: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2900: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2901: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2902: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2903: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2905: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2906: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2907: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2908: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2909: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2913: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2914: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2915: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2916: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2917: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2918: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2919: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:2921: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2922: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2923: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2924: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2925: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2929: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2930: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2931: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2932: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2933: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2934: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2935: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2937: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2938: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2939: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2940: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2941: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2945: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2946: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2947: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2948: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2949: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2950: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2951: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2953: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2954: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2955: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2956: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2957: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2961: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2962: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2963: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2964: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:2965: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2966: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2967: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:2969: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2970: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2971: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2972: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2973: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2977: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2978: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2979: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2980: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2981: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2982: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2983: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2984: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2985: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2986: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:2987: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2988: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:2992: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2993: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:2994: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2995: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:2996: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:2997: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2998: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:2999: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3001: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3002: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3003: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3004: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3008: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3009: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3010: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3011: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3012: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3013: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3014: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3016: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3017: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3018: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3020: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3024: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3025: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3026: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3027: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3028: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3029: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3030: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3032: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3033: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3034: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3035: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3036: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3040: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3041: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3042: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3043: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3044: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3045: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3046: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3048: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3049: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3050: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3051: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3052: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3056: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3057: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3058: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3059: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3060: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3061: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3062: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3064: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3065: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3066: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3067: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3068: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3072: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3073: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3074: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3075: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3076: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3077: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3078: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3080: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3081: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3082: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3083: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3084: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3088: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3089: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3090: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3091: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3092: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3093: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3094: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3096: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3097: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3098: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3099: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3104: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3105: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3106: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3107: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3108: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3109: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3110: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3112: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3113: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3114: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3115: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3116: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3120: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3121: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3122: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3123: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3124: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3125: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3126: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3127: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3128: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3129: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3130: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3131: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3135: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3136: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3137: error: Unused "type: ignore" comment  [unused-ignore]
@@ -2219,246 +791,67 @@ tests/@types/expr.py:3143: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3144: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3145: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3146: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3150: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3151: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3152: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3153: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3154: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3155: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3156: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3157: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3159: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3160: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3161: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3162: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3166: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3167: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3168: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3169: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3170: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3171: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3172: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3173: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3175: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3176: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3177: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3178: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3182: error: Expression is of type "Any", not "PowExpr"  [assert-type]
+tests/@types/expr.py:3182: error: Unsupported operand types for ** ("ProdExpr" and "Decimal")  [operator]
 tests/@types/expr.py:3183: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3183: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:3184: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3185: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3187: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3188: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3189: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3190: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3191: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3192: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:3184: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:3185: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:3193: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3194: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3198: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3199: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3200: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3201: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3202: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3203: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3204: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3205: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3207: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3208: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3209: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3210: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3214: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3215: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3216: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3217: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3218: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3219: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3220: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3214: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3215: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3216: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3217: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3218: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3219: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3220: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:3222: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3223: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3224: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3225: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3226: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3230: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3231: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3232: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3233: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3234: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3235: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3236: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3238: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3239: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3240: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3241: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3242: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3246: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3247: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3248: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3249: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3250: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3251: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3252: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3254: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3255: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3256: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3257: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3258: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3262: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3263: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3264: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3265: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3266: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3267: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3268: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3270: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3271: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3272: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3273: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3274: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3278: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3279: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3280: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3281: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3282: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3283: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3284: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3286: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3287: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3288: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3289: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3290: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3294: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3295: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3296: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3297: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3298: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3299: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3300: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3302: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3303: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3304: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3305: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3306: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3310: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3311: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3312: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3313: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3314: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3315: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3316: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3317: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3318: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3319: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3320: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3321: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3325: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3326: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3327: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3328: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3329: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3330: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3331: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3332: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3334: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3335: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3336: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3337: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3341: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3342: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3343: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3344: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3345: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3346: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3347: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3349: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3350: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3351: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3352: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3353: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3357: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3358: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3359: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3360: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3361: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3362: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3363: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3365: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3366: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3367: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3368: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3369: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3373: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3374: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3375: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3376: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3377: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3378: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3379: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3381: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3382: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3383: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3384: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3385: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3389: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3390: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3391: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3392: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3393: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3394: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3395: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3397: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3398: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3399: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3400: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3401: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3405: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3406: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3407: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3408: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3409: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3410: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3411: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3413: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3414: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3415: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3416: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3417: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3421: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3422: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3423: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3424: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3425: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3426: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3427: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3429: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3430: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3431: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3432: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3433: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3437: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3438: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3439: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3440: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3441: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3442: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3443: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3445: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3446: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3447: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3448: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3449: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3453: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3454: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3455: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3456: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3457: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3458: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3459: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3460: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3461: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3462: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3463: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3464: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3468: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3469: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3470: error: Unused "type: ignore" comment  [unused-ignore]
@@ -2471,238 +864,65 @@ tests/@types/expr.py:3476: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3477: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3478: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3479: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3483: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3484: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3485: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3486: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3487: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3488: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3489: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3490: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3492: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3493: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3494: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3495: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3499: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3500: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3501: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3502: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3503: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3504: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3505: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3506: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3508: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3509: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3510: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3511: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3515: error: Expression is of type "Any", not "PowExpr"  [assert-type]
+tests/@types/expr.py:3515: error: Unsupported operand types for ** ("PowExpr" and "Decimal")  [operator]
 tests/@types/expr.py:3516: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3516: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:3517: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3518: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3520: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3521: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3522: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3523: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3524: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3525: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:3517: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:3518: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:3526: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3527: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3531: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3532: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3533: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3534: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3535: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3536: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3537: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3538: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3540: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3541: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3542: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3543: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3547: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3548: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3549: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3550: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3551: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3552: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3553: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3547: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3548: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3549: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3550: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3551: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3552: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3553: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:3555: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3556: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3557: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3558: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3559: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3563: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3564: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3565: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3566: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3567: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3568: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3569: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3571: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3572: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3573: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3574: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3575: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3579: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3580: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3581: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3582: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3583: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3584: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3585: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3587: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3588: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3589: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3590: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3591: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3595: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3596: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3597: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3598: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3599: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3600: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3601: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3603: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3604: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3605: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3606: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3611: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3612: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3613: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3614: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3615: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3616: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3617: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3619: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3620: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3621: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3622: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3623: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3627: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3628: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3629: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3630: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3631: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3632: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3633: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3635: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3636: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3637: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3638: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3639: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3643: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3644: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3645: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3646: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3647: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3648: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3649: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3650: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3651: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3652: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3653: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3658: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3659: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3660: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3661: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3662: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3663: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3664: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3665: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3667: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3668: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3669: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3674: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3675: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3676: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3677: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3678: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3679: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3680: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3682: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3683: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3684: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3685: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3686: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3690: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3691: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3692: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3693: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3694: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3695: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3696: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3698: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3699: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3700: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3701: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3702: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3706: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3707: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3708: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3709: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3710: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3711: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3712: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3714: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3715: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3716: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3717: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3718: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3722: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3723: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3724: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3725: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3726: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3727: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3728: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3730: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3731: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3732: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3733: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3734: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3738: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3739: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3740: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3741: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3742: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3743: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3744: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3746: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3747: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3748: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3749: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3750: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3754: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3755: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3756: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3757: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3758: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3759: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3760: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3762: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3763: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3764: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3765: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3770: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3771: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3772: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3773: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3774: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3775: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3776: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3778: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3779: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3780: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3781: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3786: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3788: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3789: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3790: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3791: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3793: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3794: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3795: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3796: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3801: error: Unused "type: ignore" comment  [unused-ignore]
@@ -2716,234 +936,66 @@ tests/@types/expr.py:3808: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3809: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3810: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3811: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3816: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3817: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3818: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3819: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3820: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3821: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3822: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3823: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3825: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3826: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:3812: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3827: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3832: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3833: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3834: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3835: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3836: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3837: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3838: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3839: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3841: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3842: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3843: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3848: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3849: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3850: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3848: error: Unsupported operand types for ** ("UnaryExpr" and "Decimal")  [operator]
+tests/@types/expr.py:3849: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3849: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:3850: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3850: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:3851: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3853: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3854: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3855: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3856: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3857: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3858: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3859: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3864: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3865: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3866: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3867: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3868: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3869: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3870: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3871: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3873: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3874: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3875: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3880: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3881: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3882: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3883: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3884: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3885: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3886: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3880: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3881: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:3882: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3883: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:3884: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3885: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:3886: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:3888: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3890: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3891: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3892: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3896: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3897: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3898: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3899: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3900: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3901: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3902: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3904: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3905: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3906: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3907: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3908: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3912: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3913: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3914: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3915: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3916: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3917: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3918: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:3920: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3921: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3922: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3923: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3924: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3928: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3929: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3930: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3931: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3932: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3933: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3934: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3936: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3937: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3938: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3939: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3944: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3945: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3946: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3947: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3948: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3949: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3950: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3952: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3953: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3954: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3955: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3956: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3960: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3961: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3962: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3963: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:3964: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3965: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3966: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:3968: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3969: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3970: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3971: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3972: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3976: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3977: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3978: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3979: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3980: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3981: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3982: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3983: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3984: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3985: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:3986: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:3991: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3992: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:3993: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3994: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:3995: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:3996: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3997: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:3998: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4000: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4001: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4002: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4007: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4008: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4009: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4010: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4011: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4012: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4013: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4015: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4016: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4017: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4018: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4023: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4024: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4025: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4026: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4027: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4028: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4029: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4031: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4032: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4033: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4034: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4035: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4039: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4040: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4041: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4042: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4043: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4044: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4045: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4047: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4048: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4049: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4050: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4051: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4055: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4056: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4057: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4058: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4059: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4060: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4061: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4063: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4064: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4065: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4066: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4067: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4071: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4072: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4073: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4074: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4075: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4076: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4077: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4079: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4080: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4081: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4082: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4083: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4087: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4088: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4089: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4090: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4091: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4092: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4093: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4095: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4096: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4097: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4098: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4103: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4104: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4105: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4106: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4107: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4108: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4109: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4111: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4112: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4113: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4114: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4119: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4120: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4121: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4122: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4123: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4124: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4125: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4126: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4127: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4128: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4129: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4134: error: Unused "type: ignore" comment  [unused-ignore]
@@ -2957,118 +1009,49 @@ tests/@types/expr.py:4141: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4142: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4143: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4144: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4149: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4150: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4151: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4152: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4153: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:4154: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4155: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4156: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4158: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4159: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4145: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4160: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4165: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4166: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4167: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4168: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4169: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:4170: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4171: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4172: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4174: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4175: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4176: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4181: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:4182: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4183: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4181: error: Unsupported operand types for ** ("VarExpr" and "Decimal")  [operator]
+tests/@types/expr.py:4182: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4182: error: No overload variant of "__le__" of "ExprLike" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:4183: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4183: error: No overload variant of "__ge__" of "ExprLike" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:4184: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4186: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4187: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4188: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4189: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4190: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4191: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4192: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4197: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4198: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4199: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4200: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4201: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:4202: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4203: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4204: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4206: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4207: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4208: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4213: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4214: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4215: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4216: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4217: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4218: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4219: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4213: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:4214: error: Expression is of type "MatrixExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:4215: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:4216: error: Expression is of type "MatrixExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:4217: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4218: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4219: error: Expression is of type "MatrixExprCons", not "ExprCons"  [assert-type]
 tests/@types/expr.py:4221: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4222: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4223: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4224: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4225: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4229: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4230: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4231: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4232: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4233: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4234: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4235: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4237: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4238: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4239: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4240: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4241: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4245: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4246: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4247: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4248: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4249: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4250: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4251: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4253: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4254: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4255: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4256: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4257: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4261: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4262: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4263: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4264: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4265: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4266: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4267: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4268: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4269: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4270: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4271: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4276: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4277: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4278: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4279: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4280: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4281: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4282: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4283: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4284: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4285: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4286: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4287: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4291: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4292: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4293: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4294: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4295: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4296: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4297: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4298: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4299: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4300: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4301: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4302: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3078,108 +1061,25 @@ tests/@types/expr.py:4313: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4314: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4315: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4316: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4321: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4322: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4323: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4324: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4325: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4326: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4327: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4328: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4329: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4330: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4331: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4336: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4337: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4338: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4339: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4340: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4341: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4342: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4343: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4344: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4345: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4346: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4347: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4351: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4352: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4353: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4354: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4355: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4356: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4357: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4358: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4359: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4360: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4361: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4362: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4366: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4367: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4368: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4369: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4370: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4371: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4372: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4373: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4374: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4375: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4376: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4377: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4381: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4382: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4383: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4384: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4385: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4386: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4387: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4388: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4389: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4390: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4391: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4392: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4396: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4397: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4398: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4399: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4400: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4401: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4402: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4403: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4404: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4405: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4406: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4407: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4411: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4412: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4413: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4414: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4415: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4416: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4417: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4418: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4419: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4420: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4421: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4426: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4427: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4428: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4429: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4430: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4431: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4432: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4433: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4434: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4435: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4436: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4441: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4442: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4443: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4444: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4445: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4446: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4447: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4448: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4449: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4450: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4451: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4456: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3188,54 +1088,21 @@ tests/@types/expr.py:4458: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4459: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4460: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4461: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4462: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4463: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4464: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4465: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4466: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4467: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4471: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4473: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4474: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4475: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4476: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4477: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4478: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4479: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4480: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4481: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4482: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4487: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4489: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4490: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4491: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4492: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4493: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4494: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4495: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4496: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4497: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4498: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4503: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4505: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4506: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4507: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4508: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4509: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4510: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4511: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4512: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4503: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:4503: error: Unsupported operand types for >= ("ExprCons" and "Decimal")  [operator]
 tests/@types/expr.py:4513: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4514: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4519: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4521: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4522: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4523: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4524: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4525: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4526: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4527: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4528: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4529: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4530: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4535: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3285,6 +1152,7 @@ tests/@types/expr.py:4587: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4588: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4589: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4590: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4591: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4595: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4596: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4597: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3309,12 +1177,18 @@ tests/@types/expr.py:4618: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4619: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4620: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4621: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4625: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4626: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4627: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4628: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4629: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4630: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4631: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4632: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4633: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4634: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4635: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4636: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4640: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4641: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4642: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3326,6 +1200,7 @@ tests/@types/expr.py:4647: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4648: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4649: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4650: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4651: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4655: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4656: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4657: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3397,6 +1272,7 @@ tests/@types/expr.py:4737: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4738: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4739: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4740: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4741: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4745: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4746: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4747: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3408,15 +1284,14 @@ tests/@types/expr.py:4752: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4753: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4754: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4755: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4756: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4760: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4761: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4762: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4763: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4764: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4765: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4766: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4767: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4768: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4769: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4770: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4771: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3432,7 +1307,6 @@ tests/@types/expr.py:4783: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4784: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4785: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4786: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4790: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4792: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4793: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4794: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3444,7 +1318,6 @@ tests/@types/expr.py:4799: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4800: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4801: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4802: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4806: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4808: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4809: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4810: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3457,10 +1330,17 @@ tests/@types/expr.py:4816: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4817: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4818: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4822: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4822: error: No overload variant of "__ge__" of "ndarray" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:4822: error: Unsupported operand types for >= ("MatrixExprCons" and "Decimal")  [operator]
+tests/@types/expr.py:4824: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4825: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4826: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4827: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4828: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4829: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4831: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4832: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4833: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4838: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:4834: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4840: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4841: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4842: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3472,7 +1352,6 @@ tests/@types/expr.py:4847: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4848: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4849: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4850: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4854: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4856: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4857: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4858: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3484,7 +1363,6 @@ tests/@types/expr.py:4863: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4864: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4865: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4866: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4870: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4872: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4873: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4874: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3496,7 +1374,6 @@ tests/@types/expr.py:4879: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4880: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4881: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4882: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4886: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4888: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4890: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3508,36 +1385,13 @@ tests/@types/expr.py:4895: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4896: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4897: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4898: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4902: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4903: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4904: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4905: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4906: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:4907: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4908: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:4909: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4911: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4912: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4913: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4918: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4919: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4920: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4921: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4922: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4923: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4924: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4925: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4927: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4928: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4929: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4930: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4934: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4935: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4936: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4937: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4938: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4939: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:4940: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4941: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:4943: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4944: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3547,111 +1401,28 @@ tests/@types/expr.py:4958: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4959: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4960: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4961: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4966: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4967: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:4968: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4969: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4970: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:4971: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4972: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:4973: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4975: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4976: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:4977: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4982: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4983: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4984: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:4985: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:4986: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:4987: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4988: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4989: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:4991: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4992: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:4989: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:4993: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4994: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:4998: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:4999: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5000: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5001: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5002: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5003: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5004: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5005: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5007: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5008: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5009: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5010: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5014: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5015: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5016: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5017: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5018: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5019: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5020: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5021: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5023: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5024: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5021: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5025: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5026: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5030: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5031: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5032: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5033: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5034: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5035: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5036: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5037: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5039: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5040: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5037: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5041: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5042: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5046: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5047: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5048: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5049: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5050: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5051: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5052: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5053: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5055: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5056: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5053: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5057: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5058: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5062: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5063: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5064: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5065: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5066: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5067: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5068: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5069: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5071: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5072: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5073: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5078: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5079: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5080: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5081: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5082: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5083: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5084: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5085: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5087: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5088: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5089: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5094: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5096: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5097: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5098: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5099: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5101: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5102: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5103: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5104: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5105: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5110: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5112: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5113: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5114: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3663,36 +1434,13 @@ tests/@types/expr.py:5119: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5120: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5121: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5122: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5126: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5127: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5128: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5129: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5130: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5131: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5132: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5133: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5135: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5136: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5137: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5142: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5143: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5144: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5145: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5146: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5147: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5148: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5149: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5151: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5152: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5153: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5154: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5158: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5159: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5160: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5161: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5162: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5163: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5164: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5165: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5167: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5168: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3702,111 +1450,28 @@ tests/@types/expr.py:5182: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5183: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5184: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5185: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5190: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5191: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5192: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5193: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5194: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5195: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5196: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5197: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5199: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5200: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5201: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5206: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5207: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5208: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5209: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5210: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5211: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5212: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5213: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5215: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5216: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5213: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5217: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5218: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5222: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5223: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5224: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5225: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5226: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5227: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5228: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5229: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5231: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5232: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5233: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5234: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5238: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5239: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5240: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5241: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5242: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5243: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5244: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5245: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5247: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5248: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5245: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5249: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5250: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5254: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5255: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5256: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5257: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5258: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5259: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5260: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5261: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5263: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5264: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5261: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5265: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5266: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5270: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5271: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5272: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5273: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5274: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5275: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5276: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5277: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5279: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5280: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5277: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5281: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5282: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5286: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5287: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5288: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5289: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5290: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5291: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5292: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5293: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5295: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5296: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5297: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5302: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5303: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5304: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5305: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5306: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5307: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5308: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5309: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5311: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5312: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5313: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5318: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5320: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5321: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5322: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5323: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5324: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5325: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5326: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5327: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5328: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5329: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5334: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5336: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5337: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5338: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3819,36 +1484,49 @@ tests/@types/expr.py:5344: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5345: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5346: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5350: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5350: error: Unsupported operand types for + ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:5351: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5351: error: Unsupported operand types for - ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:5352: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5352: error: Unsupported operand types for * ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:5353: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5354: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5355: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5353: error: Unsupported operand types for ** ("Decimal" and "Variable")  [operator]
+tests/@types/expr.py:5354: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5354: error: Unsupported operand types for <= ("Decimal" and "Variable")  [operator]
+tests/@types/expr.py:5355: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5355: error: Unsupported operand types for >= ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:5356: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5358: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5359: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5360: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5361: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5366: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5366: error: Unsupported operand types for + ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5367: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5367: error: Unsupported operand types for - ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5368: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5368: error: Unsupported operand types for * ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5369: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5370: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5371: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5369: error: Unsupported operand types for ** ("Decimal" and "MatrixVariable")  [operator]
+tests/@types/expr.py:5370: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5370: error: Unsupported operand types for <= ("Decimal" and "MatrixVariable")  [operator]
+tests/@types/expr.py:5371: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5371: error: Unsupported operand types for >= ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5372: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5374: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5375: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5376: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5377: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5378: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5382: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5382: error: Unsupported operand types for + ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5383: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5383: error: Unsupported operand types for - ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5384: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5384: error: Unsupported operand types for * ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5385: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5386: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5387: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5385: error: Unsupported operand types for ** ("Decimal" and "MatrixVariable")  [operator]
+tests/@types/expr.py:5386: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5386: error: Unsupported operand types for <= ("Decimal" and "MatrixVariable")  [operator]
+tests/@types/expr.py:5387: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5387: error: Unsupported operand types for >= ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:5388: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5390: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5391: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5392: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5393: error: Unused "type: ignore" comment  [unused-ignore]
@@ -3858,129 +1536,104 @@ tests/@types/expr.py:5407: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5408: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5409: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5414: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5415: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5416: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5414: error: Unsupported operand types for ** ("Decimal" and "Constant")  [operator]
+tests/@types/expr.py:5415: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5415: error: Unsupported operand types for <= ("Decimal" and "Constant")  [operator]
+tests/@types/expr.py:5416: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5416: error: Unsupported operand types for >= ("Decimal" and "Constant")  [operator]
 tests/@types/expr.py:5417: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5419: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5420: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5421: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5422: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5423: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5424: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5425: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5430: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5430: error: Unsupported operand types for + ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:5431: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5431: error: Unsupported operand types for - ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:5432: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:5432: error: Unsupported operand types for * ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:5433: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:5433: error: Unsupported operand types for ** ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:5434: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5434: error: Unsupported operand types for <= ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:5435: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5436: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5438: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5439: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5440: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5435: error: Unsupported operand types for >= ("Decimal" and "Expr")  [operator]
+tests/@types/expr.py:5436: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5441: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5442: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5446: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5446: error: Unsupported operand types for + ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:5447: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5447: error: Unsupported operand types for - ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:5448: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5448: error: Unsupported operand types for * ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:5449: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5450: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5451: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5449: error: Unsupported operand types for ** ("Decimal" and "MatrixExpr")  [operator]
+tests/@types/expr.py:5450: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5450: error: Unsupported operand types for <= ("Decimal" and "MatrixExpr")  [operator]
+tests/@types/expr.py:5451: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5451: error: Unsupported operand types for >= ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:5452: error: Expression is of type "bool", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5454: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5455: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5456: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5457: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5458: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5462: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:5462: error: Unsupported operand types for ** ("Decimal" and "SumExpr")  [operator]
 tests/@types/expr.py:5463: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5463: error: Unsupported operand types for <= ("Decimal" and "SumExpr")  [operator]
 tests/@types/expr.py:5464: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5465: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5467: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5468: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5469: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5470: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5471: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5472: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5464: error: Unsupported operand types for >= ("Decimal" and "SumExpr")  [operator]
+tests/@types/expr.py:5465: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5473: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5474: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5478: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:5478: error: Unsupported operand types for ** ("Decimal" and "ProdExpr")  [operator]
 tests/@types/expr.py:5479: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5479: error: Unsupported operand types for <= ("Decimal" and "ProdExpr")  [operator]
 tests/@types/expr.py:5480: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5481: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5483: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5484: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5485: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5486: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5487: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5488: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5480: error: Unsupported operand types for >= ("Decimal" and "ProdExpr")  [operator]
+tests/@types/expr.py:5481: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5489: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5490: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5494: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:5494: error: Unsupported operand types for ** ("Decimal" and "PowExpr")  [operator]
 tests/@types/expr.py:5495: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5495: error: Unsupported operand types for <= ("Decimal" and "PowExpr")  [operator]
 tests/@types/expr.py:5496: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5497: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5499: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5500: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5501: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5502: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5503: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5504: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5496: error: Unsupported operand types for >= ("Decimal" and "PowExpr")  [operator]
+tests/@types/expr.py:5497: error: Expression is of type "bool", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5505: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5506: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5510: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5511: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5512: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5510: error: Unsupported operand types for ** ("Decimal" and "UnaryExpr")  [operator]
+tests/@types/expr.py:5511: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5511: error: Unsupported operand types for <= ("Decimal" and "UnaryExpr")  [operator]
+tests/@types/expr.py:5512: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5512: error: Unsupported operand types for >= ("Decimal" and "UnaryExpr")  [operator]
 tests/@types/expr.py:5513: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5515: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5516: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5517: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5518: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5519: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5520: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5521: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5526: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5527: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5528: error: Expression is of type "bool", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5526: error: Unsupported operand types for ** ("Decimal" and "VarExpr")  [operator]
+tests/@types/expr.py:5527: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5527: error: Unsupported operand types for <= ("Decimal" and "VarExpr")  [operator]
+tests/@types/expr.py:5528: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5528: error: Unsupported operand types for >= ("Decimal" and "VarExpr")  [operator]
 tests/@types/expr.py:5529: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5531: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5532: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5533: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5534: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5535: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5536: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5537: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5542: error: Expression is of type "bool", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5544: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5545: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5546: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5547: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5548: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5549: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5550: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5551: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5542: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5542: error: Unsupported operand types for <= ("Decimal" and "ExprCons")  [operator]
 tests/@types/expr.py:5552: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5553: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5558: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5558: error: Unsupported operand types for <= ("Decimal" and "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]")  [operator]
+tests/@types/expr.py:5558: error: Unsupported operand types for <= ("Decimal" and "MatrixExprCons")  [operator]
+tests/@types/expr.py:5560: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5561: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5562: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5563: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5564: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5565: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:5566: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5568: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5569: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5574: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5575: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5576: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5577: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5578: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:5570: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5579: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5580: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5581: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5583: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5584: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5585: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5590: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5591: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5592: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5593: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5594: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5595: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5596: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5597: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
@@ -3988,11 +1641,6 @@ tests/@types/expr.py:5599: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5600: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5601: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5602: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5606: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5607: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5608: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5609: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5610: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5611: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5612: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5613: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
@@ -4016,107 +1664,42 @@ tests/@types/expr.py:5630: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5631: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5632: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5633: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5638: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5639: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5640: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5641: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5642: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
 tests/@types/expr.py:5643: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5644: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5645: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5647: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5648: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5649: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5654: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5655: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5656: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:5657: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5658: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5659: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5660: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5659: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5660: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5661: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5663: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5664: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5665: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5666: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5670: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5671: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5672: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5673: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5674: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5675: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5676: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5675: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5676: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5677: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5679: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5680: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5681: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5682: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5686: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5687: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5688: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5689: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5690: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5691: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5692: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5691: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5692: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5693: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5695: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5696: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5697: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5698: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5702: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5703: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5704: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5705: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5706: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5707: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5708: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5707: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5708: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5709: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5711: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5712: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5713: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5714: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5718: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5719: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5720: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5721: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5722: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5723: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5724: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5723: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5724: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5725: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5727: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5728: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5729: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5730: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5734: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5735: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5736: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5737: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5738: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
 tests/@types/expr.py:5739: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5740: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5741: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5743: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5744: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5745: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5750: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5751: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:5752: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5753: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:5754: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
 tests/@types/expr.py:5755: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5756: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5757: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5759: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5760: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5761: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5766: error: Expression is of type "numpy.bool[builtins.bool]", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5768: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5769: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5770: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5771: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5772: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5773: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5774: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5775: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5776: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5777: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4149,9 +1732,6 @@ tests/@types/expr.py:5815: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:5816: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5817: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5818: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5819: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5820: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5821: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5823: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5824: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5825: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4161,9 +1741,6 @@ tests/@types/expr.py:5831: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:5832: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5833: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5834: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5835: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5836: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5837: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:5839: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5840: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5841: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4197,21 +1774,18 @@ tests/@types/expr.py:5879: error: Expression is of type "Any", not "Expr"  [asse
 tests/@types/expr.py:5880: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:5881: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5882: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5883: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5884: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5883: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5884: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5885: error: Expression is of type "Any", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5887: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5888: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5889: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5890: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:5894: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5895: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5896: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5897: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5898: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:5899: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5900: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:5901: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:5894: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5895: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5896: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5897: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:5898: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:5903: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5904: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5905: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4221,8 +1795,8 @@ tests/@types/expr.py:5911: error: Expression is of type "Any", not "SumExpr"  [a
 tests/@types/expr.py:5912: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5913: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5914: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5915: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5916: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5915: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5916: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5917: error: Expression is of type "Any", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5919: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5920: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4233,8 +1807,8 @@ tests/@types/expr.py:5927: error: Expression is of type "Any", not "SumExpr"  [a
 tests/@types/expr.py:5928: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5929: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5930: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5931: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5932: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5931: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5932: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5933: error: Expression is of type "Any", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5935: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5936: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4245,8 +1819,8 @@ tests/@types/expr.py:5943: error: Expression is of type "Any", not "SumExpr"  [a
 tests/@types/expr.py:5944: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5945: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:5946: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:5947: error: Expression is of type "Any", not "ExprCons"  [assert-type]
-tests/@types/expr.py:5948: error: Expression is of type "Any", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5947: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
+tests/@types/expr.py:5948: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5949: error: Expression is of type "Any", not "ExprCons"  [assert-type]
 tests/@types/expr.py:5951: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5952: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4288,7 +1862,6 @@ tests/@types/expr.py:5998: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:5999: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6000: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6001: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6005: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6007: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6008: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6009: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4317,9 +1890,6 @@ tests/@types/expr.py:6038: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:6039: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6040: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6041: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6042: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6043: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6044: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6045: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "Expr"  [assert-type]
 tests/@types/expr.py:6047: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6048: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4329,9 +1899,6 @@ tests/@types/expr.py:6054: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:6055: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6056: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6057: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6058: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6059: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6060: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6061: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6063: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6064: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4365,22 +1932,19 @@ tests/@types/expr.py:6102: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6103: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6104: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6105: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6106: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6107: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6106: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6107: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6108: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6110: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6111: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6112: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6113: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6117: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6118: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6119: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6120: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6121: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6122: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6123: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6124: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6125: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6117: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6118: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6119: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6120: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6121: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6125: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6127: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6128: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6129: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4389,8 +1953,8 @@ tests/@types/expr.py:6134: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6135: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6136: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6137: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6138: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6139: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6138: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6139: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6140: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6142: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6143: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4401,8 +1965,8 @@ tests/@types/expr.py:6150: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6151: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6152: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6153: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6154: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6155: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6154: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6155: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6156: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6158: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6159: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4413,8 +1977,8 @@ tests/@types/expr.py:6166: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6167: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6168: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6169: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6170: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6171: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6170: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6171: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6172: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6174: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6175: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4456,7 +2020,6 @@ tests/@types/expr.py:6221: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6222: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6223: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6224: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6228: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6230: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6231: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6232: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4485,9 +2048,6 @@ tests/@types/expr.py:6261: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:6262: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6263: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6264: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6265: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6266: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6267: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6268: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6270: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6271: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4497,9 +2057,6 @@ tests/@types/expr.py:6277: error: Expression is of type "ndarray[tuple[Any, ...]
 tests/@types/expr.py:6278: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6279: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6280: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6281: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6282: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6283: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6284: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6286: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6287: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4533,22 +2090,19 @@ tests/@types/expr.py:6325: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6326: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6327: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6328: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6329: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6330: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6329: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6330: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6331: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6333: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6334: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6335: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6336: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6340: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6341: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6342: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6343: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6344: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6345: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6346: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6347: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6348: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6340: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6341: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6342: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6343: error: Expression is of type "ndarray[tuple[Any, ...], dtype[float64]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6344: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6348: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6350: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6351: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6352: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4557,8 +2111,8 @@ tests/@types/expr.py:6357: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6358: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6359: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6360: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6361: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6362: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6361: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6362: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6363: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6365: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6366: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4569,8 +2123,8 @@ tests/@types/expr.py:6373: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6374: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6375: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6376: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6377: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6378: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6377: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6378: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6379: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6381: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6382: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4581,8 +2135,8 @@ tests/@types/expr.py:6389: error: Expression is of type "Any", not "MatrixExpr"
 tests/@types/expr.py:6390: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6391: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6392: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6393: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
-tests/@types/expr.py:6394: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6393: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
+tests/@types/expr.py:6394: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6395: error: Expression is of type "Any", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6397: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6398: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4624,7 +2178,6 @@ tests/@types/expr.py:6444: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6445: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6446: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6447: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6451: error: Expression is of type "ndarray[tuple[Any, ...], dtype[numpy.bool[builtins.bool]]]", not "MatrixExprCons"  [assert-type]
 tests/@types/expr.py:6453: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6454: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6455: error: Unused "type: ignore" comment  [unused-ignore]
@@ -4636,113 +2189,160 @@ tests/@types/expr.py:6460: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6461: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6462: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:6463: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6481: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6487: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6493: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6498: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6474: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6480: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6481: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6486: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6487: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6492: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6493: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6511: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6512: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6518: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6524: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6530: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6535: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6517: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6518: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6523: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6524: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6529: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6530: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6540: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6548: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6549: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6555: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6561: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6567: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6572: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6554: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6555: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6560: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6561: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6566: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6567: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6577: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6585: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6590: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6595: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6600: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6605: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6618: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6619: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6625: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6631: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6637: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6642: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6662: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6668: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6674: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6679: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6684: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6624: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6625: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6630: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6631: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6636: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6637: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6655: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6661: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6662: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6667: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6668: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6673: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6674: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6692: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6693: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6699: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6705: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6711: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:6716: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6698: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6699: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6704: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6705: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:6710: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6711: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:6721: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6729: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6730: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6736: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6742: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6748: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6753: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6758: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6735: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6736: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6741: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6742: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6747: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6748: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6766: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6767: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6773: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6779: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6785: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6790: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6795: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6772: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6773: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6778: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6779: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6784: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6785: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6803: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6804: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6810: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6816: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6822: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6827: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6832: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6809: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6810: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6815: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6816: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6821: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6822: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6840: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6841: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6847: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6853: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6859: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6864: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6846: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6847: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6852: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6853: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6858: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6859: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6877: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:6878: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6884: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:6890: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6896: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:6901: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6914: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6919: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6924: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6929: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6934: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6947: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6952: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6957: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6962: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6883: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6884: error: Expression is of type "Variable", not "SumExpr"  [assert-type]
+tests/@types/expr.py:6889: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6890: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:6895: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6896: error: Expression is of type "Variable", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:6967: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:6987: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6993: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:6999: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7005: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7025: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7031: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7037: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7043: error: Expression is of type "Any", not "PowExpr"  [assert-type]
+tests/@types/expr.py:6972: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:6980: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6986: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6987: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6992: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6993: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:6998: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:6999: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7004: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7005: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7018: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7024: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7025: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7030: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7031: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7036: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7037: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7042: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7043: error: Expression is of type "Variable", not "PowExpr"  [assert-type]
+tests/@types/expr.py:7056: error: No overload variant of "__add__" of "Expr" matches argument type "Decimal"  [operator]
+tests/@types/expr.py:7057: error: Expression is of type "Any", not "Variable"  [assert-type]
+tests/@types/expr.py:7062: error: No overload variant of "__sub__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:7063: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:7068: error: No overload variant of "__mul__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:7069: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7074: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:7079: error: No overload variant of "__pow__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:7080: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7100: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7106: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7112: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7118: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:7093: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7099: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7100: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7105: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7106: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7111: error: Incompatible types in assignment (expression has type "Expr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7112: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7117: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7118: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7131: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:7132: error: Expression is of type "Variable", not "Expr"  [assert-type]
-tests/@types/expr.py:7138: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7144: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:7150: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:7137: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7138: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7143: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7144: error: Expression is of type "Variable", not "Expr"  [assert-type]
+tests/@types/expr.py:7149: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7150: error: Expression is of type "Variable", not "Expr"  [assert-type]
 tests/@types/expr.py:7156: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:7161: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:7169: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:7170: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7176: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7182: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7188: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7175: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7176: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7181: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7182: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7187: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7188: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:7193: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:7198: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:7206: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
 tests/@types/expr.py:7207: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7213: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7219: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:7225: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7212: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7213: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7218: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7219: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:7224: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Variable")  [assignment]
+tests/@types/expr.py:7225: error: Expression is of type "Variable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:7230: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:7235: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:7244: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
@@ -4997,64 +2597,42 @@ tests/@types/expr.py:8762: error: Expression is of type "MatrixVariable", not "M
 tests/@types/expr.py:8768: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:8774: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:8780: error: Expression is of type "MatrixVariable", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8788: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8793: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8798: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8808: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8822: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8828: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8833: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8839: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8844: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:8821: error: Unsupported operand types for + ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8821: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8822: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:8827: error: Unsupported operand types for - ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8827: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8828: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:8838: error: Unsupported operand types for / ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8838: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8839: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:8849: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8858: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8864: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8869: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8875: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:8880: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:8857: error: Unsupported operand types for + ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8857: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8858: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:8863: error: Unsupported operand types for - ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8863: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8864: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:8874: error: Unsupported operand types for / ("Term" and "MatrixVariable")  [operator]
+tests/@types/expr.py:8874: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8875: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:8885: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8927: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8932: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8937: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8947: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8960: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8965: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8970: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8975: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8980: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8985: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:8994: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9000: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9005: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9011: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9016: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:8993: error: Unsupported operand types for + ("Term" and "MatrixExpr")  [operator]
+tests/@types/expr.py:8993: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:8994: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:8999: error: Unsupported operand types for - ("Term" and "MatrixExpr")  [operator]
+tests/@types/expr.py:8999: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:9000: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9010: error: Unsupported operand types for / ("Term" and "MatrixExpr")  [operator]
+tests/@types/expr.py:9010: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Term")  [assignment]
+tests/@types/expr.py:9011: error: Expression is of type "Term", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:9021: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9029: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9034: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9039: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9044: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9049: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9054: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9062: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9067: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9072: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9077: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9082: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9087: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9095: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9105: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9110: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9115: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9120: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9128: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9133: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9138: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9148: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9161: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9166: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9171: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9181: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9227: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9232: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9237: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9242: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9247: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9252: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:9359: error: No overload variant of "__radd__" of "float64" matches argument type "Term"  [operator]
 tests/@types/expr.py:9360: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
 tests/@types/expr.py:9365: error: No overload variant of "__rsub__" of "float64" matches argument type "Term"  [operator]
@@ -5081,317 +2659,291 @@ tests/@types/expr.py:9482: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:9488: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
 tests/@types/expr.py:9494: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
 tests/@types/expr.py:9499: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9508: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9514: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9520: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9526: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9531: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9545: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9551: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9557: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9563: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9568: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9507: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9508: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9513: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9514: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9519: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9520: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9525: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9526: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9544: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9545: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9550: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9551: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9556: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9557: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9562: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9563: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:9573: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9582: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9588: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9594: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9600: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9605: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9581: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9582: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9587: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9588: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9593: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9594: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9599: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9600: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:9610: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9618: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9623: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9628: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9633: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9638: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9652: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9658: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9664: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9670: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9676: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:9690: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9696: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9702: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9708: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9713: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9718: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9727: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9733: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9739: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9745: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:9750: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9651: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9652: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9657: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9658: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9663: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9664: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9669: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9670: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9689: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9690: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9695: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9696: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9701: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9702: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9707: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9708: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9726: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9727: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9732: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9733: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9738: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9739: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:9744: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9745: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:9755: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9764: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9770: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9776: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9782: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9801: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9807: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9813: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9819: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9824: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9829: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9838: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9844: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9850: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9856: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9861: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9866: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9875: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9881: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9887: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9893: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9898: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9912: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9918: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:9924: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9930: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:9935: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9948: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9953: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9958: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9963: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9968: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9981: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9986: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9991: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:9996: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:9763: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9764: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9769: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9770: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9775: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9776: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9781: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9782: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9800: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9801: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9806: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9807: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9812: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9813: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9818: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9819: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9837: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9838: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9843: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9844: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9849: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9850: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9855: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9856: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9874: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9875: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9880: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9881: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9886: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9887: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9892: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9893: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9911: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9912: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9917: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9918: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:9923: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9924: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:9929: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:9930: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:10001: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10015: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10021: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10027: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10033: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10039: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:10053: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10059: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10065: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10071: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10077: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:10090: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10095: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10105: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10110: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10124: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10130: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10136: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10142: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10148: error: Expression is of type "Any", not "Constant"  [assert-type]
-tests/@types/expr.py:10162: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10168: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10174: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10180: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10006: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10014: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10015: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10020: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10021: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10026: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10027: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10032: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10033: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10052: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10053: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10058: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10059: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10064: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10065: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10070: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10071: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10123: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10124: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10129: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10130: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10135: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10136: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10141: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10142: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10161: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10162: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10167: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10168: error: Expression is of type "Constant", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10173: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10174: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10179: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10180: error: Expression is of type "Constant", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:10185: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:10190: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10199: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10205: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10211: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10217: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10198: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10199: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10204: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10205: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10210: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10211: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10216: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10217: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10222: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:10227: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10236: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10242: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10248: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10254: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10235: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10236: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10241: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10242: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10247: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10248: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10253: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Constant")  [assignment]
+tests/@types/expr.py:10254: error: Expression is of type "Constant", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10259: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:10264: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10273: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10279: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10285: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10291: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10296: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10301: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10310: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10316: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10322: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10328: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10333: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10290: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10291: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10309: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10310: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10315: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10316: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10321: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10322: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10327: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10328: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10338: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10347: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10353: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10359: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10365: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10370: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10346: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10347: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10352: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10353: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10358: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10359: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10364: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10365: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10375: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10383: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10388: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10393: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10398: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10403: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10408: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10417: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10423: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10429: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10435: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10440: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10445: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10454: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10460: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10466: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10472: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10477: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10482: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10491: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10497: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10503: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10509: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10514: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10416: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10417: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10422: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10423: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10428: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10429: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10434: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10435: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10471: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10472: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10490: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10491: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10496: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10497: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10502: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10503: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10508: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10509: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10519: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10528: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10534: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10540: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10546: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10551: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10556: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10565: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10571: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10577: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10583: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10588: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10593: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10602: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10608: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10614: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10620: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10625: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10630: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10639: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10645: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10651: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10657: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10662: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10667: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10676: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10682: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:10688: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10694: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:10699: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10704: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10712: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10717: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10722: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10727: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10732: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10737: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10745: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10750: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10755: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10760: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10527: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10528: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10533: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10534: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10539: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10540: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10545: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10546: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10564: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10565: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10570: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10571: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10576: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10577: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10582: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10583: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10601: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10602: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10607: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10608: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10613: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10614: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10619: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10620: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10638: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10639: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10644: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10645: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10650: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10651: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10656: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10657: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10675: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10676: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10681: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10682: error: Expression is of type "Expr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:10687: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10688: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:10693: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10694: error: Expression is of type "Expr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:10765: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:10770: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10779: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10785: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10791: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10797: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10803: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10808: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10817: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10823: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10829: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10835: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10841: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:10846: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10840: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10841: error: Expression is of type "Expr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:10854: error: No overload variant of "__add__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:10855: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:10860: error: No overload variant of "__sub__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:10861: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:10866: error: No overload variant of "__mul__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:10867: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10872: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:10877: error: No overload variant of "__pow__" of "Expr" matches argument type "Decimal"  [operator]
 tests/@types/expr.py:10878: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10883: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10892: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10898: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10904: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10910: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10916: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10921: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10930: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10936: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10942: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:10948: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:10915: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10929: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10935: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10941: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10947: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
 tests/@types/expr.py:10954: error: Expression is of type "Any", not "Expr"  [assert-type]
 tests/@types/expr.py:10959: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:10968: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10974: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10980: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:10986: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10967: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10968: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10973: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10974: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10979: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10980: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:10985: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:10986: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:10991: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:10996: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11005: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11011: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11017: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11023: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11004: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:11005: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11010: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:11011: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11016: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:11017: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11022: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "Expr")  [assignment]
+tests/@types/expr.py:11023: error: Expression is of type "Expr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11028: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11033: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11042: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11048: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11054: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11060: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11065: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11070: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11079: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11085: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11091: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11097: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11102: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11107: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11116: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11122: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11128: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11134: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11139: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11145: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11154: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11160: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11166: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11172: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11177: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11182: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11191: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11197: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11203: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11209: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11214: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11219: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11228: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11234: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11240: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11246: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11251: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11256: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11265: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11271: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11277: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11283: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11288: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11294: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11303: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11309: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11315: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11321: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11326: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11331: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11340: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11346: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11352: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11358: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11363: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11368: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11377: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11383: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11389: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11395: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11400: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11405: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11414: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11420: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11426: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11432: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11437: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11442: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11451: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11457: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11463: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11469: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11474: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11479: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11487: error: Unused "type: ignore" comment  [unused-ignore]
@@ -5406,989 +2958,1160 @@ tests/@types/expr.py:11530: error: Unused "type: ignore" comment  [unused-ignore
 tests/@types/expr.py:11535: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11540: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:11545: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11554: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11560: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11566: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11572: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11578: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11583: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11592: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11598: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11604: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11610: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11616: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11621: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11630: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11636: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11642: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11647: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11653: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11658: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11667: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11673: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11679: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11685: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11691: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11696: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11705: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11711: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11717: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11723: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11729: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11734: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11743: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11749: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11755: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11761: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11767: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11773: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11782: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11788: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11794: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11800: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11806: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11812: error: Expression is of type "ndarray[tuple[Any, ...], dtype[Any]]", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11821: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:11827: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:11833: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:11839: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:11844: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11849: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11858: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11864: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11870: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11876: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11881: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:11832: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11833: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:11838: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11839: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:11857: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11858: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11863: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11864: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11869: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11870: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11875: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11876: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11886: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11895: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11901: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11907: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11913: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:11918: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:11894: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11895: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11900: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11901: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11906: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11907: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:11912: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11913: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:11923: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11931: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11936: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11941: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11946: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11951: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11956: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:11965: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:11971: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:11977: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:11983: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:11989: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:11994: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12003: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12009: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12015: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12021: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12026: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12031: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12040: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12046: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12052: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12058: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12063: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:11976: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11977: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:11982: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11983: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:11988: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:11989: error: Expression is of type "SumExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:12014: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12015: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12020: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12021: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12039: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12040: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12045: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12046: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12051: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12052: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12057: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12058: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12068: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12077: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12083: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12089: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12095: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12100: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12105: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12114: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12120: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12126: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12132: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12137: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12142: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12151: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12157: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12163: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12169: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12174: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12179: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12188: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12194: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12200: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12206: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12211: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12216: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12225: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12231: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12237: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12243: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12248: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12253: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12261: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12266: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12271: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12276: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12281: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12286: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12294: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12299: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12304: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12309: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12088: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12089: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12094: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12095: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12125: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12126: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12131: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12132: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12162: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12163: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12168: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12169: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12199: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12200: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12205: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12206: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12236: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12237: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12242: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12243: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:12314: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:12319: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12328: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12334: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12340: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12346: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12352: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:12357: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12366: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12372: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12378: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12384: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12390: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:12395: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12403: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12408: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12413: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12418: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12339: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12340: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12345: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12346: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12351: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12352: error: Expression is of type "SumExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:12377: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12378: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12383: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12384: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12389: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12390: error: Expression is of type "SumExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:12423: error: Unsupported operand types for ** ("SumExpr" and "Decimal")  [operator]
 tests/@types/expr.py:12424: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:12429: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12438: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12444: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12450: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12456: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12462: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:12467: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12476: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12482: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12488: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12494: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12449: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12450: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12455: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12456: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12461: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12462: error: Expression is of type "SumExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:12475: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12481: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12487: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12488: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:12493: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12494: error: Expression is of type "SumExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:12499: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:12504: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12513: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12519: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12525: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12531: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12512: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12513: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12518: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12519: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12524: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12525: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12530: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12531: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12536: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:12541: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12550: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12556: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12562: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12568: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12549: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12550: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12555: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12556: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12561: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12562: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12567: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "SumExpr")  [assignment]
+tests/@types/expr.py:12568: error: Expression is of type "SumExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12573: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:12578: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12587: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12593: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12599: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12605: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12610: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12615: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12624: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12630: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12636: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12642: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12647: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12586: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12587: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12592: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12593: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12623: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12624: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12629: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12630: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12635: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12636: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12641: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12642: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12652: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12661: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12667: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12673: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12679: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12684: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12660: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12661: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12666: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12667: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12672: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12673: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12678: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12679: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12689: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12697: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12702: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12707: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12712: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12717: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12722: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12731: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12737: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12743: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12749: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12755: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:12760: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12769: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12775: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12781: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12787: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12797: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12806: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12812: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12818: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12824: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:12829: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12730: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12731: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12736: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12737: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12754: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12755: error: Expression is of type "ProdExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:12768: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12769: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12774: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12775: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12805: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12806: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12811: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12812: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12817: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12818: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:12823: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12824: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:12834: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12843: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12849: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12855: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12861: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12866: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12871: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12880: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12886: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12892: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12898: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12903: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12908: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12917: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12923: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12929: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12935: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12940: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12945: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12954: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12960: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12966: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12972: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:12977: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12982: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:12991: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:12997: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13003: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13009: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13014: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13027: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13032: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13037: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13042: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13047: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13052: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13060: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13065: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13070: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13075: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:12842: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12843: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12848: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12849: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12879: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12880: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12885: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12886: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12916: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12917: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12922: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12923: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12953: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12954: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12959: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12960: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12990: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12991: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:12996: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:12997: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
 tests/@types/expr.py:13080: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:13085: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13094: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13100: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13106: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13112: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13118: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13123: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13132: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13138: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13144: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13150: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13156: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13161: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13169: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13174: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13179: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13184: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13093: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13094: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13099: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13100: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13117: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13118: error: Expression is of type "ProdExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:13131: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13132: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13137: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13138: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13155: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13156: error: Expression is of type "ProdExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:13189: error: Unsupported operand types for ** ("ProdExpr" and "Decimal")  [operator]
 tests/@types/expr.py:13190: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13195: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13204: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13210: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13216: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13222: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13228: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13233: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13242: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13248: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13254: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13260: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13203: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13204: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13209: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13210: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13227: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13228: error: Expression is of type "ProdExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:13241: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13242: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13247: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13248: error: Expression is of type "ProdExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13253: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13259: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
 tests/@types/expr.py:13265: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:13270: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13279: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13285: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13291: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13297: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13278: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13279: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13284: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13285: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13290: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13291: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13296: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13297: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:13302: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:13307: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13316: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13322: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13328: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13334: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13315: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13316: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13321: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13322: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13327: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13328: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13333: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "ProdExpr")  [assignment]
+tests/@types/expr.py:13334: error: Expression is of type "ProdExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:13339: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:13344: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13353: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13359: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13365: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13371: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13376: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13381: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13390: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13396: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13402: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13408: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13413: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13352: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13353: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13358: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13359: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13364: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13365: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13370: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13371: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13389: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13390: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13395: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13396: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13401: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13402: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13407: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13408: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:13418: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13427: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13433: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13439: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13445: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13450: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13426: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13427: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13432: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13433: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13438: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13439: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13444: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13445: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:13455: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13463: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13468: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13473: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13478: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13483: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13488: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13497: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13503: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13509: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13515: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13521: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13526: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13535: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13541: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13547: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13553: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13558: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13563: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13572: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13578: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13584: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13590: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:13595: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13496: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13497: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13502: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13503: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13508: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13509: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13514: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13515: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13534: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13535: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13540: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13541: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13546: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13547: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13552: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13553: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13571: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13572: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13577: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13578: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13583: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13584: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:13589: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13590: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:13600: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13609: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13615: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13621: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13627: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13632: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13637: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13646: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13652: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13658: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13664: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13669: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13674: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13683: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13689: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13695: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13701: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13706: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13711: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13720: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13726: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13732: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13738: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13743: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13748: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13757: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13763: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13769: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13775: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13780: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13785: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13793: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13798: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13803: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13808: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13813: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13818: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13826: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13831: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13836: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13841: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13608: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13609: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13614: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13615: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13620: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13621: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13626: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13627: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13645: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13646: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13651: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13652: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13657: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13658: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13663: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13664: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13682: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13683: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13688: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13689: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13694: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13695: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13700: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13701: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13719: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13720: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13725: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13726: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13731: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13732: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13737: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13738: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13756: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13757: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13762: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13763: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13768: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13769: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13774: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13775: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:13846: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:13851: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13860: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13866: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13872: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13878: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13884: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13889: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13898: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13904: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13910: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13916: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13922: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13927: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13935: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13940: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13945: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13950: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:13859: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13860: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13865: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13866: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13871: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13872: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13877: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13878: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13897: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13898: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13903: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13904: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13909: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13910: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13915: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13916: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13955: error: Unsupported operand types for ** ("PowExpr" and "Decimal")  [operator]
 tests/@types/expr.py:13956: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13961: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:13970: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13976: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:13982: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13988: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:13994: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:13999: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14008: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14014: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14020: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14026: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13969: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13970: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13975: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13976: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:13981: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13982: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:13987: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:13988: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14007: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14008: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14013: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14014: error: Expression is of type "PowExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14019: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14020: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14025: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14026: error: Expression is of type "PowExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:14031: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14036: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14045: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14051: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14057: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14063: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14044: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14045: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14050: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14051: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14056: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14057: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14062: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14063: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14068: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14073: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14082: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14088: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14094: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14100: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14081: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14082: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14087: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14088: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14093: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14094: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14099: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "PowExpr")  [assignment]
+tests/@types/expr.py:14100: error: Expression is of type "PowExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14105: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14110: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14119: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14125: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14131: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14137: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14142: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14156: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14162: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14168: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14174: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14179: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14118: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14119: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14124: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14125: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14130: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14131: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14136: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14137: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14155: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14156: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14161: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14162: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14167: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14168: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14173: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14174: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14184: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14193: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14199: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14205: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14211: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14216: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14192: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14193: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14198: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14199: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14204: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14205: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14210: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14211: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14221: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14229: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14234: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14239: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14244: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14249: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14263: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14269: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14275: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14281: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14287: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:14301: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14307: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14313: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14319: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14324: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14329: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14338: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14344: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14350: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14356: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14361: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14262: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14263: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14268: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14269: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14274: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14275: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14280: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14281: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14286: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14287: error: Expression is of type "UnaryExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:14300: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14301: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14306: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14307: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14312: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14313: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14318: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14319: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14337: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14338: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14343: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14344: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14349: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14350: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14355: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14356: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14366: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14375: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14381: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14387: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14393: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14398: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14403: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14412: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14418: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14424: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14430: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14435: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14440: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14449: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14455: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14461: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14467: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14472: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14477: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14486: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14492: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14498: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14504: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14509: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14523: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14529: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14535: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14541: error: Expression is of type "GenExpr", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14546: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14559: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14564: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14569: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14574: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14579: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14592: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14597: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14602: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14607: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14374: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14375: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14380: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14381: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14386: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14387: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14392: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14393: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14411: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14412: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14417: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14418: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14423: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14424: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14429: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14430: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14448: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14449: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14454: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14455: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14460: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14461: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14466: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14467: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14485: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14486: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14491: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14492: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14497: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14498: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14503: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14504: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14522: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14523: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14528: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14529: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14534: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14535: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14540: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14541: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:14612: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14626: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14632: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14638: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14644: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14650: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:14664: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14670: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14676: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14682: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14688: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:14701: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14706: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14711: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14716: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14617: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14625: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14626: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14631: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14632: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14637: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14638: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14643: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14644: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14649: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14650: error: Expression is of type "UnaryExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:14663: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14664: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14669: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14670: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14675: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14676: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14681: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14682: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14687: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14688: error: Expression is of type "UnaryExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:14721: error: Unsupported operand types for ** ("UnaryExpr" and "Decimal")  [operator]
 tests/@types/expr.py:14722: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:14736: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14742: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14748: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14754: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14760: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:14774: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14780: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14786: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14792: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14735: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14736: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14741: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14742: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14747: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14748: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14753: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14754: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14759: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14760: error: Expression is of type "UnaryExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:14773: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14774: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14779: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14780: error: Expression is of type "UnaryExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14785: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14786: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14791: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14792: error: Expression is of type "UnaryExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:14797: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14802: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14811: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14817: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14823: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14829: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14810: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14811: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14816: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14817: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14822: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14823: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14828: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14829: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14834: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14839: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14848: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14854: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14860: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14866: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14847: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14848: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14853: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14854: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14859: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14860: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14865: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "UnaryExpr")  [assignment]
+tests/@types/expr.py:14866: error: Expression is of type "UnaryExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14871: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:14876: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14885: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14891: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:14897: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14903: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:14908: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14922: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14928: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14934: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14940: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14945: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14884: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14885: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14890: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14891: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:14896: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14897: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14902: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14903: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:14921: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14922: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14927: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14928: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14933: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14934: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14939: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14940: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14950: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14959: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14965: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14971: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14977: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:14982: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:14958: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14959: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14964: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14965: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14970: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14971: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:14976: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:14977: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:14987: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:14995: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15000: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15005: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15010: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15015: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15029: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15035: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15041: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15047: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15053: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:15067: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15073: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15079: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15085: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15090: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15095: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15104: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15110: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15116: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15122: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15127: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15028: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15029: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15034: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15035: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15040: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15041: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15046: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15047: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15052: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15053: error: Expression is of type "VarExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:15066: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15067: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15072: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15073: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15078: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15079: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15084: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15085: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15103: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15104: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15109: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15110: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15115: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15116: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15121: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15122: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:15132: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15141: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15147: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15153: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15159: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15164: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15169: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15178: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15184: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15190: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15196: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15201: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15206: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15215: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15221: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15227: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15233: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15238: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15243: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15252: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15258: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15264: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15270: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15275: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15289: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15295: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15301: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15307: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15312: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15325: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15330: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15335: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15340: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15345: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15358: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15363: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15368: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15373: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15140: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15141: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15146: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15147: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15152: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15153: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15158: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15159: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15177: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15178: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15183: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15184: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15189: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15190: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15195: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15196: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15214: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15215: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15220: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15221: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15226: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15227: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15232: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15233: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15251: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15252: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15257: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15258: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15263: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15264: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15269: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15270: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15288: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15289: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15294: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15295: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15300: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15301: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15306: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15307: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:15378: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15392: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15398: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15404: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15410: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15416: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:15430: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15436: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15442: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15448: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15454: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:15467: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15472: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15477: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15482: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15383: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15391: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15392: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15397: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15398: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15403: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15404: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15409: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15410: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15415: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15416: error: Expression is of type "VarExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:15429: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15430: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15435: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15436: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15441: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15442: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15447: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15448: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15453: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15454: error: Expression is of type "VarExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:15487: error: Unsupported operand types for ** ("VarExpr" and "Decimal")  [operator]
 tests/@types/expr.py:15488: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:15502: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15508: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15514: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15520: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15526: error: Expression is of type "Any", not "PowExpr"  [assert-type]
-tests/@types/expr.py:15540: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15546: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:15552: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:15558: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15501: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15502: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15507: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15508: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15513: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15514: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15519: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15520: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15525: error: Incompatible types in assignment (expression has type "PowExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15526: error: Expression is of type "VarExpr", not "PowExpr"  [assert-type]
+tests/@types/expr.py:15539: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15540: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15545: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15546: error: Expression is of type "VarExpr", not "SumExpr"  [assert-type]
+tests/@types/expr.py:15551: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15552: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:15557: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15558: error: Expression is of type "VarExpr", not "ProdExpr"  [assert-type]
 tests/@types/expr.py:15563: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:15568: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15577: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15583: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15589: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15595: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15576: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15577: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15582: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15583: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15588: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15589: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15594: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15595: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:15600: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:15605: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15614: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15620: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15626: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:15632: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15613: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15614: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15619: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15620: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15625: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15626: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:15631: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "VarExpr")  [assignment]
+tests/@types/expr.py:15632: error: Expression is of type "VarExpr", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:15637: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:15642: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15650: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15655: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15660: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15670: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15782: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15787: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15792: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15802: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15815: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15820: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15825: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15830: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15835: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15840: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15881: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15886: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15891: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15896: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15901: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15906: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15914: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15919: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15924: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15929: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15934: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15939: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15947: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15952: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15957: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15962: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15967: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15972: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15980: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15985: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:15990: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16000: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16013: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16018: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16023: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16033: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16066: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15708: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15741: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:15873: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16079: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16084: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16132: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:16165: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16089: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16094: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16099: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16104: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16244: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16249: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16254: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16259: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16264: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16269: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16277: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16282: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16287: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16292: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16297: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16302: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16310: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16315: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16320: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16325: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16330: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16335: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16343: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16348: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16353: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16358: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16363: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16368: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16376: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16381: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16386: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16391: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16396: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16401: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16409: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16414: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16419: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16424: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16429: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16434: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16442: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16447: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16452: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16457: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16462: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16467: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16475: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16480: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16485: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16490: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16495: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16500: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16508: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16513: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16518: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16523: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16528: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16533: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16541: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16546: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16551: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16556: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16561: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16566: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16574: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16579: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16584: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16589: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16594: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16599: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16607: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16612: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16617: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16622: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16627: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16632: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16640: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16645: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16650: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16655: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16660: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16665: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16673: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16678: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16683: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16688: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16693: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16698: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16706: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16711: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16716: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16721: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16726: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16731: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16739: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16744: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16749: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16754: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16759: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16764: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16772: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16777: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16782: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16787: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16792: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16797: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16805: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16810: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16815: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16820: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16825: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16830: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16838: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16843: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16848: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16853: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16858: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16863: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16871: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16876: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16881: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16886: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16891: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16896: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16904: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16909: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16914: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16919: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16924: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16929: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16937: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16942: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16947: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16952: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16957: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16962: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16970: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16975: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16980: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16985: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:16990: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:16995: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:17003: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:17008: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:17013: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:17018: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:17023: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:17028: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17037: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17043: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17049: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17054: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17036: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17037: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17042: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17043: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17048: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17049: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17054: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17055: error: Expression is of type "int", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17061: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17074: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17060: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17061: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17074: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17075: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17080: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17080: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17081: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17086: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17086: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17087: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17092: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17092: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17093: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17098: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17098: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17099: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17112: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17112: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17113: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17118: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17118: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17119: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17124: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17124: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17125: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17130: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17130: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17131: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17136: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17136: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17137: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17184: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17190: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17196: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17201: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17183: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17184: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17189: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17190: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17195: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17196: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17201: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17202: error: Expression is of type "int", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17208: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17222: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17228: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17234: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17240: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17246: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17251: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17259: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17207: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17208: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17221: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17222: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17227: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17228: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17233: error: Incompatible types in assignment (expression has type "Expr", variable has type "int")  [assignment]
+tests/@types/expr.py:17234: error: Expression is of type "int", not "Expr"  [assert-type]
+tests/@types/expr.py:17239: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17240: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17245: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17246: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17259: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17260: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17265: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17265: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17266: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17271: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17271: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17272: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17277: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17277: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17278: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17283: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[Any]]", variable has type "int")  [assignment]
+tests/@types/expr.py:17283: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17284: error: Expression is of type "int", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17298: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17304: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17310: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17316: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17322: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17327: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17336: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17342: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17348: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17354: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17360: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17365: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17374: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17380: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17386: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17392: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17398: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17403: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17412: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17418: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17424: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17429: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17297: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17298: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17303: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17304: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17309: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17310: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17315: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17316: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17321: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17322: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17335: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17336: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17341: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17342: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17347: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17348: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17353: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17354: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17359: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17360: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17373: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17374: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17379: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17380: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17385: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17386: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17391: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17392: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17397: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17398: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17411: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17412: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17417: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17418: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17423: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17424: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17429: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17430: error: Expression is of type "int", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17436: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17450: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17456: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17462: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17467: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17435: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17436: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17449: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17450: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17455: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17456: error: Expression is of type "int", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17461: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17462: error: Expression is of type "int", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17467: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "int")  [assignment]
 tests/@types/expr.py:17468: error: Expression is of type "int", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17474: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17487: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17492: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17497: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17507: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17554: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17560: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17566: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17571: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17473: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "int")  [assignment]
+tests/@types/expr.py:17474: error: Expression is of type "int", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17553: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17554: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17559: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17560: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17565: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17566: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17571: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17572: error: Expression is of type "float", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17578: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17591: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17577: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17578: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17591: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17592: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17597: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17597: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17598: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17603: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17603: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17604: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17609: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17609: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17610: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17615: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17615: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17616: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17629: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17629: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17630: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17635: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17635: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17636: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17641: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17641: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17642: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17647: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17647: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17648: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17653: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17653: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17654: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17701: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17707: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17713: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17718: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17700: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17701: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17706: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17707: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17712: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17713: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17718: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17719: error: Expression is of type "float", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17725: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17739: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17745: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17751: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:17757: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17763: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17768: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17776: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17724: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17725: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17738: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17739: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17744: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17745: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17750: error: Incompatible types in assignment (expression has type "Expr", variable has type "float")  [assignment]
+tests/@types/expr.py:17751: error: Expression is of type "float", not "Expr"  [assert-type]
+tests/@types/expr.py:17756: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17757: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17762: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17763: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17776: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17777: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17782: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17782: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17783: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17788: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17788: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17789: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17794: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17794: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17795: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17800: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float")  [assignment]
+tests/@types/expr.py:17800: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17801: error: Expression is of type "float", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:17815: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17821: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17827: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17833: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17839: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17844: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17853: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17859: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17865: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17871: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17877: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17882: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17891: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17897: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17903: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17909: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17915: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17920: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:17929: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17935: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17941: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17946: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17814: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17815: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17820: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17821: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17826: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17827: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17832: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17833: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17838: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17839: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17852: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17853: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17858: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17859: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17864: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17865: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17870: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17871: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17876: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17877: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17890: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17891: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17896: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17897: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17902: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17903: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17908: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17909: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17914: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17915: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17928: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17929: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17934: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17935: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17940: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17941: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17946: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17947: error: Expression is of type "float", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17953: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:17967: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17973: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:17979: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17984: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17952: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17953: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:17966: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17967: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17972: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17973: error: Expression is of type "float", not "SumExpr"  [assert-type]
+tests/@types/expr.py:17978: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17979: error: Expression is of type "float", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:17984: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float")  [assignment]
 tests/@types/expr.py:17985: error: Expression is of type "float", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:17991: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18004: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18009: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18014: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18024: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:17990: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float")  [assignment]
+tests/@types/expr.py:17991: error: Expression is of type "float", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18070: error: Unsupported operand types for + ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:18071: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:18076: error: Unsupported operand types for - ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:18077: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:18082: error: Unsupported operand types for * ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:18083: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:18093: error: Unsupported operand types for ** ("Decimal" and "Variable")  [operator]
 tests/@types/expr.py:18094: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18107: error: Unsupported operand types for + ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18108: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18113: error: Unsupported operand types for - ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18114: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18119: error: Unsupported operand types for * ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18120: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18125: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18130: error: Unsupported operand types for ** ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18131: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:18136: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18144: error: Unsupported operand types for + ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18145: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18150: error: Unsupported operand types for - ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18151: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18156: error: Unsupported operand types for * ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18157: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18162: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18167: error: Unsupported operand types for ** ("Decimal" and "MatrixVariable")  [operator]
 tests/@types/expr.py:18168: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:18173: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18214: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18219: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18224: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18234: error: Unsupported operand types for ** ("Decimal" and "Constant")  [operator]
 tests/@types/expr.py:18235: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18248: error: Unsupported operand types for + ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:18249: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:18254: error: Unsupported operand types for - ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:18255: error: Expression is of type "Any", not "Expr"  [assert-type]
+tests/@types/expr.py:18260: error: Unsupported operand types for * ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:18261: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18266: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18271: error: Unsupported operand types for ** ("Decimal" and "Expr")  [operator]
 tests/@types/expr.py:18272: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18277: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18285: error: Unsupported operand types for + ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:18286: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18291: error: Unsupported operand types for - ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:18292: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
+tests/@types/expr.py:18297: error: Unsupported operand types for * ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:18298: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18303: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18308: error: Unsupported operand types for ** ("Decimal" and "MatrixExpr")  [operator]
 tests/@types/expr.py:18309: error: Expression is of type "Any", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:18314: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18322: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18327: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18332: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18337: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18342: error: Unsupported operand types for ** ("Decimal" and "SumExpr")  [operator]
 tests/@types/expr.py:18343: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18348: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18356: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18361: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18366: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18371: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18376: error: Unsupported operand types for ** ("Decimal" and "ProdExpr")  [operator]
 tests/@types/expr.py:18377: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18382: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18390: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18395: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18400: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18405: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18410: error: Unsupported operand types for ** ("Decimal" and "PowExpr")  [operator]
 tests/@types/expr.py:18411: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18416: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18424: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18429: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18434: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18444: error: Unsupported operand types for ** ("Decimal" and "UnaryExpr")  [operator]
 tests/@types/expr.py:18445: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18458: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18463: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18468: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18478: error: Unsupported operand types for ** ("Decimal" and "VarExpr")  [operator]
 tests/@types/expr.py:18479: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18492: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18497: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18502: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18507: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18512: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18559: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18565: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18571: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18576: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18525: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18530: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18535: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18540: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18545: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18550: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:18558: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18559: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18564: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18565: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18570: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18571: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18576: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18577: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18583: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18596: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18582: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18583: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18596: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18597: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18602: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18602: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18603: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18608: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18608: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18609: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18614: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18614: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18615: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18620: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18620: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18621: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18634: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18634: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18635: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18640: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18640: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18641: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18646: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18646: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18647: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18652: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18652: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18653: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18658: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18658: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18659: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
 tests/@types/expr.py:18672: error: No overload variant of "__add__" of "float64" matches argument type "Term"  [operator]
 tests/@types/expr.py:18673: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
@@ -6400,63 +4123,86 @@ tests/@types/expr.py:18690: error: No overload variant of "__truediv__" of "floa
 tests/@types/expr.py:18691: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
 tests/@types/expr.py:18696: error: No overload variant of "__pow__" of "float64" matches argument type "Term"  [operator]
 tests/@types/expr.py:18697: error: Expression is of type "Any", not "ndarray[tuple[Any, ...], dtype[Any]]"  [assert-type]
-tests/@types/expr.py:18711: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18717: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18723: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18728: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18710: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18711: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18716: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18717: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18722: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18723: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18728: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18729: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18735: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18749: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18755: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18761: error: Expression is of type "Any", not "Expr"  [assert-type]
-tests/@types/expr.py:18767: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18773: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18778: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18786: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18734: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18735: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18748: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18749: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18754: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18755: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18760: error: Incompatible types in assignment (expression has type "Expr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18761: error: Expression is of type "float64", not "Expr"  [assert-type]
+tests/@types/expr.py:18766: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18767: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18772: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18773: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18786: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18787: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18792: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18792: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18793: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18798: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18798: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18799: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18804: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18804: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18805: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18810: error: Incompatible types in assignment (expression has type "ndarray[tuple[Any, ...], dtype[float64]]", variable has type "float64")  [assignment]
+tests/@types/expr.py:18810: error: Incompatible types in assignment (expression has type "MatrixExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18811: error: Expression is of type "float64", not "MatrixExpr"  [assert-type]
-tests/@types/expr.py:18825: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18831: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18837: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18843: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18849: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18854: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18863: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18869: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18875: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18881: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18887: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18892: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18901: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18907: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18913: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18919: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18925: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18930: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:18939: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18945: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18951: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18956: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18824: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18825: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18830: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18831: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18836: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18837: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18842: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18843: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18848: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18849: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18862: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18863: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18868: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18869: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18874: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18875: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18880: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18881: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18886: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18887: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18900: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18901: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18906: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18907: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18912: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18913: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18918: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18919: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18924: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18925: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18938: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18939: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18944: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18945: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18950: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18951: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18956: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18957: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18963: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:18977: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18983: error: Expression is of type "Any", not "SumExpr"  [assert-type]
-tests/@types/expr.py:18989: error: Expression is of type "Any", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:18994: error: Incompatible types in assignment (expression has type "GenExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18962: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18963: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
+tests/@types/expr.py:18976: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18977: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18982: error: Incompatible types in assignment (expression has type "SumExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18983: error: Expression is of type "float64", not "SumExpr"  [assert-type]
+tests/@types/expr.py:18988: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:18989: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
+tests/@types/expr.py:18994: error: Incompatible types in assignment (expression has type "ProdExpr", variable has type "float64")  [assignment]
 tests/@types/expr.py:18995: error: Expression is of type "float64", not "ProdExpr"  [assert-type]
-tests/@types/expr.py:19001: error: Expression is of type "Any", not "UnaryExpr"  [assert-type]
-tests/@types/expr.py:19014: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:19019: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:19024: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:19029: error: Unused "type: ignore" comment  [unused-ignore]
-tests/@types/expr.py:19034: error: Unused "type: ignore" comment  [unused-ignore]
+tests/@types/expr.py:19000: error: Incompatible types in assignment (expression has type "UnaryExpr", variable has type "float64")  [assignment]
+tests/@types/expr.py:19001: error: Expression is of type "float64", not "UnaryExpr"  [assert-type]
 tests/@types/expr.py:19080: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:19085: error: Unused "type: ignore" comment  [unused-ignore]
 tests/@types/expr.py:19090: error: Unused "type: ignore" comment  [unused-ignore]