Remove overzealous compiler warnings, fix build with gcc 3.4
State Changed From-To: open->closed Committed, thanks!