Fix some warnings from Clang trunk in an overly aggressive manner

Actually, that doesn't work.  Whatever, I will change it back.