Some more pedantic fixes to help with Windows.
More specifically, to help with MSVC 2010. Which uses C89, or maybe even *shudder* ANSI.