Eliminate new warnings from clang 3.2