Clean up History

[clue]

[clue]

I've started looking into this and created a working prototype. I'll file a PR once the API has been fleshed out.

[clue]

Postponing this to the next release in order to get the outstanding stream changes out.