Improved compatibility with older compilers.