Update to new VarTree syntax