Remove dependency on comment.