Fix problem that GCC3.1 doesn't like.