C++ standalone: more cleanup