Continuing C++ conversion...