Update to support comment-mode, simply