Fix a comment and some cleanup with weird non-modified modified files.