Restored support for old C++ versions.