Yield and EFA shared the same namespace, this commits splits them and introduces tuple tree containers as well.
Also, use ROOT_TYPE.