C++11 syntax corrections.