Change more places to get it compile with old MSVC 2008 (C89).