This reverts commit 9e08b083 and ensures signature rewriting also updates dead call sites to avoid the call graph assertion.