Comment 6 for bug 1746536

While I don't think there's overlap yet, this seems likely to run headlong into bug #1773417 if it gets too ambitious. I'd hope to see that get more review before pushing into this, as there's a bunch of redundant code which needs some cleanup love in this area, and diverging too much here could make that trickier.

Dan