I found that there are a few different styles in the tree, but following the Zicbom example would indeed be cleaner. I’ll squash 1-3 together in v3 for simplicity and consistency. Thanks, Zihong