better handling of comment-keywords