Further un-C++11 changes.