Code change to avoid errors on older gcc compilers.