Fixes the logic to update incremental counters that avoid nested
progress events. Previous implementation had the potential for nested
events since it fired the events before updating internal counters.
Fixed that.