Cleans up lang_CPP.cpp after previous changes.