Ensure that comments are kept in the refactoring