Index: tests/concurrent/thread.cfa
===================================================================
--- tests/concurrent/thread.cfa	(revision e71c1d42d8496ccd3b54a96f7ca5013bba8d0198)
+++ tests/concurrent/thread.cfa	(revision e8c52cf03237e8eb838f2de7d6a65626299a417b)
@@ -7,6 +7,6 @@
 thread Second { semaphore* lock; };
 
-void ?{}( First  & this, semaphore & lock ) { ((thread&)this){"Thread 1"}; this.lock = &lock; }
-void ?{}( Second & this, semaphore & lock ) { ((thread&)this){"Thread 2"}; this.lock = &lock; }
+void ?{}( First  & this, semaphore & lock ) { ((thread&)this).self_cor.name = "Thread 1"; this.lock = &lock; }
+void ?{}( Second & this, semaphore & lock ) { ((thread&)this).self_cor.name = "Thread 2"; this.lock = &lock; }
 
 void main(First& this) {
Index: tests/time.cfa
===================================================================
--- tests/time.cfa	(revision e71c1d42d8496ccd3b54a96f7ca5013bba8d0198)
+++ tests/time.cfa	(revision e8c52cf03237e8eb838f2de7d6a65626299a417b)
@@ -10,6 +10,6 @@
 // Created On       : Tue Mar 27 17:24:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 20 23:09:21 2018
-// Update Count     : 23
+// Last Modified On : Fri Nov 29 23:05:30 2019
+// Update Count     : 24
 //
 
@@ -20,5 +20,4 @@
 	Duration d1 = 3`h, d2 = 2`s, d3 = 3.375`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
 	sout | d1 | d2 | d3 | d4 | d5;
-	int i;
 	d1 = 0;
 	sout | d1 | d2 | d3;