Fix more problems found by GCC 4.6.0's static checks.