Add a re_entry_number column to the entries table and to the bounties table and populate them appropriately, including backfilling them.
Once those have been done, revisit my fix for bounties being misreported (#1706), since it'll be trivial (I think!) to group by both player_id as well as re_entry_number.
I am not adding the easy label, although I actually think it should be pretty darned easy. However, I haven't slung much SQL lately and there are much better uses of my time in the near and medium future.