Fix more warnings on older GCC.