Fix the clang -Werror build after r198818