diff --git a/build/mpi_c_wrapper.c b/build/mpi_c_wrapper.c
index 7acbe9e..a9ecee2 100644
--- a/build/mpi_c_wrapper.c
+++ b/build/mpi_c_wrapper.c
@@ -260,14 +260,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -367,14 +367,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
@@ -383,14 +383,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
@@ -420,21 +420,21 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(sendtypes[trace_elem_idx]));
   }
@@ -442,21 +442,21 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 }
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(recvtypes[trace_elem_idx]));
   }
@@ -698,7 +698,7 @@ int MPI_Cart_coords (MPI_Comm comm, int rank, int maxdims, int coords[]) {
     WRITE_TRACE("%lli:", (long long int) (rank));
     WRITE_TRACE("%lli:", (long long int) (maxdims));
   WRITE_TRACE("%p,%i[", (void*) coords, (int) maxdims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxdims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (coords[trace_elem_idx]));
   }
@@ -725,14 +725,14 @@ int MPI_Cart_create (MPI_Comm old_comm, int ndims, const int dims[], const int p
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(old_comm));
     WRITE_TRACE("%lli:", (long long int) (ndims));
   WRITE_TRACE("%p,%i[", (void*) dims, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (dims[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (periods[trace_elem_idx]));
   }
@@ -761,21 +761,21 @@ int MPI_Cart_get (MPI_Comm comm, int maxdims, int dims[], int periods[], int coo
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) (maxdims));
   WRITE_TRACE("%p,%i[", (void*) dims, (int) maxdims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxdims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (dims[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) maxdims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxdims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (periods[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) coords, (int) maxdims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxdims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (coords[trace_elem_idx]));
   }
@@ -802,14 +802,14 @@ int MPI_Cart_map (MPI_Comm comm, int ndims, const int dims[], const int periods[
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) (ndims));
   WRITE_TRACE("%p,%i[", (void*) dims, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (dims[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (periods[trace_elem_idx]));
   }
@@ -838,7 +838,7 @@ int ndims; PMPI_Cartdim_get(comm, &ndims);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
   WRITE_TRACE("%p,%i[", (void*) coords, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (coords[trace_elem_idx]));
   }
@@ -890,7 +890,7 @@ int ndims; PMPI_Cartdim_get(comm, &ndims);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
   WRITE_TRACE("%p,%i[", (void*) remain_dims, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (remain_dims[trace_elem_idx]));
   }
@@ -1570,7 +1570,7 @@ int MPI_Comm_spawn (const char * command, char * argv[], int maxprocs, MPI_Info
   pmpi_retval = PMPI_Comm_spawn(command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes);
   WRITE_TRACE("%p:", command);
   WRITE_TRACE("%p,%i[", (void*) argv, (int) 0);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<0; trace_elem_idx++) {
     WRITE_TRACE("%p;", argv[trace_elem_idx]);
   }
@@ -1582,7 +1582,7 @@ int MPI_Comm_spawn (const char * command, char * argv[], int maxprocs, MPI_Info
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(*intercomm));
   WRITE_TRACE("%p,%i[", (void*) array_of_errcodes, (int) maxprocs);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxprocs; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_errcodes[trace_elem_idx]));
   }
@@ -1608,28 +1608,28 @@ int MPI_Comm_spawn_multiple (int count, char * array_of_commands[], char ** arra
   pmpi_retval = PMPI_Comm_spawn_multiple(count, array_of_commands, array_of_argv, array_of_maxprocs, array_of_info, root, comm, intercomm, array_of_errcodes);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_commands, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
     WRITE_TRACE("%p;", array_of_commands[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_argv, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
     WRITE_TRACE("%p;", array_of_argv[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_maxprocs, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_maxprocs[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_info, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Info_c2f(array_of_info[trace_elem_idx]));
   }
@@ -1639,7 +1639,7 @@ int MPI_Comm_spawn_multiple (int count, char * array_of_commands[], char ** arra
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(*intercomm));
   WRITE_TRACE("%p,%i[", (void*) array_of_errcodes, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_errcodes[trace_elem_idx]));
   }
@@ -1756,7 +1756,7 @@ int MPI_Dims_create (int nnodes, int ndims, int dims[]) {
     WRITE_TRACE("%lli:", (long long int) (nnodes));
     WRITE_TRACE("%lli:", (long long int) (ndims));
   WRITE_TRACE("%p,%i[", (void*) dims, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (dims[trace_elem_idx]));
   }
@@ -1783,28 +1783,28 @@ int MPI_Dist_graph_create (MPI_Comm comm_old, int n, const int nodes[], const in
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm_old));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) nodes, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (nodes[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) degrees, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (degrees[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) targets, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (targets[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) weights, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (weights[trace_elem_idx]));
   }
@@ -1834,14 +1834,14 @@ int MPI_Dist_graph_create_adjacent (MPI_Comm comm_old, int indegree, const int s
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm_old));
     WRITE_TRACE("%lli:", (long long int) (indegree));
   WRITE_TRACE("%p,%i[", (void*) sources, (int) indegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<indegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sources[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sourceweights, (int) indegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<indegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sourceweights[trace_elem_idx]));
   }
@@ -1849,14 +1849,14 @@ int MPI_Dist_graph_create_adjacent (MPI_Comm comm_old, int indegree, const int s
 }
     WRITE_TRACE("%lli:", (long long int) (outdegree));
   WRITE_TRACE("%p,%i[", (void*) destinations, (int) outdegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<outdegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (destinations[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) destweights, (int) outdegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<outdegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (destweights[trace_elem_idx]));
   }
@@ -1886,14 +1886,14 @@ int MPI_Dist_graph_neighbors (MPI_Comm comm, int maxindegree, int sources[], int
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) (maxindegree));
   WRITE_TRACE("%p,%i[", (void*) sources, (int) maxindegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxindegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sources[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sourceweights, (int) maxindegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxindegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sourceweights[trace_elem_idx]));
   }
@@ -1901,14 +1901,14 @@ int MPI_Dist_graph_neighbors (MPI_Comm comm, int maxindegree, int sources[], int
 }
     WRITE_TRACE("%lli:", (long long int) (maxoutdegree));
   WRITE_TRACE("%p,%i[", (void*) destinations, (int) maxoutdegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxoutdegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (destinations[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) destweights, (int) maxoutdegree);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxoutdegree; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (destweights[trace_elem_idx]));
   }
@@ -3418,14 +3418,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -3651,14 +3651,14 @@ int MPI_Graph_create (MPI_Comm comm_old, int nnodes, const int index[], const in
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm_old));
     WRITE_TRACE("%lli:", (long long int) (nnodes));
   WRITE_TRACE("%p,%i[", (void*) index, (int) nnodes);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<nnodes; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (index[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) index[nnodes-1]);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<index[nnodes-1]; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (edges[trace_elem_idx]));
   }
@@ -3688,14 +3688,14 @@ int MPI_Graph_get (MPI_Comm comm, int maxindex, int maxedges, int index[], int e
     WRITE_TRACE("%lli:", (long long int) (maxindex));
     WRITE_TRACE("%lli:", (long long int) (maxedges));
   WRITE_TRACE("%p,%i[", (void*) index, (int) maxindex);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxindex; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (index[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) maxedges);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxedges; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (edges[trace_elem_idx]));
   }
@@ -3722,14 +3722,14 @@ int MPI_Graph_map (MPI_Comm comm, int nnodes, const int index[], const int edges
     WRITE_TRACE("%lli:", (long long int) PMPI_Comm_c2f(comm));
     WRITE_TRACE("%lli:", (long long int) (nnodes));
   WRITE_TRACE("%p,%i[", (void*) index, (int) nnodes);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<nnodes; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (index[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) index[nnodes-1]);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<index[nnodes-1]; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (edges[trace_elem_idx]));
   }
@@ -3758,7 +3758,7 @@ int MPI_Graph_neighbors (MPI_Comm comm, int rank, int maxneighbors, int neighbor
     WRITE_TRACE("%lli:", (long long int) (rank));
     WRITE_TRACE("%lli:", (long long int) (maxneighbors));
   WRITE_TRACE("%p,%i[", (void*) neighbors, (int) maxneighbors);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<maxneighbors; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (neighbors[trace_elem_idx]));
   }
@@ -3911,7 +3911,7 @@ int MPI_Group_excl (MPI_Group group, int n, const int ranks[], MPI_Group * newgr
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) ranks, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (ranks[trace_elem_idx]));
   }
@@ -3958,7 +3958,7 @@ int MPI_Group_incl (MPI_Group group, int n, const int ranks[], MPI_Group * newgr
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) ranks, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (ranks[trace_elem_idx]));
   }
@@ -4007,7 +4007,7 @@ int MPI_Group_range_excl (MPI_Group group, int n, int ranges[][3], MPI_Group * n
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) ranges, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
     WRITE_TRACE("[%i,%i,%i];", ranges[trace_elem_idx][0], ranges[trace_elem_idx][1], ranges[trace_elem_idx][2]);
   }
@@ -4035,7 +4035,7 @@ int MPI_Group_range_incl (MPI_Group group, int n, int ranges[][3], MPI_Group * n
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) ranges, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
     WRITE_TRACE("[%i,%i,%i];", ranges[trace_elem_idx][0], ranges[trace_elem_idx][1], ranges[trace_elem_idx][2]);
   }
@@ -4103,7 +4103,7 @@ int MPI_Group_translate_ranks (MPI_Group group1, int n, const int ranks1[], MPI_
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group1));
     WRITE_TRACE("%lli:", (long long int) (n));
   WRITE_TRACE("%p,%i[", (void*) ranks1, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (ranks1[trace_elem_idx]));
   }
@@ -4111,7 +4111,7 @@ int MPI_Group_translate_ranks (MPI_Group group1, int n, const int ranks1[], MPI_
 }
     WRITE_TRACE("%lli:", (long long int) PMPI_Group_c2f(group2));
   WRITE_TRACE("%p,%i[", (void*) ranks2, (int) n);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<n; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (ranks2[trace_elem_idx]));
   }
@@ -4189,14 +4189,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -4278,14 +4278,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
@@ -4294,14 +4294,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
@@ -4332,21 +4332,21 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(sendtypes[trace_elem_idx]));
   }
@@ -4354,21 +4354,21 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 }
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(recvtypes[trace_elem_idx]));
   }
@@ -4522,14 +4522,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -4629,21 +4629,21 @@ int MPI_Ineighbor_allgatherv (const void * sendbuf, int sendcount, MPI_Datatype
   WRITE_TRACE("%s", "MPI_Ineighbor_allgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
     WRITE_TRACE("%lli:", (long long int) (sendcount));
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -4696,18 +4696,18 @@ int MPI_Ineighbor_alltoallv (const void * sendbuf, const int sendcounts[], const
   WRITE_TRACE("%s", "MPI_Ineighbor_alltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
@@ -4716,14 +4716,14 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
@@ -4750,25 +4750,25 @@ int MPI_Ineighbor_alltoallw (const void * sendbuf, const int sendcounts[], const
   WRITE_TRACE("%s", "MPI_Ineighbor_alltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(sendtypes[trace_elem_idx]));
   }
@@ -4776,21 +4776,21 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 }
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(recvtypes[trace_elem_idx]));
   }
@@ -5185,7 +5185,7 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
@@ -5338,14 +5338,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) (rank == root ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank == root ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) (rank == root ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank == root ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -5557,21 +5557,21 @@ int MPI_Neighbor_allgatherv (const void * sendbuf, int sendcount, MPI_Datatype s
   WRITE_TRACE("%s", "MPI_Neighbor_allgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
     WRITE_TRACE("%lli:", (long long int) (sendcount));
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -5622,18 +5622,18 @@ int MPI_Neighbor_alltoallv (const void * sendbuf, const int sendcounts[], const
   WRITE_TRACE("%s", "MPI_Neighbor_alltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
@@ -5642,14 +5642,14 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
     WRITE_TRACE("%lli:", (long long int) PMPI_Type_c2f(sendtype));
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
@@ -5675,25 +5675,25 @@ int MPI_Neighbor_alltoallw (const void * sendbuf, const int sendcounts[], const
   WRITE_TRACE("%s", "MPI_Neighbor_alltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(sendtypes[trace_elem_idx]));
   }
@@ -5701,21 +5701,21 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);
 }
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (rdispls[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(recvtypes[trace_elem_idx]));
   }
@@ -5846,7 +5846,7 @@ int MPI_Pack_external (const char datarep[], const void * inbuf, int incount, MP
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Pack_external(datarep, inbuf, incount, datatype, outbuf, outsize, position);
   WRITE_TRACE("%p,%i[", (void*) datarep, (int) strlen(datarep));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<strlen(datarep); trace_elem_idx++) {
     WRITE_TRACE("%c;", datarep[trace_elem_idx]);
   }
@@ -5877,7 +5877,7 @@ int MPI_Pack_external_size (const char datarep[], int incount, MPI_Datatype data
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Pack_external_size(datarep, incount, datatype, size);
   WRITE_TRACE("%p,%i[", (void*) datarep, (int) strlen(datarep));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<strlen(datarep); trace_elem_idx++) {
     WRITE_TRACE("%c;", datarep[trace_elem_idx]);
   }
@@ -6151,7 +6151,7 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p:", recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (recvcounts[trace_elem_idx]));
   }
@@ -6452,14 +6452,14 @@ int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);
 //end of prologs
   WRITE_TRACE("%p:", sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) (rank==root ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank==root ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (sendcounts[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) (rank==root ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank==root ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (displs[trace_elem_idx]));
   }
@@ -6663,7 +6663,7 @@ int MPI_Startall (int count, MPI_Request array_of_requests[]) {
   pmpi_retval = PMPI_Startall(count, array_of_requests);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -6825,7 +6825,7 @@ int MPI_Testall (int count, MPI_Request array_of_requests[], int * flag, MPI_Sta
   pmpi_retval = PMPI_Testall(count, array_of_requests, flag, array_of_statuses);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -6833,7 +6833,7 @@ int MPI_Testall (int count, MPI_Request array_of_requests[], int * flag, MPI_Sta
 }
     WRITE_TRACE("%lli:", (long long int) *(flag));
   WRITE_TRACE("%p,%i[", (void*) array_of_statuses, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
     {MPI_Fint fstatus; PMPI_Status_c2f(&array_of_statuses[trace_elem_idx], &fstatus); WRITE_TRACE("%lli;", (long long int) fstatus);}  }
   WRITE_TRACE("]%s", ":");
@@ -6858,7 +6858,7 @@ int MPI_Testany (int count, MPI_Request array_of_requests[], int * index, int *
   pmpi_retval = PMPI_Testany(count, array_of_requests, index, flag, status);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -6886,7 +6886,7 @@ int MPI_Testsome (int incount, MPI_Request array_of_requests[], int * outcount,
   pmpi_retval = PMPI_Testsome(incount, array_of_requests, outcount, array_of_indices, array_of_statuses);
     WRITE_TRACE("%lli:", (long long int) (incount));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) incount);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<incount; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -6894,14 +6894,14 @@ int MPI_Testsome (int incount, MPI_Request array_of_requests[], int * outcount,
 }
     WRITE_TRACE("%lli:", (long long int) *(outcount));
   WRITE_TRACE("%p,%i[", (void*) array_of_indices, (int) *outcount);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<*outcount; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_indices[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_statuses, (int) *outcount);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<*outcount; trace_elem_idx++) {
     {MPI_Fint fstatus; PMPI_Status_c2f(&array_of_statuses[trace_elem_idx], &fstatus); WRITE_TRACE("%lli;", (long long int) fstatus);}  }
   WRITE_TRACE("]%s", ":");
@@ -6988,28 +6988,28 @@ int MPI_Type_create_darray (int size, int rank, int ndims, const int gsize_array
     WRITE_TRACE("%lli:", (long long int) (rank));
     WRITE_TRACE("%lli:", (long long int) (ndims));
   WRITE_TRACE("%p,%i[", (void*) gsize_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (gsize_array[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) distrib_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (distrib_array[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) darg_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (darg_array[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) psize_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (psize_array[trace_elem_idx]));
   }
@@ -7100,14 +7100,14 @@ int MPI_Type_create_hindexed (int count, const int array_of_blocklengths[], cons
   pmpi_retval = PMPI_Type_create_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_blocklengths, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_blocklengths[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_displacements, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_displacements[trace_elem_idx]));
   }
@@ -7136,7 +7136,7 @@ int MPI_Type_create_hindexed_block (int count, int blocklength, const MPI_Aint a
     WRITE_TRACE("%lli:", (long long int) (count));
     WRITE_TRACE("%lli:", (long long int) (blocklength));
   WRITE_TRACE("%p,%i[", (void*) array_of_displacements, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_displacements[trace_elem_idx]));
   }
@@ -7188,7 +7188,7 @@ int MPI_Type_create_indexed_block (int count, int blocklength, const int array_o
     WRITE_TRACE("%lli:", (long long int) (count));
     WRITE_TRACE("%lli:", (long long int) (blocklength));
   WRITE_TRACE("%p,%i[", (void*) array_of_displacements, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_displacements[trace_elem_idx]));
   }
@@ -7260,21 +7260,21 @@ int MPI_Type_create_struct (int count, const int array_of_block_lengths[], const
   pmpi_retval = PMPI_Type_create_struct(count, array_of_block_lengths, array_of_displacements, array_of_types, newtype);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_block_lengths, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_block_lengths[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_displacements, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_displacements[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_types, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(array_of_types[trace_elem_idx]));
   }
@@ -7301,21 +7301,21 @@ int MPI_Type_create_subarray (int ndims, const int size_array[], const int subsi
   pmpi_retval = PMPI_Type_create_subarray(ndims, size_array, subsize_array, start_array, order, oldtype, newtype);
     WRITE_TRACE("%lli:", (long long int) (ndims));
   WRITE_TRACE("%p,%i[", (void*) size_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (size_array[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) subsize_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (subsize_array[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) start_array, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (start_array[trace_elem_idx]));
   }
@@ -7447,21 +7447,21 @@ int MPI_Type_get_contents (MPI_Datatype mtype, int max_integers, int max_address
     WRITE_TRACE("%lli:", (long long int) (max_addresses));
     WRITE_TRACE("%lli:", (long long int) (max_datatypes));
   WRITE_TRACE("%p,%i[", (void*) array_of_integers, (int) max_integers);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<max_integers; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_integers[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_addresses, (int) max_addresses);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<max_addresses; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_addresses[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_datatypes, (int) max_datatypes);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<max_datatypes; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Type_c2f(array_of_datatypes[trace_elem_idx]));
   }
@@ -7615,14 +7615,14 @@ int MPI_Type_indexed (int count, const int array_of_blocklengths[], const int ar
   pmpi_retval = PMPI_Type_indexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_blocklengths, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_blocklengths[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_displacements, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_displacements[trace_elem_idx]));
   }
@@ -7799,7 +7799,7 @@ int MPI_Unpack_external (const char datarep[], const void * inbuf, MPI_Aint insi
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
   pmpi_retval = PMPI_Unpack_external(datarep, inbuf, insize, position, outbuf, outcount, datatype);
   WRITE_TRACE("%p,%i[", (void*) datarep, (int) strlen(datarep));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<strlen(datarep); trace_elem_idx++) {
     WRITE_TRACE("%c;", datarep[trace_elem_idx]);
   }
@@ -7871,7 +7871,7 @@ int MPI_Waitall (int count, MPI_Request array_of_requests[], MPI_Status * array_
   pmpi_retval = PMPI_Waitall(count, array_of_requests, array_of_statuses);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) (array_of_statuses != MPI_STATUSES_IGNORE ? count : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(array_of_statuses != MPI_STATUSES_IGNORE ? count : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -7897,7 +7897,7 @@ int MPI_Waitany (int count, MPI_Request array_of_requests[], int * index, MPI_St
   pmpi_retval = PMPI_Waitany(count, array_of_requests, index, status);
     WRITE_TRACE("%lli:", (long long int) (count));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) count);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<count; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -7924,7 +7924,7 @@ int MPI_Waitsome (int incount, MPI_Request array_of_requests[], int * outcount,
   pmpi_retval = PMPI_Waitsome(incount, array_of_requests, outcount, array_of_indices, array_of_statuses);
     WRITE_TRACE("%lli:", (long long int) (incount));
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) incount);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<incount; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) PMPI_Request_c2f(array_of_requests[trace_elem_idx]));
   }
@@ -7932,14 +7932,14 @@ int MPI_Waitsome (int incount, MPI_Request array_of_requests[], int * outcount,
 }
     WRITE_TRACE("%lli:", (long long int) *(outcount));
   WRITE_TRACE("%p,%i[", (void*) array_of_indices, (int) *outcount);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<*outcount; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) (array_of_indices[trace_elem_idx]));
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_statuses, (int) (array_of_statuses != MPI_STATUSES_IGNORE ? *outcount : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(array_of_statuses != MPI_STATUSES_IGNORE ? *outcount : 0); trace_elem_idx++) {
     {MPI_Fint fstatus; PMPI_Status_c2f(&array_of_statuses[trace_elem_idx], &fstatus); WRITE_TRACE("%lli;", (long long int) fstatus);}  }
   WRITE_TRACE("]%s", ":");
diff --git a/build/mpi_f_wrapper.c b/build/mpi_f_wrapper.c
index 06c08ee..f2d0eb1 100644
--- a/build/mpi_f_wrapper.c
+++ b/build/mpi_f_wrapper.c
@@ -597,21 +597,21 @@ void FortranCInterface_GLOBAL(mpi_allgatherv,MPI_ALLGATHERV) (int* sendbuf, int*
   WRITE_TRACE("%s", "MPI_Allgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_allgatherv,PMPI_ALLGATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -699,18 +699,18 @@ void FortranCInterface_GLOBAL(mpi_alltoallv,MPI_ALLTOALLV) (int* sendbuf, int* s
   WRITE_TRACE("%s", "MPI_Alltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_alltoallv,PMPI_ALLTOALLV)(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
@@ -719,14 +719,14 @@ int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
@@ -750,25 +750,25 @@ void FortranCInterface_GLOBAL(mpi_alltoallw,MPI_ALLTOALLW) (int* sendbuf, int* s
   WRITE_TRACE("%s", "MPI_Alltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_alltoallw,PMPI_ALLTOALLW)(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendtypes[trace_elem_idx]);
   }
@@ -776,21 +776,21 @@ int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
 }
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvtypes[trace_elem_idx]);
   }
@@ -1010,7 +1010,7 @@ void FortranCInterface_GLOBAL(mpi_cart_coords,MPI_CART_COORDS) (int* comm, int*
     WRITE_TRACE("%lli:", (long long int) *rank);
     WRITE_TRACE("%lli:", (long long int) *maxdims);
   WRITE_TRACE("%p,%i[", (void*) coords, (int) (*maxdims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxdims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) coords[trace_elem_idx]);
   }
@@ -1035,14 +1035,14 @@ void FortranCInterface_GLOBAL(mpi_cart_create,MPI_CART_CREATE) (int* old_comm, i
     WRITE_TRACE("%lli:", (long long int) *old_comm);
     WRITE_TRACE("%lli:", (long long int) *ndims);
   WRITE_TRACE("%p,%i[", (void*) dims, (int) (*ndims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*ndims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) dims[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) (*ndims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*ndims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) periods[trace_elem_idx]);
   }
@@ -1069,21 +1069,21 @@ void FortranCInterface_GLOBAL(mpi_cart_get,MPI_CART_GET) (int* comm, int* maxdim
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *maxdims);
   WRITE_TRACE("%p,%i[", (void*) dims, (int) (*maxdims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxdims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) dims[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) (*maxdims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxdims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) periods[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) coords, (int) (*maxdims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxdims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) coords[trace_elem_idx]);
   }
@@ -1108,14 +1108,14 @@ void FortranCInterface_GLOBAL(mpi_cart_map,MPI_CART_MAP) (int* comm, int* ndims,
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *ndims);
   WRITE_TRACE("%p,%i[", (void*) dims, (int) (*ndims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*ndims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) dims[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) periods, (int) (*ndims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*ndims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) periods[trace_elem_idx]);
   }
@@ -1138,11 +1138,11 @@ void FortranCInterface_GLOBAL(mpi_cart_rank,MPI_CART_RANK) (int* comm, int* coor
   WRITE_TRACE("%s", "MPI_Cart_rank:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_cart_rank,PMPI_CART_RANK)(comm, coords, rank, ierr);
-int ndims; PMPI_Cartdim_get((*comm), &ndims);
+int ndims; PMPI_Cartdim_get( MPI_Comm_f2c((*comm)),  &ndims);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *comm);
   WRITE_TRACE("%p,%i[", (void*) coords, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) coords[trace_elem_idx]);
   }
@@ -1186,11 +1186,11 @@ void FortranCInterface_GLOBAL(mpi_cart_sub,MPI_CART_SUB) (int* comm, int* remain
   WRITE_TRACE("%s", "MPI_Cart_sub:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_cart_sub,PMPI_CART_SUB)(comm, remain_dims, new_comm, ierr);
-int ndims; PMPI_Cartdim_get((*comm), &ndims);
+int ndims; PMPI_Cartdim_get( MPI_Comm_f2c((*comm)),  &ndims);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *comm);
   WRITE_TRACE("%p,%i[", (void*) remain_dims, (int) ndims);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ndims; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) remain_dims[trace_elem_idx]);
   }
@@ -1804,7 +1804,7 @@ void FortranCInterface_GLOBAL(mpi_comm_spawn,MPI_COMM_SPAWN) (char* command, cha
  FortranCInterface_GLOBAL(pmpi_comm_spawn,PMPI_COMM_SPAWN)(command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr);
     WRITE_TRACE("%lli:", (long long int) *command);
   WRITE_TRACE("%p,%i[", (void*) argv, (int) 0);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<0; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) argv[trace_elem_idx]);
   }
@@ -1816,7 +1816,7 @@ void FortranCInterface_GLOBAL(mpi_comm_spawn,MPI_COMM_SPAWN) (char* command, cha
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *intercomm);
   WRITE_TRACE("%p,%i[", (void*) array_of_errcodes, (int) (*maxprocs));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxprocs); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_errcodes[trace_elem_idx]);
   }
@@ -1840,28 +1840,28 @@ void FortranCInterface_GLOBAL(mpi_comm_spawn_multiple,MPI_COMM_SPAWN_MULTIPLE) (
  FortranCInterface_GLOBAL(pmpi_comm_spawn_multiple,PMPI_COMM_SPAWN_MULTIPLE)(count, array_of_commands, array_of_argv, array_of_maxprocs, array_of_info, root, comm, intercomm, array_of_errcodes, ierr);
     WRITE_TRACE("%lli:", (long long int) *count);
   WRITE_TRACE("%p,%i[", (void*) array_of_commands, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_commands[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_argv, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_argv[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_maxprocs, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_maxprocs[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) array_of_info, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_info[trace_elem_idx]);
   }
@@ -1871,7 +1871,7 @@ void FortranCInterface_GLOBAL(mpi_comm_spawn_multiple,MPI_COMM_SPAWN_MULTIPLE) (
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *intercomm);
   WRITE_TRACE("%p,%i[", (void*) array_of_errcodes, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_errcodes[trace_elem_idx]);
   }
@@ -1978,7 +1978,7 @@ void FortranCInterface_GLOBAL(mpi_dims_create,MPI_DIMS_CREATE) (int* nnodes, int
     WRITE_TRACE("%lli:", (long long int) *nnodes);
     WRITE_TRACE("%lli:", (long long int) *ndims);
   WRITE_TRACE("%p,%i[", (void*) dims, (int) (*ndims));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*ndims); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) dims[trace_elem_idx]);
   }
@@ -2003,28 +2003,28 @@ void FortranCInterface_GLOBAL(mpi_dist_graph_create,MPI_DIST_GRAPH_CREATE) (int*
     WRITE_TRACE("%lli:", (long long int) *comm_old);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) nodes, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) nodes[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) degrees, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) degrees[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) targets, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) targets[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) weights, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) weights[trace_elem_idx]);
   }
@@ -2052,14 +2052,14 @@ void FortranCInterface_GLOBAL(mpi_dist_graph_create_adjacent,MPI_DIST_GRAPH_CREA
     WRITE_TRACE("%lli:", (long long int) *comm_old);
     WRITE_TRACE("%lli:", (long long int) *indegree);
   WRITE_TRACE("%p,%i[", (void*) sources, (int) (*indegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*indegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sources[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sourceweights, (int) (*indegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*indegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sourceweights[trace_elem_idx]);
   }
@@ -2067,14 +2067,14 @@ void FortranCInterface_GLOBAL(mpi_dist_graph_create_adjacent,MPI_DIST_GRAPH_CREA
 }
     WRITE_TRACE("%lli:", (long long int) *outdegree);
   WRITE_TRACE("%p,%i[", (void*) destinations, (int) (*outdegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*outdegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) destinations[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) destweights, (int) (*outdegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*outdegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) destweights[trace_elem_idx]);
   }
@@ -2102,14 +2102,14 @@ void FortranCInterface_GLOBAL(mpi_dist_graph_neighbors,MPI_DIST_GRAPH_NEIGHBORS)
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *maxindegree);
   WRITE_TRACE("%p,%i[", (void*) sources, (int) (*maxindegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxindegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sources[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sourceweights, (int) (*maxindegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxindegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sourceweights[trace_elem_idx]);
   }
@@ -2117,14 +2117,14 @@ void FortranCInterface_GLOBAL(mpi_dist_graph_neighbors,MPI_DIST_GRAPH_NEIGHBORS)
 }
     WRITE_TRACE("%lli:", (long long int) *maxoutdegree);
   WRITE_TRACE("%p,%i[", (void*) destinations, (int) (*maxoutdegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxoutdegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) destinations[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) destweights, (int) (*maxoutdegree));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxoutdegree); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) destweights[trace_elem_idx]);
   }
@@ -3505,21 +3505,21 @@ void FortranCInterface_GLOBAL(mpi_gatherv,MPI_GATHERV) (int* sendbuf, int* sendc
   WRITE_TRACE("%s", "MPI_Gatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_gatherv,PMPI_GATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -3728,14 +3728,14 @@ void FortranCInterface_GLOBAL(mpi_graph_create,MPI_GRAPH_CREATE) (int* comm_old,
     WRITE_TRACE("%lli:", (long long int) *comm_old);
     WRITE_TRACE("%lli:", (long long int) *nnodes);
   WRITE_TRACE("%p,%i[", (void*) index, (int) (*nnodes));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*nnodes); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) index[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) index[(*nnodes)-1]);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<index[(*nnodes)-1]; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) edges[trace_elem_idx]);
   }
@@ -3763,14 +3763,14 @@ void FortranCInterface_GLOBAL(mpi_graph_get,MPI_GRAPH_GET) (int* comm, int* maxi
     WRITE_TRACE("%lli:", (long long int) *maxindex);
     WRITE_TRACE("%lli:", (long long int) *maxedges);
   WRITE_TRACE("%p,%i[", (void*) index, (int) (*maxindex));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxindex); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) index[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) (*maxedges));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxedges); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) edges[trace_elem_idx]);
   }
@@ -3795,14 +3795,14 @@ void FortranCInterface_GLOBAL(mpi_graph_map,MPI_GRAPH_MAP) (int* comm, int* nnod
     WRITE_TRACE("%lli:", (long long int) *comm);
     WRITE_TRACE("%lli:", (long long int) *nnodes);
   WRITE_TRACE("%p,%i[", (void*) index, (int) (*nnodes));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*nnodes); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) index[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) edges, (int) index[(*nnodes)-1]);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<index[(*nnodes)-1]; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) edges[trace_elem_idx]);
   }
@@ -3829,7 +3829,7 @@ void FortranCInterface_GLOBAL(mpi_graph_neighbors,MPI_GRAPH_NEIGHBORS) (int* com
     WRITE_TRACE("%lli:", (long long int) *rank);
     WRITE_TRACE("%lli:", (long long int) *maxneighbors);
   WRITE_TRACE("%p,%i[", (void*) neighbors, (int) (*maxneighbors));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*maxneighbors); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) neighbors[trace_elem_idx]);
   }
@@ -3968,7 +3968,7 @@ void FortranCInterface_GLOBAL(mpi_group_excl,MPI_GROUP_EXCL) (int* group, int* n
     WRITE_TRACE("%lli:", (long long int) *group);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) ranks, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) ranks[trace_elem_idx]);
   }
@@ -4011,7 +4011,7 @@ void FortranCInterface_GLOBAL(mpi_group_incl,MPI_GROUP_INCL) (int* group, int* n
     WRITE_TRACE("%lli:", (long long int) *group);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) ranks, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) ranks[trace_elem_idx]);
   }
@@ -4056,7 +4056,7 @@ void FortranCInterface_GLOBAL(mpi_group_range_excl,MPI_GROUP_RANGE_EXCL) (int* g
     WRITE_TRACE("%lli:", (long long int) *group);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) ranges, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("[%i,%i,%i];", *(&(ranges[trace_elem_idx])+0), *(&(ranges[trace_elem_idx])+1), *(&(ranges[trace_elem_idx])+2));
   }
@@ -4082,7 +4082,7 @@ void FortranCInterface_GLOBAL(mpi_group_range_incl,MPI_GROUP_RANGE_INCL) (int* g
     WRITE_TRACE("%lli:", (long long int) *group);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) ranges, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("[%i,%i,%i];", *(&(ranges[trace_elem_idx])+0), *(&(ranges[trace_elem_idx])+1), *(&(ranges[trace_elem_idx])+2));
   }
@@ -4144,7 +4144,7 @@ void FortranCInterface_GLOBAL(mpi_group_translate_ranks,MPI_GROUP_TRANSLATE_RANK
     WRITE_TRACE("%lli:", (long long int) *group1);
     WRITE_TRACE("%lli:", (long long int) *n);
   WRITE_TRACE("%p,%i[", (void*) ranks1, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) ranks1[trace_elem_idx]);
   }
@@ -4152,7 +4152,7 @@ void FortranCInterface_GLOBAL(mpi_group_translate_ranks,MPI_GROUP_TRANSLATE_RANK
 }
     WRITE_TRACE("%lli:", (long long int) *group2);
   WRITE_TRACE("%p,%i[", (void*) ranks2, (int) (*n));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*n); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) ranks2[trace_elem_idx]);
   }
@@ -4217,21 +4217,21 @@ void FortranCInterface_GLOBAL(mpi_iallgatherv,MPI_IALLGATHERV) (int* sendbuf, in
   WRITE_TRACE("%s", "MPI_Iallgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_iallgatherv,PMPI_IALLGATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -4303,18 +4303,18 @@ void FortranCInterface_GLOBAL(mpi_ialltoallv,MPI_IALLTOALLV) (int* sendbuf, int*
   WRITE_TRACE("%s", "MPI_Ialltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ialltoallv,PMPI_IALLTOALLV)(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
@@ -4323,14 +4323,14 @@ int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
@@ -4355,25 +4355,25 @@ void FortranCInterface_GLOBAL(mpi_ialltoallw,MPI_IALLTOALLW) (int* sendbuf, int*
   WRITE_TRACE("%s", "MPI_Ialltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ialltoallw,PMPI_IALLTOALLW)(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendtypes[trace_elem_idx]);
   }
@@ -4381,21 +4381,21 @@ int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
 }
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvtypes[trace_elem_idx]);
   }
@@ -4530,21 +4530,21 @@ void FortranCInterface_GLOBAL(mpi_igatherv,MPI_IGATHERV) (int* sendbuf, int* sen
   WRITE_TRACE("%s", "MPI_Igatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_igatherv,PMPI_IGATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -4637,21 +4637,21 @@ void FortranCInterface_GLOBAL(mpi_ineighbor_allgatherv,MPI_INEIGHBOR_ALLGATHERV)
   WRITE_TRACE("%s", "MPI_Ineighbor_allgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ineighbor_allgatherv,PMPI_INEIGHBOR_ALLGATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, request, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -4700,18 +4700,18 @@ void FortranCInterface_GLOBAL(mpi_ineighbor_alltoallv,MPI_INEIGHBOR_ALLTOALLV) (
   WRITE_TRACE("%s", "MPI_Ineighbor_alltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ineighbor_alltoallv,PMPI_INEIGHBOR_ALLTOALLV)(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
@@ -4720,14 +4720,14 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wte
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
@@ -4752,25 +4752,25 @@ void FortranCInterface_GLOBAL(mpi_ineighbor_alltoallw,MPI_INEIGHBOR_ALLTOALLW) (
   WRITE_TRACE("%s", "MPI_Ineighbor_alltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ineighbor_alltoallw,PMPI_INEIGHBOR_ALLTOALLW)(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendtypes[trace_elem_idx]);
   }
@@ -4778,21 +4778,21 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wte
 }
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvtypes[trace_elem_idx]);
   }
@@ -5141,12 +5141,12 @@ void FortranCInterface_GLOBAL(mpi_ireduce_scatter,MPI_IREDUCE_SCATTER) (int* sen
   WRITE_TRACE("%s", "MPI_Ireduce_scatter:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_ireduce_scatter,PMPI_IREDUCE_SCATTER)(sendbuf, recvbuf, recvcounts, datatype, op, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
@@ -5283,18 +5283,18 @@ void FortranCInterface_GLOBAL(mpi_iscatterv,MPI_ISCATTERV) (int* sendbuf, int* s
   WRITE_TRACE("%s", "MPI_Iscatterv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_iscatterv,PMPI_ISCATTERV)(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, request, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) (rank == (*root) ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank == (*root) ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) (rank == (*root) ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank == (*root) ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -5490,21 +5490,21 @@ void FortranCInterface_GLOBAL(mpi_neighbor_allgatherv,MPI_NEIGHBOR_ALLGATHERV) (
   WRITE_TRACE("%s", "MPI_Neighbor_allgatherv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_neighbor_allgatherv,PMPI_NEIGHBOR_ALLGATHERV)(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *sendcount);
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -5551,18 +5551,18 @@ void FortranCInterface_GLOBAL(mpi_neighbor_alltoallv,MPI_NEIGHBOR_ALLTOALLV) (in
   WRITE_TRACE("%s", "MPI_Neighbor_alltoallv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_neighbor_alltoallv,PMPI_NEIGHBOR_ALLTOALLV)(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
@@ -5571,14 +5571,14 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wte
     WRITE_TRACE("%lli:", (long long int) *sendtype);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
@@ -5602,25 +5602,25 @@ void FortranCInterface_GLOBAL(mpi_neighbor_alltoallw,MPI_NEIGHBOR_ALLTOALLW) (in
   WRITE_TRACE("%s", "MPI_Neighbor_alltoallw:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_neighbor_alltoallw,PMPI_NEIGHBOR_ALLTOALLW)(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, ierr);
-int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
+int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wted);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sdispls, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) sendtypes, (int) odeg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<odeg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendtypes[trace_elem_idx]);
   }
@@ -5628,21 +5628,21 @@ int ideg, odeg, wted; MPI_Dist_graph_neighbors_count((*comm), &ideg, &odeg, &wte
 }
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) rdispls, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) rdispls[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) recvtypes, (int) ideg);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<ideg; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvtypes[trace_elem_idx]);
   }
@@ -5761,7 +5761,7 @@ void FortranCInterface_GLOBAL(mpi_pack_external,MPI_PACK_EXTERNAL) (char* datare
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_pack_external,PMPI_PACK_EXTERNAL)(datarep, inbuf, incount, datatype, outbuf, outsize, position, ierr);
   WRITE_TRACE("%p,%i[", (void*) datarep, (int) strlen(datarep));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<strlen(datarep); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) datarep[trace_elem_idx]);
   }
@@ -5790,7 +5790,7 @@ void FortranCInterface_GLOBAL(mpi_pack_external_size,MPI_PACK_EXTERNAL_SIZE) (ch
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_pack_external_size,PMPI_PACK_EXTERNAL_SIZE)(datarep, incount, datatype, size, ierr);
   WRITE_TRACE("%p,%i[", (void*) datarep, (int) strlen(datarep));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<strlen(datarep); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) datarep[trace_elem_idx]);
   }
@@ -6038,12 +6038,12 @@ void FortranCInterface_GLOBAL(mpi_reduce_scatter,MPI_REDUCE_SCATTER) (int* sendb
   WRITE_TRACE("%s", "MPI_Reduce_scatter:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_reduce_scatter,PMPI_REDUCE_SCATTER)(sendbuf, recvbuf, recvcounts, datatype, op, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
     WRITE_TRACE("%lli:", (long long int) *recvbuf);
   WRITE_TRACE("%p,%i[", (void*) recvcounts, (int) size);
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<size; trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) recvcounts[trace_elem_idx]);
   }
@@ -6317,18 +6317,18 @@ void FortranCInterface_GLOBAL(mpi_scatterv,MPI_SCATTERV) (int* sendbuf, int* sen
   WRITE_TRACE("%s", "MPI_Scatterv:");
   WRITE_TRACE("%0.2f:", lap_mpi_initialized ? PMPI_Wtime()*1e6 : 0.0);
  FortranCInterface_GLOBAL(pmpi_scatterv,PMPI_SCATTERV)(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm, ierr);
-int rank, size; PMPI_Comm_size((*comm), &size); PMPI_Comm_rank((*comm), &rank);
+int rank, size; PMPI_Comm_size( MPI_Comm_f2c((*comm)),  &size); PMPI_Comm_rank( MPI_Comm_f2c((*comm)),  &rank);
 //end of prologs
     WRITE_TRACE("%lli:", (long long int) *sendbuf);
   WRITE_TRACE("%p,%i[", (void*) sendcounts, (int) (rank==(*root) ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank==(*root) ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) sendcounts[trace_elem_idx]);
   }
   WRITE_TRACE("]%s", ":");
 }
   WRITE_TRACE("%p,%i[", (void*) displs, (int) (rank==(*root) ? size : 0));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(rank==(*root) ? size : 0); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) displs[trace_elem_idx]);
   }
@@ -6518,7 +6518,7 @@ void FortranCInterface_GLOBAL(mpi_startall,MPI_STARTALL) (int* count, int* array
  FortranCInterface_GLOBAL(pmpi_startall,PMPI_STARTALL)(count, array_of_requests, ierr);
     WRITE_TRACE("%lli:", (long long int) *count);
   WRITE_TRACE("%p,%i[", (void*) array_of_requests, (int) (*count));
-  if (0) {  } else { 
+  if (lap_elem_tracing_enabled == 0) {  } else { 
     for (int trace_elem_idx=0; trace_elem_idx<(*count); trace_elem_idx++) {
       WRITE_TRACE("%lli;", (long long int) array_of_requests[trace_elem_idx]);
   }
diff --git a/build/mpi_sem.yml b/build/mpi_sem.yml
index 00679c2..5d19db9 100644
--- a/build/mpi_sem.yml
+++ b/build/mpi_sem.yml
@@ -2316,13 +2316,13 @@ MPI_Ineighbor_allgatherv:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: displs
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2358,13 +2358,13 @@ MPI_Ineighbor_alltoallv:
     type: const void *
   - elem_count: odeg
     name: sendcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: odeg
     name: sdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2374,13 +2374,13 @@ MPI_Ineighbor_alltoallv:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: rdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2397,19 +2397,19 @@ MPI_Ineighbor_alltoallw:
     type: const void *
   - elem_count: odeg
     name: sendcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: odeg
     name: sdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Aint[]
   - elem_count: odeg
     name: sendtypes
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Datatype[]
@@ -2417,19 +2417,19 @@ MPI_Ineighbor_alltoallw:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: rdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Aint[]
   - elem_count: ideg
     name: recvtypes
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Datatype[]
@@ -2850,13 +2850,13 @@ MPI_Neighbor_allgatherv:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: displs
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2888,13 +2888,13 @@ MPI_Neighbor_alltoallv:
     type: const void *
   - elem_count: odeg
     name: sendcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: odeg
     name: sdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2904,13 +2904,13 @@ MPI_Neighbor_alltoallv:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: rdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
@@ -2925,19 +2925,19 @@ MPI_Neighbor_alltoallw:
     type: const void *
   - elem_count: odeg
     name: sendcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: odeg
     name: sdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Aint[]
   - elem_count: odeg
     name: sendtypes
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Datatype[]
@@ -2945,19 +2945,19 @@ MPI_Neighbor_alltoallw:
     type: void *
   - elem_count: ideg
     name: recvcounts
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const int[]
   - elem_count: ideg
     name: rdispls
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Aint[]
   - elem_count: ideg
     name: recvtypes
-    prolog_elem_count: int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm,
+    prolog_elem_count: int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm,
       &ideg, &odeg, &wted);
     trace_each_elem: true
     type: const MPI_Datatype[]
diff --git a/src/liballprof2/gencode.py b/src/liballprof2/gencode.py
index 4ad290b..93594bf 100755
--- a/src/liballprof2/gencode.py
+++ b/src/liballprof2/gencode.py
@@ -76,6 +76,13 @@ def deref_args(self, expr, funcname):
         return expr
 
 
+    def fortranize_prolog(self, expr, funcname):
+        expr = self.deref_args(expr, funcname)
+        expr = re.sub(r"PMPI_Cartdim_get\((.+?),(.+?)\)", r"PMPI_Cartdim_get( MPI_Comm_f2c(\1), \2)", expr)
+        expr = re.sub(r"PMPI_Comm_size\((.+?),(.+?)\)", r"PMPI_Comm_size( MPI_Comm_f2c(\1), \2)", expr)
+        expr = re.sub(r"PMPI_Comm_rank\((.+?),(.+?)\)", r"PMPI_Comm_rank( MPI_Comm_f2c(\1), \2)", expr)
+        return expr
+
     def write_prolog(self, mode='c'):
         if mode == 'fortran':
             self.outfile.write("#include \"fc_mangle.h\"\n")
@@ -230,7 +237,8 @@ def write_argument_tracers(self, func, mode):
                 if mode == 'c':
                     prologs.append(sem_param['prolog_elem_count'])
                 if mode == 'fortran':
-                    prolog = self.deref_args(sem_param['prolog_elem_count'], func)
+                    prolog = sem_param['prolog_elem_count']
+                    prolog = self.fortranize_prolog(prolog, func)
                     prologs.append(prolog)
         prologs = list(set(prologs))
         if len(prologs) > 0:
@@ -247,7 +255,7 @@ def write_argument_tracers(self, func, mode):
                     if (mode == 'fortran'):
                         elem_count_expr = self.deref_args(elem_count_expr, func)
                 self.outfile.write(f"  WRITE_TRACE(\"%p,%i[\", (void*) {sem_param['name']}, (int) {elem_count_expr});\n")
-                self.outfile.write(f"  if (0) {{  }} else {{ \n")
+                self.outfile.write(f"  if (lap_elem_tracing_enabled == 0) {{  }} else {{ \n")
                 self.outfile.write(f"    for (int trace_elem_idx=0; trace_elem_idx<{elem_count_expr}; trace_elem_idx++) "+"{\n")
                 
                 # emit the tracer for the simplified arg, use ; to seperate elems
diff --git a/src/liballprof2/gensem.py b/src/liballprof2/gensem.py
index 212da6e..355ccef 100755
--- a/src/liballprof2/gensem.py
+++ b/src/liballprof2/gensem.py
@@ -41,7 +41,7 @@ def get_count_for_param_in_func(self, param, func):
         mapping = {}
         GET_NDIMS_CART_COMM = "int ndims; PMPI_Cartdim_get(comm, &ndims);"
         GET_COMM_SIZE = "int rank, size; PMPI_Comm_size(comm, &size); PMPI_Comm_rank(comm, &rank);"
-        GET_NEIGH_GRAPH_COMM = "int ideg, odeg, wted; MPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);"
+        GET_NEIGH_GRAPH_COMM = "int ideg, odeg, wted; PMPI_Dist_graph_neighbors_count(comm, &ideg, &odeg, &wted);"
         mapping[("MPI_Cart_create", "dims")] = "ndims"
         mapping[("MPI_Cart_create", "periods")] = "ndims"
         mapping[("MPI_Cart_map", "dims")] = "ndims"