diff -r de6062ac70b6 -r fe4d545f12e3 src/Pure/term_xml.scala
--- a/src/Pure/term_xml.scala	Thu Aug 15 16:17:18 2019 +0200
+++ b/src/Pure/term_xml.scala	Thu Aug 15 16:26:50 2019 +0200
@@ -21,13 +21,13 @@
       variant[Typ](List(
         { case Type(a, b) => (List(a), list(typ)(b)) },
         { case TFree(a, b) => (List(a), sort(b)) },
-        { case TVar((a, b), c) => (List(a, int_atom(b)), sort(c)) }))
+        { case TVar(Indexname(a, b), c) => (List(a, int_atom(b)), sort(c)) }))
 
     def term: T[Term] =
       variant[Term](List(
         { case Const(a, b) => (List(a), typ(b)) },
         { case Free(a, b) => (List(a), typ(b)) },
-        { case Var((a, b), c) => (List(a, int_atom(b)), typ(c)) },
+        { case Var(Indexname(a, b), c) => (List(a, int_atom(b)), typ(c)) },
         { case Bound(a) => (List(int_atom(a)), Nil) },
         { case Abs(a, b, c) => (List(a), pair(typ, term)(b, c)) },
         { case App(a, b) => (Nil, pair(term, term)(a, b)) }))
@@ -43,13 +43,13 @@
       variant[Typ](List(
         { case (List(a), b) => Type(a, list(typ)(b)) },
         { case (List(a), b) => TFree(a, sort(b)) },
-        { case (List(a, b), c) => TVar((a, int_atom(b)), sort(c)) }))
+        { case (List(a, b), c) => TVar(Indexname(a, int_atom(b)), sort(c)) }))
 
     def term: T[Term] =
       variant[Term](List(
         { case (List(a), b) => Const(a, typ(b)) },
         { case (List(a), b) => Free(a, typ(b)) },
-        { case (List(a, b), c) => Var((a, int_atom(b)), typ(c)) },
+        { case (List(a, b), c) => Var(Indexname(a, int_atom(b)), typ(c)) },
         { case (List(a), Nil) => Bound(int_atom(a)) },
         { case (List(a), b) => val (c, d) = pair(typ, term)(b); Abs(a, c, d) },
         { case (Nil, a) => val (b, c) = pair(term, term)(a); App(b, c) }))