This reverts commit 44f823c736. LazyLibrary can't take Trees anymore, so no need for it.
44f823c736
and rename functions