Simplify bundle tree and add some print utilities.