General improvements to CommentsParser