More work on compilation logic for updated multitree.