Modify to work with pre-C++11 specs.