diff --git a/src/QAST/Node.nqp b/src/QAST/Node.nqp
index 7588054f56..4cd0adc514 100644
--- a/src/QAST/Node.nqp
+++ b/src/QAST/Node.nqp
@@ -155,26 +155,25 @@ class QAST::Node {
     }
 
     method dump_annotations() {
-	my @anns;
-	nqp::push(@anns, self.dump_flags);
-
+        my @anns;
+        nqp::push(@anns, self.dump_flags);
         if nqp::ishash(%!annotations) {
-	    for %!annotations {
-		my $k := $_.key;
-		my $v := $_.value;
-		try {
-		    if nqp::isconcrete($v) {
-			if $k eq 'IN_DECL' || $k eq 'BY' {
-			    nqp::push(@anns, ':' ~ $k ~ '<' ~ $v ~ '>');
-			}
-			else {   # dunno how to introspect
-			    nqp::push(@anns, ':' ~ $k ~ '<?>');
-			}
-		    }
-		}
-	    }
-	}
-	nqp::join(' ',@anns);
+            for %!annotations {
+                my $k := $_.key;
+                my $v := $_.value;
+                try {
+                    if nqp::isconcrete($v) {
+                        if $k eq 'IN_DECL' || $k eq 'BY' || $k eq 'statement_id' {
+                            nqp::push(@anns, ':' ~ $k ~ '<' ~ $v ~ '>');
+                        }
+                        else {   # dunno how to introspect
+                            nqp::push(@anns, ':' ~ $k ~ '<?>');
+                        }
+                    }
+                }
+            }
+        }
+        nqp::join(' ',@anns);
     }
 
     method dump_children(int $indent, @onto) { }
diff --git a/src/QAST/WVal.nqp b/src/QAST/WVal.nqp
index b7ff3c43bc..05ad507b35 100644
--- a/src/QAST/WVal.nqp
+++ b/src/QAST/WVal.nqp
@@ -24,8 +24,13 @@ class QAST::WVal is QAST::Node does QAST::CompileTimeValue {
     }
 
     method dump_extra_node_info() {
-	CATCH { return "?" } 
+	      CATCH { return "?" }
         my $v := self.compile_time_value();
-        $v.HOW.name($v);
+        my $info := $v.HOW.name($v);
+        if self.ann('past_block') -> $qast {
+            $info := "$info :cuid("
+              ~ nqp::ifnull(nqp::getattr($qast, QAST::Block, '$!cuid'), '?') ~ ")";
+        }
+        $info;
     }
 }