More C++ work.