More C++ification.