Reduce matrix and slice aliases depth to 1.

src/base/alias.rs

@@ -21,132 +21,132 @@ pub type MatrixNM<N, R, C> = Matrix<N, R, C, Owned<N, R, C>>;
 pub type MatrixMN<N, R, C> = Matrix<N, R, C, Owned<N, R, C>>;
 
 /// A statically sized column-major square matrix with `D` rows and columns.
-pub type MatrixN<N, D> = MatrixMN<N, D, D>;
+pub type MatrixN<N, D> = Matrix<N, D, D, Owned<N, D, D>>;
 
 /// A dynamically sized column-major matrix.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type DMatrix<N> = MatrixN<N, Dynamic>;
+pub type DMatrix<N> = Matrix<N, Dynamic, Dynamic, Owned<N, Dynamic, Dynamic>>;
 
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 1 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx1<N> = MatrixMN<N, Dynamic, U1>;
+pub type MatrixXx1<N> = Matrix<N, Dynamic, U1, Owned<N, Dynamic, U1>>;
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 2 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx2<N> = MatrixMN<N, Dynamic, U2>;
+pub type MatrixXx2<N> = Matrix<N, Dynamic, U2, Owned<N, Dynamic, U2>>;
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 3 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx3<N> = MatrixMN<N, Dynamic, U3>;
+pub type MatrixXx3<N> = Matrix<N, Dynamic, U3, Owned<N, Dynamic, U3>>;
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 4 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx4<N> = MatrixMN<N, Dynamic, U4>;
+pub type MatrixXx4<N> = Matrix<N, Dynamic, U4, Owned<N, Dynamic, U4>>;
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 5 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx5<N> = MatrixMN<N, Dynamic, U5>;
+pub type MatrixXx5<N> = Matrix<N, Dynamic, U5, Owned<N, Dynamic, U5>>;
 /// A heap-allocated, column-major, matrix with a dynamic number of rows and 6 columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type MatrixXx6<N> = MatrixMN<N, Dynamic, U6>;
+pub type MatrixXx6<N> = Matrix<N, Dynamic, U6, Owned<N, Dynamic, U6>>;
 
 /// A heap-allocated, row-major, matrix with 1 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix1xX<N> = MatrixMN<N, U1, Dynamic>;
+pub type Matrix1xX<N> = Matrix<N, U1, Dynamic, Owned<N, U1, Dynamic>>;
 /// A heap-allocated, row-major, matrix with 2 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix2xX<N> = MatrixMN<N, U2, Dynamic>;
+pub type Matrix2xX<N> = Matrix<N, U2, Dynamic, Owned<N, U2, Dynamic>>;
 /// A heap-allocated, row-major, matrix with 3 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix3xX<N> = MatrixMN<N, U3, Dynamic>;
+pub type Matrix3xX<N> = Matrix<N, U3, Dynamic, Owned<N, U3, Dynamic>>;
 /// A heap-allocated, row-major, matrix with 4 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix4xX<N> = MatrixMN<N, U4, Dynamic>;
+pub type Matrix4xX<N> = Matrix<N, U4, Dynamic, Owned<N, U4, Dynamic>>;
 /// A heap-allocated, row-major, matrix with 5 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix5xX<N> = MatrixMN<N, U5, Dynamic>;
+pub type Matrix5xX<N> = Matrix<N, U5, Dynamic, Owned<N, U5, Dynamic>>;
 /// A heap-allocated, row-major, matrix with 6 rows and a dynamic number of columns.
 #[cfg(any(feature = "std", feature = "alloc"))]
-pub type Matrix6xX<N> = MatrixMN<N, U6, Dynamic>;
+pub type Matrix6xX<N> = Matrix<N, U6, Dynamic, Owned<N, U6, Dynamic>>;
 
 /// A stack-allocated, column-major, 1x1 square matrix.
-pub type Matrix1<N> = MatrixN<N, U1>;
+pub type Matrix1<N> = Matrix<N, U1, U1, Owned<N, U1, U1>>;
 /// A stack-allocated, column-major, 2x2 square matrix.
-pub type Matrix2<N> = MatrixN<N, U2>;
+pub type Matrix2<N> = Matrix<N, U2, U2, Owned<N, U2, U2>>;
 /// A stack-allocated, column-major, 3x3 square matrix.
-pub type Matrix3<N> = MatrixN<N, U3>;
+pub type Matrix3<N> = Matrix<N, U3, U3, Owned<N, U3, U3>>;
 /// A stack-allocated, column-major, 4x4 square matrix.
-pub type Matrix4<N> = MatrixN<N, U4>;
+pub type Matrix4<N> = Matrix<N, U4, U4, Owned<N, U4, U4>>;
 /// A stack-allocated, column-major, 5x5 square matrix.
-pub type Matrix5<N> = MatrixN<N, U5>;
+pub type Matrix5<N> = Matrix<N, U5, U5, Owned<N, U5, U5>>;
 /// A stack-allocated, column-major, 6x6 square matrix.
-pub type Matrix6<N> = MatrixN<N, U6>;
+pub type Matrix6<N> = Matrix<N, U6, U6, Owned<N, U6, U6>>;
 
 /// A stack-allocated, column-major, 1x2 matrix.
-pub type Matrix1x2<N> = MatrixMN<N, U1, U2>;
+pub type Matrix1x2<N> = Matrix<N, U1, U2, Owned<N, U1, U2>>;
 /// A stack-allocated, column-major, 1x3 matrix.
-pub type Matrix1x3<N> = MatrixMN<N, U1, U3>;
+pub type Matrix1x3<N> = Matrix<N, U1, U3, Owned<N, U1, U3>>;
 /// A stack-allocated, column-major, 1x4 matrix.
-pub type Matrix1x4<N> = MatrixMN<N, U1, U4>;
+pub type Matrix1x4<N> = Matrix<N, U1, U4, Owned<N, U1, U4>>;
 /// A stack-allocated, column-major, 1x5 matrix.
-pub type Matrix1x5<N> = MatrixMN<N, U1, U5>;
+pub type Matrix1x5<N> = Matrix<N, U1, U5, Owned<N, U1, U5>>;
 /// A stack-allocated, column-major, 1x6 matrix.
-pub type Matrix1x6<N> = MatrixMN<N, U1, U6>;
+pub type Matrix1x6<N> = Matrix<N, U1, U6, Owned<N, U1, U6>>;
 
 /// A stack-allocated, column-major, 2x3 matrix.
-pub type Matrix2x3<N> = MatrixMN<N, U2, U3>;
+pub type Matrix2x3<N> = Matrix<N, U2, U3, Owned<N, U2, U3>>;
 /// A stack-allocated, column-major, 2x4 matrix.
-pub type Matrix2x4<N> = MatrixMN<N, U2, U4>;
+pub type Matrix2x4<N> = Matrix<N, U2, U4, Owned<N, U2, U4>>;
 /// A stack-allocated, column-major, 2x5 matrix.
-pub type Matrix2x5<N> = MatrixMN<N, U2, U5>;
+pub type Matrix2x5<N> = Matrix<N, U2, U5, Owned<N, U2, U5>>;
 /// A stack-allocated, column-major, 2x6 matrix.
-pub type Matrix2x6<N> = MatrixMN<N, U2, U6>;
+pub type Matrix2x6<N> = Matrix<N, U2, U6, Owned<N, U2, U6>>;
 
 /// A stack-allocated, column-major, 3x4 matrix.
-pub type Matrix3x4<N> = MatrixMN<N, U3, U4>;
+pub type Matrix3x4<N> = Matrix<N, U3, U4, Owned<N, U3, U4>>;
 /// A stack-allocated, column-major, 3x5 matrix.
-pub type Matrix3x5<N> = MatrixMN<N, U3, U5>;
+pub type Matrix3x5<N> = Matrix<N, U3, U5, Owned<N, U3, U5>>;
 /// A stack-allocated, column-major, 3x6 matrix.
-pub type Matrix3x6<N> = MatrixMN<N, U3, U6>;
+pub type Matrix3x6<N> = Matrix<N, U3, U6, Owned<N, U3, U6>>;
 
 /// A stack-allocated, column-major, 4x5 matrix.
-pub type Matrix4x5<N> = MatrixMN<N, U4, U5>;
+pub type Matrix4x5<N> = Matrix<N, U4, U5, Owned<N, U4, U5>>;
 /// A stack-allocated, column-major, 4x6 matrix.
-pub type Matrix4x6<N> = MatrixMN<N, U4, U6>;
+pub type Matrix4x6<N> = Matrix<N, U4, U6, Owned<N, U4, U6>>;
 
 /// A stack-allocated, column-major, 5x6 matrix.
-pub type Matrix5x6<N> = MatrixMN<N, U5, U6>;
+pub type Matrix5x6<N> = Matrix<N, U5, U6, Owned<N, U5, U6>>;
 
 /// A stack-allocated, column-major, 2x1 matrix.
-pub type Matrix2x1<N> = MatrixMN<N, U2, U1>;
+pub type Matrix2x1<N> = Matrix<N, U2, U1, Owned<N, U2, U1>>;
 /// A stack-allocated, column-major, 3x1 matrix.
-pub type Matrix3x1<N> = MatrixMN<N, U3, U1>;
+pub type Matrix3x1<N> = Matrix<N, U3, U1, Owned<N, U3, U1>>;
 /// A stack-allocated, column-major, 4x1 matrix.
-pub type Matrix4x1<N> = MatrixMN<N, U4, U1>;
+pub type Matrix4x1<N> = Matrix<N, U4, U1, Owned<N, U4, U1>>;
 /// A stack-allocated, column-major, 5x1 matrix.
-pub type Matrix5x1<N> = MatrixMN<N, U5, U1>;
+pub type Matrix5x1<N> = Matrix<N, U5, U1, Owned<N, U5, U1>>;
 /// A stack-allocated, column-major, 6x1 matrix.
-pub type Matrix6x1<N> = MatrixMN<N, U6, U1>;
+pub type Matrix6x1<N> = Matrix<N, U6, U1, Owned<N, U6, U1>>;
 
 /// A stack-allocated, column-major, 3x2 matrix.
-pub type Matrix3x2<N> = MatrixMN<N, U3, U2>;
+pub type Matrix3x2<N> = Matrix<N, U3, U2, Owned<N, U3, U2>>;
 /// A stack-allocated, column-major, 4x2 matrix.
-pub type Matrix4x2<N> = MatrixMN<N, U4, U2>;
+pub type Matrix4x2<N> = Matrix<N, U4, U2, Owned<N, U4, U2>>;
 /// A stack-allocated, column-major, 5x2 matrix.
-pub type Matrix5x2<N> = MatrixMN<N, U5, U2>;
+pub type Matrix5x2<N> = Matrix<N, U5, U2, Owned<N, U5, U2>>;
 /// A stack-allocated, column-major, 6x2 matrix.
-pub type Matrix6x2<N> = MatrixMN<N, U6, U2>;
+pub type Matrix6x2<N> = Matrix<N, U6, U2, Owned<N, U6, U2>>;
 
 /// A stack-allocated, column-major, 4x3 matrix.
-pub type Matrix4x3<N> = MatrixMN<N, U4, U3>;
+pub type Matrix4x3<N> = Matrix<N, U4, U3, Owned<N, U4, U3>>;
 /// A stack-allocated, column-major, 5x3 matrix.
-pub type Matrix5x3<N> = MatrixMN<N, U5, U3>;
+pub type Matrix5x3<N> = Matrix<N, U5, U3, Owned<N, U5, U3>>;
 /// A stack-allocated, column-major, 6x3 matrix.
-pub type Matrix6x3<N> = MatrixMN<N, U6, U3>;
+pub type Matrix6x3<N> = Matrix<N, U6, U3, Owned<N, U6, U3>>;
 
 /// A stack-allocated, column-major, 5x4 matrix.
-pub type Matrix5x4<N> = MatrixMN<N, U5, U4>;
+pub type Matrix5x4<N> = Matrix<N, U5, U4, Owned<N, U5, U4>>;
 /// A stack-allocated, column-major, 6x4 matrix.
-pub type Matrix6x4<N> = MatrixMN<N, U6, U4>;
+pub type Matrix6x4<N> = Matrix<N, U6, U4, Owned<N, U6, U4>>;
 
 /// A stack-allocated, column-major, 6x5 matrix.
-pub type Matrix6x5<N> = MatrixMN<N, U6, U5>;
+pub type Matrix6x5<N> = Matrix<N, U6, U5, Owned<N, U6, U5>>;
 
 /*
  *
@@ -160,20 +160,20 @@ pub type Matrix6x5<N> = MatrixMN<N, U6, U5>;
 pub type DVector<N> = Matrix<N, Dynamic, U1, VecStorage<N, Dynamic, U1>>;
 
 /// A statically sized D-dimensional column vector.
-pub type VectorN<N, D> = MatrixMN<N, D, U1>;
+pub type VectorN<N, D> = Matrix<N, D, U1, Owned<N, D, U1>>;
 
 /// A stack-allocated, 1-dimensional column vector.
-pub type Vector1<N> = VectorN<N, U1>;
+pub type Vector1<N> = Matrix<N, U1, U1, Owned<N, U1, U1>>;
 /// A stack-allocated, 2-dimensional column vector.
-pub type Vector2<N> = VectorN<N, U2>;
+pub type Vector2<N> = Matrix<N, U2, U1, Owned<N, U2, U1>>;
 /// A stack-allocated, 3-dimensional column vector.
-pub type Vector3<N> = VectorN<N, U3>;
+pub type Vector3<N> = Matrix<N, U3, U1, Owned<N, U3, U1>>;
 /// A stack-allocated, 4-dimensional column vector.
-pub type Vector4<N> = VectorN<N, U4>;
+pub type Vector4<N> = Matrix<N, U4, U1, Owned<N, U4, U1>>;
 /// A stack-allocated, 5-dimensional column vector.
-pub type Vector5<N> = VectorN<N, U5>;
+pub type Vector5<N> = Matrix<N, U5, U1, Owned<N, U5, U1>>;
 /// A stack-allocated, 6-dimensional column vector.
-pub type Vector6<N> = VectorN<N, U6>;
+pub type Vector6<N> = Matrix<N, U6, U1, Owned<N, U6, U1>>;
 
 /*
  *
@@ -187,17 +187,17 @@ pub type Vector6<N> = VectorN<N, U6>;
 pub type RowDVector<N> = Matrix<N, U1, Dynamic, VecStorage<N, U1, Dynamic>>;
 
 /// A statically sized D-dimensional row vector.
-pub type RowVectorN<N, D> = MatrixMN<N, U1, D>;
+pub type RowVectorN<N, D> = Matrix<N, U1, D, Owned<N, U1, D>>;
 
 /// A stack-allocated, 1-dimensional row vector.
-pub type RowVector1<N> = RowVectorN<N, U1>;
+pub type RowVector1<N> = Matrix<N, U1, U1, Owned<N, U1, U1>>;
 /// A stack-allocated, 2-dimensional row vector.
-pub type RowVector2<N> = RowVectorN<N, U2>;
+pub type RowVector2<N> = Matrix<N, U1, U2, Owned<N, U1, U2>>;
 /// A stack-allocated, 3-dimensional row vector.
-pub type RowVector3<N> = RowVectorN<N, U3>;
+pub type RowVector3<N> = Matrix<N, U1, U3, Owned<N, U1, U3>>;
 /// A stack-allocated, 4-dimensional row vector.
-pub type RowVector4<N> = RowVectorN<N, U4>;
+pub type RowVector4<N> = Matrix<N, U1, U4, Owned<N, U1, U4>>;
 /// A stack-allocated, 5-dimensional row vector.
-pub type RowVector5<N> = RowVectorN<N, U5>;
+pub type RowVector5<N> = Matrix<N, U1, U5, Owned<N, U1, U5>>;
 /// A stack-allocated, 6-dimensional row vector.
-pub type RowVector6<N> = RowVectorN<N, U6>;
+pub type RowVector6<N> = Matrix<N, U1, U6, Owned<N, U1, U6>>;

src/base/alias_slice.rs

@@ -15,164 +15,164 @@ pub type MatrixSliceMN<'a, N, R, C, RStride = U1, CStride = R> =
 
 /// A column-major matrix slice with `D` rows and columns.
 pub type MatrixSliceN<'a, N, D, RStride = U1, CStride = D> =
-    MatrixSliceMN<'a, N, D, D, RStride, CStride>;
+    Matrix<N, D, D, SliceStorage<'a, N, D, D, RStride, CStride>>;
 
 /// A column-major matrix slice dynamic numbers of rows and columns.
 pub type DMatrixSlice<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceN<'a, N, Dynamic, RStride, CStride>;
+    Matrix<N, Dynamic, Dynamic, SliceStorage<'a, N, Dynamic, Dynamic, RStride, CStride>>;
 
 /// A column-major 1x1 matrix slice.
 pub type MatrixSlice1<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceN<'a, N, U1, RStride, CStride>;
+    Matrix<N, U1, U1, SliceStorage<'a, N, U1, U1, RStride, CStride>>;
 /// A column-major 2x2 matrix slice.
 pub type MatrixSlice2<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceN<'a, N, U2, RStride, CStride>;
+    Matrix<N, U2, U2, SliceStorage<'a, N, U2, U2, RStride, CStride>>;
 /// A column-major 3x3 matrix slice.
 pub type MatrixSlice3<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceN<'a, N, U3, RStride, CStride>;
+    Matrix<N, U3, U3, SliceStorage<'a, N, U3, U3, RStride, CStride>>;
 /// A column-major 4x4 matrix slice.
 pub type MatrixSlice4<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceN<'a, N, U4, RStride, CStride>;
+    Matrix<N, U4, U4, SliceStorage<'a, N, U4, U4, RStride, CStride>>;
 /// A column-major 5x5 matrix slice.
 pub type MatrixSlice5<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceN<'a, N, U5, RStride, CStride>;
+    Matrix<N, U5, U5, SliceStorage<'a, N, U5, U5, RStride, CStride>>;
 /// A column-major 6x6 matrix slice.
 pub type MatrixSlice6<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceN<'a, N, U6, RStride, CStride>;
+    Matrix<N, U6, U6, SliceStorage<'a, N, U6, U6, RStride, CStride>>;
 
 /// A column-major 1x2 matrix slice.
 pub type MatrixSlice1x2<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, U2, RStride, CStride>;
+    Matrix<N, U1, U2, SliceStorage<'a, N, U1, U2, RStride, CStride>>;
 /// A column-major 1x3 matrix slice.
 pub type MatrixSlice1x3<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, U3, RStride, CStride>;
+    Matrix<N, U1, U3, SliceStorage<'a, N, U1, U3, RStride, CStride>>;
 /// A column-major 1x4 matrix slice.
 pub type MatrixSlice1x4<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, U4, RStride, CStride>;
+    Matrix<N, U1, U4, SliceStorage<'a, N, U1, U4, RStride, CStride>>;
 /// A column-major 1x5 matrix slice.
 pub type MatrixSlice1x5<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, U5, RStride, CStride>;
+    Matrix<N, U1, U5, SliceStorage<'a, N, U1, U5, RStride, CStride>>;
 /// A column-major 1x6 matrix slice.
 pub type MatrixSlice1x6<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, U6, RStride, CStride>;
+    Matrix<N, U1, U6, SliceStorage<'a, N, U1, U6, RStride, CStride>>;
 
 /// A column-major 2x1 matrix slice.
 pub type MatrixSlice2x1<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, U1, RStride, CStride>;
+    Matrix<N, U2, U1, SliceStorage<'a, N, U2, U1, RStride, CStride>>;
 /// A column-major 2x3 matrix slice.
 pub type MatrixSlice2x3<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, U3, RStride, CStride>;
+    Matrix<N, U2, U3, SliceStorage<'a, N, U2, U3, RStride, CStride>>;
 /// A column-major 2x4 matrix slice.
 pub type MatrixSlice2x4<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, U4, RStride, CStride>;
+    Matrix<N, U2, U4, SliceStorage<'a, N, U2, U4, RStride, CStride>>;
 /// A column-major 2x5 matrix slice.
 pub type MatrixSlice2x5<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, U5, RStride, CStride>;
+    Matrix<N, U2, U5, SliceStorage<'a, N, U2, U5, RStride, CStride>>;
 /// A column-major 2x6 matrix slice.
 pub type MatrixSlice2x6<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, U6, RStride, CStride>;
+    Matrix<N, U2, U6, SliceStorage<'a, N, U2, U6, RStride, CStride>>;
 
 /// A column-major 3x1 matrix slice.
 pub type MatrixSlice3x1<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, U1, RStride, CStride>;
+    Matrix<N, U3, U1, SliceStorage<'a, N, U3, U1, RStride, CStride>>;
 /// A column-major 3x2 matrix slice.
 pub type MatrixSlice3x2<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, U2, RStride, CStride>;
+    Matrix<N, U3, U2, SliceStorage<'a, N, U3, U2, RStride, CStride>>;
 /// A column-major 3x4 matrix slice.
 pub type MatrixSlice3x4<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, U4, RStride, CStride>;
+    Matrix<N, U3, U4, SliceStorage<'a, N, U3, U4, RStride, CStride>>;
 /// A column-major 3x5 matrix slice.
 pub type MatrixSlice3x5<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, U5, RStride, CStride>;
+    Matrix<N, U3, U5, SliceStorage<'a, N, U3, U5, RStride, CStride>>;
 /// A column-major 3x6 matrix slice.
 pub type MatrixSlice3x6<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, U6, RStride, CStride>;
+    Matrix<N, U3, U6, SliceStorage<'a, N, U3, U6, RStride, CStride>>;
 
 /// A column-major 4x1 matrix slice.
 pub type MatrixSlice4x1<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, U1, RStride, CStride>;
+    Matrix<N, U4, U1, SliceStorage<'a, N, U4, U1, RStride, CStride>>;
 /// A column-major 4x2 matrix slice.
 pub type MatrixSlice4x2<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, U2, RStride, CStride>;
+    Matrix<N, U4, U2, SliceStorage<'a, N, U4, U2, RStride, CStride>>;
 /// A column-major 4x3 matrix slice.
 pub type MatrixSlice4x3<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, U3, RStride, CStride>;
+    Matrix<N, U4, U3, SliceStorage<'a, N, U4, U3, RStride, CStride>>;
 /// A column-major 4x5 matrix slice.
 pub type MatrixSlice4x5<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, U5, RStride, CStride>;
+    Matrix<N, U4, U5, SliceStorage<'a, N, U4, U5, RStride, CStride>>;
 /// A column-major 4x6 matrix slice.
 pub type MatrixSlice4x6<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, U6, RStride, CStride>;
+    Matrix<N, U4, U6, SliceStorage<'a, N, U4, U6, RStride, CStride>>;
 
 /// A column-major 5x1 matrix slice.
 pub type MatrixSlice5x1<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, U1, RStride, CStride>;
+    Matrix<N, U5, U1, SliceStorage<'a, N, U5, U1, RStride, CStride>>;
 /// A column-major 5x2 matrix slice.
 pub type MatrixSlice5x2<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, U2, RStride, CStride>;
+    Matrix<N, U5, U2, SliceStorage<'a, N, U5, U2, RStride, CStride>>;
 /// A column-major 5x3 matrix slice.
 pub type MatrixSlice5x3<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, U3, RStride, CStride>;
+    Matrix<N, U5, U3, SliceStorage<'a, N, U5, U3, RStride, CStride>>;
 /// A column-major 5x4 matrix slice.
 pub type MatrixSlice5x4<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, U4, RStride, CStride>;
+    Matrix<N, U5, U4, SliceStorage<'a, N, U5, U4, RStride, CStride>>;
 /// A column-major 5x6 matrix slice.
 pub type MatrixSlice5x6<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, U6, RStride, CStride>;
+    Matrix<N, U5, U6, SliceStorage<'a, N, U5, U6, RStride, CStride>>;
 
 /// A column-major 6x1 matrix slice.
 pub type MatrixSlice6x1<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, U1, RStride, CStride>;
+    Matrix<N, U6, U1, SliceStorage<'a, N, U6, U1, RStride, CStride>>;
 /// A column-major 6x2 matrix slice.
 pub type MatrixSlice6x2<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, U2, RStride, CStride>;
+    Matrix<N, U6, U2, SliceStorage<'a, N, U6, U2, RStride, CStride>>;
 /// A column-major 6x3 matrix slice.
 pub type MatrixSlice6x3<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, U3, RStride, CStride>;
+    Matrix<N, U6, U3, SliceStorage<'a, N, U6, U3, RStride, CStride>>;
 /// A column-major 6x4 matrix slice.
 pub type MatrixSlice6x4<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, U4, RStride, CStride>;
+    Matrix<N, U6, U4, SliceStorage<'a, N, U6, U4, RStride, CStride>>;
 /// A column-major 6x5 matrix slice.
 pub type MatrixSlice6x5<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, U6, RStride, CStride>;
+    Matrix<N, U6, U5, SliceStorage<'a, N, U6, U5, RStride, CStride>>;
 
 /// A column-major matrix slice with 1 row and a number of columns chosen at runtime.
 pub type MatrixSlice1xX<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMN<'a, N, U1, Dynamic, RStride, CStride>;
+    Matrix<N, U1, Dynamic, SliceStorage<'a, N, U1, Dynamic, RStride, CStride>>;
 /// A column-major matrix slice with 2 rows and a number of columns chosen at runtime.
 pub type MatrixSlice2xX<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMN<'a, N, U2, Dynamic, RStride, CStride>;
+    Matrix<N, U2, Dynamic, SliceStorage<'a, N, U2, Dynamic, RStride, CStride>>;
 /// A column-major matrix slice with 3 rows and a number of columns chosen at runtime.
 pub type MatrixSlice3xX<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMN<'a, N, U3, Dynamic, RStride, CStride>;
+    Matrix<N, U3, Dynamic, SliceStorage<'a, N, U3, Dynamic, RStride, CStride>>;
 /// A column-major matrix slice with 4 rows and a number of columns chosen at runtime.
 pub type MatrixSlice4xX<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMN<'a, N, U4, Dynamic, RStride, CStride>;
+    Matrix<N, U4, Dynamic, SliceStorage<'a, N, U4, Dynamic, RStride, CStride>>;
 /// A column-major matrix slice with 5 rows and a number of columns chosen at runtime.
 pub type MatrixSlice5xX<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMN<'a, N, U5, Dynamic, RStride, CStride>;
+    Matrix<N, U5, Dynamic, SliceStorage<'a, N, U5, Dynamic, RStride, CStride>>;
 /// A column-major matrix slice with 6 rows and a number of columns chosen at runtime.
 pub type MatrixSlice6xX<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMN<'a, N, U6, Dynamic, RStride, CStride>;
+    Matrix<N, U6, Dynamic, SliceStorage<'a, N, U6, Dynamic, RStride, CStride>>;
 
 /// A column-major matrix slice with a number of rows chosen at runtime and 1 column.
 pub type MatrixSliceXx1<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U1, RStride, CStride>;
+    Matrix<N, Dynamic, U1, SliceStorage<'a, N, Dynamic, U1, RStride, CStride>>;
 /// A column-major matrix slice with a number of rows chosen at runtime and 2 columns.
 pub type MatrixSliceXx2<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U2, RStride, CStride>;
+    Matrix<N, Dynamic, U2, SliceStorage<'a, N, Dynamic, U2, RStride, CStride>>;
 /// A column-major matrix slice with a number of rows chosen at runtime and 3 columns.
 pub type MatrixSliceXx3<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U3, RStride, CStride>;
+    Matrix<N, Dynamic, U3, SliceStorage<'a, N, Dynamic, U3, RStride, CStride>>;
 /// A column-major matrix slice with a number of rows chosen at runtime and 4 columns.
 pub type MatrixSliceXx4<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U4, RStride, CStride>;
+    Matrix<N, Dynamic, U4, SliceStorage<'a, N, Dynamic, U4, RStride, CStride>>;
 /// A column-major matrix slice with a number of rows chosen at runtime and 5 columns.
 pub type MatrixSliceXx5<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U5, RStride, CStride>;
+    Matrix<N, Dynamic, U5, SliceStorage<'a, N, Dynamic, U5, RStride, CStride>>;
 /// A column-major matrix slice with a number of rows chosen at runtime and 6 columns.
 pub type MatrixSliceXx6<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMN<'a, N, Dynamic, U6, RStride, CStride>;
+    Matrix<N, Dynamic, U6, SliceStorage<'a, N, Dynamic, U6, RStride, CStride>>;
 
 /// A column vector slice with `D` rows.
 pub type VectorSliceN<'a, N, D, RStride = U1, CStride = D> =
@@ -180,26 +180,26 @@ pub type VectorSliceN<'a, N, D, RStride = U1, CStride = D> =
 
 /// A column vector slice dynamic numbers of rows and columns.
 pub type DVectorSlice<'a, N, RStride = U1, CStride = Dynamic> =
-    VectorSliceN<'a, N, Dynamic, RStride, CStride>;
+    Matrix<N, Dynamic, U1, SliceStorage<'a, N, Dynamic, U1, RStride, CStride>>;
 
 /// A 1D column vector slice.
 pub type VectorSlice1<'a, N, RStride = U1, CStride = U1> =
-    VectorSliceN<'a, N, U1, RStride, CStride>;
+    Matrix<N, U1, U1, SliceStorage<'a, N, U1, U1, RStride, CStride>>;
 /// A 2D column vector slice.
 pub type VectorSlice2<'a, N, RStride = U1, CStride = U2> =
-    VectorSliceN<'a, N, U2, RStride, CStride>;
+    Matrix<N, U2, U1, SliceStorage<'a, N, U2, U1, RStride, CStride>>;
 /// A 3D column vector slice.
 pub type VectorSlice3<'a, N, RStride = U1, CStride = U3> =
-    VectorSliceN<'a, N, U3, RStride, CStride>;
+    Matrix<N, U3, U1, SliceStorage<'a, N, U3, U1, RStride, CStride>>;
 /// A 4D column vector slice.
 pub type VectorSlice4<'a, N, RStride = U1, CStride = U4> =
-    VectorSliceN<'a, N, U4, RStride, CStride>;
+    Matrix<N, U4, U1, SliceStorage<'a, N, U4, U1, RStride, CStride>>;
 /// A 5D column vector slice.
 pub type VectorSlice5<'a, N, RStride = U1, CStride = U5> =
-    VectorSliceN<'a, N, U5, RStride, CStride>;
+    Matrix<N, U5, U1, SliceStorage<'a, N, U5, U1, RStride, CStride>>;
 /// A 6D column vector slice.
 pub type VectorSlice6<'a, N, RStride = U1, CStride = U6> =
-    VectorSliceN<'a, N, U6, RStride, CStride>;
+    Matrix<N, U6, U1, SliceStorage<'a, N, U6, U1, RStride, CStride>>;
 
 /*
  *
@@ -208,194 +208,194 @@ pub type VectorSlice6<'a, N, RStride = U1, CStride = U6> =
  *
  *
  */
-/// A column-major mutable matrix slice with `R` rows and `C` columns.
+/// A column-major matrix slice with `R` rows and `C` columns.
 pub type MatrixSliceMutMN<'a, N, R, C, RStride = U1, CStride = R> =
     Matrix<N, R, C, SliceStorageMut<'a, N, R, C, RStride, CStride>>;
 
-/// A column-major mutable matrix slice with `D` rows and columns.
+/// A column-major matrix slice with `D` rows and columns.
 pub type MatrixSliceMutN<'a, N, D, RStride = U1, CStride = D> =
-    MatrixSliceMutMN<'a, N, D, D, RStride, CStride>;
+    Matrix<N, D, D, SliceStorageMut<'a, N, D, D, RStride, CStride>>;
 
-/// A column-major mutable matrix slice dynamic numbers of rows and columns.
+/// A column-major matrix slice dynamic numbers of rows and columns.
 pub type DMatrixSliceMut<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutN<'a, N, Dynamic, RStride, CStride>;
+    Matrix<N, Dynamic, Dynamic, SliceStorageMut<'a, N, Dynamic, Dynamic, RStride, CStride>>;
 
-/// A column-major 1x1 mutable matrix slice.
+/// A column-major 1x1 matrix slice.
 pub type MatrixSliceMut1<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutN<'a, N, U1, RStride, CStride>;
+    Matrix<N, U1, U1, SliceStorageMut<'a, N, U1, U1, RStride, CStride>>;
-/// A column-major 2x2 mutable matrix slice.
+/// A column-major 2x2 matrix slice.
 pub type MatrixSliceMut2<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutN<'a, N, U2, RStride, CStride>;
+    Matrix<N, U2, U2, SliceStorageMut<'a, N, U2, U2, RStride, CStride>>;
-/// A column-major 3x3 mutable matrix slice.
+/// A column-major 3x3 matrix slice.
 pub type MatrixSliceMut3<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutN<'a, N, U3, RStride, CStride>;
+    Matrix<N, U3, U3, SliceStorageMut<'a, N, U3, U3, RStride, CStride>>;
-/// A column-major 4x4 mutable matrix slice.
+/// A column-major 4x4 matrix slice.
 pub type MatrixSliceMut4<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutN<'a, N, U4, RStride, CStride>;
+    Matrix<N, U4, U4, SliceStorageMut<'a, N, U4, U4, RStride, CStride>>;
-/// A column-major 5x5 mutable matrix slice.
+/// A column-major 5x5 matrix slice.
 pub type MatrixSliceMut5<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutN<'a, N, U5, RStride, CStride>;
+    Matrix<N, U5, U5, SliceStorageMut<'a, N, U5, U5, RStride, CStride>>;
-/// A column-major 6x6 mutable matrix slice.
+/// A column-major 6x6 matrix slice.
 pub type MatrixSliceMut6<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutN<'a, N, U6, RStride, CStride>;
+    Matrix<N, U6, U6, SliceStorageMut<'a, N, U6, U6, RStride, CStride>>;
 
-/// A column-major 1x2 mutable matrix slice.
+/// A column-major 1x2 matrix slice.
 pub type MatrixSliceMut1x2<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, U2, RStride, CStride>;
+    Matrix<N, U1, U2, SliceStorageMut<'a, N, U1, U2, RStride, CStride>>;
-/// A column-major 1x3 mutable matrix slice.
+/// A column-major 1x3 matrix slice.
 pub type MatrixSliceMut1x3<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, U3, RStride, CStride>;
+    Matrix<N, U1, U3, SliceStorageMut<'a, N, U1, U3, RStride, CStride>>;
-/// A column-major 1x4 mutable matrix slice.
+/// A column-major 1x4 matrix slice.
 pub type MatrixSliceMut1x4<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, U4, RStride, CStride>;
+    Matrix<N, U1, U4, SliceStorageMut<'a, N, U1, U4, RStride, CStride>>;
-/// A column-major 1x5 mutable matrix slice.
+/// A column-major 1x5 matrix slice.
 pub type MatrixSliceMut1x5<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, U5, RStride, CStride>;
+    Matrix<N, U1, U5, SliceStorageMut<'a, N, U1, U5, RStride, CStride>>;
-/// A column-major 1x6 mutable matrix slice.
+/// A column-major 1x6 matrix slice.
 pub type MatrixSliceMut1x6<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, U6, RStride, CStride>;
+    Matrix<N, U1, U6, SliceStorageMut<'a, N, U1, U6, RStride, CStride>>;
 
-/// A column-major 2x1 mutable matrix slice.
+/// A column-major 2x1 matrix slice.
 pub type MatrixSliceMut2x1<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, U1, RStride, CStride>;
+    Matrix<N, U2, U1, SliceStorageMut<'a, N, U2, U1, RStride, CStride>>;
-/// A column-major 2x3 mutable matrix slice.
+/// A column-major 2x3 matrix slice.
 pub type MatrixSliceMut2x3<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, U3, RStride, CStride>;
+    Matrix<N, U2, U3, SliceStorageMut<'a, N, U2, U3, RStride, CStride>>;
-/// A column-major 2x4 mutable matrix slice.
+/// A column-major 2x4 matrix slice.
 pub type MatrixSliceMut2x4<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, U4, RStride, CStride>;
+    Matrix<N, U2, U4, SliceStorageMut<'a, N, U2, U4, RStride, CStride>>;
-/// A column-major 2x5 mutable matrix slice.
+/// A column-major 2x5 matrix slice.
 pub type MatrixSliceMut2x5<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, U5, RStride, CStride>;
+    Matrix<N, U2, U5, SliceStorageMut<'a, N, U2, U5, RStride, CStride>>;
-/// A column-major 2x6 mutable matrix slice.
+/// A column-major 2x6 matrix slice.
 pub type MatrixSliceMut2x6<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, U6, RStride, CStride>;
+    Matrix<N, U2, U6, SliceStorageMut<'a, N, U2, U6, RStride, CStride>>;
 
-/// A column-major 3x1 mutable matrix slice.
+/// A column-major 3x1 matrix slice.
 pub type MatrixSliceMut3x1<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, U1, RStride, CStride>;
+    Matrix<N, U3, U1, SliceStorageMut<'a, N, U3, U1, RStride, CStride>>;
-/// A column-major 3x2 mutable matrix slice.
+/// A column-major 3x2 matrix slice.
 pub type MatrixSliceMut3x2<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, U2, RStride, CStride>;
+    Matrix<N, U3, U2, SliceStorageMut<'a, N, U3, U2, RStride, CStride>>;
-/// A column-major 3x4 mutable matrix slice.
+/// A column-major 3x4 matrix slice.
 pub type MatrixSliceMut3x4<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, U4, RStride, CStride>;
+    Matrix<N, U3, U4, SliceStorageMut<'a, N, U3, U4, RStride, CStride>>;
-/// A column-major 3x5 mutable matrix slice.
+/// A column-major 3x5 matrix slice.
 pub type MatrixSliceMut3x5<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, U5, RStride, CStride>;
+    Matrix<N, U3, U5, SliceStorageMut<'a, N, U3, U5, RStride, CStride>>;
-/// A column-major 3x6 mutable matrix slice.
+/// A column-major 3x6 matrix slice.
 pub type MatrixSliceMut3x6<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, U6, RStride, CStride>;
+    Matrix<N, U3, U6, SliceStorageMut<'a, N, U3, U6, RStride, CStride>>;
 
-/// A column-major 4x1 mutable matrix slice.
+/// A column-major 4x1 matrix slice.
 pub type MatrixSliceMut4x1<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, U1, RStride, CStride>;
+    Matrix<N, U4, U1, SliceStorageMut<'a, N, U4, U1, RStride, CStride>>;
-/// A column-major 4x2 mutable matrix slice.
+/// A column-major 4x2 matrix slice.
 pub type MatrixSliceMut4x2<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, U2, RStride, CStride>;
+    Matrix<N, U4, U2, SliceStorageMut<'a, N, U4, U2, RStride, CStride>>;
-/// A column-major 4x3 mutable matrix slice.
+/// A column-major 4x3 matrix slice.
 pub type MatrixSliceMut4x3<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, U3, RStride, CStride>;
+    Matrix<N, U4, U3, SliceStorageMut<'a, N, U4, U3, RStride, CStride>>;
-/// A column-major 4x5 mutable matrix slice.
+/// A column-major 4x5 matrix slice.
 pub type MatrixSliceMut4x5<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, U5, RStride, CStride>;
+    Matrix<N, U4, U5, SliceStorageMut<'a, N, U4, U5, RStride, CStride>>;
-/// A column-major 4x6 mutable matrix slice.
+/// A column-major 4x6 matrix slice.
 pub type MatrixSliceMut4x6<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, U6, RStride, CStride>;
+    Matrix<N, U4, U6, SliceStorageMut<'a, N, U4, U6, RStride, CStride>>;
 
-/// A column-major 5x1 mutable matrix slice.
+/// A column-major 5x1 matrix slice.
 pub type MatrixSliceMut5x1<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, U1, RStride, CStride>;
+    Matrix<N, U5, U1, SliceStorageMut<'a, N, U5, U1, RStride, CStride>>;
-/// A column-major 5x2 mutable matrix slice.
+/// A column-major 5x2 matrix slice.
 pub type MatrixSliceMut5x2<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, U2, RStride, CStride>;
+    Matrix<N, U5, U2, SliceStorageMut<'a, N, U5, U2, RStride, CStride>>;
-/// A column-major 5x3 mutable matrix slice.
+/// A column-major 5x3 matrix slice.
 pub type MatrixSliceMut5x3<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, U3, RStride, CStride>;
+    Matrix<N, U5, U3, SliceStorageMut<'a, N, U5, U3, RStride, CStride>>;
-/// A column-major 5x4 mutable matrix slice.
+/// A column-major 5x4 matrix slice.
 pub type MatrixSliceMut5x4<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, U4, RStride, CStride>;
+    Matrix<N, U5, U4, SliceStorageMut<'a, N, U5, U4, RStride, CStride>>;
-/// A column-major 5x6 mutable matrix slice.
+/// A column-major 5x6 matrix slice.
 pub type MatrixSliceMut5x6<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, U6, RStride, CStride>;
+    Matrix<N, U5, U6, SliceStorageMut<'a, N, U5, U6, RStride, CStride>>;
 
-/// A column-major 6x1 mutable matrix slice.
+/// A column-major 6x1 matrix slice.
 pub type MatrixSliceMut6x1<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, U1, RStride, CStride>;
+    Matrix<N, U6, U1, SliceStorageMut<'a, N, U6, U1, RStride, CStride>>;
-/// A column-major 6x2 mutable matrix slice.
+/// A column-major 6x2 matrix slice.
 pub type MatrixSliceMut6x2<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, U2, RStride, CStride>;
+    Matrix<N, U6, U2, SliceStorageMut<'a, N, U6, U2, RStride, CStride>>;
-/// A column-major 6x3 mutable matrix slice.
+/// A column-major 6x3 matrix slice.
 pub type MatrixSliceMut6x3<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, U3, RStride, CStride>;
+    Matrix<N, U6, U3, SliceStorageMut<'a, N, U6, U3, RStride, CStride>>;
-/// A column-major 6x4 mutable matrix slice.
+/// A column-major 6x4 matrix slice.
 pub type MatrixSliceMut6x4<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, U4, RStride, CStride>;
+    Matrix<N, U6, U4, SliceStorageMut<'a, N, U6, U4, RStride, CStride>>;
-/// A column-major 6x5 mutable matrix slice.
+/// A column-major 6x5 matrix slice.
 pub type MatrixSliceMut6x5<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, U5, RStride, CStride>;
+    Matrix<N, U6, U5, SliceStorageMut<'a, N, U6, U5, RStride, CStride>>;
 
-/// A column-major mutable matrix slice with 1 row and a number of columns chosen at runtime.
+/// A column-major matrix slice with 1 row and a number of columns chosen at runtime.
 pub type MatrixSliceMut1xX<'a, N, RStride = U1, CStride = U1> =
-    MatrixSliceMutMN<'a, N, U1, Dynamic, RStride, CStride>;
+    Matrix<N, U1, Dynamic, SliceStorageMut<'a, N, U1, Dynamic, RStride, CStride>>;
-/// A column-major mutable matrix slice with 2 rows and a number of columns chosen at runtime.
+/// A column-major matrix slice with 2 rows and a number of columns chosen at runtime.
 pub type MatrixSliceMut2xX<'a, N, RStride = U1, CStride = U2> =
-    MatrixSliceMutMN<'a, N, U2, Dynamic, RStride, CStride>;
+    Matrix<N, U2, Dynamic, SliceStorageMut<'a, N, U2, Dynamic, RStride, CStride>>;
-/// A column-major mutable matrix slice with 3 rows and a number of columns chosen at runtime.
+/// A column-major matrix slice with 3 rows and a number of columns chosen at runtime.
 pub type MatrixSliceMut3xX<'a, N, RStride = U1, CStride = U3> =
-    MatrixSliceMutMN<'a, N, U3, Dynamic, RStride, CStride>;
+    Matrix<N, U3, Dynamic, SliceStorageMut<'a, N, U3, Dynamic, RStride, CStride>>;
-/// A column-major mutable matrix slice with 4 rows and a number of columns chosen at runtime.
+/// A column-major matrix slice with 4 rows and a number of columns chosen at runtime.
 pub type MatrixSliceMut4xX<'a, N, RStride = U1, CStride = U4> =
-    MatrixSliceMutMN<'a, N, U4, Dynamic, RStride, CStride>;
+    Matrix<N, U4, Dynamic, SliceStorageMut<'a, N, U4, Dynamic, RStride, CStride>>;
-/// A column-major mutable matrix slice with 5 rows and a number of columns chosen at runtime.
+/// A column-major matrix slice with 5 rows and a number of columns chosen at runtime.
 pub type MatrixSliceMut5xX<'a, N, RStride = U1, CStride = U5> =
-    MatrixSliceMutMN<'a, N, U5, Dynamic, RStride, CStride>;
+    Matrix<N, U5, Dynamic, SliceStorageMut<'a, N, U5, Dynamic, RStride, CStride>>;
-/// A column-major mutable matrix slice with 6 rows and a number of columns chosen at runtime.
+/// A column-major matrix slice with 6 rows and a number of columns chosen at runtime.
 pub type MatrixSliceMut6xX<'a, N, RStride = U1, CStride = U6> =
-    MatrixSliceMutMN<'a, N, U6, Dynamic, RStride, CStride>;
+    Matrix<N, U6, Dynamic, SliceStorageMut<'a, N, U6, Dynamic, RStride, CStride>>;
 
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 1 column.
+/// A column-major matrix slice with a number of rows chosen at runtime and 1 column.
 pub type MatrixSliceMutXx1<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U1, RStride, CStride>;
+    Matrix<N, Dynamic, U1, SliceStorageMut<'a, N, Dynamic, U1, RStride, CStride>>;
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 2 columns.
+/// A column-major matrix slice with a number of rows chosen at runtime and 2 columns.
 pub type MatrixSliceMutXx2<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U2, RStride, CStride>;
+    Matrix<N, Dynamic, U2, SliceStorageMut<'a, N, Dynamic, U2, RStride, CStride>>;
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 3 columns.
+/// A column-major matrix slice with a number of rows chosen at runtime and 3 columns.
 pub type MatrixSliceMutXx3<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U3, RStride, CStride>;
+    Matrix<N, Dynamic, U3, SliceStorageMut<'a, N, Dynamic, U3, RStride, CStride>>;
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 4 columns.
+/// A column-major matrix slice with a number of rows chosen at runtime and 4 columns.
 pub type MatrixSliceMutXx4<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U4, RStride, CStride>;
+    Matrix<N, Dynamic, U4, SliceStorageMut<'a, N, Dynamic, U4, RStride, CStride>>;
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 5 columns.
+/// A column-major matrix slice with a number of rows chosen at runtime and 5 columns.
 pub type MatrixSliceMutXx5<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U5, RStride, CStride>;
+    Matrix<N, Dynamic, U5, SliceStorageMut<'a, N, Dynamic, U5, RStride, CStride>>;
-/// A column-major mutable matrix slice with a number of rows chosen at runtime and 6 columns.
+/// A column-major matrix slice with a number of rows chosen at runtime and 6 columns.
 pub type MatrixSliceMutXx6<'a, N, RStride = U1, CStride = Dynamic> =
-    MatrixSliceMutMN<'a, N, Dynamic, U6, RStride, CStride>;
+    Matrix<N, Dynamic, U6, SliceStorageMut<'a, N, Dynamic, U6, RStride, CStride>>;
 
-/// A mutable column vector slice with `D` rows.
+/// A column vector slice with `D` rows.
 pub type VectorSliceMutN<'a, N, D, RStride = U1, CStride = D> =
     Matrix<N, D, U1, SliceStorageMut<'a, N, D, U1, RStride, CStride>>;
 
-/// A mutable column vector slice dynamic numbers of rows and columns.
+/// A column vector slice dynamic numbers of rows and columns.
 pub type DVectorSliceMut<'a, N, RStride = U1, CStride = Dynamic> =
-    VectorSliceMutN<'a, N, Dynamic, RStride, CStride>;
+    Matrix<N, Dynamic, U1, SliceStorageMut<'a, N, Dynamic, U1, RStride, CStride>>;
 
-/// A 1D mutable column vector slice.
+/// A 1D column vector slice.
 pub type VectorSliceMut1<'a, N, RStride = U1, CStride = U1> =
-    VectorSliceMutN<'a, N, U1, RStride, CStride>;
+    Matrix<N, U1, U1, SliceStorageMut<'a, N, U1, U1, RStride, CStride>>;
-/// A 2D mutable column vector slice.
+/// A 2D column vector slice.
 pub type VectorSliceMut2<'a, N, RStride = U1, CStride = U2> =
-    VectorSliceMutN<'a, N, U2, RStride, CStride>;
+    Matrix<N, U2, U1, SliceStorageMut<'a, N, U2, U1, RStride, CStride>>;
-/// A 3D mutable column vector slice.
+/// A 3D column vector slice.
 pub type VectorSliceMut3<'a, N, RStride = U1, CStride = U3> =
-    VectorSliceMutN<'a, N, U3, RStride, CStride>;
+    Matrix<N, U3, U1, SliceStorageMut<'a, N, U3, U1, RStride, CStride>>;
-/// A 4D mutable column vector slice.
+/// A 4D column vector slice.
 pub type VectorSliceMut4<'a, N, RStride = U1, CStride = U4> =
-    VectorSliceMutN<'a, N, U4, RStride, CStride>;
+    Matrix<N, U4, U1, SliceStorageMut<'a, N, U4, U1, RStride, CStride>>;
-/// A 5D mutable column vector slice.
+/// A 5D column vector slice.
 pub type VectorSliceMut5<'a, N, RStride = U1, CStride = U5> =
-    VectorSliceMutN<'a, N, U5, RStride, CStride>;
+    Matrix<N, U5, U1, SliceStorageMut<'a, N, U5, U1, RStride, CStride>>;
-/// A 6D mutable column vector slice.
+/// A 6D column vector slice.
 pub type VectorSliceMut6<'a, N, RStride = U1, CStride = U6> =
-    VectorSliceMutN<'a, N, U6, RStride, CStride>;
+    Matrix<N, U6, U1, SliceStorageMut<'a, N, U6, U1, RStride, CStride>>;