C++11 migration, Part 8 of n
C++11 migration, Part 9 of n