Use reify(...).tree instead of Select() chains
Fix deprecation warnings related to Block() and Select()