Add comment-dwim-2 support.