Avoid mangling names twice. No functionality change.