Switch to ImmutableMatrix types