2.4.2: * Avoid compiler errors with g++ 3.4. (Denis Leroy)