Bring CP printer output in line with parser.
Fix bugs in implementation of let rec.