Merge pull request #1349 from comex/good-job-dereferencing-null-on-purpose Fix some warnings from Clang trunk in an overly aggressive manner