Simple improvements to store.ToTreeNodes