Write C++ mangle, then store substitute.

Once again, as per a previous pull of mine. C++ mangling (for GNU ABI at least) is always in the logic of:
```
if (found substitute)
  => write substitute
else
  => write mangle
  => store substitute
```

If this breaks something, then it's a bug in the implementation.