Progress on removing c++11 specific code path.