fixup
Return leaf status from tree walk
Use fast layout
Cache tree walk