diff --git a/JIT/HPP/indexing_std.h b/JIT/HPP/indexing_std.h
index 54211a91f..45d444978 100644
--- a/JIT/HPP/indexing_std.h
+++ b/JIT/HPP/indexing_std.h
@@ -98,24 +98,24 @@
       GONext();
 
 #define ENTER_PROFILING_INSTINIT \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfEntries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfEntries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), p); \
       GONext();
 
 #define RETRY_PROFILED_INSTINIT \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), p); \
       GONext();
 
 #define PROFILED_RETRY_ME_INSTINIT \
       CACHE_Y(B); \
-      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
-      (*_PREG)->u.Otapl.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
+      (*_PREG)->u.Otapl.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
       restore_yaam_regs((*_PREG)->u.Otapl.d); \
       restore_args((*_PREG)->u.Otapl.s);
 	  
@@ -189,9 +189,9 @@
 #define PROFILED_TRUST_ME_END \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
-      (*_PREG)->u.Otapl.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
+      (*_PREG)->u.Otapl.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), Otapl); \
       GONext();
 
@@ -208,9 +208,9 @@
 	else { \
 	  restore_yaam_regs((*_PREG)->u.OtaLl.n); \
 	  restore_args((*_PREG)->u.OtaLl.s); \
-	  LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	  (*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	  UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	  LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	  (*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	  UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	}
 	
 #ifdef THREADS
@@ -252,9 +252,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -309,9 +309,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -367,9 +367,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -418,9 +418,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -474,9 +474,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -535,9 +535,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -597,9 +597,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -653,9 +653,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -711,9 +711,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -771,9 +771,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -832,9 +832,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -886,9 +886,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1264,9 +1264,9 @@
 	}
 
 #define PROFILED_RETRY_AND_MARK_INSTINIT \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
 
 #define RETRY_AND_MARK_INSTINIT
 	  
diff --git a/JIT/HPP/indexing_std_d.h b/JIT/HPP/indexing_std_d.h
index 7a1f490ef..fca6fca97 100644
--- a/JIT/HPP/indexing_std_d.h
+++ b/JIT/HPP/indexing_std_d.h
@@ -102,26 +102,26 @@
 
 #define ENTER_PROFILING_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfEntries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfEntries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), p); \
       GONext();
 
 #define RETRY_PROFILED_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), p); \
       GONext();
 
 #define PROFILED_RETRY_ME_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
       CACHE_Y(B); \
-      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
-      (*_PREG)->u.Otapl.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
+      (*_PREG)->u.Otapl.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
       restore_yaam_regs((*_PREG)->u.Otapl.d); \
       restore_args((*_PREG)->u.Otapl.s);
 	  
@@ -196,9 +196,9 @@
 #define PROFILED_TRUST_ME_END \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
-      (*_PREG)->u.Otapl.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
+      (*_PREG)->u.Otapl.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.Otapl.p->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), Otapl); \
       GONext();
 
@@ -216,9 +216,9 @@
 	else { \
 	  restore_yaam_regs((*_PREG)->u.OtaLl.n); \
 	  restore_args((*_PREG)->u.OtaLl.s); \
-	  LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	  (*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	  UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	  LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	  (*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	  UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	}
 	
 #ifdef THREADS
@@ -261,9 +261,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -319,9 +319,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -378,9 +378,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -430,9 +430,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(1, ap); \
@@ -487,9 +487,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -549,9 +549,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -612,9 +612,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -669,9 +669,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -728,9 +728,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -789,9 +789,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -851,9 +851,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -906,9 +906,9 @@
 	if (!VALID_TIMESTAMP(timestamp, lcl)) { \
 	  (*_PREG) = FAILCODE; \
 	} else { \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1298,9 +1298,9 @@
 
 #define PROFILED_RETRY_AND_MARK_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
 
 #define RETRY_AND_MARK_INSTINIT
 	  
diff --git a/JIT/HPP/singlecode_misc.h b/JIT/HPP/singlecode_misc.h
index f4ff7b0e7..d52063b04 100644
--- a/JIT/HPP/singlecode_misc.h
+++ b/JIT/HPP/singlecode_misc.h
@@ -1647,9 +1647,9 @@
 	  setregs();
 
 #define SPY_PRED_SECONDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock); \
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock); \
 	  LOCAL_ReductionsCounter--;
 
 #define SPY_PRED_SECONDIFOK_FIRSTIFOK \
@@ -1675,9 +1675,9 @@
 	    JMPNext();
 
 #define SPY_PRED_THIRDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock);
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock);
 	  
 #define SPY_PRED_THIRDIFOK_FIRSTIFOK \
 	    (*_PREG) = pe->cs.p_code.TrueCodeOfPred; \
diff --git a/JIT/HPP/yaam_call_count.h b/JIT/HPP/yaam_call_count.h
index 788cd8735..c3fa11c04 100644
--- a/JIT/HPP/yaam_call_count.h
+++ b/JIT/HPP/yaam_call_count.h
@@ -1,7 +1,7 @@
 #define COUNT_CALL_INSTINIT \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfEntries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfEntries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       LOCAL_ReductionsCounter--;
 
 #define COUNT_CALL_MIDDLE \
@@ -26,9 +26,9 @@
       GONext();
 
 #define COUNT_RETRY_INSTINIT \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--;
 
 #define COUNT_RETRY_MIDDLE \
@@ -65,9 +65,9 @@
       set_cut(S_YREG, B->cp_b); \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--; \
       if (LOCAL_RetriesCounter == 0 && LOCAL_RetriesCounterOn) { \
 	saveregs(); \
@@ -87,9 +87,9 @@
       set_cut(S_YREG, B_YREG->cp_b); \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--; \
       if (LOCAL_RetriesCounter == 0 && LOCAL_RetriesCounterOn) { \
 	saveregs(); \
@@ -227,9 +227,9 @@
 #endif /* YAPOR */
 
 #define COUNT_TRUST_ME_END \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), Otapl); \
       GONext();
 
@@ -262,9 +262,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	PP = (*_PREG)->u.OtaLl.d->ClPred; \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG); \
@@ -301,9 +301,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	PP = (*_PREG)->u.OtaLl.d->ClPred; \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	set_cut(S_YREG, B_YREG->cp_b); \
@@ -341,9 +341,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG); \
 	set_cut(S_YREG, B->cp_b); \
@@ -379,9 +379,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	set_cut(S_YREG, B_YREG->cp_b); \
 	SET_BB(B_YREG); \
@@ -422,9 +422,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -493,9 +493,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -565,9 +565,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -630,9 +630,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -699,9 +699,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -773,9 +773,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -848,9 +848,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -916,9 +916,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -987,9 +987,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1060,9 +1060,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1134,9 +1134,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1201,9 +1201,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
diff --git a/JIT/HPP/yaam_call_count_d.h b/JIT/HPP/yaam_call_count_d.h
index 3f672e6aa..6e79b9beb 100644
--- a/JIT/HPP/yaam_call_count_d.h
+++ b/JIT/HPP/yaam_call_count_d.h
@@ -1,8 +1,8 @@
 #define COUNT_CALL_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfEntries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfEntries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       LOCAL_ReductionsCounter--;
 
 #define COUNT_CALL_MIDDLE \
@@ -28,9 +28,9 @@
 
 #define COUNT_RETRY_INSTINIT \
       print_instruction((*_PREG), ON_NATIVE); \
-      LOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
-      (*_PREG)->u.p.p->StatisticsForPred.NOfRetries++; \
-      UNLOCK((*_PREG)->u.p.p->StatisticsForPred.lock); \
+      LOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
+      (*_PREG)->u.p.p->StatisticsForPred->NOfRetries++; \
+      UNLOCK((*_PREG)->u.p.p->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--;
 
 #define COUNT_RETRY_MIDDLE \
@@ -68,9 +68,9 @@
       set_cut(S_YREG, B->cp_b); \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--; \
       if (LOCAL_RetriesCounter == 0 && LOCAL_RetriesCounterOn) { \
 	saveregs(); \
@@ -90,9 +90,9 @@
       set_cut(S_YREG, B_YREG->cp_b); \
       SET_BB(B_YREG); \
       ENDCACHE_Y(); \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       LOCAL_RetriesCounter--; \
       if (LOCAL_RetriesCounter == 0 && LOCAL_RetriesCounterOn) { \
 	saveregs(); \
@@ -231,9 +231,9 @@
 #endif /* YAPOR */
 
 #define COUNT_TRUST_ME_END \
-      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
-      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.NOfRetries++; \
-      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred.lock); \
+      LOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
+      ((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->NOfRetries++; \
+      UNLOCK(((PredEntry *)((*_PREG)->u.Otapl.p))->StatisticsForPred->lock); \
       (*_PREG) = NEXTOP((*_PREG), Otapl); \
       GONext();
 
@@ -267,9 +267,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	PP = (*_PREG)->u.OtaLl.d->ClPred; \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG); \
@@ -307,9 +307,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	PP = (*_PREG)->u.OtaLl.d->ClPred; \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	set_cut(S_YREG, B_YREG->cp_b); \
@@ -348,9 +348,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	S_YREG = (CELL *) PROTECT_FROZEN_B(B_YREG); \
 	set_cut(S_YREG, B->cp_b); \
@@ -387,9 +387,9 @@
 	  setregs(); \
 	  JMPNext(); \
 	} \
-	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
-	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.NOfRetries++; \
-	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred.lock); \
+	LOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
+	(*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->NOfRetries++; \
+	UNLOCK((*_PREG)->u.OtaLl.d->ClPred->StatisticsForPred->lock); \
 	(*_PREG) = (*_PREG)->u.OtaLl.d->ClCode; \
 	set_cut(S_YREG, B_YREG->cp_b); \
 	SET_BB(B_YREG); \
@@ -431,9 +431,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -503,9 +503,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -576,9 +576,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -642,9 +642,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	PELOCK(2, ap); \
@@ -712,9 +712,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -787,9 +787,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -863,9 +863,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -932,9 +932,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1004,9 +1004,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1078,9 +1078,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1153,9 +1153,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
@@ -1221,9 +1221,9 @@
 	    setregs(); \
 	    JMPNext(); \
 	  } \
-	  LOCK(ap->StatisticsForPred.lock); \
-	  ap->StatisticsForPred.NOfRetries++; \
-	  UNLOCK(ap->StatisticsForPred.lock); \
+	  LOCK(ap->StatisticsForPred->lock); \
+	  ap->StatisticsForPred->NOfRetries++; \
+	  UNLOCK(ap->StatisticsForPred->lock); \
 	  (*_PREG) = lcl->ClCode; \
 	} \
 	if (TrailTerm(B->cp_tr-1) == CLREF_TO_TRENTRY(cl) && \
diff --git a/JIT/HPP/yaam_misc.h b/JIT/HPP/yaam_misc.h
index b1920371b..2bd792508 100644
--- a/JIT/HPP/yaam_misc.h
+++ b/JIT/HPP/yaam_misc.h
@@ -1156,9 +1156,9 @@
 	  setregs();
 
 #define SPY_PRED_SECONDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock); \
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock); \
 	  LOCAL_ReductionsCounter--;
 
 #define SPY_PRED_SECONDIFOK_FIRSTIFOK \
@@ -1184,9 +1184,9 @@
 	    JMPNext();
 
 #define SPY_PRED_THIRDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock);
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock);
 	  
 #define SPY_PRED_THIRDIFOK_FIRSTIFOK \
 	    (*_PREG) = pe->cs.p_code.TrueCodeOfPred; \
diff --git a/JIT/HPP/yaam_misc_d.h b/JIT/HPP/yaam_misc_d.h
index 6dc543eaa..60f9eff75 100644
--- a/JIT/HPP/yaam_misc_d.h
+++ b/JIT/HPP/yaam_misc_d.h
@@ -1195,9 +1195,9 @@
 	  setregs();
 
 #define SPY_PRED_SECONDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock); \
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock); \
 	  LOCAL_ReductionsCounter--;
 
 #define SPY_PRED_SECONDIFOK_FIRSTIFOK \
@@ -1223,9 +1223,9 @@
 	    JMPNext();
 
 #define SPY_PRED_THIRDIFOK_INIT \
-	  LOCK(pe->StatisticsForPred.lock); \
-	  pe->StatisticsForPred.NOfEntries++; \
-	  UNLOCK(pe->StatisticsForPred.lock);
+	  LOCK(pe->StatisticsForPred->lock); \
+	  pe->StatisticsForPred->NOfEntries++; \
+	  UNLOCK(pe->StatisticsForPred->lock);
 	  
 #define SPY_PRED_THIRDIFOK_FIRSTIFOK \
 	    (*_PREG) = pe->cs.p_code.TrueCodeOfPred; \