diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/debug/DebugDumpBuiltin.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/debug/DebugDumpBuiltin.java
index 36748b471c2c140f44e749f727bfa906193c5b1a..2e2c4838ab091b181864305d6b8d859bfec358b2 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/debug/DebugDumpBuiltin.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/debug/DebugDumpBuiltin.java
@@ -25,7 +25,6 @@ package com.oracle.truffle.r.nodes.builtin.debug;
 import static com.oracle.truffle.r.runtime.RBuiltinKind.*;
 
 import com.oracle.truffle.api.dsl.*;
-import com.oracle.truffle.api.impl.*;
 import com.oracle.truffle.r.nodes.*;
 import com.oracle.truffle.r.nodes.access.*;
 import com.oracle.truffle.r.nodes.builtin.*;
@@ -61,7 +60,7 @@ public abstract class DebugDumpBuiltin extends RBuiltinNode {
     @Specialization
     public Object dump(RFunction function) {
         controlVisibility();
-        String source = ((RRootNode) ((DefaultCallTarget) function.getTarget()).getRootNode()).getSourceCode();
+        String source = ((RRootNode) function.getTarget().getRootNode()).getSourceCode();
         Utils.dumpFunction("dump: " + (source.length() <= FUNCTION_LENGTH_LIMIT ? source : source.substring(0, FUNCTION_LENGTH_LIMIT) + "..."), function);
         return RNull.instance;
     }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
index c991fa2fe711defbec3134bb9779d00bb28e795f..105325437c60b261e093dec245eed59f7849c5f4 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
@@ -27,12 +27,11 @@ import java.nio.charset.*;
 import java.util.*;
 
 import com.oracle.truffle.api.*;
-import com.oracle.truffle.api.source.*;
-import com.oracle.truffle.api.CompilerDirectives.*;
+import com.oracle.truffle.api.CompilerDirectives.SlowPath;
 import com.oracle.truffle.api.frame.*;
-import com.oracle.truffle.api.frame.FrameInstance.*;
-import com.oracle.truffle.api.impl.*;
+import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
 import com.oracle.truffle.api.nodes.*;
+import com.oracle.truffle.api.source.*;
 import com.oracle.truffle.r.runtime.data.*;
 
 public final class Utils {
@@ -118,7 +117,7 @@ public final class Utils {
 
     public static void dumpFunction(String groupName, RFunction function) {
         GraphPrintVisitor graphPrinter = new GraphPrintVisitor();
-        DefaultCallTarget callTarget = (DefaultCallTarget) function.getTarget();
+        RootCallTarget callTarget = function.getTarget();
         if (callTarget != null) {
             graphPrinter.beginGroup(groupName);
             graphPrinter.beginGraph(RRuntime.toString(function)).visit(callTarget.getRootNode());