Improve Leaf constructors