Fix gcc -Wall nits.

5 files changed