C++11 migration, Part 3 of n
C++11 migration, Part 4 of n