Matrix has a new spec coming that will fix everything (they say). But last I checked it's not finalised, and they have been working on it for years.