Keep gcc -Wall and Microsoft VC happy.
6 files changed