Fix clang -Werror build due to -Wreorder violation introduced in r181825