Change to C++11, eliminating one header include and allowing use of emplace() and range-base for loop.