Move several damage modifiers to the correct event

These effects should take place last in damage calculation during the
ModifyDamage event.