First set of changes for c++11 migration.