Added demangling for C++ names.