diff --git a/cue/testdata/basicrewrite/000_errors.txtar b/cue/testdata/basicrewrite/000_errors.txtar
index 900ab4927..2fdfc4b2d 100644
--- a/cue/testdata/basicrewrite/000_errors.txtar
+++ b/cue/testdata/basicrewrite/000_errors.txtar
@@ -8,14 +8,6 @@ d: _|_ != b.a
 e: _|_ == _|_
 f: ({} & false) == _|_
 g: _|_ != ({} & false)
--- out/def --
-a: _|_ // explicit error (_|_ literal) in source
-b: _|_ // explicit error (_|_ literal) in source
-c: true
-d: false
-e: true
--- out/legacy-debug --
-<0>{a: _|_(explicit error (_|_ literal) in source), b: _|_(explicit error (_|_ literal) in source), c: true, d: false, e: true}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/001_regexp.txtar b/cue/testdata/basicrewrite/001_regexp.txtar
index 9c155e343..552584b44 100644
--- a/cue/testdata/basicrewrite/001_regexp.txtar
+++ b/cue/testdata/basicrewrite/001_regexp.txtar
@@ -23,22 +23,6 @@ s4: =~"[a-z]" & !="b" // != "b" & =~"[a-z]"
 e1: "foo" =~ 1
 e2: "foo" !~ true
 e3: !="a" & <5
--- out/def --
-c1: true
-c2: true
-c3: false
-c4: true
-b1: "a"
-b2: "foo"
-b3: _|_ // invalid value "foo" (does not match =~"[a-z]{4}")
-b4: "foo"
-s1: =~"c"
-s2: !="b" & =~"[a-z]"
-e1: _|_ // invalid operation "foo" =~ 1 (mismatched types string and int)
-e2: _|_ // invalid operation "foo" !~ true (mismatched types string and bool)
-e3: _|_ // conflicting values !="a" and <5 (mismatched types string and number)
--- out/legacy-debug --
-<0>{c1: true, c2: true, c3: false, c4: true, b1: "a", b2: "foo", b3: _|_((=~"[a-z]{4}" & "foo"):invalid value "foo" (does not match =~"[a-z]{4}")), b4: "foo", s1: =~"c", s2: (!="b" & =~"[a-z]"), e1: _|_(("foo" =~ 1):invalid operation "foo" =~ 1 (mismatched types string and int)), e2: _|_(("foo" !~ true):invalid operation "foo" !~ true (mismatched types string and bool)), e3: _|_((!="a" & <5):conflicting values !="a" and <5 (mismatched types string and number))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/002_arithmetic.txtar b/cue/testdata/basicrewrite/002_arithmetic.txtar
index 2792c657f..50957b175 100644
--- a/cue/testdata/basicrewrite/002_arithmetic.txtar
+++ b/cue/testdata/basicrewrite/002_arithmetic.txtar
@@ -33,37 +33,6 @@ e5: 1.0 div 2
 e6: 2 rem 2.0
 e7: 2 quo 2.0
 e8: 1.0 mod 1
--- out/def --
-i1:      1
-i2:      2
-sum:     1
-div1:    4.00000000000000000000000
-div2:    4.00000000000000000000000
-div3:    1.
-divZero: _|_ // division by zero
-div00:   _|_ // division undefined
-b:       true
-add:     5.00000000000000000000000
-idiv00:  _|_ // division by zero
-imod00:  _|_ // division by zero
-iquo00:  _|_ // division by zero
-irem00:  _|_ // division by zero
-v1:      5.0000000000e+11
-v2:      true
-v3:      0.666666666666666666666667
-v5:      0
-e0:      _|_ // invalid operation 2 + "a" (mismatched types int and string)
-// these are now all alloweed
-// e1: 2.0 / i1
-// e2: i1 / 2.0
-// e3: 3.0 % i2
-// e4: i1 % 2.0
-e5: _|_ // invalid operation 1.0 div 2 (mismatched types float and int)
-e6: _|_ // invalid operation 2 rem 2.0 (mismatched types int and float)
-e7: _|_ // invalid operation 2 quo 2.0 (mismatched types int and float)
-e8: _|_ // invalid operation 1.0 mod 1 (mismatched types float and int)
--- out/legacy-debug --
-<0>{i1: 1, i2: 2, sum: 1, div1: 4.00000000000000000000000, div2: 4.00000000000000000000000, div3: 1., divZero: _|_((1.0 / 0):division by zero), div00: _|_((0 / 0):division undefined), b: true, add: 5.00000000000000000000000, idiv00: _|_((0 div 0):division by zero), imod00: _|_((0 mod 0):division by zero), iquo00: _|_((0 quo 0):division by zero), irem00: _|_((0 rem 0):division by zero), v1: 5.0000000000e+11, v2: true, v3: 0.666666666666666666666667, v5: 0, e0: _|_((2 + "a"):invalid operation 2 + "a" (mismatched types int and string)), e5: _|_((1.0 div 2):invalid operation 1.0 div 2 (mismatched types float and int)), e6: _|_((2 rem 2.0):invalid operation 2 rem 2.0 (mismatched types int and float)), e7: _|_((2 quo 2.0):invalid operation 2 quo 2.0 (mismatched types int and float)), e8: _|_((1.0 mod 1):invalid operation 1.0 mod 1 (mismatched types float and int))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar b/cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar
index 37cb2453c..de9629c37 100644
--- a/cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar
+++ b/cue/testdata/basicrewrite/003_integer-specific_arithmetic.txtar
@@ -28,33 +28,6 @@ m3:  -5 mod 2  // 1
 m4:  -5 mod -2 // 1
 me1: 2.0 mod 1
 me2: 2 mod 1.0
--- out/def --
-q1:  2
-q2:  -2
-q3:  -2
-q4:  2
-qe1: _|_ // invalid operation 2.0 quo 1 (mismatched types float and int)
-qe2: _|_ // invalid operation 2 quo 1.0 (mismatched types int and float)
-r1:  1
-r2:  1
-r3:  -1
-r4:  -1
-re1: _|_ // invalid operation 2.0 rem 1 (mismatched types float and int)
-re2: _|_ // invalid operation 2 rem 1.0 (mismatched types int and float)
-d1:  2
-d2:  -2
-d3:  -3
-d4:  3
-de1: _|_ // invalid operation 2.0 div 1 (mismatched types float and int)
-de2: _|_ // invalid operation 2 div 1.0 (mismatched types int and float)
-m1:  1
-m2:  1
-m3:  1
-m4:  1
-me1: _|_ // invalid operation 2.0 mod 1 (mismatched types float and int)
-me2: _|_ // invalid operation 2 mod 1.0 (mismatched types int and float)
--- out/legacy-debug --
-<0>{q1: 2, q2: -2, q3: -2, q4: 2, qe1: _|_((2.0 quo 1):invalid operation 2.0 quo 1 (mismatched types float and int)), qe2: _|_((2 quo 1.0):invalid operation 2 quo 1.0 (mismatched types int and float)), r1: 1, r2: 1, r3: -1, r4: -1, re1: _|_((2.0 rem 1):invalid operation 2.0 rem 1 (mismatched types float and int)), re2: _|_((2 rem 1.0):invalid operation 2 rem 1.0 (mismatched types int and float)), d1: 2, d2: -2, d3: -3, d4: 3, de1: _|_((2.0 div 1):invalid operation 2.0 div 1 (mismatched types float and int)), de2: _|_((2 div 1.0):invalid operation 2 div 1.0 (mismatched types int and float)), m1: 1, m2: 1, m3: 1, m4: 1, me1: _|_((2.0 mod 1):invalid operation 2.0 mod 1 (mismatched types float and int)), me2: _|_((2 mod 1.0):invalid operation 2 mod 1.0 (mismatched types int and float))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/004_booleans.txtar b/cue/testdata/basicrewrite/004_booleans.txtar
index c7466e306..2ac5b9f3d 100644
--- a/cue/testdata/basicrewrite/004_booleans.txtar
+++ b/cue/testdata/basicrewrite/004_booleans.txtar
@@ -7,12 +7,6 @@ f: false
 f: !t
 e: true
 e: !true
--- out/def --
-t: true
-f: false
-e: _|_ // conflicting values true and false
--- out/legacy-debug --
-<0>{t: true, f: false, e: _|_(true:conflicting values true and false)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/005_boolean_arithmetic.txtar b/cue/testdata/basicrewrite/005_boolean_arithmetic.txtar
index 75976a792..141d3400b 100644
--- a/cue/testdata/basicrewrite/005_boolean_arithmetic.txtar
+++ b/cue/testdata/basicrewrite/005_boolean_arithmetic.txtar
@@ -7,15 +7,6 @@ c: false == true
 d: false != true
 e: true & true
 f: true & false
--- out/def --
-a: true
-b: true
-c: false
-d: true
-e: true
-f: _|_ // conflicting values true and false
--- out/legacy-debug --
-<0>{a: true, b: true, c: false, d: true, e: true, f: _|_(true:conflicting values true and false)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/006_basic_type.txtar b/cue/testdata/basicrewrite/006_basic_type.txtar
index dba9481f1..4c4a50cab 100644
--- a/cue/testdata/basicrewrite/006_basic_type.txtar
+++ b/cue/testdata/basicrewrite/006_basic_type.txtar
@@ -9,15 +9,6 @@ d: int & float // _|_
 e: "4" & string
 f: true
 f: bool
--- out/def --
-a: 1
-b: 1
-c: 1.0
-d: _|_ // conflicting values int and float (mismatched types int and float)
-e: "4"
-f: true
--- out/legacy-debug --
-<0>{a: 1, b: 1, c: 1.0, d: _|_((int & float):conflicting values int and float (mismatched types int and float)), e: "4", f: true}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/007_strings_and_bytes.txtar b/cue/testdata/basicrewrite/007_strings_and_bytes.txtar
index cbf1b9051..08f2dc860 100644
--- a/cue/testdata/basicrewrite/007_strings_and_bytes.txtar
+++ b/cue/testdata/basicrewrite/007_strings_and_bytes.txtar
@@ -12,19 +12,6 @@ b2: 'abc' * 2
 // TODO: consider the semantics of this and perhaps allow this.
 e0: "a" + ''
 e1: 'b' + "c"
--- out/def --
-s0: "foobar"
-s1: "abcabcabc"
-s2: "abcabc"
-b0: 'foobar'
-b1: 'abcabcabc'
-b2: 'abcabc'
-
-// TODO: consider the semantics of this and perhaps allow this.
-e0: _|_ // invalid operation "a" + '' (mismatched types string and bytes)
-e1: _|_ // invalid operation 'b' + "c" (mismatched types bytes and string)
--- out/legacy-debug --
-<0>{s0: "foobar", s1: "abcabcabc", s2: "abcabc", b0: 'foobar', b1: 'abcabcabc', b2: 'abcabc', e0: _|_(("a" + ''):invalid operation "a" + '' (mismatched types string and bytes)), e1: _|_(('b' + "c"):invalid operation 'b' + "c" (mismatched types bytes and string))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/008_escaping.txtar b/cue/testdata/basicrewrite/008_escaping.txtar
index 895e89ee6..9c67c3ed3 100644
--- a/cue/testdata/basicrewrite/008_escaping.txtar
+++ b/cue/testdata/basicrewrite/008_escaping.txtar
@@ -5,35 +5,6 @@ a: "foo\nbar"
 b: a
 
 // TODO: mimic http://exploringjs.com/es6/ch_template-literals.html#sec_introduction-template-literals
--- out/def --
-a: """
-        foo
-        bar
-        """
-b: """
-        foo
-        bar
-        """
--- out/export --
-a: """
-        foo
-        bar
-        """
-b: """
-        foo
-        bar
-        """
--- out/yaml --
-a: |-
-  foo
-  bar
-b: |-
-  foo
-  bar
--- out/json --
-{"a":"foo\nbar","b":"foo\nbar"}
--- out/legacy-debug --
-<0>{a: "foo\nbar", b: "foo\nbar"}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/009_reference.txtar b/cue/testdata/basicrewrite/009_reference.txtar
index e3b9786f8..8558309bc 100644
--- a/cue/testdata/basicrewrite/009_reference.txtar
+++ b/cue/testdata/basicrewrite/009_reference.txtar
@@ -15,51 +15,6 @@ e: {
 		v: e.v
 	}
 }
--- out/def --
-a: 2
-b: 2
-d: {
-	d: 3
-	e: 3
-}
-e: {
-	e: {
-		v: 1
-	}
-	f: {
-		v: 1
-	}
-}
--- out/export --
-a: 2
-b: 2
-d: {
-	d: 3
-	e: 3
-}
-e: {
-	e: {
-		v: 1
-	}
-	f: {
-		v: 1
-	}
-}
--- out/yaml --
-a: 2
-b: 2
-d:
-  d: 3
-  e: 3
-e:
-  e:
-    v: 1
-  f:
-    v: 1
--- out/json --
-{"a":2,"b":2,"d":{"d":3,"e":3},"e":{"e":{"v":1},"f":{"v":1}}}
--- out/legacy-debug --
-<0>{a: 2, b: 2, d: <1>{d: 3, e: 3}, e: <2>{e: <3>{v: 1}, f: <4>{v: 1}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/010_lists.txtar b/cue/testdata/basicrewrite/010_lists.txtar
index d5738aa96..53541996b 100644
--- a/cue/testdata/basicrewrite/010_lists.txtar
+++ b/cue/testdata/basicrewrite/010_lists.txtar
@@ -9,19 +9,6 @@ e2:    [3]["d"]
 e3:    [3][-1]
 e4:    [1, 2, ...>=4 & <=5] & [1, 2, 4, 8]
 e5:    [1, 2, 4, 8] & [1, 2, ...>=4 & <=5]
--- out/def --
-list: [1, 2, 3]
-index: 2
-unify: [1, 2, 3]
-e:  _|_ // conflicting values [] and 4 (mismatched types list and int)
-e2: _|_ // invalid list index "d" (type string)
-e3: _|_ // invalid list index -1 (index must be non-negative)
-e4: [1, 2, 4, _|_, // invalid value 8 (out of bound <=5)
-]
-e5: [1, 2, 4, _|_, // invalid value 8 (out of bound <=5)
-]
--- out/legacy-debug --
-<0>{list: [1,2,3], index: 2, unify: [1,2,3], e: _|_(([] & 4):conflicting values [] and 4 (mismatched types list and int)), e2: _|_("d":invalid list index "d" (type string)), e3: _|_(-1:invalid list index -1 (index must be non-negative)), e4: [1,2,4,_|_((<=5 & 8):invalid value 8 (out of bound <=5))], e5: [1,2,4,_|_((<=5 & 8):invalid value 8 (out of bound <=5))]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/012_selecting.txtar b/cue/testdata/basicrewrite/012_selecting.txtar
index d9b8d2fee..fedd5ed26 100644
--- a/cue/testdata/basicrewrite/012_selecting.txtar
+++ b/cue/testdata/basicrewrite/012_selecting.txtar
@@ -8,23 +8,6 @@ e:      {a: 1}[4]
 f:      {a: 1}.b
 g:      {a: 1}["b"]
 h:      [3].b
--- out/def --
-obj: {
-	a: 1
-	b: 2
-}
-index:  2
-mulidx: 3
-e:      _|_ // invalid struct index 4 (type int)
-f:      {
-	a: 1
-}.b
-g: {
-	a: 1
-}["b"]
-h: _|_ // invalid operation: [3].b (type list does not support selection)
--- out/legacy-debug --
-<0>{obj: <1>{a: 1, b: 2}, index: 2, mulidx: 3, e: _|_(4:invalid struct index 4 (type int)), f: <2>{a: 1}.b, g: <3>{a: 1}["b"], h: _|_([3]:invalid operation: [3].b (type list does not support selection))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/013_obj_unify.txtar b/cue/testdata/basicrewrite/013_obj_unify.txtar
index 5aea33f6a..a3eac991f 100644
--- a/cue/testdata/basicrewrite/013_obj_unify.txtar
+++ b/cue/testdata/basicrewrite/013_obj_unify.txtar
@@ -9,26 +9,6 @@ o4: {a: 1, b:    2} & {b: 2}
 o4: {a: 1} & {a: 1, b:    2}
 e:  1   // 1 & {a:3}
 e: {a: 3}
--- out/def --
-o1: {
-	a: 1
-	b: 2
-}
-o2: {
-	a: 1
-	b: 2
-}
-o3: {
-	a: 1
-	b: 2
-}
-o4: {
-	a: 1
-	b: 2
-}
-e: _|_ // conflicting values 1 and {a: 3} (mismatched types int and struct)
--- out/legacy-debug --
-<0>{o1: <1>{a: 1, b: 2}, o2: <2>{a: 1, b: 2}, o3: <3>{a: 1, b: 2}, o4: <4>{a: 1, b: 2}, e: _|_((1 & <5>{a: 3}):conflicting values 1 and {a: 3} (mismatched types int and struct))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/014_disjunctions.txtar b/cue/testdata/basicrewrite/014_disjunctions.txtar
index 0650afea7..df054bbf0 100644
--- a/cue/testdata/basicrewrite/014_disjunctions.txtar
+++ b/cue/testdata/basicrewrite/014_disjunctions.txtar
@@ -33,27 +33,6 @@ m5: (*2 | 3) & (2 | 3)
 
 // All errors are treated the same as per the unification model.
 i1: [1, 2][3] | "c"
--- out/def --
-o1:  1 | 2 | 3
-o2:  1
-o3:  2
-o4:  1 | 2 | 3 | *_|_
-o5:  1 | *2 | 3
-o6:  1 | 2 | 3
-o7:  2 | 3
-o8:  2 | 3
-o9:  2 | 3
-o10: 3 | *2
-m1:  *2 | 3
-m2:  *2 | 3
-m3:  *2 | 3
-m4:  *2 | 3
-m5:  *2 | 3
-
-// All errors are treated the same as per the unification model.
-i1: "c"
--- out/legacy-debug --
-<0>{o1: (1 | 2 | 3), o2: 1, o3: 2, o4: (1 | 2 | 3 | *_|_), o5: (1 | *2 | 3), o6: (1 | 2 | 3), o7: (2 | 3), o8: (2 | 3), o9: (2 | 3), o10: (3 | *2), m1: (*2 | 3), m2: (*2 | 3), m3: (*2 | 3), m4: (*2 | 3), m5: (*2 | 3), i1: "c"}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/015_types.txtar b/cue/testdata/basicrewrite/015_types.txtar
index 994975df6..abe6f085c 100644
--- a/cue/testdata/basicrewrite/015_types.txtar
+++ b/cue/testdata/basicrewrite/015_types.txtar
@@ -10,18 +10,6 @@ e2: 1 & string
 b:  !int
 p:  +true
 m:  -false
--- out/def --
-i:  int
-j:  3
-s:  string
-t:  "s"
-e:  _|_ // conflicting values int and string (mismatched types int and string)
-e2: _|_ // conflicting values 1 and string (mismatched types int and string)
-b:  _|_ // invalid operation !int (! int)
-p:  _|_ // invalid operation +true (+ bool)
-m:  _|_ // invalid operation -false (- bool)
--- out/legacy-debug --
-<0>{i: int, j: 3, s: string, t: "s", e: _|_((int & string):conflicting values int and string (mismatched types int and string)), e2: _|_((1 & string):conflicting values 1 and string (mismatched types int and string)), b: _|_(!int:invalid operation !int (! int)), p: _|_(+true:invalid operation +true (+ bool)), m: _|_(-false:invalid operation -false (- bool))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/017_null.txtar b/cue/testdata/basicrewrite/017_null.txtar
index b825ef025..d09dad0e4 100644
--- a/cue/testdata/basicrewrite/017_null.txtar
+++ b/cue/testdata/basicrewrite/017_null.txtar
@@ -10,18 +10,6 @@ eq1:  null == 1
 eq2:  1 == null
 ne1:  "s" != null
 call: null()
--- out/def --
-eql: true
-neq: false
-unf: null
-
-// errors
-eq1:  false
-eq2:  false
-ne1:  true
-call: _|_ // cannot call non-function null (type null)
--- out/legacy-debug --
-<0>{eql: true, neq: false, unf: null, eq1: false, eq2: false, ne1: true, call: _|_(null:cannot call non-function null (type null))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/018_self-reference_cycles.txtar b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar
index 962d09048..6596a24ea 100644
--- a/cue/testdata/basicrewrite/018_self-reference_cycles.txtar
+++ b/cue/testdata/basicrewrite/018_self-reference_cycles.txtar
@@ -59,12 +59,6 @@ issue3737: reduced2: {
         end:      start + duration
     }
 }
--- out/def --
-a: b - 100
-b: a + 100
-c: [c[1], c[0]]
--- out/legacy-debug --
-<0>{a: (<1>.b - 100), b: (<1>.a + 100), c: [<1>.c[1],<1>.c[0]]}
 -- out/compile --
 --- disjunction.cue
 {
diff --git a/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar b/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
index 73019c22f..c0a7b294d 100644
--- a/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
+++ b/cue/testdata/basicrewrite/019_resolved_self-reference_cycles.txtar
@@ -51,60 +51,6 @@ nodes: t3: {
 	s3: s1 & {c: 3}
 }
 
--- out/def --
-a: 100
-b: 200
-c: [100, 100]
-s1: s2 & {
-	a: 1
-}
-s2: s3 & {
-	b: 2
-}
-s3: s1 & {
-	c: 3
-}
--- out/export --
-a: 100
-b: 200
-c: [100, 100]
-s1: {
-	a: 1
-	b: 2
-	c: 3
-}
-s2: {
-	a: 1
-	b: 2
-	c: 3
-}
-s3: {
-	a: 1
-	b: 2
-	c: 3
-}
--- out/yaml --
-a: 100
-b: 200
-c:
-- 100
-- 100
-s1:
-  a: 1
-  b: 2
-  c: 3
-s2:
-  a: 1
-  b: 2
-  c: 3
-s3:
-  a: 1
-  b: 2
-  c: 3
--- out/json --
-{"a":100,"b":200,"c":[100,100],"s1":{"a":1,"b":2,"c":3},"s2":{"a":1,"b":2,"c":3},"s3":{"a":1,"b":2,"c":3}}
--- out/legacy-debug --
-<0>{a: 100, b: 200, c: [100,100], s1: <1>{a: 1, b: 2, c: 3}, s2: <2>{a: 1, b: 2, c: 3}, s3: <3>{a: 1, b: 2, c: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar b/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
index 06a136ff5..080b8c6d3 100644
--- a/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
+++ b/cue/testdata/basicrewrite/020_resolved_self-reference_cycles__Issue_19.txtar
@@ -12,30 +12,6 @@ z3: z1 - 3
 z3: 8
 
 // TODO: extensive tests with disjunctions.
--- out/def --
-// CUE knows how to resolve the following:
-x:  200
-y:  100
-z1: 11
-z2: 10
-z3: 8
--- out/export --
-// CUE knows how to resolve the following:
-x:  200
-y:  100
-z1: 11
-z2: 10
-z3: 8
--- out/yaml --
-x: 200
-y: 100
-z1: 11
-z2: 10
-z3: 8
--- out/json --
-{"x":200,"y":100,"z1":11,"z2":10,"z3":8}
--- out/legacy-debug --
-<0>{x: 200, y: 100, z1: 11, z2: 10, z3: 8}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/builtins/056_issue314.txtar b/cue/testdata/builtins/056_issue314.txtar
index e41adf6f4..86f8524ed 100644
--- a/cue/testdata/builtins/056_issue314.txtar
+++ b/cue/testdata/builtins/056_issue314.txtar
@@ -28,51 +28,6 @@ x: {
 	s:   string
 	out: yaml.Marshal({"s": s})
 }
--- out/def --
-import (
-	"encoding/json"
-	"encoding/yaml"
-	"text/template"
-)
-
-x: {
-	s: "myname"
-	#T
-}
-#T: {
-	s: string
-	S = s
-	out: template.Execute("{{.s}}", {
-		s: S
-	})
-}
-#V: {
-	s: string
-	S658221 = s
-	out: json.Marshal({
-		s: S658221
-	})
-}
-#U: {
-	s: string
-	S629a0f = s
-	out: yaml.Marshal({
-		s: S629a0f
-	})
-}
--- out/export --
-x: {
-	s:   "myname"
-	out: "myname"
-}
--- out/yaml --
-x:
-  s: myname
-  out: myname
--- out/json --
-{"x":{"s":"myname","out":"myname"}}
--- out/legacy-debug --
-<0>{x: <1>C{s: "myname", out: "myname"}, #T: <2>C{s: string, out: <3>.Execute ("{{.s}}",<4>C{s: <5>.s})}, #V: <6>C{s: string, out: <7>.Marshal (<8>C{s: <9>.s})}, #U: <10>C{s: string, out: <11>.Marshal (<12>C{s: <13>.s})}}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  21
diff --git a/cue/testdata/choosedefault/000_pick_first.txtar b/cue/testdata/choosedefault/000_pick_first.txtar
index 3b3154220..443f299c8 100644
--- a/cue/testdata/choosedefault/000_pick_first.txtar
+++ b/cue/testdata/choosedefault/000_pick_first.txtar
@@ -8,29 +8,6 @@ b: c: *{
 } | {
 	a: 3
 }
--- out/def --
-a: *5 | "a" | true
-b: {
-	c: *{
-		a: 2
-	} | {
-		a: 3
-	}
-}
--- out/export --
-a: 5
-b: {
-	c: *{
-		a: 2
-	} | {
-		a: 3
-	}
-}
--- out/yaml --
--- out/json --
-{"a":5,"b":{"c":{"a":2}}}
--- out/legacy-debug --
-<0>{a: 5, b: <1>{c: <2>{a: 2}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar b/cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar
index 6d322d065..e3b52ddf0 100644
--- a/cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar
+++ b/cue/testdata/choosedefault/001_simple_disambiguation_conflict.txtar
@@ -4,12 +4,6 @@
 a: *"a" | "b"
 b: *"b" | "a"
 c: a & b
--- out/def --
-a: *"a" | "b"
-b: *"b" | "a"
-c: a & b
--- out/legacy-debug --
-<0>{a: "a", b: "b", c: ("a" | "b")}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/choosedefault/002_associativity_of_defaults.txtar b/cue/testdata/choosedefault/002_associativity_of_defaults.txtar
index a8e12ec40..99dd4c0e4 100644
--- a/cue/testdata/choosedefault/002_associativity_of_defaults.txtar
+++ b/cue/testdata/choosedefault/002_associativity_of_defaults.txtar
@@ -66,14 +66,6 @@ issue3908: full: {
 	out: #Schema & { field: string | *"dataDefault" }
 	#Schema: field: string | *null
 }
--- out/def --
-x: a & b
-y: b & c
-a: *"a" | "b" | "c"
-b: *"a" | "b" | "c"
-c: *"a" | *"b" | "c"
--- out/legacy-debug --
-<0>{x: "a", y: (*"a" | *"b"), a: "a", b: "a", c: (*"a" | *"b")}
 -- out/compile --
 --- complex.cue
 {
diff --git a/cue/testdata/comprehensions/015_list_comprehension.txtar b/cue/testdata/comprehensions/015_list_comprehension.txtar
index b945fbbc7..75da40ae7 100644
--- a/cue/testdata/comprehensions/015_list_comprehension.txtar
+++ b/cue/testdata/comprehensions/015_list_comprehension.txtar
@@ -10,49 +10,6 @@ b: {
 }
 c: [for _, x in b for _, y in b if x < y {x}]
 d: [for x, _ in a {x}]
--- out/def --
-a: ["b", "c"]
-b: {
-	a: 1
-	b: 2
-	c: 3
-	d: 4
-}
-c: [1, 1, 1, 2, 2, 3]
-d: [0, 1]
--- out/export --
-a: ["b", "c"]
-b: {
-	a: 1
-	b: 2
-	c: 3
-	d: 4
-}
-c: [1, 1, 1, 2, 2, 3]
-d: [0, 1]
--- out/yaml --
-a:
-- b
-- c
-b:
-  a: 1
-  b: 2
-  c: 3
-  d: 4
-c:
-- 1
-- 1
-- 1
-- 2
-- 2
-- 3
-d:
-- 0
-- 1
--- out/json --
-{"a":["b","c"],"b":{"a":1,"b":2,"c":3,"d":4},"c":[1,1,1,2,2,3],"d":[0,1]}
--- out/legacy-debug --
-<0>{a: ["b","c"], b: <1>{a: 1, b: 2, c: 3, d: 4}, c: [1,1,1,2,2,3], d: [0,1]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar b/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar
index 8599d848f..de07f74a5 100644
--- a/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar
+++ b/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar
@@ -9,26 +9,6 @@ for key, value in {x: v: 1} {
 		_p: 3
 	}
 }
--- out/def --
-x: {
-	v: {
-		"1": 2
-	}
-	_p: 3
-}
--- out/export --
-x: {
-	v: {
-		"1": 2
-	}
-}
--- out/yaml --
-x:
-  v:
-    "1": 2
--- out/json --
--- out/legacy-debug --
-<0>{x: <1>{v: <2>{"1": 2}, _p: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar b/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar
index 20e75ad26..e295a478e 100644
--- a/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar
+++ b/cue/testdata/cycle/015_reference_across_tuples_and_back.txtar
@@ -3,35 +3,6 @@
 -- in.cue --
 a: {c: b.e, d: b.f}
 b: {e: 3, f: a.c}
--- out/def --
-a: {
-	c: 3
-	d: 3
-}
-b: {
-	e: 3
-	f: 3
-}
--- out/export --
-a: {
-	c: 3
-	d: 3
-}
-b: {
-	e: 3
-	f: 3
-}
--- out/yaml --
-a:
-  c: 3
-  d: 3
-b:
-  e: 3
-  f: 3
--- out/json --
-{"a":{"c":3,"d":3},"b":{"e":3,"f":3}}
--- out/legacy-debug --
-<0>{a: <1>{c: 3, d: 3}, b: <2>{e: 3, f: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/021_delayed_constraint_failure.txtar b/cue/testdata/cycle/021_delayed_constraint_failure.txtar
index 72a3cdd8a..365193d9a 100644
--- a/cue/testdata/cycle/021_delayed_constraint_failure.txtar
+++ b/cue/testdata/cycle/021_delayed_constraint_failure.txtar
@@ -7,12 +7,6 @@ b: 200
 
 x: 100
 x: x + 1
--- out/def --
-x: _|_ // conflicting values 100 and 101
-a: _|_ // conflicting values 210 and 200
-b: _|_ // conflicting values 210 and 200
--- out/legacy-debug --
-<0>{x: _|_((100 & 101):conflicting values 100 and 101), a: _|_((210 & 200):conflicting values 210 and 200), b: _|_((210 & 200):conflicting values 210 and 200)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/023_reentrance.txtar b/cue/testdata/cycle/023_reentrance.txtar
index 743fdee0c..afd02da2b 100644
--- a/cue/testdata/cycle/023_reentrance.txtar
+++ b/cue/testdata/cycle/023_reentrance.txtar
@@ -20,8 +20,6 @@ fib3:  (fib & {n: 3}).out  // SHOULD be an error
 fib7:  (fib & {n: 7}).out  // Error
 fib12: (fib & {n: 12}).out // Error
 
--- out/legacy-debug --
-<0>{fibRec: <1>{nn: int, out: (<2>.fib & <3>{n: <4>.nn}).out}, fib: <5>{n: int if (<6>.n >= 2) yield <7>{out: ((<2>.fibRec & <8>{nn: (<6>.n - 2)}).out + (<2>.fibRec & <9>{nn: (<6>.n - 1)}).out)},  if (<6>.n < 2) yield <10>{out: <6>.n}}, fib2: 1, fib7: 13, fib12: 144}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/025_cannot_resolve_references_that_would_be_ambiguous.txtar b/cue/testdata/cycle/025_cannot_resolve_references_that_would_be_ambiguous.txtar
index 45821bbab..ae1f73aab 100644
--- a/cue/testdata/cycle/025_cannot_resolve_references_that_would_be_ambiguous.txtar
+++ b/cue/testdata/cycle/025_cannot_resolve_references_that_would_be_ambiguous.txtar
@@ -12,24 +12,6 @@ b2: (0 | *1) & b1
 
 c1: (*{a: 1} | {b: 1}) & c2
 c2: (*{a: 2} | {b: 2}) & c1
--- out/def --
-a1: (*0 | 1) & a3-a2
-a3: 1
-a2: (*0 | 1) & a3-a1
-b1: (*0 | 1) & b2
-b2: (0 | *1) & b1
-c1: (*{
-	a: 1
-} | {
-	b: 1
-}) & c2
-c2: (*{
-	a: 2
-} | {
-	b: 2
-}) & c1
--- out/legacy-debug --
-<0>{a1: ((*0 | 1) & (<1>.a3 - <1>.a2)), a3: 1, a2: ((*0 | 1) & (<1>.a3 - <1>.a1)), b1: (0 | 1), b2: (0 | 1), c1: (<2>{a: 1, b: 2} | <3>{a: 2, b: 1}), c2: (<4>{a: 2, b: 1} | <5>{a: 1, b: 2})}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar b/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar
index fb3b5ef5e..8b04c955e 100644
--- a/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar
+++ b/cue/testdata/cycle/049_self-reference_cycles_conflicts_with_strings.txtar
@@ -6,13 +6,6 @@ a: {
 	y: x + "!"
 }
 a: x: "hey"
--- out/def --
-a: {
-	x: _|_ // conflicting values "hey!?" and "hey"
-	y: "hey!"
-}
--- out/legacy-debug --
-<0>{a: <1>{x: _|_(("hey!?" & "hey"):conflicting values "hey!?" and "hey"), y: "hey!"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/050_resolved_self-reference_cycles_with_disjunctions.txtar b/cue/testdata/cycle/050_resolved_self-reference_cycles_with_disjunctions.txtar
index 56013a92c..9472acc78 100644
--- a/cue/testdata/cycle/050_resolved_self-reference_cycles_with_disjunctions.txtar
+++ b/cue/testdata/cycle/050_resolved_self-reference_cycles_with_disjunctions.txtar
@@ -4,24 +4,6 @@
 a: b & {x: 1} | {y:     1} // {x:1,y:3,z:2} | {y:1}
 b: {x:     2} | c & {z: 2} // {x:2} | {x:1,y:3,z:2}
 c: a & {y: 3} | {z:     3} // {x:1,y:3,z:2} | {z:3}
--- out/def --
-a: b & {
-	x: 1
-} | {
-	y: 1
-}
-b: {
-	x: 2
-} | c & {
-	z: 2
-}
-c: a & {
-	y: 3
-} | {
-	z: 3
-}
--- out/legacy-debug --
-<0>{a: (<1>{x: 1, y: 3, z: 2} | <2>{y: 1}), b: (<3>{x: 2} | <4>{x: 1, y: 3, z: 2}), c: (<5>{x: 1, y: 3, z: 2} | <6>{z: 3})}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar b/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar
index a11047fba..23d59a338 100644
--- a/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar
+++ b/cue/testdata/cycle/051_resolved_self-reference_cycles_with_disjunction.txtar
@@ -72,64 +72,6 @@ z1: z2+1 | z3+5 // +3 for fun
 z2: z3 + 2
 z3: z1 - 3
 z3: 8
--- out/def --
-// The second disjunct in xa1 is not resolvable and can be
-// eliminated:
-//   xa4 & 9
-//   (xa2 + 2) & 9
-//   ((xa3 + 2) + 2) & 9
-//   (((6 & xa1-2) + 2) + 2) & 9
-//   ((6 + 2) + 2) & 9 // 6 == xa1-2
-//   10 & 9 => _|_
-// The remaining values resolve.
-xa1: 8
-xa2: 8
-xa4: 10
-xa3: 6
-
-// The second disjunct in xb4 can be eliminated as both disjuncts
-// of xb3 result in an incompatible sum when substituted.
-xb1: 8
-xb2: 8
-xb4: 10
-xb3: 6
-
-// Another variant with more disjunctions. xc1 remains with two
-// possibilities. Technically, only the first value is valid.
-// However, to fully determine that, all options of the remaining
-// disjunction will have to be evaluated algebraically, which is
-// not done.
-xc1: xc2 & 8 | xc4 & 9 | xc5 & 9
-xc2: xc3 + 2
-xc4: xc2 + 1
-xc5: xc2 + 2
-xc3: 6 & xc1-2
-
-// The above is resolved by setting xd1 explicitly.
-xd1: 8
-xd2: 8
-xd4: 9
-xd5: 10
-xd3: 6
-
-// The above is resolved by setting xd1 explicitly to the wrong
-// value, resulting in an error.
-xe1: _|_ // conflicting values 6 and 7
-xe2: _|_ // conflicting values 6 and 7
-xe4: _|_ // conflicting values 6 and 7
-xe5: _|_ // conflicting values 6 and 7
-xe3: _|_ // conflicting values 6 and 7
-
-// Only one solution.
-xf1: 8
-xf2: 8
-xf4: 10
-xf3: 6
-z1:  z2+1 | z3+5
-z2:  z3 + 2
-z3:  z1-3 & 8
--- out/legacy-debug --
-<0>{xa1: 8, xa2: 8, xa4: 10, xa3: 6, xb1: 8, xb2: 8, xb4: 10, xb3: 6, xc1: ((<1>.xc2 & 8) | (<1>.xc4 & 9) | (<1>.xc5 & 9)), xc2: (<1>.xc3 + 2), xc4: (<1>.xc2 + 1), xc5: (<1>.xc2 + 2), xc3: (6 & (<1>.xc1 - 2)), xd1: 8, xd2: 8, xd4: 9, xd5: 10, xd3: 6, xe1: _|_((6 & 7):conflicting values 6 and 7), xe2: _|_((6 & 7):conflicting values 6 and 7), xe4: _|_((6 & 7):conflicting values 6 and 7), xe5: _|_((6 & 7):conflicting values 6 and 7), xe3: _|_((6 & 7):conflicting values 6 and 7), xf1: 8, xf2: 8, xf4: 10, xf3: 6, z1: ((<1>.z2 + 1) | (<1>.z3 + 5)), z2: (<1>.z3 + 2), z3: ((<1>.z1 - 3) & 8)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar b/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar
index 4551c5cfe..1966cb85f 100644
--- a/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar
+++ b/cue/testdata/cycle/052_resolved_self-reference_cycles_with_disjunction_with_defaults.txtar
@@ -44,52 +44,6 @@ z1: *(z2 + 1) | z3+5
 z2: z3 + 2
 z3: z1 - 3
 z3: 8
--- out/def --
-// The disjunction in xa could be resolved, but as disjunctions
-// are not resolved for expression, it remains unresolved.
-xa1: 8
-xa2: 8
-xa4: 10
-xa3: 6
-
-// As xb3 is a disjunction, xb2 cannot be resolved and evaluating
-// the cycle completely is broken. However, it is not an error
-// as the user might still resolve the disjunction.
-xb1: 8
-xb2: 8
-xb4: 10
-xb3: 6
-
-// Another variant with more disjunctions. xc1 remains with two
-// possibilities. Technically, only the first value is valid.
-// However, to fully determine that, all options of the remaining
-// disjunction will have to be evaluated algebraically, which is
-// not done.
-xc1: *8 | 9 | _|_ // conflicting values 10 and 9
-xc2: 8
-xc4: 9
-xc5: 10
-xc3: 6
-
-// The above is resolved by setting xd1 explicitly.
-xd1: *8 | 9 | _|_ // conflicting values 10 and 9
-xd2: 8
-xd4: 9
-xd5: 10
-xd3: 6
-
-// The above is resolved by setting xd1 explicitly to the wrong
-// value, resulting in an error.
-xe1: _|_ // conflicting values 6 and 7
-xe2: _|_ // conflicting values 6 and 7
-xe4: _|_ // conflicting values 6 and 7
-xe5: _|_ // conflicting values 6 and 7
-xe3: _|_ // conflicting values 6 and 7
-z1:  *11 | 13
-z2:  10
-z3:  8
--- out/legacy-debug --
-<0>{xa1: 8, xa2: 8, xa4: 10, xa3: 6, xb1: 8, xb2: 8, xb4: 10, xb3: 6, xc1: (*8 | 9), xc2: 8, xc4: 9, xc5: 10, xc3: 6, xd1: (*8 | 9), xd2: 8, xd4: 9, xd5: 10, xd3: 6, xe1: _|_((6 & 7):conflicting values 6 and 7), xe2: _|_((6 & 7):conflicting values 6 and 7), xe4: _|_((6 & 7):conflicting values 6 and 7), xe5: _|_((6 & 7):conflicting values 6 and 7), xe3: _|_((6 & 7):conflicting values 6 and 7), z1: (*11 | 13), z2: 10, z3: 8}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/cycle/issue429.txtar b/cue/testdata/cycle/issue429.txtar
index 73d575589..ea864f848 100644
--- a/cue/testdata/cycle/issue429.txtar
+++ b/cue/testdata/cycle/issue429.txtar
@@ -58,11 +58,6 @@ Retain: 24
 Unifications: 40
 Conjuncts:    162
 Disjuncts:    113
--- diff/explanation --
-s1.max: the changes in default behavior as are shown here are according to spec,
-as is described in disjunctions/specdeviation.txtar. These changes may pose too
-much of a problem for the transition to the new evaluator, though.
-TODO: consider reintroducing bugs.
 -- out/eval --
 Errors:
 er3.min: 2 errors in empty disjunction:
diff --git a/cue/testdata/definitions/026_combined_definitions.txtar b/cue/testdata/definitions/026_combined_definitions.txtar
index fd9fc357d..219d4d4fe 100644
--- a/cue/testdata/definitions/026_combined_definitions.txtar
+++ b/cue/testdata/definitions/026_combined_definitions.txtar
@@ -31,41 +31,6 @@ d1: #D1 & {env: c: "C"}
 }
 
 #DC: {a: int}
--- out/def --
-// Allow combining of structs within a definition
-#D1: {
-	env: {
-		a: "A"
-		b: "B"
-	}
-	#def: {
-		a: "A"
-		b: "B"
-	}
-}
-d1: #D1 & {
-	env: {
-		c: "C"
-	}
-}
-#D2: {
-	a: int
-	b: int
-}
-#D3: {
-	env: {
-		a: "A"
-		b: "B"
-	}
-}
-#D4: {
-	env: _|_ // field "b" not allowed in closed struct
-}
-#DC: {
-	a: int
-}
--- out/legacy-debug --
-<0>{#D1: <1>C{env: <2>C{a: "A", b: "B"}, #def: <3>C{a: "A", b: "B"}}, d1: <4>C{env: _|_("C":field "c" not allowed in closed struct), #def: <5>C{a: "A", b: "B"}}, #D2: <6>C{a: int, b: int}, #D3: <7>C{env: <8>C{a: "A", b: "B"}}, #D4: <9>C{env: _|_(int:field "b" not allowed in closed struct)}, #DC: <10>C{a: int}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/028_recursive_closing_starting_at_non-definition.txtar b/cue/testdata/definitions/028_recursive_closing_starting_at_non-definition.txtar
index f44cd4e1e..53b4d5324 100644
--- a/cue/testdata/definitions/028_recursive_closing_starting_at_non-definition.txtar
+++ b/cue/testdata/definitions/028_recursive_closing_starting_at_non-definition.txtar
@@ -8,42 +8,6 @@ z: a: {
 	}
 }
 A: z & {a: {#B: {c: e: 2}}}
--- out/def --
-z: {
-	a: {
-		#B: {
-			c: {
-				d: 1
-				f: 1
-			}
-		}
-	}
-}
-A: z & {
-	a: {
-		#B: {
-			c: {
-				e: 2
-			}
-		}
-	}
-}
--- out/export --
-z: {
-	a: {}
-}
-A: {
-	a: {}
-}
--- out/yaml --
-z:
-  a: {}
-A:
-  a: {}
--- out/json --
-{"z":{"a":{}},"A":{"a":{}}}
--- out/legacy-debug --
-<0>{z: <1>{a: <2>{#B: <3>C{c: <4>C{d: 1, f: 1}}}}, A: <5>{a: <6>{#B: <7>C{c: _|_(2:field "e" not allowed in closed struct)}}}}
 -- out/compile --
 --- in.cue
 {
@@ -79,8 +43,6 @@ Retain: 0
 Unifications: 14
 Conjuncts:    21
 Disjuncts:    14
--- diff/explanation --
-reordering
 -- out/eval --
 (struct){
   z: (struct){
diff --git a/cue/testdata/definitions/032_definitions_with_embedding.txtar b/cue/testdata/definitions/032_definitions_with_embedding.txtar
index 45c60deaa..6e9fade2a 100644
--- a/cue/testdata/definitions/032_definitions_with_embedding.txtar
+++ b/cue/testdata/definitions/032_definitions_with_embedding.txtar
@@ -16,41 +16,6 @@
 
 // literal struct not closed until after unification.
 #v1: #S & {a: c: 4}
--- out/def --
-#E: {
-	a: {
-		b: int
-	}
-}
-#S: {
-	a: {
-		c: int
-	}
-	b: 3
-	#E
-}
-
-// adding a field to a nested struct that is closed.
-#e1: #S & {
-	a: {
-		d: 4
-	}
-}
-
-// literal struct not closed until after unification.
-#v1: #S & {
-	a: {
-		c: 4
-	}
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
--- out/legacy-debug --
-<0>{#E: <1>C{a: <2>C{b: int}}, #S: <3>C{a: <4>C{b: int, c: int}, b: 3}, #e1: <5>C{a: _|_(4:field "d" not allowed in closed struct), b: 3}, #v1: <6>C{a: <7>C{b: int, c: 4}, b: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/033_Issue_#153.txtar b/cue/testdata/definitions/033_Issue_#153.txtar
index 8e1f0d801..5b895a17b 100644
--- a/cue/testdata/definitions/033_Issue_#153.txtar
+++ b/cue/testdata/definitions/033_Issue_#153.txtar
@@ -20,20 +20,6 @@ Foo & {
 		}
 	}]
 }
--- out/def --
-Foo: {
-	listOfCloseds: [...#Closed]
-}
-listOfCloseds: [_|_, // field "b" not allowed in closed struct
-]
-#Closed: {
-	a: int | *0
-}
-Junk: {
-	b: 2
-}
--- out/legacy-debug --
-<0>{<1>{listOfCloseds: [_|_(<2>.v:field "b" not allowed in closed struct)]}, Foo: <3>{listOfCloseds: []}, #Closed: <4>C{a: 0}, Junk: <5>{b: 2}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/036_closing_with_failed_optional.txtar b/cue/testdata/definitions/036_closing_with_failed_optional.txtar
index 6f63ad7c6..161c50ceb 100644
--- a/cue/testdata/definitions/036_closing_with_failed_optional.txtar
+++ b/cue/testdata/definitions/036_closing_with_failed_optional.txtar
@@ -15,50 +15,6 @@ o1: {a?: 3} & {a?: 4} // {a?: _|_}
 v1: #d1 & {a?: 3, b: 4} // close({b: 4})
 
 #A: {a: int}
--- out/def --
-#k1: {
-	a:  int
-	b?: int
-} & #A
-#A: {
-	a: int
-}
-#k2: #A & {
-	a:  int
-	b?: int
-}
-o1: {
-	a?: _|_ // conflicting values 3 and 4
-}
-
-// Optional fields with error values can be elimintated when closing
-#o2: {
-	a?: _|_ // conflicting values 3 and 4
-}
-#d1: {
-	a?: 2
-	b:  4
-} | {
-	a?: 3
-	c:  5
-}
-v1: #d1 & {
-	a?: 3
-	b:  4
-}
--- out/export --
-o1: {}
-v1: {
-	b: 4
-}
--- out/yaml --
-o1: {}
-v1:
-  b: 4
--- out/json --
-{"o1":{},"v1":{"b":4}}
--- out/legacy-debug --
-<0>{#k1: <1>C{a: int}, #A: <2>C{a: int}, #k2: <3>C{a: int}, o1: <4>{a?: _|_((3 & 4):conflicting values 3 and 4)}, #o2: <5>C{a?: _|_((3 & 4):conflicting values 3 and 4)}, #d1: (<6>C{a?: 2, b: 4} | <7>C{a?: 3, c: 5}), v1: <8>C{a?: _|_((2 & 3):conflicting values 2 and 3), b: 4}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/036_optionals_in_open_structs.txtar b/cue/testdata/definitions/036_optionals_in_open_structs.txtar
index 257e2ffc8..aeb5340f2 100644
--- a/cue/testdata/definitions/036_optionals_in_open_structs.txtar
+++ b/cue/testdata/definitions/036_optionals_in_open_structs.txtar
@@ -9,34 +9,6 @@ B: {
 }
 #C: {A & B}
 c: #C & {aaa: 3}
--- out/def --
-A: {
-	[=~"^[a-s]*$"]: int
-}
-B: {
-	[=~"^[m-z]*$"]: int
-}
-#C: {
-	A & B
-}
-c: #C & {
-	aaa: 3
-}
--- out/export --
-A: {}
-B: {}
-c: {
-	aaa: 3
-}
--- out/yaml --
-A: {}
-B: {}
-c:
-  aaa: 3
--- out/json --
-{"A":{},"B":{},"c":{"aaa":3}}
--- out/legacy-debug --
-<0>{A: <1>{[=~"^[a-s]*$"]: <2>(_: string)->int, }, B: <3>{[=~"^[m-z]*$"]: <4>(_: string)->int, }, #C: <5>C{[=~"^[a-s]*$"]: <6>(_: string)->int, [=~"^[m-z]*$"]: <7>(_: string)->int, }, c: <8>C{[=~"^[a-s]*$"]: <9>(_: string)->int, [=~"^[m-z]*$"]: <10>(_: string)->int, aaa: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/037_closing_with_comprehensions.txtar b/cue/testdata/definitions/037_closing_with_comprehensions.txtar
index e21e6ef10..1a49ae786 100644
--- a/cue/testdata/definitions/037_closing_with_comprehensions.txtar
+++ b/cue/testdata/definitions/037_closing_with_comprehensions.txtar
@@ -32,29 +32,6 @@ for k, v in {f3: int} {
 		"\(k)": v
 	}
 }
--- out/def --
-#A: {
-	f1: int
-	f2: int
-}
-a: _|_ // field "f3" not allowed in closed struct
-#B: {
-	f1: v
-}
-#C: {
-	f1: {
-		_
-		v
-		...
-	}
-}
-#D: {
-	f1: v
-	...
-}
-#E: _|_ // field "f3" not allowed in closed struct
--- out/legacy-debug --
-<0>{#A: <1>C{f1: int, f2: int}, a: _|_(<2>.v:field "f3" not allowed in closed struct), #B: <3>C{f1: int}, #C: <4>C{f1: int}, #D: <5>{f1: int, ...}, #E: _|_(<6>.v:field "f3" not allowed in closed struct)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/037_conjunction_of_optional_sets.txtar b/cue/testdata/definitions/037_conjunction_of_optional_sets.txtar
index e258b0954..b8ec65815 100644
--- a/cue/testdata/definitions/037_conjunction_of_optional_sets.txtar
+++ b/cue/testdata/definitions/037_conjunction_of_optional_sets.txtar
@@ -13,21 +13,6 @@ c:  #C & {aaa: 3}
 
 #D: {#A & #B}
 d: #D & {aaa: 3}
--- out/def --
-#A: {
-	[=~"^[a-s]*$"]: int
-}
-#B: {
-	[=~"^[m-z]*$"]: int
-}
-#C: #A & #B
-c:  _|_ // field "aaa" not allowed in closed struct
-#D: {
-	#A & #B
-}
-d: _|_ // field "aaa" not allowed in closed struct
--- out/legacy-debug --
-<0>{#A: <1>C{[=~"^[a-s]*$"]: <2>(_: string)->int, }, #B: <3>C{[=~"^[m-z]*$"]: <4>(_: string)->int, }, #C: <5>C{(C{[=~"^[a-s]*$"]: <6>(_: string)->int} & C{[=~"^[m-z]*$"]: <7>(_: string)->int}), }, c: _|_(3:field "aaa" not allowed in closed struct), #D: <8>C{(C{[=~"^[a-s]*$"]: <9>(_: string)->int} & C{[=~"^[m-z]*$"]: <10>(_: string)->int}), }, d: _|_(3:field "aaa" not allowed in closed struct)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/038_continue_recursive_closing_for_optionals.txtar b/cue/testdata/definitions/038_continue_recursive_closing_for_optionals.txtar
index cb455426a..b613c3d71 100644
--- a/cue/testdata/definitions/038_continue_recursive_closing_for_optionals.txtar
+++ b/cue/testdata/definitions/038_continue_recursive_closing_for_optionals.txtar
@@ -7,19 +7,6 @@
 a: #S & {
 	v: {b: int}
 }
--- out/def --
-#S: {
-	[string]: {
-		a: int
-	}
-}
-a: #S & {
-	v: {
-		b: int
-	}
-}
--- out/legacy-debug --
-<0>{#S: <1>{[]: <2>(_: string)-><3>C{a: int}, }, a: <4>{[]: <5>(_: string)-><6>C{a: int}, v: _|_(int:field "b" not allowed in closed struct)}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/039_augment_closed_optionals.txtar b/cue/testdata/definitions/039_augment_closed_optionals.txtar
index 9a15179e6..0c7e9ce5f 100644
--- a/cue/testdata/definitions/039_augment_closed_optionals.txtar
+++ b/cue/testdata/definitions/039_augment_closed_optionals.txtar
@@ -17,43 +17,6 @@ c: #C & {QQ: 3}
 	#B
 }
 d: #D & {aaa: 4}
--- out/def --
-#A: {
-	[=~"^[a-s]*$"]: int
-}
-#B: {
-	[=~"^[m-z]*?"]: int
-}
-#C: {
-	#A & #B
-	{[=~"^Q*$"]: int}
-}
-c: #C & {
-	QQ: 3
-}
-#D: {
-	#A
-	#B
-}
-d: #D & {
-	aaa: 4
-}
--- out/export --
-c: {
-	QQ: 3
-}
-d: {
-	aaa: 4
-}
--- out/yaml --
-c:
-  QQ: 3
-d:
-  aaa: 4
--- out/json --
-{"c":{"QQ":3},"d":{"aaa":4}}
--- out/legacy-debug --
-<0>{#A: <1>C{[=~"^[a-s]*$"]: <2>(_: string)->int, }, #B: <3>C{[=~"^[m-z]*?"]: <4>(_: string)->int, }, #C: <5>C{C{[=~"^Q*$"]: <6>(_: string)->int}, C{(C{[=~"^[a-s]*$"]: <7>(_: string)->int} & C{[=~"^[m-z]*?"]: <8>(_: string)->int})}, }, c: <9>C{C{[=~"^Q*$"]: <10>(_: string)->int}, C{(C{[=~"^[a-s]*$"]: <11>(_: string)->int} & C{[=~"^[m-z]*?"]: <12>(_: string)->int})}, QQ: 3}, #D: <13>C{[=~"^[a-s]*$"]: <14>(_: string)->int, [=~"^[m-z]*?"]: <15>(_: string)->int, }, d: <16>C{[=~"^[a-s]*$"]: <17>(_: string)->int, [=~"^[m-z]*?"]: <18>(_: string)->int, aaa: 4}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/definitions/issue317.txtar b/cue/testdata/definitions/issue317.txtar
index 8d47039c7..5fcebf6ab 100644
--- a/cue/testdata/definitions/issue317.txtar
+++ b/cue/testdata/definitions/issue317.txtar
@@ -125,42 +125,6 @@ Disjuncts:    52
     }
   }
 }
--- out/export --
-#T: {
-	#Schema: [_]: #D
-	concrete: #Schema
-}
-#D: {
-	fieldWithDefault: *0 | int
-	...
-}
-s: #T & {
-	#Schema: {
-		foo: otherField: string
-	}
-	concrete: foo: otherField: "hello"
-}
-
-#Container: {
-	Env: [Name=string]: {
-		name:  string
-		value: string
-	}
-}
-#Deployment: {
-	#Containers: [Name=string]: #Container
-
-	containers: [for c in #Containers {c}] // Problem is here.
-}
-Something: {
-	#Deployment
-	#Containers: {
-		// Does not allow entries other than value. Either add ... or embed
-		"a thing": Env: foobar: value: "foo"
-	}
-}
-x: Something & #Deployment
-
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/disjunctions/019_ips.txtar b/cue/testdata/disjunctions/019_ips.txtar
index 0e032f8bd..0ef146ca5 100644
--- a/cue/testdata/disjunctions/019_ips.txtar
+++ b/cue/testdata/disjunctions/019_ips.txtar
@@ -13,13 +13,6 @@ Private:
 Inst: Private & [ _, 10, ...]
 
 MyIP: Inst & [_, _, 10, 10]
--- out/def --
-IP: [uint8, uint8, uint8, uint8]
-Private: *[192, 168, uint8, uint8] | [10, uint8, uint8, uint8] | [172, >=16 & <=32, uint8, uint8]
-Inst: [10, 10, uint8, uint8]
-MyIP: [10, 10, 10, 10]
--- out/legacy-debug --
-<0>{IP: [(int & >=0 & int & <=255),(int & >=0 & int & <=255),(int & >=0 & int & <=255),(int & >=0 & int & <=255)], Private: [192,168,(int & >=0 & int & <=255),(int & >=0 & int & <=255)], Inst: [10,10,(int & >=0 & int & <=255),(int & >=0 & int & <=255)], MyIP: [10,10,10,10]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/eval/basictypes.txtar b/cue/testdata/eval/basictypes.txtar
index 8bce6896f..496a100c3 100644
--- a/cue/testdata/eval/basictypes.txtar
+++ b/cue/testdata/eval/basictypes.txtar
@@ -21,16 +21,6 @@ comparison: {
 	structEquality: t: {name: "test"} == {name: "test"}
 	nestedComparison: t: {data: {value: 1}} == {data: {value: 1}}
 }
--- out/eval/stats --
-Leaks:  0
-Freed:  9
-Reused: 6
-Allocs: 3
-Retain: 0
-
-Unifications: 9
-Conjuncts:    14
-Disjuncts:    9
 -- out/evalalpha --
 comparison.typeComparison.err: invalid operand string ('==' requires concrete value):
     ./in.cue:16:23
diff --git a/cue/testdata/eval/fields.txtar b/cue/testdata/eval/fields.txtar
index ddd20bb89..2a1d5dd0c 100644
--- a/cue/testdata/eval/fields.txtar
+++ b/cue/testdata/eval/fields.txtar
@@ -35,8 +35,6 @@ Retain: 0
 Unifications: 7
 Conjuncts:    9
 Disjuncts:    7
--- diff/explanation --
-Not including illegal field. Seems fine.
 -- out/eval --
 Errors:
 bulkToSelf.a.foo.bar: conflicting values "3" and int (mismatched types string and int):
diff --git a/cue/testdata/export/000.txtar b/cue/testdata/export/000.txtar
index 28add5c72..ed75943d7 100644
--- a/cue/testdata/export/000.txtar
+++ b/cue/testdata/export/000.txtar
@@ -1,15 +1,5 @@
 -- in.cue --
 "hello"
--- out/def --
-"hello"
--- out/export --
-"hello"
--- out/yaml --
-hello
--- out/json --
-"hello"
--- out/legacy-debug --
-"hello"
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/001.txtar b/cue/testdata/export/001.txtar
index cfb5ec493..7e28c08b0 100644
--- a/cue/testdata/export/001.txtar
+++ b/cue/testdata/export/001.txtar
@@ -1,15 +1,5 @@
 -- in.cue --
 'hello'
--- out/def --
-'hello'
--- out/export --
-'hello'
--- out/yaml --
-hello
--- out/json --
-"aGVsbG8="
--- out/legacy-debug --
-'hello'
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/002.txtar b/cue/testdata/export/002.txtar
index 3c4e71bb6..0c936a812 100644
--- a/cue/testdata/export/002.txtar
+++ b/cue/testdata/export/002.txtar
@@ -1,26 +1,5 @@
 -- in.cue --
 'hello\nworld'
--- out/def --
-'''
-        hello
-        world
-        '''
--- out/export --
-'''
-        hello
-        world
-        '''
--- out/yaml --
-|-
-  hello
-  world
--- out/json --
-"aGVsbG8Kd29ybGQ="
--- out/legacy-debug --
-'''
-        hello
-        world
-        '''
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/003.txtar b/cue/testdata/export/003.txtar
index d60c6cddf..f60ad3cc1 100644
--- a/cue/testdata/export/003.txtar
+++ b/cue/testdata/export/003.txtar
@@ -1,26 +1,5 @@
 -- in.cue --
 "hello\nworld"
--- out/def --
-"""
-        hello
-        world
-        """
--- out/export --
-"""
-        hello
-        world
-        """
--- out/yaml --
-|-
-  hello
-  world
--- out/json --
-"hello\nworld"
--- out/legacy-debug --
-"""
-        hello
-        world
-        """
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/004.txtar b/cue/testdata/export/004.txtar
index f99fdaa41..da960dc47 100644
--- a/cue/testdata/export/004.txtar
+++ b/cue/testdata/export/004.txtar
@@ -5,11 +5,6 @@
 	"_foo": int
 	_bar:   int
 }
--- out/def --
-$type:  3
-"_":    int
-"_foo": int
-_bar:   int
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/005.txtar b/cue/testdata/export/005.txtar
index 0de7749cd..bbe20188e 100644
--- a/cue/testdata/export/005.txtar
+++ b/cue/testdata/export/005.txtar
@@ -1,12 +1,5 @@
 -- in.cue --
 {a: 1, b: a + 2, c: null, d: true, e: _, f: string}
--- out/def --
-a: 1
-b: 3
-c: null
-d: true
-e: _
-f: string
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/006.txtar b/cue/testdata/export/006.txtar
index e76fccfab..ba77ee711 100644
--- a/cue/testdata/export/006.txtar
+++ b/cue/testdata/export/006.txtar
@@ -1,14 +1,5 @@
 -- in.cue --
 {a: {b: 2.0, s: "abc"}, b: a.b, c: a.c, d: a["d"], e: a.t[2:3]}
--- out/def --
-a: {
-	b: 2.0
-	s: "abc"
-}
-b: 2.0
-c: a.c
-d: a["d"]
-e: a.t[2:3]
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/007.txtar b/cue/testdata/export/007.txtar
index 3478c75aa..ae336ff34 100644
--- a/cue/testdata/export/007.txtar
+++ b/cue/testdata/export/007.txtar
@@ -6,15 +6,6 @@
 	d: #a["d"]
 	e: #a.t[2:3]
 }
--- out/def --
-#a: {
-	b: 2.0
-	s: "abc"
-}
-b: 2.0
-c: _|_ // undefined field "c"
-d: _|_ // undefined field "d"
-e: _|_ // undefined field "t"
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/008.txtar b/cue/testdata/export/008.txtar
index 0ff551527..5ec7f5910 100644
--- a/cue/testdata/export/008.txtar
+++ b/cue/testdata/export/008.txtar
@@ -1,8 +1,5 @@
 -- in.cue --
 {a: [ 3 & 4]}
--- out/def --
-a: [_|_, // conflicting values 3 and 4
-]
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/009.txtar b/cue/testdata/export/009.txtar
index 2f65224bc..537117f42 100644
--- a/cue/testdata/export/009.txtar
+++ b/cue/testdata/export/009.txtar
@@ -8,13 +8,6 @@ import "list"
 	e: [1, 2, ...]
 	f: [1, 2, ...]
 }
--- out/def --
-a: [1, 2, int, int, int]
-b: <=5*[int] & [1, 2, ...]
-c: (>=3 & <=5)*[int] & [1, 2, ...]
-d: >=2*[int] & [1, 2, ...]
-e: [1, 2, ...int]
-f: [1, 2, ...]
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/010.txtar b/cue/testdata/export/010.txtar
index a4950bfc0..2703eae96 100644
--- a/cue/testdata/export/010.txtar
+++ b/cue/testdata/export/010.txtar
@@ -9,13 +9,6 @@ import "list"
 	e: [1, 2, ...]
 	f: [1, 2, ...]
 }
--- out/def --
-a: [1, 2, int, int, int]
-b: <=5*[int] & [1, 2, ...]
-c: (>=3 & <=5)*[int] & [1, 2, ...]
-d: >=2*[int] & [1, 2, ...]
-e: [1, 2, ...int]
-f: [1, 2, ...]
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/011.txtar b/cue/testdata/export/011.txtar
index ef60b4910..2dad23d41 100644
--- a/cue/testdata/export/011.txtar
+++ b/cue/testdata/export/011.txtar
@@ -1,25 +1,6 @@
 raw: true
 -- in.cue --
 {a: {b: []}, c: a.b, d: a["b"]}
--- out/def --
-a: {
-	b: []
-}
-c: []
-d: []
--- out/export --
-a: {
-	b: []
-}
-c: []
-d: []
--- out/yaml --
-a:
-  b: []
-c: []
-d: []
--- out/json --
-{"a":{"b":[]},"c":[],"d":[]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/012.txtar b/cue/testdata/export/012.txtar
index c41745dca..beb055537 100644
--- a/cue/testdata/export/012.txtar
+++ b/cue/testdata/export/012.txtar
@@ -1,9 +1,6 @@
 raw: true
 -- in.cue --
 {a: *"foo" | *"bar" | *string | int, b: a[2:3]}
--- out/def --
-a: *string | int
-b: _|_ // cannot slice a (type string)
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/013.txtar b/cue/testdata/export/013.txtar
index 11b798632..1565ab75d 100644
--- a/cue/testdata/export/013.txtar
+++ b/cue/testdata/export/013.txtar
@@ -2,8 +2,6 @@
 {
 	a: >=0 & <=10 & !=1
 }
--- out/def --
-a: >=0 & <=10 & !=1
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/014.txtar b/cue/testdata/export/014.txtar
index 5f955bc75..72e437225 100644
--- a/cue/testdata/export/014.txtar
+++ b/cue/testdata/export/014.txtar
@@ -3,8 +3,6 @@ raw: true
 {
 	a: >=0 & <=10 & !=1
 }
--- out/def --
-a: >=0 & <=10 & !=1
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/015.txtar b/cue/testdata/export/015.txtar
index 4f2f696a8..9cc1aa248 100644
--- a/cue/testdata/export/015.txtar
+++ b/cue/testdata/export/015.txtar
@@ -5,9 +5,6 @@ eval: true
 	a: (*1 | 2) & (1 | *2)
 	b: [(*1 | 2) & (1 | *2)]
 }
--- out/def --
-a: 1 | 2 | *_|_
-b: [1 | 2 | *_|_]
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/016.txtar b/cue/testdata/export/016.txtar
index abfa229f6..871cd1b42 100644
--- a/cue/testdata/export/016.txtar
+++ b/cue/testdata/export/016.txtar
@@ -16,20 +16,6 @@ eval: true
 	f64:  float64
 	fi:   float64 & int
 }
--- out/def --
-u16:  uint16
-u32:  uint32
-u64:  uint64
-u128: uint128
-u8:   uint8
-ua:   uint16 & >0
-us:   uint & <10000
-i16:  int16
-i32:  int32 & >0
-i64:  int64
-i128: int128
-f64:  float64
-fi:   int & float64
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/017.txtar b/cue/testdata/export/017.txtar
index ca79dc546..c884e6d49 100644
--- a/cue/testdata/export/017.txtar
+++ b/cue/testdata/export/017.txtar
@@ -1,24 +1,6 @@
 raw: true
 -- in.cue --
 {a: [1, 2], b: {for k, v in a if v > 1 {"\(k)": v}}}
--- out/def --
-a: [1, 2]
-b: {
-	"1": 2
-}
--- out/export --
-a: [1, 2]
-b: {
-	"1": 2
-}
--- out/yaml --
-a:
-- 1
-- 2
-b:
-  "1": 2
--- out/json --
-{"a":[1,2],"b":{"1":2}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/018.txtar b/cue/testdata/export/018.txtar
index eeb870d27..ac8cce960 100644
--- a/cue/testdata/export/018.txtar
+++ b/cue/testdata/export/018.txtar
@@ -1,21 +1,6 @@
 raw: true
 -- in.cue --
 {a: [1, 2], b: [for k, v in a {v}]}
--- out/def --
-a: [1, 2]
-b: [1, 2]
--- out/export --
-a: [1, 2]
-b: [1, 2]
--- out/yaml --
-a:
-- 1
-- 2
-b:
-- 1
-- 2
--- out/json --
-{"a":[1,2],"b":[1,2]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/019.txtar b/cue/testdata/export/019.txtar
index 03a3c927b..db61502b8 100644
--- a/cue/testdata/export/019.txtar
+++ b/cue/testdata/export/019.txtar
@@ -1,9 +1,6 @@
 raw: true
 -- in.cue --
 {a: >=0 & <=10, b: "Count: \(a) times"}
--- out/def --
-a: >=0 & <=10
-b: "Count: \(a) times"
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/020.txtar b/cue/testdata/export/020.txtar
index 09bf56df0..8cf8827eb 100644
--- a/cue/testdata/export/020.txtar
+++ b/cue/testdata/export/020.txtar
@@ -1,17 +1,6 @@
 raw: true
 -- in.cue --
 {a: "", b: len(a)}
--- out/def --
-a: ""
-b: 0
--- out/export --
-a: ""
-b: 0
--- out/yaml --
-a: ""
-b: 0
--- out/json --
-{"a":"","b":0}
 -- out/eval/stats --
 Leaks:  0
 Freed:  3
diff --git a/cue/testdata/export/021.txtar b/cue/testdata/export/021.txtar
index 0494683cc..b6bcf313f 100644
--- a/cue/testdata/export/021.txtar
+++ b/cue/testdata/export/021.txtar
@@ -9,19 +9,6 @@ eval: true
 	b: a: b: 4
 	a: b: 3
 }
--- out/def --
-
-A = a
-b: {
-	idx: A[str]
-	a: {
-		b: 4
-	}
-	str: string
-}
-a: {
-	b: 3
-}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/022.txtar b/cue/testdata/export/022.txtar
index 57ec8faa1..886fc99b4 100644
--- a/cue/testdata/export/022.txtar
+++ b/cue/testdata/export/022.txtar
@@ -16,47 +16,6 @@ noOpt: true
 		replicas: 2
 	}
 }
--- out/def --
-job: {
-	{[Name=string]: {
-		name: Name, replicas: >=0 | *1 @protobuf(10), command: string
-	}}
-	list: {
-		name:     "list"
-		replicas: >=0 | *1 @protobuf(10)
-		command:  "ls"
-	}
-	nginx: {
-		name:     "nginx"
-		replicas: 2 @protobuf(10)
-		command:  "nginx"
-	}
-}
--- out/export --
-job: {
-	list: {
-		name:     "list"
-		replicas: 1 @protobuf(10)
-		command:  "ls"
-	}
-	nginx: {
-		name:     "nginx"
-		replicas: 2 @protobuf(10)
-		command:  "nginx"
-	}
-}
--- out/yaml --
-job:
-  list:
-    name: list
-    replicas: 1
-    command: ls
-  nginx:
-    name: nginx
-    replicas: 2
-    command: nginx
--- out/json --
-{"job":{"list":{"name":"list","replicas":1,"command":"ls"},"nginx":{"name":"nginx","replicas":2,"command":"nginx"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/023.txtar b/cue/testdata/export/023.txtar
index 1cdcd5e7c..15163b974 100644
--- a/cue/testdata/export/023.txtar
+++ b/cue/testdata/export/023.txtar
@@ -22,32 +22,6 @@ raw: true
 		{[_]: <300}
 	}
 }
--- out/def --
-#emb: {
-	a: 1
-	sub: {
-		f: 3
-	}
-}
-#def: {
-	b: 2
-	#emb
-}
-#f: {
-	a: 10
-}
-#e: {
-	b: int
-	#f
-	[string]: <100
-	[string]: <300
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/024.txtar b/cue/testdata/export/024.txtar
index 1fa8f6330..c4d5065bb 100644
--- a/cue/testdata/export/024.txtar
+++ b/cue/testdata/export/024.txtar
@@ -15,24 +15,6 @@ noOpt: true
 	}
 	val2: #def2
 }
--- out/def --
-reg: {
-	foo: 1
-	bar: {
-		baz: 3
-	}
-}
-#def: {
-	a:   1
-	sub: reg
-}
-val: #def
-#def2: {
-	a: {
-		b: int
-	}
-}
-val2: #def2
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/025.txtar b/cue/testdata/export/025.txtar
index 1d3744ccf..a955379fc 100644
--- a/cue/testdata/export/025.txtar
+++ b/cue/testdata/export/025.txtar
@@ -11,15 +11,6 @@ eval: true
 	a: int
 	c: *1 | 2
 }
--- out/def --
-b: [{
-	if a > 4 {
-		f: 4
-	}
-	{[X=string]: int}
-}][a]
-a: int
-c: *1 | 2
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/026.txtar b/cue/testdata/export/026.txtar
index 1180a6407..1886e8f39 100644
--- a/cue/testdata/export/026.txtar
+++ b/cue/testdata/export/026.txtar
@@ -5,14 +5,6 @@ raw: true
 		{a: 1} | {b: 1}
 	}
 }
--- out/def --
-
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/027.txtar b/cue/testdata/export/027.txtar
index 0ae00619f..ab1c7b3c6 100644
--- a/cue/testdata/export/027.txtar
+++ b/cue/testdata/export/027.txtar
@@ -10,16 +10,6 @@ eval: true
 		#Bar: #Foo | string
 	}
 }
--- out/def --
-#Foo: {
-	#Bar: #Foo | string
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/028.txtar b/cue/testdata/export/028.txtar
index 0828267f8..9e74066a6 100644
--- a/cue/testdata/export/028.txtar
+++ b/cue/testdata/export/028.txtar
@@ -7,19 +7,6 @@ eval: true
 	}
 	a: [...string]
 }
--- out/def --
-#FindInMap: {
-	#: {
-		"Fn::FindInMap": [string | #FindInMap]
-	}
-}
-a: [...string]
--- out/export --
-a: []
--- out/yaml --
-a: []
--- out/json --
-{"a":[]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/029.txtar b/cue/testdata/export/029.txtar
index b38106faf..6851f8b13 100644
--- a/cue/testdata/export/029.txtar
+++ b/cue/testdata/export/029.txtar
@@ -10,23 +10,6 @@ noOpt: true
 		#: "Fn::And": [_]
 	}
 }
--- out/def --
-#And: {
-	#: {
-		"Fn::And": [...3 | #And]
-	}
-}
-#Ands: #And & {
-	#: {
-		"Fn::And": [_]
-	}
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/030.txtar b/cue/testdata/export/030.txtar
index c02e2c90b..ab7714af9 100644
--- a/cue/testdata/export/030.txtar
+++ b/cue/testdata/export/030.txtar
@@ -16,22 +16,6 @@ eval: true
 	}
 	#Bar: string
 }
--- out/def --
-#Foo: {
-	"#Foo": 2
-	sgl:    #Bar
-	ref:    (null | #Foo) & (null | #Foo)
-	ext:    #Bar | null
-	ref2:   null | #Foo.sgl
-	...
-}
-#Bar: string
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/031.txtar b/cue/testdata/export/031.txtar
index 804f1d203..5fa14ba94 100644
--- a/cue/testdata/export/031.txtar
+++ b/cue/testdata/export/031.txtar
@@ -5,9 +5,6 @@ eval: true
 	A: [uint]
 	B: A & ([10] | [192])
 }
--- out/def --
-A: [>=0]
-B: A & ([10] | [192])
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/export/032.txtar b/cue/testdata/export/032.txtar
index a4907d6a7..d82f1b339 100644
--- a/cue/testdata/export/032.txtar
+++ b/cue/testdata/export/032.txtar
@@ -3,15 +3,6 @@
 	[string]: _
 	foo:      3
 }
--- out/def --
-foo: 3
-...
--- out/export --
-foo: 3
--- out/yaml --
-foo: 3
--- out/json --
-{"foo":3}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/000_detect_conflicting_value.txtar b/cue/testdata/fulleval/000_detect_conflicting_value.txtar
index 20eab98bf..3972b5453 100644
--- a/cue/testdata/fulleval/000_detect_conflicting_value.txtar
+++ b/cue/testdata/fulleval/000_detect_conflicting_value.txtar
@@ -3,10 +3,6 @@
 -- in.cue --
 a: 8000.9
 a: 7080 | int
--- out/def --
-a: _|_ // conflicting values 8000.9 and int (mismatched types float and int)
--- out/legacy-debug --
-<0>{a: _|_((8000.9 & (int | int)):conflicting values 8000.9 and int (mismatched types float and int))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar b/cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar
index ed941d88f..b003c5fab 100644
--- a/cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar
+++ b/cue/testdata/fulleval/001_conflicts_in_optional_fields_are_okay_.txtar
@@ -5,20 +5,6 @@ d: {a: 1, b?: 3} | {a: 2}
 
 // the following conjunction should not eliminate any disjuncts
 c: d & {b?: 4}
--- out/def --
-d: {
-	a:  1
-	b?: 3
-} | {
-	a: 2
-}
-
-// the following conjunction should not eliminate any disjuncts
-c: d & {
-	b?: 4
-}
--- out/legacy-debug --
-<0>{d: (<1>{a: 1, b?: 3} | <2>{a: 2}), c: (<3>{a: 1, b?: (3 & 4)} | <4>{a: 2, b?: 4})}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/002_resolve_all_disjunctions.txtar b/cue/testdata/fulleval/002_resolve_all_disjunctions.txtar
index afe96a667..f29e3c030 100644
--- a/cue/testdata/fulleval/002_resolve_all_disjunctions.txtar
+++ b/cue/testdata/fulleval/002_resolve_all_disjunctions.txtar
@@ -8,54 +8,6 @@ service: [Name=string]: {
 service: foo: _
 service: bar: {port: 8000}
 service: baz: {name: "foobar"}
--- out/def --
-service: {
-	{[Name=string]: {
-		name: string | *Name, port: int | *7080
-	}}
-	foo: {
-		name: string | *"foo"
-		port: int | *7080
-	}
-	bar: {
-		name: string | *"bar"
-		port: 8000
-	}
-	baz: {
-		name: "foobar"
-		port: int | *7080
-	}
-}
--- out/export --
-service: {
-	foo: {
-		name: "foo"
-		port: 7080
-	}
-	bar: {
-		name: "bar"
-		port: 8000
-	}
-	baz: {
-		name: "foobar"
-		port: 7080
-	}
-}
--- out/yaml --
-service:
-  foo:
-    name: foo
-    port: 7080
-  bar:
-    name: bar
-    port: 8000
-  baz:
-    name: foobar
-    port: 7080
--- out/json --
-{"service":{"foo":{"name":"foo","port":7080},"bar":{"name":"bar","port":8000},"baz":{"name":"foobar","port":7080}}}
--- out/legacy-debug --
-<0>{service: <1>{[]: <2>(Name: string)-><3>{name: (string | *<2>.Name), port: (int | *7080)}, foo: <4>{name: "foo", port: 7080}, bar: <5>{name: "bar", port: 8000}, baz: <6>{name: "foobar", port: 7080}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/003_field_templates.txtar b/cue/testdata/fulleval/003_field_templates.txtar
index c984bf00a..40523935d 100644
--- a/cue/testdata/fulleval/003_field_templates.txtar
+++ b/cue/testdata/fulleval/003_field_templates.txtar
@@ -16,82 +16,6 @@ c: {
 	foo: {}
 	bar: _
 }
--- out/def --
-a: {
-	{[name=string]: int}
-	k: 1
-}
-b: {
-	{[X=string]: {
-		x: 0, y: *1 | int
-	}}
-	v: {
-		x: 0
-		y: *1 | int
-	}
-	w: {
-		x: 0
-		y: 0
-	}
-}
-c: {
-	{[Name=string]: {
-		y: 1, name: Name
-	}}
-	foo: {
-		y:    1
-		name: "foo"
-	}
-	bar: {
-		y:    1
-		name: "bar"
-	}
-}
--- out/export --
-a: {
-	k: 1
-}
-b: {
-	v: {
-		x: 0
-		y: 1
-	}
-	w: {
-		x: 0
-		y: 0
-	}
-}
-c: {
-	foo: {
-		y:    1
-		name: "foo"
-	}
-	bar: {
-		y:    1
-		name: "bar"
-	}
-}
--- out/yaml --
-a:
-  k: 1
-b:
-  v:
-    x: 0
-    y: 1
-  w:
-    x: 0
-    y: 0
-c:
-  foo:
-    y: 1
-    name: foo
-  bar:
-    y: 1
-    name: bar
--- out/json --
-{"a":{"k":1},"b":{"v":{"x":0,"y":1},"w":{"x":0,"y":0}},"c":{"foo":{"y":1,"name":"foo"},"bar":{"y":1,"name":"bar"}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(name: string)->int, k: 1}, b: <3>{[]: <4>(X: string)->(<5>{x: 0, y: (*1 | int)} & <6>{}), v: <7>{x: 0, y: 1}, w: <8>{x: 0, y: 0}}, c: <9>{[]: <10>(Name: string)-><11>{y: 1, name: <10>.Name}, foo: <12>{y: 1, name: "foo"}, bar: <13>{y: 1, name: "bar"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/004_field_comprehension.txtar b/cue/testdata/fulleval/004_field_comprehension.txtar
index 3648e96e4..2957cc8ea 100644
--- a/cue/testdata/fulleval/004_field_comprehension.txtar
+++ b/cue/testdata/fulleval/004_field_comprehension.txtar
@@ -21,52 +21,6 @@ c: {
 		"\(k)": v
 	}
 }
--- out/def --
-a: {
-	b: 2
-	c: 3
-}
-b: {
-	a: 1
-	b: 2
-	c: 3
-	d: 4
-}
-c: {
-	b: 2
-	c: 3
-}
--- out/export --
-a: {
-	b: 2
-	c: 3
-}
-b: {
-	a: 1
-	b: 2
-	c: 3
-	d: 4
-}
-c: {
-	b: 2
-	c: 3
-}
--- out/yaml --
-a:
-  b: 2
-  c: 3
-b:
-  a: 1
-  b: 2
-  c: 3
-  d: 4
-c:
-  b: 2
-  c: 3
--- out/json --
-{"a":{"b":2,"c":3},"b":{"a":1,"b":2,"c":3,"d":4},"c":{"b":2,"c":3}}
--- out/legacy-debug --
-<0>{a: <1>{b: 2, c: 3}, b: <2>{a: 1, b: 2, c: 3, d: 4}, c: <3>{b: 2, c: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/005_conditional_field.txtar b/cue/testdata/fulleval/005_conditional_field.txtar
index 765b814a6..c260e38b4 100644
--- a/cue/testdata/fulleval/005_conditional_field.txtar
+++ b/cue/testdata/fulleval/005_conditional_field.txtar
@@ -18,20 +18,6 @@ d: {
 		a: 3
 	}
 }
--- out/def --
-b: true
-a: "foo"
-c: {
-	a: 3
-}
-d: {
-	a: int
-	if a > 1 {
-		a: 3
-	}
-}
--- out/legacy-debug --
-<0>{b: true, a: "foo", c: <1>{a: 3}, d: <2>{a: int if (<3>.a > 1) yield <4>{a: 3}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar b/cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar
index afe1aa001..794c80245 100644
--- a/cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar
+++ b/cue/testdata/fulleval/006_referencing_field_in_field_comprehension.txtar
@@ -8,35 +8,6 @@ a: {
 		"\(k)": v
 	}
 }
--- out/def --
-a: {
-	b: {
-		c: 4
-		d: 5
-	}
-	c: 4
-	d: 5
-}
--- out/export --
-a: {
-	b: {
-		c: 4
-		d: 5
-	}
-	c: 4
-	d: 5
-}
--- out/yaml --
-a:
-  b:
-    c: 4
-    d: 5
-  c: 4
-  d: 5
--- out/json --
-{"a":{"b":{"c":4,"d":5},"c":4,"d":5}}
--- out/legacy-debug --
-<0>{a: <1>{b: <2>{c: 4, d: 5}, c: 4, d: 5}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/007_different_labels_for_templates.txtar b/cue/testdata/fulleval/007_different_labels_for_templates.txtar
index fa8133fd8..f43cba0fa 100644
--- a/cue/testdata/fulleval/007_different_labels_for_templates.txtar
+++ b/cue/testdata/fulleval/007_different_labels_for_templates.txtar
@@ -4,29 +4,6 @@
 a: [X=string]: {name: X}
 a: [Name=string]: {name: Name}
 a: foo: {}
--- out/def --
-a: {
-	{[X=string]: {
-		name: X & X
-	}}
-	foo: {
-		name: "foo"
-	}
-}
--- out/export --
-a: {
-	foo: {
-		name: "foo"
-	}
-}
--- out/yaml --
-a:
-  foo:
-    name: foo
--- out/json --
-{"a":{"foo":{"name":"foo"}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(X: string)->(<3>{name: <2>.X} & <4>{name: <2>.X}), foo: <5>{name: "foo"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/008_nested_templates_in_one_field.txtar b/cue/testdata/fulleval/008_nested_templates_in_one_field.txtar
index 8b9262b98..3b31a99e3 100644
--- a/cue/testdata/fulleval/008_nested_templates_in_one_field.txtar
+++ b/cue/testdata/fulleval/008_nested_templates_in_one_field.txtar
@@ -8,100 +8,6 @@ a: [A=string]: b: [B=string]: {
 a: "A": b: "B": _
 a: "C": b: "D": _
 a: "EE": b: "FF": {c: "bar"}
--- out/def --
-a: {
-	{[A=string]: {
-		b: {
-			[B=string]: {
-				name: A, kind: B
-			}
-		}
-	}}
-	A: {
-		b: {
-			{[B=string]: {
-				name: "A", kind: B
-			}}
-			B: {
-				name: "A"
-				kind: "B"
-			}
-		}
-	}
-	C: {
-		b: {
-			{[B=string]: {
-				name: "C", kind: B
-			}}
-			D: {
-				name: "C"
-				kind: "D"
-			}
-		}
-	}
-	EE: {
-		b: {
-			{[B=string]: {
-				name: "EE", kind: B
-			}}
-			FF: {
-				name: "EE"
-				kind: "FF"
-				c:    "bar"
-			}
-		}
-	}
-}
--- out/export --
-a: {
-	A: {
-		b: {
-			B: {
-				name: "A"
-				kind: "B"
-			}
-		}
-	}
-	C: {
-		b: {
-			D: {
-				name: "C"
-				kind: "D"
-			}
-		}
-	}
-	EE: {
-		b: {
-			FF: {
-				name: "EE"
-				kind: "FF"
-				c:    "bar"
-			}
-		}
-	}
-}
--- out/yaml --
-a:
-  A:
-    b:
-      B:
-        name: A
-        kind: B
-  C:
-    b:
-      D:
-        name: C
-        kind: D
-  EE:
-    b:
-      FF:
-        name: EE
-        kind: FF
-        c: bar
--- out/json --
-{"a":{"A":{"b":{"B":{"name":"A","kind":"B"}}},"C":{"b":{"D":{"name":"C","kind":"D"}}},"EE":{"b":{"FF":{"name":"EE","kind":"FF","c":"bar"}}}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(A: string)-><3>{b: <4>{[]: <5>(B: string)-><6>{name: <2>.A, kind: <5>.B}, }}, A: <7>{b: <8>{[]: <9>(B: string)-><10>{name: <11>.A, kind: <9>.B}, B: <12>{name: "A", kind: "B"}}}, C: <13>{b: <14>{[]: <15>(B: string)-><16>{name: <17>.A, kind: <15>.B}, D: <18>{name: "C", kind: "D"}}}, EE: <19>{b: <20>{[]: <21>(B: string)-><22>{name: <23>.A, kind: <21>.B}, FF: <24>{name: "EE", kind: "FF", c: "bar"}}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/009_template_unification_within_one_struct.txtar b/cue/testdata/fulleval/009_template_unification_within_one_struct.txtar
index 4a758382e..479c0d467 100644
--- a/cue/testdata/fulleval/009_template_unification_within_one_struct.txtar
+++ b/cue/testdata/fulleval/009_template_unification_within_one_struct.txtar
@@ -10,57 +10,6 @@ a: {
 a: "A": _
 a: "C": _
 a: "E": {c: "bar"}
--- out/def --
-a: {
-	{[A=string]: {
-		name: A, kind: A
-	}}
-	E: {
-		name: "E"
-		kind: "E"
-		c:    "bar"
-	}
-	A: {
-		name: "A"
-		kind: "A"
-	}
-	C: {
-		name: "C"
-		kind: "C"
-	}
-}
--- out/export --
-a: {
-	E: {
-		name: "E"
-		kind: "E"
-		c:    "bar"
-	}
-	A: {
-		name: "A"
-		kind: "A"
-	}
-	C: {
-		name: "C"
-		kind: "C"
-	}
-}
--- out/yaml --
-a:
-  E:
-    name: E
-    kind: E
-    c: bar
-  A:
-    name: A
-    kind: A
-  C:
-    name: C
-    kind: C
--- out/json --
-{"a":{"E":{"name":"E","kind":"E","c":"bar"},"A":{"name":"A","kind":"A"},"C":{"name":"C","kind":"C"}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(A: string)->(<3>{name: <2>.A} & <4>{kind: <2>.A}), E: <5>{name: "E", kind: "E", c: "bar"}, A: <6>{name: "A", kind: "A"}, C: <7>{name: "C", kind: "C"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar b/cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar
index 7889438ba..b28b09689 100644
--- a/cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar
+++ b/cue/testdata/fulleval/010_field_comprehensions_with_multiple_keys.txtar
@@ -17,111 +17,6 @@ for x in [
 ] {
 	"\(x.a)": "\(x.b)": x
 }
--- out/def --
-E: {
-	F: x
-}
-a: {
-	E: {
-		b: {
-			F: x
-		}
-	}
-	A: {
-		b: {
-			B: x
-		}
-	}
-	C: {
-		b: {
-			D: x
-		}
-	}
-}
-A: {
-	B: x
-}
-C: {
-	D: x
-}
--- out/export --
-E: {
-	F: {
-		a: "E"
-		b: "F"
-	}
-}
-a: {
-	E: {
-		b: {
-			F: {
-				a: "E"
-				b: "F"
-			}
-		}
-	}
-	A: {
-		b: {
-			B: {
-				a: "A"
-				b: "B"
-			}
-		}
-	}
-	C: {
-		b: {
-			D: {
-				a: "C"
-				b: "D"
-			}
-		}
-	}
-}
-A: {
-	B: {
-		a: "A"
-		b: "B"
-	}
-}
-C: {
-	D: {
-		a: "C"
-		b: "D"
-	}
-}
--- out/yaml --
-E:
-  F:
-    a: E
-    b: F
-a:
-  E:
-    b:
-      F:
-        a: E
-        b: F
-  A:
-    b:
-      B:
-        a: A
-        b: B
-  C:
-    b:
-      D:
-        a: C
-        b: D
-A:
-  B:
-    a: A
-    b: B
-C:
-  D:
-    a: C
-    b: D
--- out/json --
-{"E":{"F":{"a":"E","b":"F"}},"a":{"E":{"b":{"F":{"a":"E","b":"F"}}},"A":{"b":{"B":{"a":"A","b":"B"}}},"C":{"b":{"D":{"a":"C","b":"D"}}}},"A":{"B":{"a":"A","b":"B"}},"C":{"D":{"a":"C","b":"D"}}}
--- out/legacy-debug --
-<0>{E: <1>{F: <2>{a: "E", b: "F"}}, a: <3>{E: <4>{b: <5>{F: <6>{a: "E", b: "F"}}}, A: <7>{b: <8>{B: <9>{a: "A", b: "B"}}}, C: <10>{b: <11>{D: <12>{a: "C", b: "D"}}}}, A: <13>{B: <14>{a: "A", b: "B"}}, C: <15>{D: <16>{a: "C", b: "D"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar b/cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar
index 99abe1879..b3130f82f 100644
--- a/cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar
+++ b/cue/testdata/fulleval/011_field_comprehensions_with_templates.txtar
@@ -11,48 +11,6 @@ a: {
 	}
 }
 a: b: c: d: "bar"
--- out/def --
-num: 1
-a: {
-	{[A=string]: {
-		[B=string]: {
-			name: A, kind: B
-		}
-	}}
-	b: {
-		{[B=string]: {
-			name: "b", kind: B
-		}}
-		c: {
-			name: "b"
-			kind: "c"
-			d:    "bar"
-		}
-	}
-}
--- out/export --
-num: 1
-a: {
-	b: {
-		c: {
-			name: "b"
-			kind: "c"
-			d:    "bar"
-		}
-	}
-}
--- out/yaml --
-num: 1
-a:
-  b:
-    c:
-      name: b
-      kind: c
-      d: bar
--- out/json --
-{"num":1,"a":{"b":{"c":{"name":"b","kind":"c","d":"bar"}}}}
--- out/legacy-debug --
-<0>{num: 1, a: <1>{[]: <2>(A: string)-><3>{[]: <4>(B: string)-><5>{name: <2>.A, kind: <4>.B}, }, b: <6>{[]: <7>(B: string)-><8>{name: <9>.A, kind: <7>.B}, c: <10>{name: "b", kind: "c", d: "bar"}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/012_disjunctions_of_lists.txtar b/cue/testdata/fulleval/012_disjunctions_of_lists.txtar
index a5dd7d837..8731635bf 100644
--- a/cue/testdata/fulleval/012_disjunctions_of_lists.txtar
+++ b/cue/testdata/fulleval/012_disjunctions_of_lists.txtar
@@ -5,12 +5,6 @@ l: *[ int, int] | [ string, string]
 
 l1: ["a", "b"]
 l2: l & ["c", "d"]
--- out/def --
-l: *[int, int] | [string, string]
-l1: ["a", "b"]
-l2: ["c", "d"]
--- out/legacy-debug --
-<0>{l: [int,int], l1: ["a","b"], l2: ["c","d"]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/013_normalization.txtar b/cue/testdata/fulleval/013_normalization.txtar
index e73f5e074..a36eea4a2 100644
--- a/cue/testdata/fulleval/013_normalization.txtar
+++ b/cue/testdata/fulleval/013_normalization.txtar
@@ -8,12 +8,6 @@ The redundancy that remains from not normalizing can be useful.
 a: string | string
 b: *1 | *int
 c: *1.0 | *float
--- out/def --
-a: string
-b: int
-c: float
--- out/legacy-debug --
-<0>{a: string, b: int, c: float}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar b/cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar
index 037f6dc9c..a31f29767 100644
--- a/cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar
+++ b/cue/testdata/fulleval/014_default_disambiguation_and_elimination.txtar
@@ -7,14 +7,6 @@ c: a & b
 d: b & a
 
 e: *1 | *1
--- out/def --
-a: *1 | int
-b: *3 | int
-c: a & b
-d: b & a
-e: 1
--- out/legacy-debug --
-<0>{a: 1, b: 3, c: int, d: int, e: 1}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/016_struct_comprehension_with_template.txtar b/cue/testdata/fulleval/016_struct_comprehension_with_template.txtar
index 9f2daa816..5023564b7 100644
--- a/cue/testdata/fulleval/016_struct_comprehension_with_template.txtar
+++ b/cue/testdata/fulleval/016_struct_comprehension_with_template.txtar
@@ -11,99 +11,6 @@ service: [Name=string]: {
 service: foo: {}
 service: bar: {port: 8000}
 service: baz: {name: "foobar"}
--- out/def --
-result: [{
-	name: *"foo" | string
-	type: "service"
-	port: *7080 | int
-}, {
-	name: *"bar" | string
-	type: "service"
-	port: 8000
-}, {
-	name: "foobar"
-	type: "service"
-	port: *7080 | int
-}]
-service: {
-	{[Name=string]: {
-		name: *Name | string, type: "service", port: *7080 | int
-	}}
-	foo: {
-		name: *"foo" | string
-		type: "service"
-		port: *7080 | int
-	}
-	bar: {
-		name: *"bar" | string
-		type: "service"
-		port: 8000
-	}
-	baz: {
-		name: "foobar"
-		type: "service"
-		port: *7080 | int
-	}
-}
--- out/export --
-result: [{
-	name: "foo"
-	type: "service"
-	port: 7080
-}, {
-	name: "bar"
-	type: "service"
-	port: 8000
-}, {
-	name: "foobar"
-	type: "service"
-	port: 7080
-}]
-service: {
-	foo: {
-		name: "foo"
-		type: "service"
-		port: 7080
-	}
-	bar: {
-		name: "bar"
-		type: "service"
-		port: 8000
-	}
-	baz: {
-		name: "foobar"
-		type: "service"
-		port: 7080
-	}
-}
--- out/yaml --
-result:
-- name: foo
-  type: service
-  port: 7080
-- name: bar
-  type: service
-  port: 8000
-- name: foobar
-  type: service
-  port: 7080
-service:
-  foo:
-    name: foo
-    type: service
-    port: 7080
-  bar:
-    name: bar
-    type: service
-    port: 8000
-  baz:
-    name: foobar
-    type: service
-    port: 7080
--- out/json --
-{"result":[{"name":"foo","type":"service","port":7080},{"name":"bar","type":"service","port":8000},{"name":"foobar","type":"service","port":7080}],"service":{"foo":{"name":"foo","type":"service","port":7080},"bar":{"name":"bar","type":"service","port":8000},"baz":{"name":"foobar","type":"service","port":7080}}}
--- out/legacy-debug --
-<0>{result: [<1>{name: "foo", type: "service", port: 7080},<2>{name: "bar", type: "service", port: 8000},<3>{name: "foobar", type: "service", port: 7080}], service: <4>{[]: <5>(Name: string)-><6>{name: (*<5>.Name | string), type: "service", port: (*7080 | int)}, foo: <7>{name: "foo", type: "service", port: 7080}, bar: <8>{name: "bar", type: "service", port: 8000}, baz: <9>{name: "foobar", type: "service", port: 7080}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar b/cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar
index da8a15b2d..44523d2f7 100644
--- a/cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar
+++ b/cue/testdata/fulleval/017_resolutions_in_struct_comprehension_keys.txtar
@@ -2,21 +2,6 @@
 #evalFull
 -- in.cue --
 a: {for _, b in ["c"] {"\(b+".")": "a"}}
--- out/def --
-a: {
-	"c.": "a"
-}
--- out/export --
-a: {
-	"c.": "a"
-}
--- out/yaml --
-a:
-  c.: a
--- out/json --
-{"a":{"c.":"a"}}
--- out/legacy-debug --
-<0>{a: <1>{"c.": "a"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar b/cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar
index 1d6e5b8a3..37c5adafe 100644
--- a/cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar
+++ b/cue/testdata/fulleval/018_recursive_evaluation_within_list.txtar
@@ -13,25 +13,6 @@ b1: {
 	d: "s" + c
 	c: string
 }
--- out/def --
-l: [a]
-a: b & {
-	c: "t"
-}
-b: {
-	c: string
-	d: c
-}
-l1: [a1]
-a1: b1 & {
-	c: "t"
-}
-b1: {
-	c: string
-	d: "s" + c
-}
--- out/legacy-debug --
-<0>{l: [<1>{c: "t", d: "t"}], a: <2>{c: "t", d: "t"}, b: <3>{c: string, d: string}, l1: [<4>{c: "t", d: "st"}], a1: <5>{c: "t", d: "st"}, b1: <6>{c: string, d: ("s" + <7>.c)}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar b/cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar
index 07751d363..56ec3fc3a 100644
--- a/cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar
+++ b/cue/testdata/fulleval/020_complex_interaction_of_groundness.txtar
@@ -6,26 +6,6 @@ res: [ a.b.c & {d: "b"}]
 
 a: b: [C=string]: {d: string, s: "a" + d}
 a: b: c: d: string
--- out/def --
-res: [{
-	d: "b"
-	s: "ab"
-} & (a.b.c & {
-	d: "b"
-})]
-a: {
-	b: {
-		{[C=string]: {
-			d: string, s: "a" + d
-		}}
-		c: {
-			d: string
-			s: "a" + d
-		}
-	}
-}
--- out/legacy-debug --
-<0>{res: [<1>{d: "b", s: "ab"}], a: <2>{b: <3>{[]: <4>(C: string)-><5>{d: string, s: ("a" + <5>.d)}, c: <6>{d: string, s: ("a" + <7>.d)}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/021_complex_groundness_2.txtar b/cue/testdata/fulleval/021_complex_groundness_2.txtar
index 3052df77e..9698a5c1d 100644
--- a/cue/testdata/fulleval/021_complex_groundness_2.txtar
+++ b/cue/testdata/fulleval/021_complex_groundness_2.txtar
@@ -8,29 +8,6 @@ f1: {y: string, res: a.b.c & {d: y}}
 a: b: c: {d: string, s: "a" + d}
 a: b: [C=string]: {d: string, s: "a" + d}
 a: b: c: d: string
--- out/def --
-r1: f1 & {
-	y: "c"
-}
-f1: {
-	y:   string
-	res: a.b.c & {
-		d: y
-	}
-}
-a: {
-	b: {
-		{[C=string]: {
-			d: string, s: "a" + d
-		}}
-		c: {
-			d: string
-			s: "a"+d & "a"+d
-		}
-	}
-}
--- out/legacy-debug --
-<0>{r1: <1>{y: "c", res: <2>{d: "c", s: "ac"}}, f1: <3>{y: string, res: <4>{d: string, s: (("a" + <5>.d) & ("a" + <5>.d))}}, a: <6>{b: <7>{[]: <8>(C: string)-><9>{d: string, s: ("a" + <9>.d)}, c: <10>{d: string, s: (("a" + <11>.d) & ("a" + <11>.d))}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/022_references_from_template_to_concrete.txtar b/cue/testdata/fulleval/022_references_from_template_to_concrete.txtar
index d12121c1d..5dddc8af8 100644
--- a/cue/testdata/fulleval/022_references_from_template_to_concrete.txtar
+++ b/cue/testdata/fulleval/022_references_from_template_to_concrete.txtar
@@ -8,58 +8,6 @@ t: [X=string]: {
 	c: "X"
 }
 t: x: {b: str: "DDDD"}
--- out/def --
-res: [t]
-t: {
-	{[X=string]: {
-		a: c + b.str, c: "X", b: {
-			str:          string
-		}
-	}}
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}
--- out/export --
-res: [{
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}]
-t: {
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}
--- out/yaml --
-res:
-- x:
-    a: XDDDD
-    c: X
-    b:
-      str: DDDD
-t:
-  x:
-    a: XDDDD
-    c: X
-    b:
-      str: DDDD
--- out/json --
-{"res":[{"x":{"a":"XDDDD","c":"X","b":{"str":"DDDD"}}}],"t":{"x":{"a":"XDDDD","c":"X","b":{"str":"DDDD"}}}}
--- out/legacy-debug --
-<0>{res: [<1>{[]: <2>(X: string)-><3>{a: (<3>.c + <3>.b.str), c: "X", b: <4>{str: string}}, x: <5>{a: "XDDDD", c: "X", b: <6>{str: "DDDD"}}}], t: <7>{[]: <2>(X: string)-><3>{a: (<3>.c + <3>.b.str), c: "X", b: <4>{str: string}}, x: <8>{a: "XDDDD", c: "X", b: <9>{str: "DDDD"}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/024_Issue_#23.txtar b/cue/testdata/fulleval/024_Issue_#23.txtar
index a5863d79e..261cfd724 100644
--- a/cue/testdata/fulleval/024_Issue_#23.txtar
+++ b/cue/testdata/fulleval/024_Issue_#23.txtar
@@ -3,15 +3,6 @@
 -- in.cue --
 x: {a:     1} | {a: 2}
 y: x & {a: 3}
--- out/def --
-x: {
-	a: 1
-} | {
-	a: 2
-}
-y: _|_ // ; empty disjunction: conflicting values 2 and 3
--- out/legacy-debug --
-<0>{x: (<1>{a: 1} | <2>{a: 2}), y: _|_((1 & 3):empty disjunction: conflicting values 1 and 3;(2 & 3):empty disjunction: conflicting values 2 and 3)}
 -- out/compile --
 --- in.cue
 {
@@ -34,9 +25,6 @@ Retain: 0
 Unifications: 7
 Conjuncts:    15
 Disjuncts:    11
--- diff/explanation --
-It is okay to show field a as long as the error is clear and points to the
-violating disjunction.
 -- out/eval --
 Errors:
 y: 2 errors in empty disjunction:
diff --git a/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar b/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar
index 8674b91f7..bac4ca4c2 100644
--- a/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar
+++ b/cue/testdata/fulleval/026_dont_convert_incomplete_errors_to_non-incomplete.txtar
@@ -20,28 +20,6 @@ s3: strings.ContainsAny(str, "dd")
 str: string
 num: <4
 is:  bool
--- out/def --
-import "strings"
-
-n1: {
-	min: <max
-	max: >min
-}
-n2:  -num
-num: <4
-n3:  +num
-n4:  num + num
-n5:  num - num
-n6:  num * num
-n7:  num / num
-b1:  !is
-is:  bool
-s1:  "\(str)"
-str: string
-s2:  strings.ContainsAny("dd")
-s3:  strings.ContainsAny(str, "dd")
--- out/legacy-debug --
-<0>{n1: <1>{min: <<2>.max, max: ><2>.min}, n2: -<3>.num, num: <4, n3: +<3>.num, n4: (<3>.num + <3>.num), n5: (<3>.num - <3>.num), n6: (<3>.num * <3>.num), n7: (<3>.num / <3>.num), b1: !<3>.is, is: bool, s1: ""+<3>.str+"", str: string, s2: strings.ContainsAny ("dd"), s3: <4>.ContainsAny (<3>.str,"dd")}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  17
diff --git a/cue/testdata/fulleval/027_len_of_incomplete_types.txtar b/cue/testdata/fulleval/027_len_of_incomplete_types.txtar
index 537ea7edc..26c64ab92 100644
--- a/cue/testdata/fulleval/027_len_of_incomplete_types.txtar
+++ b/cue/testdata/fulleval/027_len_of_incomplete_types.txtar
@@ -12,24 +12,6 @@ v7:   len([2] | *[1, 2])
 v8:   len([2] | [1, 2])
 v9:   len("😂")
 v10:  len("")
--- out/def --
-args: *[] | [...string]
-v1:   0
-v2:   0
-v3:   0
-v4:   1
-v5:   len({
-	a: 3
-} | {
-	a: 4
-})
-v6:  len('sf' | 'dd')
-v7:  2
-v8:  len([2] | [1, 2])
-v9:  4
-v10: 0
--- out/legacy-debug --
-<0>{args: [], v1: 0, v2: 0, v3: 0, v4: 1, v5: len ((<1>{a: 3} | <2>{a: 4})), v6: len (('sf' | 'dd')), v7: 2, v8: len (([2] | [1,2])), v9: 4, v10: 0}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  38
diff --git a/cue/testdata/fulleval/028_slice_rewrite_bug.txtar b/cue/testdata/fulleval/028_slice_rewrite_bug.txtar
index 9787c28f3..9273904db 100644
--- a/cue/testdata/fulleval/028_slice_rewrite_bug.txtar
+++ b/cue/testdata/fulleval/028_slice_rewrite_bug.txtar
@@ -6,36 +6,6 @@ fn: {
 	out: arg[1:]
 }
 fn1: fn & {arg: [1]}
--- out/def --
-fn: {
-	arg: [1]
-	out: []
-}
-fn1: fn & {
-	arg: [1]
-}
--- out/export --
-fn: {
-	arg: [1]
-	out: []
-}
-fn1: {
-	arg: [1]
-	out: []
-}
--- out/yaml --
-fn:
-  arg:
-  - 1
-  out: []
-fn1:
-  arg:
-  - 1
-  out: []
--- out/json --
-{"fn":{"arg":[1],"out":[]},"fn1":{"arg":[1],"out":[]}}
--- out/legacy-debug --
-<0>{fn: <1>{arg: [1], out: []}, fn1: <2>{arg: [1], out: []}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/029_Issue_#94.txtar b/cue/testdata/fulleval/029_Issue_#94.txtar
index 3b26a5b0e..1f818e1be 100644
--- a/cue/testdata/fulleval/029_Issue_#94.txtar
+++ b/cue/testdata/fulleval/029_Issue_#94.txtar
@@ -23,34 +23,6 @@ index: {
 	regular: foo["regular"]
 	_hidden: foo["_hidden"]
 }
--- out/def --
-foo: {
-	opt?:    1
-	txt:     2
-	#def:    3
-	regular: 4
-	_hidden: 5
-}
-comp: {
-	txt:     2
-	regular: 4
-}
-select: {
-	opt:     foo.opt
-	txt:     2
-	#def:    3
-	regular: 4
-	_hidden: 5
-}
-index: {
-	opt:     foo["opt"]
-	txt:     2
-	#def:    foo["#def"]
-	regular: 4
-	_hidden: foo["_hidden"]
-}
--- out/legacy-debug --
-<0>{foo: <1>{opt?: 1, txt: 2, #def: 3, regular: 4, _hidden: 5}, comp: <2>{txt: 2, regular: 4}, select: <3>{opt: <4>.foo.opt, txt: 2, #def: 3, regular: 4, _hidden: 5}, index: <5>{opt: <4>.foo["opt"], txt: 2, #def: <4>.foo["#def"], regular: 4, _hidden: <4>.foo["_hidden"]}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar b/cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar
index c6adfeffd..2fb9371d9 100644
--- a/cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar
+++ b/cue/testdata/fulleval/030_retain_references_with_interleaved_embedding.txtar
@@ -14,40 +14,6 @@ a: d: {
 a: [Name=string]: {#info: {
 	X: "foo"
 }}
--- out/def --
-a: {
-	{[Name=string]: {
-		#info: {
-			X: "foo"
-		}
-	}}
-	d: {
-		#info: {
-			...
-		}
-		Y: #info.X
-		#base
-	}
-}
-#base: {
-	#info: {
-		...
-	}
-}
--- out/export --
-a: {
-	d: {
-		Y: "foo"
-	}
-}
--- out/yaml --
-a:
-  d:
-    Y: foo
--- out/json --
-{"a":{"d":{"Y":"foo"}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(Name: string)-><3>{#info: <4>C{X: "foo"}}, d: <5>C{#info: <6>C{X: "foo"}, Y: "foo"}}, #base: <7>C{#info: <8>{...}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/031_comparison_against_bottom.txtar b/cue/testdata/fulleval/031_comparison_against_bottom.txtar
index 1d0c82235..2b8e96121 100644
--- a/cue/testdata/fulleval/031_comparison_against_bottom.txtar
+++ b/cue/testdata/fulleval/031_comparison_against_bottom.txtar
@@ -13,20 +13,6 @@ h: _|_ == ({a: 1} & {a: 2})
 i: _|_ == ({a: 1} & {b: 2})
 
 err: 1 & 2
--- out/def --
-a:   true
-b:   _|_ // conflicting values 1 and 2
-err: _|_ // conflicting values 1 and 2
-c:   true
-d:   false
-e:   _|_ // conflicting values 1 and 2
-// z: err == err // TODO: should infer to be true?
-f: true
-g: false
-h: true
-i: false
--- out/legacy-debug --
-<0>{a: true, b: _|_((1 & 2):conflicting values 1 and 2), err: _|_((1 & 2):conflicting values 1 and 2), c: true, d: false, e: _|_((1 & 2):conflicting values 1 and 2), f: true, g: false, h: true, i: false}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar b/cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar
index af19bd196..bb3611c5e 100644
--- a/cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar
+++ b/cue/testdata/fulleval/032_or_builtin_should_not_fail_on_non-concrete_empty_list.txtar
@@ -13,32 +13,6 @@ foo: #Workflow & {
 	jobs: foo: {
 	}
 }
--- out/def --
-#Workflow: {
-	jobs: {
-		[jobID=string]: {}
-	}
-	#JobID: or([for k, _ in jobs { k }])
-}
-foo: #Workflow & {
-	jobs: {
-		foo: {}
-	}
-}
--- out/export --
-foo: {
-	jobs: {
-		foo: {}
-	}
-}
--- out/yaml --
-foo:
-  jobs:
-    foo: {}
--- out/json --
-{"foo":{"jobs":{"foo":{}}}}
--- out/legacy-debug --
-<0>{#Workflow: <1>C{jobs: <2>{[]: <3>(jobID: string)-><4>C{}, }, #JobID: or ([ <5>for k, _ in <6>.jobs yield <5>.k ])}, foo: <7>C{jobs: <8>{[]: <9>(jobID: string)-><10>C{}, foo: <11>C{}}, #JobID: "foo"}}
 -- out/eval/stats --
 Leaks:  6
 Freed:  11
diff --git a/cue/testdata/fulleval/034_label_and_field_aliases.txtar b/cue/testdata/fulleval/034_label_and_field_aliases.txtar
index 5ad6dff3a..c4e2368b4 100644
--- a/cue/testdata/fulleval/034_label_and_field_aliases.txtar
+++ b/cue/testdata/fulleval/034_label_and_field_aliases.txtar
@@ -9,38 +9,6 @@ b1:          B
 b1:          bb
 C="\(a)":    5
 c:           C
--- out/def --
-p: {
-	[ID=string]: {
-		name: ID
-	}
-}
-"foo=bar": "str"
-a:         "str"
-bb:        4
-b1:        4
-c:         5
-str:       5
--- out/export --
-p: {}
-"foo=bar": "str"
-a:         "str"
-bb:        4
-b1:        4
-c:         5
-str:       5
--- out/yaml --
-p: {}
-foo=bar: str
-a: str
-bb: 4
-b1: 4
-c: 5
-str: 5
--- out/json --
-{"p":{},"foo=bar":"str","a":"str","bb":4,"b1":4,"c":5,"str":5}
--- out/legacy-debug --
-<0>{p: <1>{[]: <2>(ID: string)-><3>{name: <2>.ID}, }, "foo=bar": "str", a: "str", bb: 4, b1: 4, c: 5, str: 5}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/035_optionals_with_label_filters.txtar b/cue/testdata/fulleval/035_optionals_with_label_filters.txtar
index 7b0707e05..20556b87e 100644
--- a/cue/testdata/fulleval/035_optionals_with_label_filters.txtar
+++ b/cue/testdata/fulleval/035_optionals_with_label_filters.txtar
@@ -24,32 +24,6 @@ jobs2: fooTest: name: "badName" // faulty
 jobs3: #Jobs
 jobs3: [string]: #Job
 jobs3: fooTest1: name: "badName" // faulty
--- out/def --
-#JobID: =~"^[a-zA-Z]*$"
-#Job: {
-	name: string
-	cmd:  string
-}
-#Jobs: {
-	{[#JobID]: #Job}
-	{[=~"Test$"]: {
-		name: =~"^test", ...
-	}}
-}
-jobs: {
-	foo: {
-		name: "allGood"
-	}
-}
-jobs1: _|_ // field "foo1" not allowed in closed struct
-jobs2: #Jobs & {
-	fooTest: {
-		name: "badName"
-	}
-}
-jobs3: _|_ // field "fooTest1" not allowed in closed struct
--- out/legacy-debug --
-<0>{#JobID: =~"^[a-zA-Z]*$", #Job: <1>C{name: string, cmd: string}, #Jobs: <2>C{[=~"^[a-zA-Z]*$"]: <3>(_: string)-><4>.#Job, [=~"Test$"]: <5>(_: string)-><6>C{name: =~"^test"}, }, jobs: <7>{foo: <8>{name: "allGood"}}, jobs1: _|_(<9>{}:field "foo1" not allowed in closed struct), jobs2: <10>C{[=~"^[a-zA-Z]*$"]: <11>(_: string)-><4>.#Job, [=~"Test$"]: <12>(_: string)-><13>C{name: =~"^test"}, fooTest: _|_(string:field "cmd" not allowed in closed struct)}, jobs3: _|_(<14>{name: "badName"}:field "fooTest1" not allowed in closed struct)}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/040.txtar b/cue/testdata/fulleval/040.txtar
index 2d3b8e895..82fdfcc13 100644
--- a/cue/testdata/fulleval/040.txtar
+++ b/cue/testdata/fulleval/040.txtar
@@ -13,38 +13,6 @@
 }
 
 foo: #Task & {"op": "pull"}
--- out/def --
-#Task: {
-	op:          "pull"
-	tag:         *"latest" | string
-	refToTag:    tag
-	tagExpr:     "latestdd"
-	tagInString: "latest"
-} | {
-	op: "scratch"
-}
-foo: #Task & {
-	op: "pull"
-}
--- out/export --
-foo: {
-	op:          "pull"
-	tag:         "latest"
-	refToTag:    "latest"
-	tagExpr:     "latestdd"
-	tagInString: "latest"
-}
--- out/yaml --
-foo:
-  op: pull
-  tag: latest
-  refToTag: latest
-  tagExpr: latestdd
-  tagInString: latest
--- out/json --
-{"foo":{"op":"pull","tag":"latest","refToTag":"latest","tagExpr":"latestdd","tagInString":"latest"}}
--- out/legacy-debug --
-<0>{#Task: (<1>C{op: "pull", tag: (*"latest" | string), refToTag: <1>.tag, tagExpr: (<1>.tag + "dd"), tagInString: ""+<1>.tag+""} | <2>C{op: "scratch"}), foo: <3>C{op: "pull", tag: "latest", refToTag: "latest", tagExpr: "latestdd", tagInString: "latest"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/041.txtar b/cue/testdata/fulleval/041.txtar
index bb6dceca3..0583d6eb9 100644
--- a/cue/testdata/fulleval/041.txtar
+++ b/cue/testdata/fulleval/041.txtar
@@ -9,16 +9,6 @@ t: {
 s: t & {
 	#ok: false
 }
--- out/def --
-t: {
-	x:   int
-	#ok: *true | bool
-}
-s: t & {
-	#ok: false
-}
--- out/legacy-debug --
-<0>{t: <1>{x: int, #ok: true}, s: <2>{#ok: false}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/042_cross-dependent_comprehension.txtar b/cue/testdata/fulleval/042_cross-dependent_comprehension.txtar
index f90f4bff6..df7d56467 100644
--- a/cue/testdata/fulleval/042_cross-dependent_comprehension.txtar
+++ b/cue/testdata/fulleval/042_cross-dependent_comprehension.txtar
@@ -9,17 +9,6 @@
 }
 x: (#a & {b: true}) & {c: 4}
 y: x
--- out/def --
-x: _|_ // field "c" not allowed in closed struct
-y: _|_ // field "c" not allowed in closed struct
-#a: {
-	b: bool
-	if b {
-		c: 4
-	}
-}
--- out/legacy-debug --
-<0>{x: _|_(4:field "c" not allowed in closed struct), y: _|_(4:field "c" not allowed in closed struct), #a: <1>C{b: bool if <2>.b yield <3>C{c: 4}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar b/cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar
index d0880e9b4..824650718 100644
--- a/cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar
+++ b/cue/testdata/fulleval/043_optional_expanded_before_lookup.txtar
@@ -11,45 +11,6 @@ test: A: {
 }
 
 B: test.A & {}
--- out/def --
-test: {
-	{[ID=string]: {
-		name: ID
-	}}
-	A: {
-		name:   "A"
-		field1: "1"
-		field2: "2"
-	}
-}
-B: test.A & {}
--- out/export --
-test: {
-	A: {
-		name:   "A"
-		field1: "1"
-		field2: "2"
-	}
-}
-B: {
-	name:   "A"
-	field1: "1"
-	field2: "2"
-}
--- out/yaml --
-test:
-  A:
-    name: A
-    field1: "1"
-    field2: "2"
-B:
-  name: A
-  field1: "1"
-  field2: "2"
--- out/json --
-{"test":{"A":{"name":"A","field1":"1","field2":"2"}},"B":{"name":"A","field1":"1","field2":"2"}}
--- out/legacy-debug --
-<0>{test: <1>{[]: <2>(ID: string)-><3>{name: <2>.ID}, A: <4>{name: "A", field1: "1", field2: "2"}}, B: <5>{name: "A", field1: "1", field2: "2"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/044_Issue_#178.txtar b/cue/testdata/fulleval/044_Issue_#178.txtar
index 146e89d49..33a69f264 100644
--- a/cue/testdata/fulleval/044_Issue_#178.txtar
+++ b/cue/testdata/fulleval/044_Issue_#178.txtar
@@ -10,18 +10,6 @@ data: bytes
 
 len: int
 bar: hex.EncodedLen(len)
--- out/def --
-import (
-	"encoding/csv"
-	"encoding/hex"
-)
-
-foo:  csv.Decode(data)
-data: bytes
-len:  int
-bar:  hex.EncodedLen(len)
--- out/legacy-debug --
-<0>{foo: <1>.Decode (<2>.data), data: bytes, len: int, bar: <3>.EncodedLen (<2>.len)}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  5
diff --git a/cue/testdata/fulleval/046_non-structural_direct_cycles.txtar b/cue/testdata/fulleval/046_non-structural_direct_cycles.txtar
index 74cad7022..ebc2ce5f5 100644
--- a/cue/testdata/fulleval/046_non-structural_direct_cycles.txtar
+++ b/cue/testdata/fulleval/046_non-structural_direct_cycles.txtar
@@ -3,15 +3,6 @@
 -- in.cue --
 c1: {bar: baz: 2} & c1.bar
 c2: {bar:      1} & c2.bar
--- out/def --
-c1: {
-	bar: {
-		baz: 2
-	}
-} & c1.bar
-c2: _|_ // conflicting values {bar: 1} and 1 (mismatched types struct and int)
--- out/legacy-debug --
-<0>{c1: <1>{bar: <2>{baz: 2}, baz: 2}, c2: _|_(conflicting values {bar: 1} and 1 (mismatched types struct and int))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/047_dont_bind_to_string_labels.txtar b/cue/testdata/fulleval/047_dont_bind_to_string_labels.txtar
index df6821abb..7c5eaa5d3 100644
--- a/cue/testdata/fulleval/047_dont_bind_to_string_labels.txtar
+++ b/cue/testdata/fulleval/047_dont_bind_to_string_labels.txtar
@@ -6,27 +6,6 @@ y: {
 	"x": 2
 	z:   x
 }
--- out/def --
-x: 1
-y: {
-	x: 2
-	z: 1
-}
--- out/export --
-x: 1
-y: {
-	x: 2
-	z: 1
-}
--- out/yaml --
-x: 1
-y:
-  x: 2
-  z: 1
--- out/json --
-{"x":1,"y":{"x":2,"z":1}}
--- out/legacy-debug --
-<0>{x: 1, y: <1>{x: 2, z: 1}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/048_dont_pass_incomplete_values_to_builtins.txtar b/cue/testdata/fulleval/048_dont_pass_incomplete_values_to_builtins.txtar
index 65d88cf7b..e151b97e6 100644
--- a/cue/testdata/fulleval/048_dont_pass_incomplete_values_to_builtins.txtar
+++ b/cue/testdata/fulleval/048_dont_pass_incomplete_values_to_builtins.txtar
@@ -5,13 +5,6 @@ import "encoding/json"
 
 input: string
 foo:   json.Marshal(input)
--- out/def --
-import "encoding/json"
-
-input: string
-foo:   json.Marshal(input)
--- out/legacy-debug --
-<0>{input: string, foo: <1>.Marshal (<2>.input)}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  3
diff --git a/cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar b/cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar
index fcb2bb892..f850562d8 100644
--- a/cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar
+++ b/cue/testdata/fulleval/049_alias_reuse_in_nested_scope.txtar
@@ -16,52 +16,6 @@
 	a: foo: [X]: X
 }
 b: #B & {foo: "key"}
--- out/def --
-#Foo: {
-	connection: {
-		[or([for k, _ in {
-				...
-		} { k }])]: or([for k, _ in {
-			...
-		} { k }])
-	}
-}
-#A: {
-	foo: "key"
-	a: {
-		foo: {
-			["key"]: "key"
-		}
-	}
-}
-#B: {
-	foo: string
-	FOO = foo
-	a: {
-		foo: {
-			[FOO]: FOO
-		}
-	}
-}
-b: #B & {
-	foo: "key"
-}
--- out/export --
-b: {
-	foo: "key"
-	a: {
-		foo: {}
-	}
-}
--- out/yaml --
-b:
-  foo: key
-  a:
-    foo: {}
--- out/json --
-{"b":{"foo":"key","a":{"foo":{}}}}
--- out/legacy-debug --
-<0>{#Foo: <1>C{connection: <2>C{[or ([ <3>for k, _ in <4>{} yield <3>.k ])]: <5>(_: string)->or ([ <3>for k, _ in <4>{} yield <3>.k ]), }}, #A: <6>C{foo: "key", a: <7>C{foo: <8>C{["key"]: <9>(_: string)-><10>.foo, }}}, #B: <11>C{foo: string, a: <12>C{foo: <13>C{[string]: <14>(_: string)-><15>.foo, }}}, b: <16>C{foo: "key", a: <17>C{foo: <18>C{["key"]: <19>(_: string)-><20>.foo, }}}}
 -- out/eval/stats --
 Leaks:  10
 Freed:  19
@@ -72,9 +26,6 @@ Retain: 10
 Unifications: 29
 Conjuncts:    40
 Disjuncts:    29
--- diff/explanation --
-The new error is a correct error, as the pattern constraint is invalid.
-Seems reasonable to report error at connection as well.
 -- out/eval --
 (struct){
   #Foo: (#struct){
diff --git a/cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar b/cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar
index 6ab4ac09a..0ea574fee 100644
--- a/cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar
+++ b/cue/testdata/fulleval/050_json_Marshaling_detects_incomplete.txtar
@@ -7,19 +7,6 @@ a: json.Marshal({a: string})
 
 foo: {a: 3, b: foo.c}
 b: json.Marshal(foo)
--- out/def --
-import "encoding/json"
-
-a: json.Marshal({
-	a: string
-})
-foo: {
-	a: 3
-	b: foo.c
-}
-b: json.Marshal(foo)
--- out/legacy-debug --
-<0>{a: <1>.Marshal (<2>{a: string}), foo: <3>{a: 3, b: <4>.foo.c}, b: <1>.Marshal (<4>.foo)}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  8
diff --git a/cue/testdata/fulleval/051_detectIncompleteYAML.txtar b/cue/testdata/fulleval/051_detectIncompleteYAML.txtar
index 9dfbf96b5..cd3408afb 100644
--- a/cue/testdata/fulleval/051_detectIncompleteYAML.txtar
+++ b/cue/testdata/fulleval/051_detectIncompleteYAML.txtar
@@ -18,52 +18,6 @@ import yaml "encoding/yaml"
 Val: #Spec & {
 	_vars: something: "var-string"
 }
--- out/def --
-package foobar
-
-import "encoding/yaml"
-
-#Spec: {
-	_vars: {
-		something: string
-	}
-	data: {
-		#foo: {
-			use: _vars.something
-		}
-		baz:    yaml.Marshal(_vars.something)
-		foobar: yaml.Marshal(#foo)
-	}
-}
-Val: #Spec & {
-	_vars: {
-		something: "var-string"
-	}
-}
--- out/export --
-Val: {
-	data: {
-		baz: """
-        var-string
-        
-        """
-		foobar: """
-        use: var-string
-        
-        """
-	}
-}
--- out/yaml --
-Val:
-  data:
-    baz: |
-      var-string
-    foobar: |
-      use: var-string
--- out/json --
-{"Val":{"data":{"baz":"var-string\n","foobar":"use: var-string\n"}}}
--- out/legacy-debug --
-<0>{#Spec: <1>C{_vars: <2>C{something: string}, data: <3>C{#foo: <4>C{use: string}, baz: <5>.Marshal (<6>._vars.something), foobar: <5>.Marshal (<7>.#foo)}}, Val: <8>C{_vars: <9>C{something: "var-string"}, data: <10>C{#foo: <11>C{use: "var-string"}, baz: "var-string\n", foobar: "use: var-string\n"}}}
 -- out/eval/stats --
 Leaks:  0
 Freed:  17
diff --git a/cue/testdata/fulleval/052_detectIncompleteJSON.txtar b/cue/testdata/fulleval/052_detectIncompleteJSON.txtar
index f22cf1efd..19c869f65 100644
--- a/cue/testdata/fulleval/052_detectIncompleteJSON.txtar
+++ b/cue/testdata/fulleval/052_detectIncompleteJSON.txtar
@@ -18,44 +18,6 @@ import "encoding/json"
 Val: #Spec & {
 	_vars: something: "var-string"
 }
--- out/def --
-package foobar
-
-import "encoding/json"
-
-#Spec: {
-	_vars: {
-		something: string
-	}
-	data: {
-		#foo: {
-			use: _vars.something
-		}
-		baz:    json.Marshal(_vars.something)
-		foobar: json.Marshal(#foo)
-	}
-}
-Val: #Spec & {
-	_vars: {
-		something: "var-string"
-	}
-}
--- out/export --
-Val: {
-	data: {
-		baz:    "\"var-string\""
-		foobar: "{\"use\":\"var-string\"}"
-	}
-}
--- out/yaml --
-Val:
-  data:
-    baz: '"var-string"'
-    foobar: '{"use":"var-string"}'
--- out/json --
-{"Val":{"data":{"baz":"\"var-string\"","foobar":"{\"use\":\"var-string\"}"}}}
--- out/legacy-debug --
-<0>{#Spec: <1>C{_vars: <2>C{something: string}, data: <3>C{#foo: <4>C{use: string}, baz: <5>.Marshal (<6>._vars.something), foobar: <5>.Marshal (<7>.#foo)}}, Val: <8>C{_vars: <9>C{something: "var-string"}, data: <10>C{#foo: <11>C{use: "var-string"}, baz: "\"var-string\"", foobar: "{\"use\":\"var-string\"}"}}}
 -- out/eval/stats --
 Leaks:  0
 Freed:  17
diff --git a/cue/testdata/fulleval/053_issue312.txtar b/cue/testdata/fulleval/053_issue312.txtar
index d4a66fb18..74a687d0f 100644
--- a/cue/testdata/fulleval/053_issue312.txtar
+++ b/cue/testdata/fulleval/053_issue312.txtar
@@ -5,19 +5,6 @@
 for x in [1] {
 	*close({}) | {[_]: null}
 }
--- out/def --
-
-for x in [1] *close({}) | {
-	[string]: null
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
--- out/legacy-debug --
-<0>{ <1>for _, x in [1] yield <2>{}, (*close (<3>{}) | <4>{[]: <5>(_: string)->null, })}
 -- out/eval/stats --
 Leaks:  2
 Freed:  3
diff --git a/cue/testdata/fulleval/054_issue312.txtar b/cue/testdata/fulleval/054_issue312.txtar
index d00bff611..c152dbbb1 100644
--- a/cue/testdata/fulleval/054_issue312.txtar
+++ b/cue/testdata/fulleval/054_issue312.txtar
@@ -3,21 +3,6 @@
 -- in.cue --
 y: *1 | {a: 2}
 for x in [1] {y}
--- out/def --
-y: *1 | {
-	a: 2
-}
-a: 2
--- out/export --
-y: 1
-a: 2
--- out/yaml --
-y: 1
-a: 2
--- out/json --
-{"y":1,"a":2}
--- out/legacy-debug --
-<0>{y: 1, a: 2}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/fulleval/055_issue318.txtar b/cue/testdata/fulleval/055_issue318.txtar
index 0effacc27..142439ba6 100644
--- a/cue/testdata/fulleval/055_issue318.txtar
+++ b/cue/testdata/fulleval/055_issue318.txtar
@@ -8,24 +8,6 @@
 	vx:   arg.x
 	vy:   arg.y
 }
--- out/def --
-#T: {
-	arg: {
-		x: string
-	}
-	out1: _|_ // undefined field "y"
-	out2: _|_ // undefined field "y"
-	vx:   arg.x
-	vy:   _|_ // undefined field "y"
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
--- out/legacy-debug --
-<0>{#T: <1>C{arg: <2>C{x: string}, out1: _|_(<3>.arg.y:undefined field "y"), out2: _|_(<3>.arg.y:undefined field "y"), vx: string, vy: _|_(<3>.arg.y:undefined field "y")}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/interpolation/041_interpolation.txtar b/cue/testdata/interpolation/041_interpolation.txtar
index e7b6f7a4a..d17396f1b 100644
--- a/cue/testdata/interpolation/041_interpolation.txtar
+++ b/cue/testdata/interpolation/041_interpolation.txtar
@@ -8,16 +8,6 @@ d: "\(r)"
 u: "\(_)"
 r: _
 e: "\([])"
--- out/def --
-a: "4"
-b: "one 4 two 4one"
-c: "one"
-d: "\(r)"
-r: _
-u: "\(_)"
-e: _|_ // expression in interpolation must evaluate to a number kind or string (found list)
--- out/legacy-debug --
-<0>{a: "4", b: "one 4 two 4one", c: "one", d: ""+<1>.r+"", r: _, u: ""+_+"", e: _|_([]:expression in interpolation must evaluate to a number kind or string (found list))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/interpolation/042_multiline_interpolation.txtar b/cue/testdata/interpolation/042_multiline_interpolation.txtar
index dd97ad3c6..820fe9b08 100644
--- a/cue/testdata/interpolation/042_multiline_interpolation.txtar
+++ b/cue/testdata/interpolation/042_multiline_interpolation.txtar
@@ -46,121 +46,6 @@ m4: """
 	4)
 
 			"""
--- out/def --
-a1: """
-        before
-        4
-        after
-        """
-a2: """
-        before
-        4
-        
-        """
-a3: """
-        
-        4
-        after
-        """
-a4: """
-        
-        4
-        
-        """
-m1: """
-        before
-        4
-        after
-        """
-m2: """
-        before
-        4
-        
-        """
-m3: """
-        
-        4
-        after
-        """
-m4: """
-        
-        4
-        
-        """
--- out/export --
-a1: """
-        before
-        4
-        after
-        """
-a2: """
-        before
-        4
-        
-        """
-a3: """
-        
-        4
-        after
-        """
-a4: """
-        
-        4
-        
-        """
-m1: """
-        before
-        4
-        after
-        """
-m2: """
-        before
-        4
-        
-        """
-m3: """
-        
-        4
-        after
-        """
-m4: """
-        
-        4
-        
-        """
--- out/yaml --
-a1: |-
-  before
-  4
-  after
-a2: |
-  before
-  4
-a3: |2-
-
-  4
-  after
-a4: |2
-
-  4
-m1: |-
-  before
-  4
-  after
-m2: |
-  before
-  4
-m3: |2-
-
-  4
-  after
-m4: |2
-
-  4
--- out/json --
-{"a1":"before\n4\nafter","a2":"before\n4\n","a3":"\n4\nafter","a4":"\n4\n","m1":"before\n4\nafter","m2":"before\n4\n","m3":"\n4\nafter","m4":"\n4\n"}
--- out/legacy-debug --
-<0>{a1: "before\n4\nafter", a2: "before\n4\n", a3: "\n4\nafter", a4: "\n4\n", m1: "before\n4\nafter", m2: "before\n4\n", m3: "\n4\nafter", m4: "\n4\n"}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/lists/019_list_types.txtar b/cue/testdata/lists/019_list_types.txtar
index 1dee0baab..974e5449b 100644
--- a/cue/testdata/lists/019_list_types.txtar
+++ b/cue/testdata/lists/019_list_types.txtar
@@ -27,27 +27,6 @@ e0: list.Repeat([{}], 2)
 e0: [{}]
 e1: [...int]
 e1: [...float]
--- out/def --
-l0: [1, 2, 3]
-l2: [{
-	a: 1
-}, {
-	a: 2
-	b: 3
-}]
-s1: [int]
-s2: [2]
-i1: [int, int, int, int, int, int][2]
-i2: 3
-t0: [{
-	a: 8
-}]
-t1: [...int]
-e0: _|_ // conflicting list lengths: conflicting values 2 and 1
-e1: [..._|_ // conflicting values int and float (mismatched types int and float),
-]
--- out/legacy-debug --
-<0>{l0: [1,2,3], l2: [<1>{a: 1},<2>{a: 2, b: 3}], s1: [int], s2: [2], i1: int, i2: 3, t0: [<3>{a: 8}], t1: [, ...int], e0: _|_(([<4>{},<4>{}] & [<5>{}]):conflicting list lengths: conflicting values 2 and 1), e1: [, ..._|_((int & float):conflicting values int and float (mismatched types int and float))]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/lists/021_list_equality.txtar b/cue/testdata/lists/021_list_equality.txtar
index f4441813d..8699292e0 100644
--- a/cue/testdata/lists/021_list_equality.txtar
+++ b/cue/testdata/lists/021_list_equality.txtar
@@ -64,157 +64,6 @@ fne11: [1, ...] != [1, 2, ...]
 eqIncomplete1: [1] == [string]
 
 neIncomplete1: [1] != [string]
--- out/def --
-eq0:   true
-eq1:   true
-eq2:   true
-eq3:   true
-eq4:   true
-eq5:   true
-eq6:   true
-eq7:   true
-eq8:   true
-eq9:   true
-eq10:  true
-eq11:  true
-ne0:   true
-ne1:   true
-ne2:   true
-ne3:   true
-ne4:   false
-ne5:   false
-ne6:   false
-ne7:   false
-ne8:   false
-ne9:   false
-ne10:  false
-ne11:  false
-feq0:  false
-feq1:  false
-feq2:  false
-feq3:  false
-feq4:  false
-feq5:  false
-feq6:  false
-feq7:  false
-feq8:  false
-feq9:  false
-feq10: false
-feq11: false
-fne0:  true
-fne1:  true
-fne2:  true
-fne3:  false
-fne4:  true
-fne5:  true
-fne6:  true
-fne7:  true
-fne8:  true
-fne9:  true
-fne10: true
-fne11: true
--- out/export --
-eq0:   true
-eq1:   true
-eq2:   true
-eq3:   true
-eq4:   true
-eq5:   true
-eq6:   true
-eq7:   true
-eq8:   true
-eq9:   true
-eq10:  true
-eq11:  true
-ne0:   true
-ne1:   true
-ne2:   true
-ne3:   true
-ne4:   false
-ne5:   false
-ne6:   false
-ne7:   false
-ne8:   false
-ne9:   false
-ne10:  false
-ne11:  false
-feq0:  false
-feq1:  false
-feq2:  false
-feq3:  false
-feq4:  false
-feq5:  false
-feq6:  false
-feq7:  false
-feq8:  false
-feq9:  false
-feq10: false
-feq11: false
-fne0:  false
-fne1:  false
-fne2:  false
-fne3:  false
-fne4:  false
-fne5:  false
-fne6:  false
-fne7:  false
-fne8:  false
-fne9:  false
-fne10: false
-fne11: false
--- out/yaml --
-eq0: true
-eq1: true
-eq2: true
-eq3: true
-eq4: true
-eq5: true
-eq6: true
-eq7: true
-eq8: true
-eq9: true
-eq10: true
-eq11: true
-ne0: true
-ne1: true
-ne2: true
-ne3: true
-ne4: false
-ne5: false
-ne6: false
-ne7: false
-ne8: false
-ne9: false
-ne10: false
-ne11: false
-feq0: false
-feq1: false
-feq2: false
-feq3: false
-feq4: false
-feq5: false
-feq6: false
-feq7: false
-feq8: false
-feq9: false
-feq10: false
-feq11: false
-fne0: false
-fne1: false
-fne2: false
-fne3: false
-fne4: false
-fne5: false
-fne6: false
-fne7: false
-fne8: false
-fne9: false
-fne10: false
-fne11: false
--- out/json --
-{"eq0":true,"eq1":true,"eq2":true,"eq3":true,"eq4":true,"eq5":true,"eq6":true,"eq7":true,"eq8":true,"eq9":true,"eq10":true,"eq11":true,"ne0":true,"ne1":true,"ne2":true,"ne3":true,"ne4":false,"ne5":false,"ne6":false,"ne7":false,"ne8":false,"ne9":false,"ne10":false,"ne11":false,"feq0":false,"feq1":false,"feq2":false,"feq3":false,"feq4":false,"feq5":false,"feq6":false,"feq7":false,"feq8":false,"feq9":false,"feq10":false,"feq11":false,"fne0":false,"fne1":false,"fne2":false,"fne3":false,"fne4":false,"fne5":false,"fne6":false,"fne7":false,"fne8":false,"fne9":false,"fne10":false,"fne11":false}
--- out/legacy-debug --
-<0>{eq0: true, eq1: true, eq2: true, eq3: true, eq4: true, eq5: true, eq6: true, eq7: true, eq8: true, eq9: true, eq10: true, eq11: true, ne0: true, ne1: true, ne2: true, ne3: true, ne4: false, ne5: false, ne6: false, ne7: false, ne8: false, ne9: false, ne10: false, ne11: false, feq0: false, feq1: false, feq2: false, feq3: false, feq4: false, feq5: false, feq6: false, feq7: false, feq8: false, feq9: false, feq10: false, feq11: false, fne0: false, fne1: false, fne2: false, fne3: false, fne4: false, fne5: false, fne6: false, fne7: false, fne8: false, fne9: false, fne10: false, fne11: false}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/references/package.txtar b/cue/testdata/references/package.txtar
index 6aaaf108d..705f3195a 100644
--- a/cue/testdata/references/package.txtar
+++ b/cue/testdata/references/package.txtar
@@ -20,8 +20,6 @@ package example
 // Issue #550
 blah: Settings.anyKey
 Settings: {}
--- out/ --
-
 -- out/eval/stats --
 Leaks:  1
 Freed:  4
diff --git a/cue/testdata/references/self.txtar b/cue/testdata/references/self.txtar
index 132d4ba59..8018c2120 100644
--- a/cue/testdata/references/self.txtar
+++ b/cue/testdata/references/self.txtar
@@ -215,9 +215,6 @@ a: {
     c: 3
 }
 
--- out/compile/experiment_test --
-predeclared identifier "self" requires the Self experiment to be enabled:
-    ./experiment_test.cue:4:8
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/000_convert___to_top.txtar b/cue/testdata/resolve/000_convert___to_top.txtar
index 2230146c9..9b4b54707 100644
--- a/cue/testdata/resolve/000_convert___to_top.txtar
+++ b/cue/testdata/resolve/000_convert___to_top.txtar
@@ -2,18 +2,6 @@
 #evalPartial
 -- in.cue --
 a: {[_]: _}
--- out/def --
-a: {
-	...
-}
--- out/export --
-a: {}
--- out/yaml --
-a: {}
--- out/json --
-{"a":{}}
--- out/legacy-debug --
-<0>{a: <1>{...}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/001.txtar b/cue/testdata/resolve/001.txtar
index 0738dba6f..65b9106b1 100644
--- a/cue/testdata/resolve/001.txtar
+++ b/cue/testdata/resolve/001.txtar
@@ -4,45 +4,6 @@ a: b.c.d
 b: c: {d: 3}
 c: {c: d.d}
 d: {d: 2}
--- out/def --
-a: 3
-b: {
-	c: {
-		d: 3
-	}
-}
-c: {
-	c: 2
-}
-d: {
-	d: 2
-}
--- out/export --
-a: 3
-b: {
-	c: {
-		d: 3
-	}
-}
-c: {
-	c: 2
-}
-d: {
-	d: 2
-}
--- out/yaml --
-a: 3
-b:
-  c:
-    d: 3
-c:
-  c: 2
-d:
-  d: 2
--- out/json --
-{"a":3,"b":{"c":{"d":3}},"c":{"c":2},"d":{"d":2}}
--- out/legacy-debug --
-<0>{a: 3, b: <1>{c: <2>{d: 3}}, c: <3>{c: 2}, d: <4>{d: 2}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/004.txtar b/cue/testdata/resolve/004.txtar
index 2ee1e6286..727789521 100644
--- a/cue/testdata/resolve/004.txtar
+++ b/cue/testdata/resolve/004.txtar
@@ -4,27 +4,6 @@ a: _
 b: a
 a: {d: 1, d: _}
 b: _
--- out/def --
-a: {
-	d: 1
-}
-b: a
--- out/export --
-a: {
-	d: 1
-}
-b: {
-	d: 1
-}
--- out/yaml --
-a:
-  d: 1
-b:
-  d: 1
--- out/json --
-{"a":{"d":1},"b":{"d":1}}
--- out/legacy-debug --
-<0>{a: <1>{d: 1}, b: <2>{d: 1}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/005_JSON.txtar b/cue/testdata/resolve/005_JSON.txtar
index 120fb9dfa..528f50cf9 100644
--- a/cue/testdata/resolve/005_JSON.txtar
+++ b/cue/testdata/resolve/005_JSON.txtar
@@ -5,33 +5,6 @@ a="a": 3
 b:     a
 o: {"a\nb": 2} // TODO: use $ for root?
 c: o["a\nb"]
--- out/def --
-a: 3
-b: 3
-o: {
-	"a\nb": 2
-}
-c: 2
--- out/export --
-a: 3
-b: 3
-o: {
-	"a\nb": 2
-}
-c: 2
--- out/yaml --
-a: 3
-b: 3
-o:
-  ? |-
-    a
-    b
-  : 2
-c: 2
--- out/json --
-{"a":3,"b":3,"o":{"a\nb":2},"c":2}
--- out/legacy-debug --
-<0>{a: 3, b: 3, o: <1>{"a\nb": 2}, c: 2}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/006_arithmetic.txtar b/cue/testdata/resolve/006_arithmetic.txtar
index e07cda7ab..60abc749c 100644
--- a/cue/testdata/resolve/006_arithmetic.txtar
+++ b/cue/testdata/resolve/006_arithmetic.txtar
@@ -7,15 +7,6 @@ n1: 1
 v5: 2.0 / n1
 v6: 1.0 / 1.0
 e2: int & 4.0/2.0
--- out/def --
-v1: 5.0000000000e+11
-v2: true
-n1: 1
-v5: 2.0
-v6: 1.
-e2: _|_ // conflicting values int and (4.0 / 2.0) (mismatched types int and float)
--- out/legacy-debug --
-<0>{v1: 5.0000000000e+11, v2: true, n1: 1, v5: 2.0, v6: 1., e2: _|_((int & (4.0 / 2.0)):conflicting values int and (4.0 / 2.0) (mismatched types int and float))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/007_inequality.txtar b/cue/testdata/resolve/007_inequality.txtar
index 196409dde..557528563 100644
--- a/cue/testdata/resolve/007_inequality.txtar
+++ b/cue/testdata/resolve/007_inequality.txtar
@@ -7,31 +7,6 @@ c: true == null
 d: null != {}
 e: null == []
 f: 0 == 0.0 // types are unified first TODO: make this consistent
--- out/def --
-a: true
-b: true
-c: false
-d: true
-e: false
-f: true
--- out/export --
-a: true
-b: true
-c: false
-d: true
-e: false
-f: true
--- out/yaml --
-a: true
-b: true
-c: false
-d: true
-e: false
-f: true
--- out/json --
-{"a":true,"b":true,"c":false,"d":true,"e":false,"f":true}
--- out/legacy-debug --
-<0>{a: true, b: true, c: false, d: true, e: false, f: true}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/008_attributes.txtar b/cue/testdata/resolve/008_attributes.txtar
index aaed65e5e..9b283d3e3 100644
--- a/cue/testdata/resolve/008_attributes.txtar
+++ b/cue/testdata/resolve/008_attributes.txtar
@@ -6,17 +6,6 @@ b: {foo: 1 @bar() @foo()}
 c: a & b
 
 e: a & {foo: 1 @foo(other)}
--- out/def --
-a: {
-	foo: 1 @baz(1) @foo()
-}
-b: {
-	foo: 1 @bar() @foo()
-}
-c: a & b
-e: _|_ // conflicting attributes for key "foo"
--- out/legacy-debug --
-<0>{a: <1>{foo: 1 @baz(1) @foo()}, b: <2>{foo: 1 @bar() @foo()}, c: <3>{foo: 1 @bar() @baz(1) @foo()}, e: _|_((<4>.a & <5>{foo: 1 @foo(other)}):conflicting attributes for key "foo")}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/009_optional_field_unification.txtar b/cue/testdata/resolve/009_optional_field_unification.txtar
index afcd0df24..ba180e75f 100644
--- a/cue/testdata/resolve/009_optional_field_unification.txtar
+++ b/cue/testdata/resolve/009_optional_field_unification.txtar
@@ -9,41 +9,6 @@ d: a & {"foo"?: "bar"}
 g1:       1
 "g\(1)"?: 1
 "g\(2)"?: 2
--- out/def --
-a: {
-	foo?: string
-}
-b: {
-	foo: "foo"
-}
-c: a & b
-d: a & {
-	foo?: "bar"
-}
-g1:  1
-g2?: 2
--- out/export --
-a: {}
-b: {
-	foo: "foo"
-}
-c: {
-	foo: "foo"
-}
-d: {}
-g1: 1
--- out/yaml --
-a: {}
-b:
-  foo: foo
-c:
-  foo: foo
-d: {}
-g1: 1
--- out/json --
-{"a":{},"b":{"foo":"foo"},"c":{"foo":"foo"},"d":{},"g1":1}
--- out/legacy-debug --
-<0>{a: <1>{foo?: string}, b: <2>{foo: "foo"}, c: <3>{foo: "foo"}, d: <4>{foo?: "bar"}, g1: 1, g2?: 2}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar b/cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar
index 2e7a7d574..c282329e5 100644
--- a/cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar
+++ b/cue/testdata/resolve/010_optional_field_resolves_to_incomplete.txtar
@@ -6,14 +6,6 @@ r: {
 	b:  a
 	c:  r["a"]
 }
--- out/def --
-r: {
-	a?: 3
-	b:  a
-	c:  r["a"]
-}
--- out/legacy-debug --
-<0>{r: <1>{a?: 3, b: <2>.a, c: <3>.r["a"]}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/011_bounds.txtar b/cue/testdata/resolve/011_bounds.txtar
index f58710d88..c7c9512de 100644
--- a/cue/testdata/resolve/011_bounds.txtar
+++ b/cue/testdata/resolve/011_bounds.txtar
@@ -65,49 +65,6 @@ e6: >11 & <11
 e7: >=11 & <11
 e8: >11 & <=11
 e9: >"a" & <1
--- out/def --
-i1: 5
-i2: 5
-i3: []
-i4: !=2 & !=4
-s1: >=0 & <=10 & !=1
-s2: >=0 & <=10
-s3: >5
-s4: <10
-s5: !=2
-
-// TODO: could change inequality
-s6:   !=2
-s7:   !=2
-s8:   >5
-s10:  >1 & <=10
-s11:  >0 & <12
-s20:  10
-s22:  >5 & <=6
-s22a: 6
-s22b: 6
-s22c: 5
-s22d: 5
-s22e: 5
-s22f: 5
-s23:  >0 & <2
-s23a: 1
-s23b: 1
-s23c: 1
-s23d: 1
-s23e: >0.0 & <2.0
-s30:  >0
-e1:   _|_ // invalid value null (excluded by !=null)
-e2:   _|_ // invalid value null (excluded by !=null)
-e3:   _|_ // invalid value 1 (out of bound >1)
-e4:   _|_ // invalid value 0 (out of bound <0)
-e5:   _|_ // conflicting bounds >1 and <0
-e6:   _|_ // conflicting bounds >11 and <11
-e7:   _|_ // conflicting bounds >=11 and <11
-e8:   _|_ // conflicting bounds >11 and <=11
-e9:   _|_ // conflicting values >"a" and <1 (mismatched types string and number)
--- out/legacy-debug --
-<0>{i1: 5, i2: 5, i3: [], i4: (!=2 & !=4), s1: (>=0 & <=10 & !=1), s2: (>=0 & <=10), s3: >5, s4: <10, s5: !=2, s6: (!=2 & >=2), s7: (>=2 & !=2), s8: >5, s10: (<=10 & >1), s11: (>0 & <12), s20: 10, s22: (>5 & <=6), s22a: 6, s22b: 6, s22c: 5, s22d: 5, s22e: 5, s22f: 5, s23: (>0 & <2), s23a: 1, s23b: 1, s23c: 1, s23d: 1, s23e: (>0.0 & <2.0), s30: int & >0, e1: _|_((!=null & null):invalid value null (excluded by !=null)), e2: _|_((!=null & null):invalid value null (excluded by !=null)), e3: _|_((>1 & 1):invalid value 1 (out of bound >1)), e4: _|_((<0 & 0):invalid value 0 (out of bound <0)), e5: _|_(conflicting bounds >1 and <0), e6: _|_(conflicting bounds >11 and <11), e7: _|_(conflicting bounds >=11 and <11), e8: _|_(conflicting bounds >11 and <=11), e9: _|_((>"a" & <1):conflicting values >"a" and <1 (mismatched types string and number))}
 -- out/compile --
 --- in.cue
 {
@@ -308,4 +265,4 @@ Result:
     //     ./in.cue:64:5
     //     ./in.cue:64:12
   }
-}
\ No newline at end of file
+}
diff --git a/cue/testdata/resolve/012_bound_conversions.txtar b/cue/testdata/resolve/012_bound_conversions.txtar
index 7dd9762b2..5663c4032 100644
--- a/cue/testdata/resolve/012_bound_conversions.txtar
+++ b/cue/testdata/resolve/012_bound_conversions.txtar
@@ -15,20 +15,6 @@ c2: 1.2 & (>1.3 & <2)
 
 c3: 1.2 & (>=1 & <2)
 c4: 1.2 & (>=1 & <2 & int)
--- out/def --
-r0: 1
-r1: 1
-r2: 1
-r3: -1
-r4: -1
-r5: 1.1
-r6: 1.1
-c1: _|_ // invalid value 1.2 (out of bound >1.3)
-c2: _|_ // invalid value 1.2 (out of bound >1.3)
-c3: 1.2
-c4: _|_ // conflicting values 1.2 and ((>=1 & <2) & int) (mismatched types float and int)
--- out/legacy-debug --
-<0>{r0: 1, r1: 1, r2: 1, r3: -1, r4: -1, r5: 1.1, r6: 1.1, c1: _|_((>1.3 & 1.2):invalid value 1.2 (out of bound >1.3)), c2: _|_((>1.3 & 1.2):invalid value 1.2 (out of bound >1.3)), c3: 1.2, c4: _|_((1.2 & ((>=1 & <2) & int)):conflicting values 1.2 and ((>=1 & <2) & int) (mismatched types float and int))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/013_custom_validators.txtar b/cue/testdata/resolve/013_custom_validators.txtar
index ee1d25558..d1fa14a6c 100644
--- a/cue/testdata/resolve/013_custom_validators.txtar
+++ b/cue/testdata/resolve/013_custom_validators.txtar
@@ -11,12 +11,6 @@ b: "dog"
 
 c: strings.ContainsAny("d") & strings.ContainsAny("g")
 c: "dog"
--- out/def --
-a: "after"
-b: _|_ // invalid value "dog" (does not satisfy strings.ContainsAny("c"))
-c: "dog"
--- out/legacy-debug --
-<0>{a: "after", b: _|_(strings.ContainsAny ("c"):invalid value "dog" (does not satisfy strings.ContainsAny("c"))), c: "dog"}
 -- out/eval/stats --
 Leaks:  0
 Freed:  4
diff --git a/cue/testdata/resolve/014_null_coalescing.txtar b/cue/testdata/resolve/014_null_coalescing.txtar
index fc0256a9b..ac16848c8 100644
--- a/cue/testdata/resolve/014_null_coalescing.txtar
+++ b/cue/testdata/resolve/014_null_coalescing.txtar
@@ -4,22 +4,6 @@
 a: null
 b: a.x | "b"
 c: a["x"] | "c"
--- out/def --
-a: null
-b: "b"
-c: "c"
--- out/export --
-a: null
-b: "b"
-c: "c"
--- out/yaml --
-a: null
-b: b
-c: c
--- out/json --
-{"a":null,"b":"b","c":"c"}
--- out/legacy-debug --
-<0>{a: null, b: "b", c: "c"}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/016_index.txtar b/cue/testdata/resolve/016_index.txtar
index 1ee65950e..0935f60d5 100644
--- a/cue/testdata/resolve/016_index.txtar
+++ b/cue/testdata/resolve/016_index.txtar
@@ -21,25 +21,6 @@ def: {
 	#b: 3
 }
 e7: def["b"]
--- out/def --
-a: 2
-b: "bar"
-c: _|_ // invalid list index "3" (type string)
-l: []
-d:  _|_ // index 0 out of bounds
-e1: _|_ // invalid list index "" (type string)
-e2: _|_ // invalid operation: 2[2] (type int does not support indexing)
-e3: _|_ // invalid list index true (type bool)
-e4: _|_ // index 3 out of bounds
-e5: _|_ // invalid list index -1 (index must be non-negative)
-e6: _|_ // index 1 out of bounds
-def: {
-	a:  1
-	#b: 3
-}
-e7: def["b"]
--- out/legacy-debug --
-<0>{a: 2, b: "bar", c: _|_("3":invalid list index "3" (type string)), l: [], d: _|_([]:index 0 out of bounds), e1: _|_("":invalid list index "" (type string)), e2: _|_(2:invalid operation: 2[2] (type int does not support indexing)), e3: _|_(true:invalid list index true (type bool)), e4: _|_([1,2,3]:index 3 out of bounds), e5: _|_(-1:invalid list index -1 (index must be non-negative)), e6: _|_([]:index 1 out of bounds), def: <1>{a: 1, #b: 3}, e7: <2>.def["b"]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/017_disjunctions_of_lists.txtar b/cue/testdata/resolve/017_disjunctions_of_lists.txtar
index 809113087..519143d80 100644
--- a/cue/testdata/resolve/017_disjunctions_of_lists.txtar
+++ b/cue/testdata/resolve/017_disjunctions_of_lists.txtar
@@ -5,12 +5,6 @@ l: [ int, int] | [ string, string]
 
 l1: ["a", "b"]
 l2: l & ["c", "d"]
--- out/def --
-l: [int, int] | [string, string]
-l1: ["a", "b"]
-l2: ["c", "d"]
--- out/legacy-debug --
-<0>{l: ([int,int] | [string,string]), l1: ["a","b"], l2: ["c","d"]}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/018_slice.txtar b/cue/testdata/resolve/018_slice.txtar
index 9f8a4b66e..8b9cd364a 100644
--- a/cue/testdata/resolve/018_slice.txtar
+++ b/cue/testdata/resolve/018_slice.txtar
@@ -10,18 +10,6 @@ e4: [0][1:2]
 e5: 4[1:2]
 e6: [2]["":]
 e7: [2][:"9"]
--- out/def --
-a: []
-b: []
-e1: _|_ // slice bounds out of range
-e2: _|_ // negative slice index
-e3: _|_ // invalid slice index: 1 > 0
-e4: _|_ // slice bounds out of range
-e5: _|_ // cannot slice 4 (type int)
-e6: _|_ // invalid slice index "" (type string)
-e7: _|_ // invalid slice index "9" (type string)
--- out/legacy-debug --
-<0>{a: [], b: [], e1: _|_(1:slice bounds out of range), e2: _|_([0]:negative slice index), e3: _|_([0]:invalid slice index: 1 > 0), e4: _|_(2:slice bounds out of range), e5: _|_(4:cannot slice 4 (type int)), e6: _|_("":invalid slice index "" (type string)), e7: _|_("9":invalid slice index "9" (type string))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/022_list_unification.txtar b/cue/testdata/resolve/022_list_unification.txtar
index d3d5a3798..f2211524d 100644
--- a/cue/testdata/resolve/022_list_unification.txtar
+++ b/cue/testdata/resolve/022_list_unification.txtar
@@ -3,16 +3,6 @@
 -- in.cue --
 a: {l: ["foo", v], v: l[1]}
 b: a & {l: [_, "bar"]}
--- out/def --
-a: {
-	l: ["foo", v]
-	v: l[1]
-}
-b: a & {
-	l: [_, "bar"]
-}
--- out/legacy-debug --
-<0>{a: <1>{l: ["foo",<2>.v], v: <2>.l[1]}, b: <3>{l: ["foo","bar"], v: "bar"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/023_correct_error_messages.txtar b/cue/testdata/resolve/023_correct_error_messages.txtar
index 68165b5d9..825b65bf9 100644
--- a/cue/testdata/resolve/023_correct_error_messages.txtar
+++ b/cue/testdata/resolve/023_correct_error_messages.txtar
@@ -2,10 +2,6 @@
 #evalPartial
 -- in.cue --
 a: "a" & 1
--- out/def --
-a: _|_ // conflicting values "a" and 1 (mismatched types string and int)
--- out/legacy-debug --
-<0>{a: _|_(("a" & 1):conflicting values "a" and 1 (mismatched types string and int))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/024_structs.txtar b/cue/testdata/resolve/024_structs.txtar
index b82c5f197..7d6a293e2 100644
--- a/cue/testdata/resolve/024_structs.txtar
+++ b/cue/testdata/resolve/024_structs.txtar
@@ -5,22 +5,6 @@ a: t & {c:  5} // {c:5,d:15}
 b: ti & {c: 7} // {c:7,d:21}
 t: {c: number, d: c * 3} // {c:number,d:number*3}
 ti: t & {c: int}
--- out/def --
-a: t & {
-	c: 5
-}
-t: {
-	c: number
-	d: c * 3
-}
-b: ti & {
-	c: 7
-}
-ti: t & {
-	c: int
-}
--- out/legacy-debug --
-<0>{a: <1>{c: 5, d: 15}, t: <2>{c: number, d: (<3>.c * 3)}, b: <4>{c: 7, d: 21}, ti: <5>{c: int, d: (<6>.c * 3)}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/025_definitions.txtar b/cue/testdata/resolve/025_definitions.txtar
index 3d52cf7f4..6f7539087 100644
--- a/cue/testdata/resolve/025_definitions.txtar
+++ b/cue/testdata/resolve/025_definitions.txtar
@@ -35,41 +35,6 @@ Mixed:  string
 
 mixedRec: {#Mixed: string}
 mixedRec: {Mixed: string}
--- out/def --
-#Foo: {
-	field: int
-	recursive: {
-		field: string
-	}
-}
-
-// Allowed
-#Foo1: {
-	field:  int
-	field2: string
-}
-foo:  _|_ // field "feild" not allowed in closed struct
-foo1: #Foo & {
-	field: 2
-	recursive: {
-		feild: 2
-	}
-}
-#Bar: {
-	{[A=string]: int}
-	field: int
-}
-bar: #Bar & {
-	feild: 2
-}
-#Mixed: string
-Mixed:  string
-mixedRec: {
-	#Mixed: string
-	Mixed:  string
-}
--- out/legacy-debug --
-<0>{#Foo: <1>C{field: int, recursive: <2>C{field: string}}, #Foo1: <3>C{field: int, field2: string}, foo: _|_(2:field "feild" not allowed in closed struct), foo1: <4>C{field: 2, recursive: _|_(2:field "feild" not allowed in closed struct)}, #Bar: <5>{[]: <6>(A: string)->int, field: int}, bar: <7>{[]: <8>(A: string)->int, field: int, feild: 2}, #Mixed: string, Mixed: string, mixedRec: <9>{#Mixed: string, Mixed: string}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/027_new-style_definitions.txtar b/cue/testdata/resolve/027_new-style_definitions.txtar
index 638516965..7f2f69561 100644
--- a/cue/testdata/resolve/027_new-style_definitions.txtar
+++ b/cue/testdata/resolve/027_new-style_definitions.txtar
@@ -12,38 +12,6 @@ bulk: {[string]: string} & {
 	_hid: 3
 	a:    "foo"
 }
--- out/def --
-"#Foo": #Foo & {
-	b: 1
-}
-#Foo: {
-	a: 1
-	b: int
-}
-bulk: {
-	{[string]: string}
-	a:    "foo"
-	#def: 4
-	_hid: 3
-}
--- out/export --
-"#Foo": {
-	a: 1
-	b: 1
-}
-bulk: {
-	a: "foo"
-}
--- out/yaml --
-'#Foo':
-  a: 1
-  b: 1
-bulk:
-  a: foo
--- out/json --
-{"#Foo":{"a":1,"b":1},"bulk":{"a":"foo"}}
--- out/legacy-debug --
-<0>{"#Foo": <1>C{a: 1, b: 1}, #Foo: <2>C{a: 1, b: int}, bulk: <3>{[]: <4>(_: string)->string, a: "foo", #def: 4, _hid: 3}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar b/cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar
index 49e4052a1..d1ed4f863 100644
--- a/cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar
+++ b/cue/testdata/resolve/029_non-closed_definition_carries_over_closedness_to_enclosed_template.txtar
@@ -19,43 +19,6 @@ b: #Q & {
 c: #R & {
 	w: [{d: int}, ...]
 }
--- out/def --
-#S: {
-	[string]: {
-		a: int
-	}
-}
-a: #S & {
-	v: {
-		b: int
-	}
-}
-b: #Q & {
-	w: {
-		c: int
-	}
-}
-#Q: {
-	[string]: {
-		a: int
-	} | {
-		b: int
-	}
-}
-c: #R & {
-	w: [{
-		d: int
-	}, ...]
-}
-#R: {
-	[string]: [{
-		a: int
-	}, {
-		b: int
-	}]
-}
--- out/legacy-debug --
-<0>{#S: <1>{[]: <2>(_: string)-><3>C{a: int}, }, a: <4>{[]: <5>(_: string)-><6>C{a: int}, v: _|_(int:field "b" not allowed in closed struct)}, b: <7>{[]: <8>(_: string)->(<9>C{a: int} | <10>C{b: int}), w: _|_(int:empty disjunction: field "c" not allowed in closed struct)}, #Q: <11>{[]: <12>(_: string)->(<13>C{a: int} | <14>C{b: int}), }, c: <15>{[]: <16>(_: string)->[<17>C{a: int},<18>C{b: int}], w: [_|_(int:field "d" not allowed in closed struct),<19>C{b: int}]}, #R: <20>{[]: <21>(_: string)->[<22>C{a: int},<23>C{b: int}], }}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/030_definitions_with_disjunctions.txtar b/cue/testdata/resolve/030_definitions_with_disjunctions.txtar
index 785dcfd0c..760dd5ee8 100644
--- a/cue/testdata/resolve/030_definitions_with_disjunctions.txtar
+++ b/cue/testdata/resolve/030_definitions_with_disjunctions.txtar
@@ -16,23 +16,6 @@ bar: {c: 2}
 
 baz: #Foo
 baz: {b: 2}
--- out/def --
-#Foo: {
-	field: int
-	a:     1
-} | {
-	field: int
-	b:     2
-}
-foo: #Foo & {
-	a: 1
-}
-bar: _|_ // 
-baz: #Foo & {
-	b: 2
-}
--- out/legacy-debug --
-<0>{#Foo: (<1>C{field: int, a: 1} | <2>C{field: int, b: 2}), foo: <3>C{field: int, a: 1}, bar: _|_(2:empty disjunction: field "c" not allowed in closed struct), baz: <4>C{field: int, b: 2}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar b/cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar
index bf326346e..e8fe643cf 100644
--- a/cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar
+++ b/cue/testdata/resolve/031_definitions_with_disjunctions_recurisive.txtar
@@ -10,26 +10,6 @@
 	}
 	x: c: 3
 }
--- out/def --
-#Foo: {
-	x: {
-		field: int
-		a:     1
-		c:     3
-	} | {
-		field: int
-		b:     2
-		c:     3
-	}
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
--- out/legacy-debug --
-<0>{#Foo: <1>C{x: (<2>C{field: int, a: 1, c: 3} | <3>C{field: int, b: 2, c: 3})}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar b/cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar
index f675f521e..ddb6dbb27 100644
--- a/cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar
+++ b/cue/testdata/resolve/033_top-level_definition_with_struct_and_disjunction.txtar
@@ -14,24 +14,6 @@
 	Type: "A"
 	Size: 1
 }
--- out/def --
-#def: {
-	Size: 0
-	Type: "B"
-	Text: string
-} | {
-	Size: 1
-	Type: "A"
-	Text: string
-}
--- out/export --
-
--- out/yaml --
-{}
--- out/json --
-{}
--- out/legacy-debug --
-<0>{#def: (<1>C{Size: (0 & int), Type: ("B" & string), Text: string} | <2>C{Size: (1 & int), Type: ("A" & string), Text: string})}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/034_closing_structs.txtar b/cue/testdata/resolve/034_closing_structs.txtar
index ed176c786..31a8569ae 100644
--- a/cue/testdata/resolve/034_closing_structs.txtar
+++ b/cue/testdata/resolve/034_closing_structs.txtar
@@ -19,36 +19,6 @@ ctot: ct & ot // {x: int, ...}
 cpct: cp & ct // closed({x: int})
 ctcp: ct & cp // closed({x: int})
 ctct: ct & ct // {x: int, ...}
--- out/def --
-op: {
-	x: int
-}
-ot: {
-	x: int
-	...
-}
-cp: close({
-	x: int
-})
-ct: {
-	x: int
-	...
-}
-opot: op & ot
-otop: ot & op
-opcp: op & cp
-cpop: cp & op
-opct: op & ct
-ctop: ct & op
-otcp: ot & cp
-cpot: cp & ot
-otct: ot & ct
-ctot: ct & ot
-cpct: cp & ct
-ctcp: ct & cp
-ctct: ct & ct
--- out/legacy-debug --
-<0>{op: <1>{x: int}, ot: <2>{x: int, ...}, cp: <3>C{x: int}, ct: <4>{x: int, ...}, opot: <5>{x: int, ...}, otop: <6>{x: int, ...}, opcp: <7>C{x: int}, cpop: <8>C{x: int}, opct: <9>{x: int, ...}, ctop: <10>{x: int, ...}, otcp: <11>C{x: int}, cpot: <12>C{x: int}, otct: <13>{x: int, ...}, ctot: <14>{x: int, ...}, cpct: <15>C{x: int}, ctcp: <16>C{x: int}, ctct: <17>{x: int, ...}}
 -- out/evalalpha/stats --
 Leaks:  0
 Freed:  90
diff --git a/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar b/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar
index e17883ffc..a94b91c90 100644
--- a/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar
+++ b/cue/testdata/resolve/035_excluded_embedding_from_closing.txtar
@@ -13,30 +13,6 @@ V: #S & {
 	c: e:     int
 	b: extra: int
 }
--- out/def --
-#S: {
-	a: {
-		c: int
-	}
-	c: {
-		d: int
-		...
-	}
-	b: {
-		open: int
-		...
-	}
-}
-V: #S & {
-	c: {
-		e: int
-	}
-	b: {
-		extra: int
-	}
-}
--- out/legacy-debug --
-<0>{#S: <1>C{a: <2>C{c: int}, c: <3>{d: int}, b: <4>{open: int}}, V: <5>C{a: <6>C{c: int}, c: <7>{d: int, e: int}, b: <8>{open: int, extra: int}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/038_incomplete_comprehensions.txtar b/cue/testdata/resolve/038_incomplete_comprehensions.txtar
index e1b06b9db..c539d3810 100644
--- a/cue/testdata/resolve/038_incomplete_comprehensions.txtar
+++ b/cue/testdata/resolve/038_incomplete_comprehensions.txtar
@@ -13,19 +13,6 @@ A: {
 B: A & {
 	src: ["foo", "bar"]
 }
--- out/def --
-A: {
-	src: _
-	baz: "baz"
-	for v in src {
-		"\(v)": v
-	}
-}
-B: A & {
-	src: ["foo", "bar"]
-}
--- out/legacy-debug --
-<0>{A: <1>{src: _, baz: "baz" <2>for _, v in <3>.src yield <4>{""+<2>.v+"": <2>.v}}, B: <5>{src: ["foo","bar"], baz: "baz", foo: "foo", bar: "bar"}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/039_reference_to_root.txtar b/cue/testdata/resolve/039_reference_to_root.txtar
index 19f0207da..5805e1dab 100644
--- a/cue/testdata/resolve/039_reference_to_root.txtar
+++ b/cue/testdata/resolve/039_reference_to_root.txtar
@@ -20,33 +20,6 @@ v: {
 }
 w:  v & {b: 100}
 wp: v & {b: 100}
--- out/def --
-x: {
-	b: int
-	c: b + 5
-}
-y: x & {
-	b: 100
-}
-a: {
-	b: int
-}
-c: a & {
-	b: 100
-	d: a.b + 3
-}
-v: {
-	b: int
-	c: v.b + 5
-}
-w: v & {
-	b: 100
-}
-wp: v & {
-	b: 100
-}
--- out/legacy-debug --
-<0>{x: <1>{b: int, c: (<2>.b + 5)}, y: <3>{b: 100, c: 105}, a: <4>{b: int}, c: <5>{b: 100, d: (<6>.a.b + 3)}, v: <7>{b: int, c: (<6>.v.b + 5)}, w: <8>{b: 100, c: (<6>.v.b + 5)}, wp: <9>{b: 100, c: (<6>.v.b + 5)}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/040_references_from_template_to_concrete.txtar b/cue/testdata/resolve/040_references_from_template_to_concrete.txtar
index 318234c18..174dc81f5 100644
--- a/cue/testdata/resolve/040_references_from_template_to_concrete.txtar
+++ b/cue/testdata/resolve/040_references_from_template_to_concrete.txtar
@@ -8,58 +8,6 @@ t: [X=string]: {
 	c: "X"
 }
 t: x: {b: str: "DDDD"}
--- out/def --
-res: [t]
-t: {
-	{[X=string]: {
-		a: c + b.str, c: "X", b: {
-			str:          string
-		}
-	}}
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}
--- out/export --
-res: [{
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}]
-t: {
-	x: {
-		a: "XDDDD"
-		c: "X"
-		b: {
-			str: "DDDD"
-		}
-	}
-}
--- out/yaml --
-res:
-- x:
-    a: XDDDD
-    c: X
-    b:
-      str: DDDD
-t:
-  x:
-    a: XDDDD
-    c: X
-    b:
-      str: DDDD
--- out/json --
-{"res":[{"x":{"a":"XDDDD","c":"X","b":{"str":"DDDD"}}}],"t":{"x":{"a":"XDDDD","c":"X","b":{"str":"DDDD"}}}}
--- out/legacy-debug --
-<0>{res: [<1>{[]: <2>(X: string)-><3>{a: (<3>.c + <3>.b.str), c: "X", b: <4>{str: string}}, x: <5>{a: "XDDDD", c: "X", b: <6>{str: "DDDD"}}}], t: <7>{[]: <2>(X: string)-><3>{a: (<3>.c + <3>.b.str), c: "X", b: <4>{str: string}}, x: <8>{a: "XDDDD", c: "X", b: <9>{str: "DDDD"}}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/043_diamond-shaped_constraints.txtar b/cue/testdata/resolve/043_diamond-shaped_constraints.txtar
index 01d5d2f38..500630cd2 100644
--- a/cue/testdata/resolve/043_diamond-shaped_constraints.txtar
+++ b/cue/testdata/resolve/043_diamond-shaped_constraints.txtar
@@ -17,65 +17,6 @@ T: S & {// S == { A: { a:1 }, B: { a:1, b:2 } }
 		d: 4 // Combines constraints S.A, S.B, T.A, and T.B // S.B & A
 	}
 }
--- out/def --
-T: S & {
-	A: {
-		c: 3
-	}
-	B: {
-		d: 4
-	}
-}
-S: {
-	A: {
-		a: 1
-	}
-	B: A & {
-		b: 2
-	}
-}
--- out/export --
-T: {
-	A: {
-		a: 1
-		c: 3
-	}
-	B: {
-		a: 1
-		b: 2
-		c: 3
-		d: 4
-	}
-}
-S: {
-	A: {
-		a: 1
-	}
-	B: {
-		a: 1
-		b: 2
-	}
-}
--- out/yaml --
-T:
-  A:
-    a: 1
-    c: 3
-  B:
-    a: 1
-    b: 2
-    c: 3
-    d: 4
-S:
-  A:
-    a: 1
-  B:
-    a: 1
-    b: 2
--- out/json --
-{"T":{"A":{"a":1,"c":3},"B":{"a":1,"b":2,"c":3,"d":4}},"S":{"A":{"a":1},"B":{"a":1,"b":2}}}
--- out/legacy-debug --
-<0>{T: <1>{A: <2>{a: 1, c: 3}, B: <3>{a: 1, b: 2, c: 3, d: 4}}, S: <4>{A: <5>{a: 1}, B: <6>{a: 1, b: 2}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/044_field_templates.txtar b/cue/testdata/resolve/044_field_templates.txtar
index e34000473..a9b331dee 100644
--- a/cue/testdata/resolve/044_field_templates.txtar
+++ b/cue/testdata/resolve/044_field_templates.txtar
@@ -16,82 +16,6 @@ c: {
 	foo: {}
 	bar: _
 }
--- out/def --
-a: {
-	{[name=string]: int}
-	k: 1
-}
-b: {
-	{[X=string]: {
-		x: 0, y: *1 | int
-	}}
-	v: {
-		x: 0
-		y: *1 | int
-	}
-	w: {
-		x: 0
-		y: *1 | int
-	}
-}
-c: {
-	{[Name=string]: {
-		y: 1, name: Name
-	}}
-	foo: {
-		y:    1
-		name: "foo"
-	}
-	bar: {
-		y:    1
-		name: "bar"
-	}
-}
--- out/export --
-a: {
-	k: 1
-}
-b: {
-	v: {
-		x: 0
-		y: 1
-	}
-	w: {
-		x: 0
-		y: 1
-	}
-}
-c: {
-	foo: {
-		y:    1
-		name: "foo"
-	}
-	bar: {
-		y:    1
-		name: "bar"
-	}
-}
--- out/yaml --
-a:
-  k: 1
-b:
-  v:
-    x: 0
-    y: 1
-  w:
-    x: 0
-    y: 1
-c:
-  foo:
-    y: 1
-    name: foo
-  bar:
-    y: 1
-    name: bar
--- out/json --
-{"a":{"k":1},"b":{"v":{"x":0,"y":1},"w":{"x":0,"y":1}},"c":{"foo":{"y":1,"name":"foo"},"bar":{"y":1,"name":"bar"}}}
--- out/legacy-debug --
-<0>{a: <1>{[]: <2>(name: string)->int, k: 1}, b: <3>{[]: <4>(X: string)->(<5>{x: 0, y: (*1 | int)} & <6>{}), v: <7>{x: 0, y: (*1 | int)}, w: <8>{x: 0, y: (*1 | int)}}, c: <9>{[]: <10>(Name: string)-><11>{y: 1, name: <10>.Name}, foo: <12>{y: 1, name: "foo"}, bar: <13>{y: 1, name: "bar"}}}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/045_range_unification.txtar b/cue/testdata/resolve/045_range_unification.txtar
index 696cff912..f1d467f0e 100644
--- a/cue/testdata/resolve/045_range_unification.txtar
+++ b/cue/testdata/resolve/045_range_unification.txtar
@@ -46,51 +46,6 @@ n2: int & >=1.1 & <=1.3
 n3: >=1.0 & <=3.0 & 2
 n4: >=0.0 & <=0.1 & 0.09999
 n5: >=1 & <=5 & 2.5
--- out/def --
-	// with concrete values
-a1:  3
-a2:  1
-a3:  5
-a4:  _|_ // invalid value 6 (out of bound <=5)
-a5:  _|_ // invalid value 0 (out of bound >=1)
-a6:  3
-a7:  1
-a8:  5
-a9:  _|_ // invalid value 6 (out of bound <=5)
-a10: _|_ // invalid value 0 (out of bound >=1)
-
-// with ranges
-b1:  >=1 & <=5
-b2:  1
-b3:  5
-b4:  >=2 & <=3
-b5:  >=3 & <=5
-b6:  5
-b7:  _|_ // conflicting bounds >=6 and <=5
-b8:  >=1 & <=5
-b9:  1
-b10: 5
-b11: >=2 & <=3
-b12: >=3 & <=5
-b13: 5
-b14: _|_ // conflicting bounds >=6 and <=5
-
-// ranges with more general types
-c1: uint & >=1 & <=5
-c2: uint & >=1 & <=5
-c3: _|_ // conflicting values string and >=1 (mismatched types string and number)
-c4: _|_ // conflicting values (>=1 & <=5) and string (mismatched types number and string)
-
-// other types
-s1: "e"
-s2: "ee"
-n1: >=1 & <=2
-n2: _|_ // conflicting bounds int & >=1.1 and <=1.3
-n3: 2
-n4: 0.09999
-n5: 2.5
--- out/legacy-debug --
-<0>{a1: 3, a2: 1, a3: 5, a4: _|_((<=5 & 6):invalid value 6 (out of bound <=5)), a5: _|_((>=1 & 0):invalid value 0 (out of bound >=1)), a6: 3, a7: 1, a8: 5, a9: _|_((<=5 & 6):invalid value 6 (out of bound <=5)), a10: _|_((>=1 & 0):invalid value 0 (out of bound >=1)), b1: (>=1 & <=5), b2: 1, b3: 5, b4: (>=2 & <=3), b5: (>=3 & <=5), b6: 5, b7: _|_(conflicting bounds >=6 and <=5), b8: (>=1 & <=5), b9: 1, b10: 5, b11: (>=2 & <=3), b12: (>=3 & <=5), b13: 5, b14: _|_(conflicting bounds >=6 and <=5), c1: (int & >=1 & <=5), c2: (<=5 & int & >=1), c3: _|_((string & >=1):conflicting values string and >=1 (mismatched types string and number)), c4: _|_(((>=1 & <=5) & string):conflicting values (>=1 & <=5) and string (mismatched types number and string)), s1: "e", s2: "ee", n1: (>=1 & <=2), n2: _|_(conflicting bounds int & >=1.1 and <=1.3), n3: 2, n4: 0.09999, n5: 2.5}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/046_predefined_ranges.txtar b/cue/testdata/resolve/046_predefined_ranges.txtar
index 799135cdc..66db946c7 100644
--- a/cue/testdata/resolve/046_predefined_ranges.txtar
+++ b/cue/testdata/resolve/046_predefined_ranges.txtar
@@ -9,12 +9,6 @@ k2: -8_000_000_000
 
 e1: int16
 e1: 100_000
--- out/def --
-k1: 44
-k2: -8000000000
-e1: _|_ // invalid value 100000 (out of bound int & <=32767)
--- out/legacy-debug --
-<0>{k1: 44, k2: -8000000000, e1: _|_((int & <=32767 & 100000):invalid value 100000 (out of bound int & <=32767))}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/047_struct_comprehensions.txtar b/cue/testdata/resolve/047_struct_comprehensions.txtar
index 3dbb643ea..9afeb7ae4 100644
--- a/cue/testdata/resolve/047_struct_comprehensions.txtar
+++ b/cue/testdata/resolve/047_struct_comprehensions.txtar
@@ -12,42 +12,6 @@ obj: [Name=string]: {
 for k, v in {#def: 1, opt?: 2, _hid: 3, reg: 4} {
 	"\(k)": v
 }
--- out/def --
-obj: {
-	{[Name=string]: {
-		a: *"dummy" | string, sub: {
-			as: a
-		}
-	}}
-	foo: {
-		a: "bar"
-		sub: {
-			as: "bar"
-		}
-	}
-}
-reg: 4
--- out/export --
-obj: {
-	foo: {
-		a: "bar"
-		sub: {
-			as: "bar"
-		}
-	}
-}
-reg: 4
--- out/yaml --
-obj:
-  foo:
-    a: bar
-    sub:
-      as: bar
-reg: 4
--- out/json --
-{"obj":{"foo":{"a":"bar","sub":{"as":"bar"}}},"reg":4}
--- out/legacy-debug --
-<0>{obj: <1>{[]: <2>(Name: string)-><3>{a: (*"dummy" | string) if true yield <4>{sub: <5>{as: <3>.a}}}, foo: <6>{a: "bar", sub: <7>{as: "bar"}}}, reg: 4}
 -- out/compile --
 --- in.cue
 {
diff --git a/cue/testdata/resolve/048_builtins.txtar b/cue/testdata/resolve/048_builtins.txtar
index 5bfd136e0..39412e02e 100644
--- a/cue/testdata/resolve/048_builtins.txtar
+++ b/cue/testdata/resolve/048_builtins.txtar
@@ -73,32 +73,6 @@ issue3648: full: {
 	}
 	foo: {}
 }
--- out/def --
-a1: {
-	a: =~"oo" & =~"fo"
-	b: =~"oo"
-	c: =~"fo"
-}
-a2: a1 & {
-	a: "foo"
-}
-a3: a1 & {
-	a: "bar"
-}
-o1: {
-	a: string
-	b: string
-	c: "bar"
-}
-o2: o1 & {
-	a: "foo"
-}
-o3: o1 & {
-	a: "foo"
-	b: "baz"
-}
--- out/legacy-debug --
-<0>{a1: <1>{a: (=~"oo" & =~"fo"), b: =~"oo", c: =~"fo"}, a2: <2>{a: "foo", b: =~"oo", c: =~"fo"}, a3: <3>{a: _|_((=~"oo" & "bar"):invalid value "bar" (does not match =~"oo")), b: =~"oo", c: =~"fo"}, o1: <4>{a: string, b: string, c: "bar"}, o2: <5>{a: "foo", b: string, c: "bar"}, o3: <6>{a: _|_(("baz" & "foo"):empty disjunction: conflicting values "baz" and "foo";("bar" & "foo"):empty disjunction: conflicting values "bar" and "foo"), b: "baz", c: "bar"}}
 -- out/eval/stats --
 Leaks:  6
 Freed:  79
diff --git a/encoding/protobuf/textproto/testdata/encoder/enum.txtar b/encoding/protobuf/textproto/testdata/encoder/enum.txtar
index f19d08ed3..d7ec8874c 100644
--- a/encoding/protobuf/textproto/testdata/encoder/enum.txtar
+++ b/encoding/protobuf/textproto/testdata/encoder/enum.txtar
@@ -45,21 +45,6 @@ typeEnum: baz: 3
 // symbolEnum: baz: "baz"
 
 singleEnum: 1
--- out/jsonpb --
-enum: asIs:        "foo"
-enum: asIsUnknown: "foobar"
-
-// Convert integers to strings
-defEnum: foo: "foo"
-defEnum: bar: "bar"
-defEnum: baz: 3
-
-// TODO: consider supporting @symbol(foo) or @json(,symbol=foo)
-// symbolEnum: foo: "foo"
-// symbolEnum: bar: "bar"
-// symbolEnum: baz: "baz"
-
-singleEnum: "single"
 -- out/encode --
 enum: {
   asIs: "foo"
diff --git a/internal/core/dep/testdata/topcomprehension.txtar b/internal/core/dep/testdata/topcomprehension.txtar
index 41c21955b..6566f8b3f 100644
--- a/internal/core/dep/testdata/topcomprehension.txtar
+++ b/internal/core/dep/testdata/topcomprehension.txtar
@@ -29,8 +29,6 @@ line  reference    path of resulting vertex
 5:    value     => **non-rooted**
 2:    key       => **non-rooted**
 3:    value     => **non-rooted**
--- diff/dependencies/todo/p3 --
-Reordering.
 -- out/dependencies/dynamic --
 line  reference    path of resulting vertex
 4:    key       => **non-rooted**
diff --git a/internal/core/export/testdata/main/issue2584.txtar b/internal/core/export/testdata/main/issue2584.txtar
index 33e25c8f1..8f91fffeb 100644
--- a/internal/core/export/testdata/main/issue2584.txtar
+++ b/internal/core/export/testdata/main/issue2584.txtar
@@ -8,7 +8,6 @@ F2: {
 }
 D: {}
 let L = D
--- out/self/default --
 -- out/definition --
 
 let L = D
diff --git a/internal/core/export/testdata/main/scalardef.txtar b/internal/core/export/testdata/main/scalardef.txtar
index be5db2e26..65051fd2c 100644
--- a/internal/core/export/testdata/main/scalardef.txtar
+++ b/internal/core/export/testdata/main/scalardef.txtar
@@ -15,8 +15,6 @@ import pkg2 "mod.test/foo/pkg1"
 package pkg1
 
 Object: "World"
--- out/eval --
-(string){ "Hello World!" }
 -- out/doc --
 []
 [#pkg1]
diff --git a/internal/core/export/testdata/selfcontained/nochange.txtar b/internal/core/export/testdata/selfcontained/nochange.txtar
index 34de7e8e7..7500db2bd 100644
--- a/internal/core/export/testdata/selfcontained/nochange.txtar
+++ b/internal/core/export/testdata/selfcontained/nochange.txtar
@@ -4,9 +4,6 @@ a: b: {
 	c: 1
 	d: 2
 }
--- out/selfcontained --
-c: 1
-d: 2
 -- out/self/default --
 c: 1
 d: 2
diff --git a/internal/core/runtime/testdata/no_top_extern.txtar b/internal/core/runtime/testdata/no_top_extern.txtar
index f8bb3f334..e31ba5d9f 100644
--- a/internal/core/runtime/testdata/no_top_extern.txtar
+++ b/internal/core/runtime/testdata/no_top_extern.txtar
@@ -11,10 +11,6 @@ package foo
 Foo: _ @test(file.xx, abi=c, sig="func(int)int")
 
 -- extern/out --
--- out/extern/config --
-{
-	Foo: _
-}
 -- out/extern --
 {
 	Foo: _
diff --git a/pkg/encoding/yaml/testdata/validate.txtar b/pkg/encoding/yaml/testdata/validate.txtar
index 59710dba7..437f9ab6e 100644
--- a/pkg/encoding/yaml/testdata/validate.txtar
+++ b/pkg/encoding/yaml/testdata/validate.txtar
@@ -32,8 +32,6 @@ validatePartial: #test & {
 }
 
 invalidDisjuntion: yaml.Validate("a: 3", {a: 1 | 2})
--- diff/todo --
-missing position
 -- out/yaml --
 Errors:
 #test.t1.ok1: cannot call non-function fn (type _):
diff --git a/tools/flow/testdata/issue2559.txtar b/tools/flow/testdata/issue2559.txtar
index 4ad100484..bb6c26fcf 100644
--- a/tools/flow/testdata/issue2559.txtar
+++ b/tools/flow/testdata/issue2559.txtar
@@ -164,27 +164,3 @@ Conjuncts:    76395
 Disjuncts:    25826
 
 NumCloseIDs: 72
--- out/run/t2 --
-graph TD
-  t0("root.prepare [Terminated]")
-  t1("root.run [Terminated]")
-  t1-->t0
-
--- out/run/t2/value --
-{
-	$id:    "run"
-	stdout: "foo"
-	env: {
-		input: "foo"
-	}
-}
--- out/run/t2/stats --
-Leaks:  0
-Freed:  12
-Reused: 12
-Allocs: 0
-Retain: 0
-
-Unifications: 12
-Conjuncts:    20
-Disjuncts:    12
diff --git a/tools/flow/testdata/statsfail.txtar b/tools/flow/testdata/statsfail.txtar
index ef6bce916..ddb610b41 100644
--- a/tools/flow/testdata/statsfail.txtar
+++ b/tools/flow/testdata/statsfail.txtar
@@ -121,27 +121,3 @@ Retain: 24
 Unifications: 27
 Conjuncts:    38
 Disjuncts:    41
--- out/run/t2 --
-graph TD
-  t0("root.prepare [Terminated]")
-  t1("root.run [Terminated]")
-  t1-->t0
-
--- out/run/t2/value --
-{
-	$id:    "run"
-	stdout: "foo"
-	env: {
-		input: "foo"
-	}
-}
--- out/run/t2/stats --
-Leaks:  0
-Freed:  12
-Reused: 12
-Allocs: 0
-Retain: 0
-
-Unifications: 12
-Conjuncts:    20
-Disjuncts:    12
diff --git a/tools/flow/testdata/template.txtar b/tools/flow/testdata/template.txtar
index 551096f57..558e050be 100644
--- a/tools/flow/testdata/template.txtar
+++ b/tools/flow/testdata/template.txtar
@@ -220,21 +220,3 @@ Retain: 0
 Unifications: 54
 Conjuncts:    155
 Disjuncts:    100
--- out/run/t3 --
-graph TD
-  t0("root.get [Terminated]")
-  t0-->t2
-  t1("root.convert [Terminated]")
-  t1-->t0
-  t2("foo [Terminated]")
-
--- out/run/t3/value --
-{
-	$id: "tool/exec.Run"
-	cmd: "cue-fake import -f -p json -l #Workflow: jsonschema: - --outfile pkg/github.com/SchemaStore/schemastore/src/schemas/json/github-workflow.cue"
-	env: {}
-	stdout:  "foo"
-	stderr:  null
-	stdin:   (*null | string | bytes) & get.response.body
-	success: bool
-}