Demangling fixes. Only a rough test done yet.