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