Fix more warnings emitted by gcc.