Remove old hack for compiling with gcc-4.0.