Some cleanups for compilation with GCC 4.0.0 to remove warnings: