C++11 migration, Part 2 of n