Hey @tj2 @Devin - here is a new BIP that proposes to address this issue:
Let me know what you think and if you have any other implementation suggestions.