Deprecate BlockCMat class by beefing up VarMat to handle CMatrix entries