Reapply r52988, "Simplify addRegisterKilled and addRegisterDead." The