Made Tree comply with last pretty_extra changes.