Move comments over to the C++ class.