Generate more code compatible with g++ 4.6