Cleaning up code to make it compatible with older C++ versions.