Add markup for comments, via parts of patch-261.