Start porting to C++11