better C++ std mangling

More C++ mangling bugs fixed.
this function is not needed is it?