Clarify CUT code, and in the process, fix a bug in trunk only