Simplify Damage::resolve a bit