Fix some warnings from Clang trunk in an overly aggressive manner

Yeah, looks like you're right... Feel like providing a fix? :)