Allow multi-line cbugg refs with mixed close/comments.

cbugg: close bug-433