Merge change 7036

* changes:
  Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors.