Note that gcc 2.4.5, the compiler we are currently using, still compiles it correctly after this change.