More -Werror=reorder fixes.