Fixes #7238
Refactors a lot of reused/redundant death code, fixes #7224