Make copy-and-comment work