I was thinking the same thing.  We should add ref versions for Matrix at least in a future PR and fix this to use it.