Move tree-structure leaves into partial instead of helper [story:41066469]