Are those comments not in the first round of PR fixes commit?