Simplify Leaf and its sub-classes.

Change-Id: I711db26bedee2bebdd39ffd8b637fa8918c16ff9
Fix LeafContainer

Change-Id: Ie708e64c1d30751d902f99d17ce0cae0c8d5d08a