Matrix: Merged matrix and type into matrix.type