--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Tue Oct 20 18:27:55 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/GraphPrintVisitor.java	Wed Oct 21 00:16:07 2015 +0200
@@ -217,7 +217,7 @@
 
     protected void createElementForNode(Object node) {
         boolean exists = nodeMap.containsKey(node);
-        if (!exists || NodeUtil.findAnnotation(node.getClass(), GraphDuplicate.class) != null) {
+        if (!exists) {
             Element nodeElem = dom.createElement("node");
             nodeElem.setAttribute("id", !exists ? oldOrNextId(node) : nextId());
             nodeMap.put(node, nodeElem);
@@ -278,7 +278,7 @@
     }
 
     private void readNodeProperties(Node node) {
-        NodeFieldAccessor[] fields = node.getNodeClass().getFields();
+        NodeFieldAccessor[] fields = NodeClass.get(node).getFields();
         for (NodeFieldAccessor field : fields) {
             if (field.getKind() == NodeFieldKind.DATA) {
                 String key = field.getName();
@@ -323,7 +323,7 @@
         }
 
         // if node is visited once again, skip
-        if (getElementByObject(node) != null && NodeUtil.findAnnotation(node.getClass(), GraphDuplicate.class) == null) {
+        if (getElementByObject(node) != null) {
             return this;
         }
 
@@ -355,7 +355,7 @@
 
     private static LinkedHashMap<String, Node> findNamedNodeChildren(Node node) {
         LinkedHashMap<String, Node> nodes = new LinkedHashMap<>();
-        NodeClass nodeClass = node.getNodeClass();
+        NodeClass nodeClass = NodeClass.get(node);
 
         for (NodeFieldAccessor field : nodeClass.getFields()) {
             NodeFieldKind kind = field.getKind();
@@ -403,15 +403,6 @@
         void visit(Object node, GraphPrintAdapter gPrinter);
     }
 
-    public interface ChildSupplier {
-
-        /** Supplies an additional child if available. */
-        Object startNode(Object callNode);
-
-        void endNode(Object callNode);
-
-    }
-
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
     public @interface CustomGraphPrintHandler {
@@ -423,14 +414,4 @@
     @Target(ElementType.TYPE)
     public @interface NullGraphPrintHandler {
     }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.TYPE)
-    public @interface GraphDuplicate {
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface HiddenField {
-    }
 }