C++ from C, again