Presumably this approach won't work with Conduit (since you can't pass a Document) but I don't think anything here puts us in a worse place than we were before.

(I'll try to go over this week's changes in more detail further in advance of the release cut so we have more time to fix anything I catch, since I really want to hit the release normally this week even though we're churning everything a lot.)