Updated to latest CPP11 features.