Remove explicit references to chm_com, fix chm_nm macro