More C++11 changes.

Signed-off-by: Andrew Maclean <andrew.amaclean@gmail.com>