I'll cherry pick it, that's no problem.

In general, where the older compatibility stuff doesn't get in the way, I've left it in place, to avoid cluttering up the diff. Much of `timemachine` relates to versions of Python that we're dropping support for.