BF FA extra damage fails when rolled from damage roll instead of attack

[Bathtor]

Reproduction

Working Scenario:

1. Roll a ranged attack from sheet
2. Roll damage from chat
3. roll BF/FA from chat

Not Working Scenario:

1. Roll damage from sheet
2. roll BF/FA from chat

Cause

This appears to be a Roll20 issue.
When rolling damage from the sheet, Roll20 tries to resolve the global chat button macro for BF(ranged_damage_conc_extra_bf)/FA(ranged_damage_conc_extra_fa) as if it were a repeating section, completely garbling it in the process (e.g. repeating_rangedweapons_-KnyUIqobFpVz8TjNSUx_conc_extra_fa).
When rolling via the attack roll first, Roll20 forgets that the context was a repeating section, and renders it correctly.

Possible Solutions

1. Hope that Roll20 fixes it (yeah, right...)
2. Remove the BF/FA rolls from damage rolls from the sheet, and move them to buttons in the shot type explanation section instead.
3. Duplicate the BF/FA for every weapon, and use that one to roll from damage, so that Roll20 can actually resolve to an existing macro. This will cause a lot of sheet bloat, though.
4. Make BF/FA a query that pops up when rolling damage, instead

[Bathtor]

Implemented option 4.