I've made some progress on this for Phoenix. It's a giant fugly hack, but it seems to be working (minus any cases I forgot to test).
Related to this, I had to change (honestly, it was just easier to do it) the way all footnotes are formatted, so that's a thing too. Hopefully that won't drive anyone bonkers. For example, something like this:
Includes: +1 from 'A', +2 from 'B'; Conditional: +2 from 'C', +1 from 'D' when you're happy
Will now look like this:
+1 from 'A', +2 from 'B', Cond. +2 from 'C', Cond. +1 from 'D' when you're happy
I should have something out by the weekend.