Comment 4 for bug 1993823

I've updated the branch with one additional commit. Part of the work was synchronizing the eg-tree implementation between the Custom Org Tree work and the reporter. That caused a need for one extra bit of explicit instantiation data, which is there now.

If/when this is merged, that last commit can just be squashed into the main big commit.