Major cleanup: de-templatized CMatrix (now always operates on doubles)