Fix warnings on older GCC, take 2.