Fix some warnings from Clang trunk in an overly aggressive manner