Update for new VarTree syntax