Yet another pass through Matrix.cs