TreeBuilder and fixed various things in AbstractBuilder.