Transition away from making the internals known, so rework
the whole tree.mk to expand better to dynamic destinations.