leaf: more meat to TLeaf{I,D,F}