More C++-ification