Keep gcc -Wall happy.
27 files changed