Fixes #7238
Refactors a lot of reused/redundant death code, fixes #7224
Amendments to previous commit.
Fixes #7266
Fixes #7119
Fixes #7162. Eject ID verb for laptops is still busted though.
Fixes #7151
Fixes #6974
Fixes #7105
Replaces some macros.
Merge pull request #7264 from Zuhayr/master

Fixes, death refactor.