Rebase: Move handleDamage EH back to init EH.