Index: libcfa/src/bits/random.hfa
===================================================================
--- libcfa/src/bits/random.hfa	(revision eac318afd8929f4e697581980c4ef80782c95d87)
+++ libcfa/src/bits/random.hfa	(revision c2dfa56add568cd5de5c577ee3b9c646c9919748)
@@ -10,6 +10,6 @@
 // Created On       : Fri Jan 14 07:18:11 2022
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 22 20:54:22 2022
-// Update Count     : 178
+// Last Modified On : Mon Mar 20 10:01:40 2023
+// Update Count     : 180
 // 
 
@@ -44,10 +44,8 @@
 // Define C/CFA PRNG name and random-state.
 
-// SKULLDUGGERY: typedefs name struct and typedef with the same name to deal with CFA typedef numbering problem.
-
 #ifdef XOSHIRO256PP
 #define PRNG_NAME_64 xoshiro256pp
 #define PRNG_STATE_64_T GLUE(PRNG_NAME_64,_t)
-typedef struct PRNG_STATE_64_T { uint64_t s0, s1, s2, s3; } PRNG_STATE_64_T;
+typedef struct { uint64_t s0, s1, s2, s3; } PRNG_STATE_64_T;
 #endif // XOSHIRO256PP
 
@@ -55,5 +53,5 @@
 #define PRNG_NAME_32 xoshiro128pp
 #define PRNG_STATE_32_T GLUE(PRNG_NAME_32,_t)
-typedef struct PRNG_STATE_32_T { uint32_t s0, s1, s2, s3; } PRNG_STATE_32_T;
+typedef struct { uint32_t s0, s1, s2, s3; } PRNG_STATE_32_T;
 #endif // XOSHIRO128PP
 
@@ -86,5 +84,5 @@
 #define PRNG_NAME_64 kiss_64
 #define PRNG_STATE_64_T GLUE(PRNG_NAME_64,_t)
-typedef struct PRNG_STATE_64_T { uint64_t z, w, jsr, jcong; } PRNG_STATE_64_T;
+typedef struct { uint64_t z, w, jsr, jcong; } PRNG_STATE_64_T;
 #endif // KISS_^64
 
@@ -92,5 +90,5 @@
 #define PRNG_NAME_32 xorwow
 #define PRNG_STATE_32_T GLUE(PRNG_NAME_32,_t)
-typedef struct PRNG_STATE_32_T { uint32_t a, b, c, d, counter; } PRNG_STATE_32_T;
+typedef struct { uint32_t a, b, c, d, counter; } PRNG_STATE_32_T;
 #endif // XOSHIRO128PP
 
@@ -130,5 +128,5 @@
 
 #ifndef XOSHIRO256PP
-typedef struct xoshiro256pp_t { uint64_t s0, s1, s2, s3; } xoshiro256pp_t;
+typedef struct { uint64_t s0, s1, s2, s3; } xoshiro256pp_t;
 #endif // ! XOSHIRO256PP
 
@@ -152,5 +150,5 @@
 static inline void xoshiro256pp_set_seed( xoshiro256pp_t & state, uint64_t seed ) {
 	state = (xoshiro256pp_t){ seed, seed, seed, seed };
-	xoshiro256pp( state );
+	xoshiro256pp( state );								// prime
 } // xoshiro256pp_set_seed
 
@@ -165,5 +163,5 @@
 
 #ifndef XOSHIRO128PP
-typedef struct xoshiro128pp_t { uint32_t s0, s1, s2, s3; } xoshiro128pp_t;
+typedef struct { uint32_t s0, s1, s2, s3; } xoshiro128pp_t;
 #endif // ! XOSHIRO128PP
 
@@ -272,5 +270,5 @@
 // The state must be seeded with a nonzero value.
 #ifndef KISS_64
-typedef struct kiss_64_t { uint64_t z, w, jsr, jcong; } kiss_64_t;
+typedef struct { uint64_t z, w, jsr, jcong; } kiss_64_t;
 #endif // ! KISS_64
 
@@ -294,5 +292,5 @@
 // The state array must be initialized to non-zero in the first four words.
 #ifndef XORWOW
-typedef struct xorwow_t { uint32_t a, b, c, d, counter; } xorwow_t;
+typedef struct { uint32_t a, b, c, d, counter; } xorwow_t;
 #endif // ! XORWOW
 
Index: sts/zombies/prolog.c
===================================================================
--- tests/zombies/prolog.c	(revision eac318afd8929f4e697581980c4ef80782c95d87)
+++ 	(revision )
@@ -1,50 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// prolog.c --
-//
-// Author           : Richard C. Bilson
-// Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 11 23:27:19 2018
-// Update Count     : 6
-//
-
-#include <fstream.hfa>
-
-void printResult( int x ) { sout | "int"; }
-void printResult( double x ) { sout | "double"; }
-void printResult( char * x ) { sout | "char*"; }
-
-void is_arithmetic( int x ) {}
-void is_arithmetic( double x ) {}
-
-void is_integer( int x ) {}
-
-trait ArithmeticType( T ) {
-	void is_arithmetic( T );
-};
-
-trait IntegralType( T | ArithmeticType( T ) ) {
-	void is_integer( T );
-};
-
-forall( T | IntegralType( T ) | { void printResult( T ); } )
-void hornclause( T param ) {
-	printResult( param );
-}
-
-int main() {
-	int x;
-	double x;
-	char * x;
-	hornclause( x );
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// compile-command: "cfa prolog.c" //
-// End: //