Associate deaths with resurrections

Counting deaths was not previously directly associated with the
resurrection of the units. By converting the death event into two
events, it can be included in the same generation macro as the
resurrection portion of the logic.