3. Adjusting tantrums and berserk rages so that merely tantrumming only causes dwarves to break stuff rather than attack other dwarves or animals. Ideally the death of a berserk dwarf should also generate a somewhat smaller unhappy thought than someone dying in a cave-in or goblin ambush.
I disagree with this. Think about how it works in reality -- which gets people angrier, someone dying in a tragic accident, or someone going berserk and getting killed by police?
People get angrier when they have other people they can clearly blame for their loss, whether or not it's entirely justified. That's just the way it is. The friends and loved ones of the dead dwarf will question whether the guards had to use as much force as they did, whether their loved one could have survived if the guards had dealt with the situation differently, and so forth. A dwarf killed in a hunting accident is just an accident; a dwarf killed by the guards can poison the whole fortress with doubts and recriminations.
The friends of the dwarf who died are rarely going to say "Oh, he was crazy in the end, so he deserved to die!" They didn't know him when he was crazy; they knew him as a friend.
(In fact, that should probably be tracked by relationships, if it isn't already -- regardless of the circumstances, dwarves should always be colder towards another dwarf who has killed one of their friends, and should of course feel more guilty and sorrowful if they end up killing one of their friends themselves.)