fix cut-and-paste bugs in .cmm -> .hc/.s rules