Fixups for C98 Visual Studio compiler errors.