Tweaked debug to use new framework death types