C++11 Fixes: Part 8.