Commenting out additional warnings doesn't seem to be a good thing in this pull request?