minor changes to Cmm left over from September 2007

Nothing too deep here; primarily tinking with prettyprinting
and names.  Also eliminated some warnings.  This patch covers
most (but not all) of the code NR changed at the very end
of September 2007, just before ICFP hit...