Fixed extension handling w.r.t. `Leaf` and `Node`