better C++ std mangling

More C++ mangling bugs fixed.