diff --git a/src/core/CallFrame.pm b/src/core/CallFrame.pm
index fba621fa930..400903edb07 100644
--- a/src/core/CallFrame.pm
+++ b/src/core/CallFrame.pm
@@ -17,15 +17,13 @@ class CallFrame {
     }
 
     method line() {
-        my $ann = self!annotations();
-        $ann<line>;
+        self!annotations()<fline>;
     }
     method file() {
-        my $ann = self!annotations();
-        $ann<file>;
+        self!annotations()<file>;
     }
 
-    method callframe(Int $level) {
+    method callframe(Int $level = 0) {
         CallFrame.new(:interp($!interp), :level($!level + $level));
     }