Switching some parts to C++11