SotBE: use DEFEAT macro consistently in all death events