Correct handling of comments.