Remove explicit references to chm_com, fix chm_nm macro
Merge branch 'anj/linalg2'