Ensuring comments are correctly skipped