Disclaimer, I'm not really a programmer, certainly not a protocols designers, and I don't know all that much about the guts of how matrix works. There may be perfectly good reasons why neither of these are good ideas. Or they may be obvious ideas that have already been suggested, but the devil is in the details.