Alter death calculation ordering of HIV deaths vs other deaths

[pineapple-cat]

Calculating death types in series may bias death numbers to the first types of deaths calculated. Consider calculating all deaths in one step, such as how the number of sexual partners is calculated.