SotBE: reorganize death macros to avoid code duplication