From ca43c45941461b117ddb4938380e001408ffb255 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Tue, 17 Jan 2017 13:17:22 +0100
Subject: [PATCH] [tests] update wrt Frama-C Silicon

---
 .../e-acsl/tests/bts/oracle/gen_bts1304.c     |   16 +-
 .../e-acsl/tests/bts/oracle/gen_bts1700.c     |   34 +-
 .../e-acsl/tests/bts/oracle/gen_bts1717.c     |   24 +-
 .../e-acsl/tests/bts/oracle/gen_bts1718.c     |   24 +-
 .../e-acsl/tests/bts/oracle/gen_bts1837.c     |  114 +-
 .../e-acsl/tests/bts/oracle/gen_bts2191.c     |   26 +-
 .../e-acsl/tests/bts/oracle/gen_bts2231.c     |   71 +-
 .../e-acsl/tests/bts/oracle/gen_bts2252.c     |   24 +-
 .../tests/full-mmodel/oracle/gen_addrOf.c     |   10 +-
 .../tests/full-mmodel/oracle/gen_addrOf2.c    |   10 +-
 .../e-acsl/tests/gmp/oracle/gen_arith.c       |  142 +-
 .../e-acsl/tests/gmp/oracle/gen_arith2.c      | 1203 ++++++++---------
 src/plugins/e-acsl/tests/gmp/oracle/gen_at.c  |   20 +-
 src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c |  211 ++-
 .../e-acsl/tests/gmp/oracle/gen_comparison2.c |  432 +++---
 .../tests/gmp/oracle/gen_integer_constant.c   |   23 +-
 .../tests/gmp/oracle/gen_integer_constant2.c  |   86 +-
 .../e-acsl/tests/gmp/oracle/gen_not2.c        |   48 +-
 .../e-acsl/tests/gmp/oracle/gen_quantif.c     |  283 ++--
 .../e-acsl/tests/gmp/oracle/gen_quantif2.c    |  996 +++++++-------
 .../e-acsl/tests/runtime/oracle/gen_addrOf.c  |   10 +-
 .../e-acsl/tests/runtime/oracle/gen_alias.c   |   12 +-
 .../tests/runtime/oracle/gen_base_addr.c      |  339 ++---
 .../tests/runtime/oracle/gen_block_length.c   |  259 ++--
 .../oracle/gen_compound_initializers.c        |  125 +-
 .../tests/runtime/oracle/gen_ctype_macros.c   |   24 +-
 .../e-acsl/tests/runtime/oracle/gen_errno.c   |   24 +-
 .../e-acsl/tests/runtime/oracle/gen_init.c    |   21 +-
 .../tests/runtime/oracle/gen_initialized.c    |  382 +++---
 .../e-acsl/tests/runtime/oracle/gen_lazy.c    |  238 ++--
 .../tests/runtime/oracle/gen_linear_search.c  |  131 +-
 .../tests/runtime/oracle/gen_literal_string.c |   77 +-
 .../tests/runtime/oracle/gen_mainargs.c       |  248 ++--
 .../tests/runtime/oracle/gen_memalign.c       |  137 +-
 .../e-acsl/tests/runtime/oracle/gen_offset.c  |  225 ++-
 .../e-acsl/tests/runtime/oracle/gen_ptr.c     |  103 +-
 .../tests/runtime/oracle/gen_ptr_init.c       |   20 +-
 .../tests/runtime/oracle/gen_stmt_contract.c  |   84 +-
 38 files changed, 2853 insertions(+), 3403 deletions(-)

diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
index 9393af7ffa7..22a85bfa2ec 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
@@ -38,15 +38,13 @@ int main(void)
   }
   /*@ assert \initialized((union msg *)((unsigned char *)buf)); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(buf),
-                                                      sizeof(union msg));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\initialized((union msg *)((unsigned char *)buf))",
-                      23);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(buf),
+                                                    sizeof(union msg));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\initialized((union msg *)((unsigned char *)buf))",
+                    23);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(buf));
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
index ea16f514ee2..f2027aa6a56 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
@@ -12,31 +12,27 @@ int main(void)
   __e_acsl_store_block((void *)(& s),0UL);
   /*@ assert \valid(&s); */
   {
-    {
-      int __gen_e_acsl_valid;
-      __gen_e_acsl_valid = __e_acsl_valid((void *)(& s),sizeof(struct toto));
-      __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(&s)",9);
-    }
+    int __gen_e_acsl_valid;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(& s),sizeof(struct toto));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&s)",9);
   }
   __e_acsl_full_init((void *)(& p));
   p = & s;
   /*@ assert \valid(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                      sizeof(struct toto *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_2;
-        __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(struct toto));
-        __gen_e_acsl_and = __gen_e_acsl_valid_2;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(p)",12);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(struct toto *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_2;
+      __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(struct toto));
+      __gen_e_acsl_and = __gen_e_acsl_valid_2;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(p)",12);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& p));
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
index 0db5c8ad0f7..7a4d037a6c3 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
@@ -13,20 +13,18 @@ int main(void)
   lbl_2:
     /*@ assert \valid(p); */
     {
-      {
-        int __gen_e_acsl_initialized;
-        int __gen_e_acsl_and;
-        __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                        sizeof(int *));
-        if (__gen_e_acsl_initialized) {
-          int __gen_e_acsl_valid;
-          __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
-          __gen_e_acsl_and = __gen_e_acsl_valid;
-        }
-        else __gen_e_acsl_and = 0;
-        __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                        (char *)"\\valid(p)",10);
+      int __gen_e_acsl_initialized;
+      int __gen_e_acsl_and;
+      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+      if (__gen_e_acsl_initialized) {
+        int __gen_e_acsl_valid;
+        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
+        __gen_e_acsl_and = __gen_e_acsl_valid;
       }
+      else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                      (char *)"\\valid(p)",10);
     }
     __retres = 0;
     goto return_label;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
index d37ffae2b81..abc1a197f25 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
@@ -13,20 +13,18 @@ int main(void)
   lbl_2:
     /*@ assert \valid(p); */
     {
-      {
-        int __gen_e_acsl_initialized;
-        int __gen_e_acsl_and;
-        __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                        sizeof(int *));
-        if (__gen_e_acsl_initialized) {
-          int __gen_e_acsl_valid;
-          __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
-          __gen_e_acsl_and = __gen_e_acsl_valid;
-        }
-        else __gen_e_acsl_and = 0;
-        __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                        (char *)"\\valid(p)",13);
+      int __gen_e_acsl_initialized;
+      int __gen_e_acsl_and;
+      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+      if (__gen_e_acsl_initialized) {
+        int __gen_e_acsl_valid;
+        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
+        __gen_e_acsl_and = __gen_e_acsl_valid;
       }
+      else __gen_e_acsl_and = 0;
+      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                      (char *)"\\valid(p)",13);
     }
     __retres = 0;
     goto return_label;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
index c26af6b5ae3..5ad2ba8ad8c 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
@@ -16,48 +16,42 @@ int f(void)
   s2 = (char *)__gen_e_acsl_literal_string_2;
   /*@ assert \valid_read(S); */
   {
-    {
-      int __gen_e_acsl_valid_read;
-      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)S,sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"Assertion",
-                      (char *)"f",(char *)"\\valid_read(S)",10);
-    }
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)S,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"Assertion",(char *)"f",
+                    (char *)"\\valid_read(S)",10);
   }
   /*@ assert \valid_read(s1); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s1),
-                                                      sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_read_2;
-        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)s1,
-                                                        sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid_read_2;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"f",
-                      (char *)"\\valid_read(s1)",11);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s1),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)s1,
+                                                      sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read_2;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"f",
+                    (char *)"\\valid_read(s1)",11);
   }
   /*@ assert \valid_read(s2); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      int __gen_e_acsl_and_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s2),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_2) {
-        int __gen_e_acsl_valid_read_3;
-        __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)s2,
-                                                        sizeof(char));
-        __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
-      }
-      else __gen_e_acsl_and_2 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"f",
-                      (char *)"\\valid_read(s2)",12);
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s2),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)s2,
+                                                      sizeof(char));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
     }
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"f",
+                    (char *)"\\valid_read(s2)",12);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& s2));
@@ -107,39 +101,35 @@ int main(void)
       s = (char *)__gen_e_acsl_literal_string_3;
       /*@ assert \valid_read(s); */
       {
-        {
-          int __gen_e_acsl_initialized;
-          int __gen_e_acsl_and;
-          __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s),
-                                                          sizeof(char *));
-          if (__gen_e_acsl_initialized) {
-            int __gen_e_acsl_valid_read;
-            __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)s,
-                                                          sizeof(char));
-            __gen_e_acsl_and = __gen_e_acsl_valid_read;
-          }
-          else __gen_e_acsl_and = 0;
-          __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",
-                          (char *)"main",(char *)"\\valid_read(s)",20);
+        int __gen_e_acsl_initialized;
+        int __gen_e_acsl_and;
+        __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& s),
+                                                        sizeof(char *));
+        if (__gen_e_acsl_initialized) {
+          int __gen_e_acsl_valid_read;
+          __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)s,
+                                                        sizeof(char));
+          __gen_e_acsl_and = __gen_e_acsl_valid_read;
         }
+        else __gen_e_acsl_and = 0;
+        __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                        (char *)"\\valid_read(s)",20);
       }
       /*@ assert ¬\valid(s); */
       {
-        {
-          int __gen_e_acsl_initialized_2;
-          int __gen_e_acsl_and_2;
-          __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s),
-                                                            sizeof(char *));
-          if (__gen_e_acsl_initialized_2) {
-            int __gen_e_acsl_valid;
-            __gen_e_acsl_valid = __e_acsl_valid((void *)s,sizeof(char));
-            __gen_e_acsl_and_2 = __gen_e_acsl_valid;
-          }
-          else __gen_e_acsl_and_2 = 0;
-          __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",
-                          (char *)"main",(char *)"!\\valid(s)",21);
-          __e_acsl_delete_block((void *)(& s));
+        int __gen_e_acsl_initialized_2;
+        int __gen_e_acsl_and_2;
+        __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& s),
+                                                          sizeof(char *));
+        if (__gen_e_acsl_initialized_2) {
+          int __gen_e_acsl_valid;
+          __gen_e_acsl_valid = __e_acsl_valid((void *)s,sizeof(char));
+          __gen_e_acsl_and_2 = __gen_e_acsl_valid;
         }
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",
+                        (char *)"main",(char *)"!\\valid(s)",21);
+        __e_acsl_delete_block((void *)(& s));
       }
     }
   }
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
index 105c9ac89d9..3f99ab5fc7d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
@@ -32,21 +32,19 @@ int main(int argc, char **argv)
   __e_acsl_globals_init();
   /*@ assert \valid_read(_G[0].str); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& _G[0L].str),
-                                                      sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_read;
-        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)_G[0L].str,
-                                                      sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid_read;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid_read(_G[0].str)",22);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& _G[0L].str),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)_G[0L].str,
+                                                    sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid_read(_G[0].str)",22);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(_G));
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
index 174ad1a7f1f..5f000302bf0 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
@@ -5,44 +5,39 @@ int main(void)
   int __retres;
   /*@ assert A + (long)((long)(3 * A) - 1) ≡ -1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_A;
-      __e_acsl_mpz_t __gen_e_acsl_;
-      __e_acsl_mpz_t __gen_e_acsl_mul;
-      long __gen_e_acsl__2;
-      __e_acsl_mpz_t __gen_e_acsl__3;
-      __e_acsl_mpz_t __gen_e_acsl_add;
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl_A,A);
-      __gmpz_init_set_si(__gen_e_acsl_,3L);
-      __gmpz_init(__gen_e_acsl_mul);
-      __gmpz_mul(__gen_e_acsl_mul,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_A));
-      __gen_e_acsl__2 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_mul));
-      /*@ assert
-          Value: signed_overflow:
-            -9223372036854775808 ≤ __gen_e_acsl__2 - 1;
-      */
-      __gmpz_init_set_si(__gen_e_acsl__3,__gen_e_acsl__2 - 1L);
-      __gmpz_init(__gen_e_acsl_add);
-      __gmpz_add(__gen_e_acsl_add,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_A),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
-      __gmpz_init_set_si(__gen_e_acsl__4,(long)(-1));
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"A + (long)((long)(3 * A) - 1) == -1",8);
-      __gmpz_clear(__gen_e_acsl_A);
-      __gmpz_clear(__gen_e_acsl_);
-      __gmpz_clear(__gen_e_acsl_mul);
-      __gmpz_clear(__gen_e_acsl__3);
-      __gmpz_clear(__gen_e_acsl_add);
-      __gmpz_clear(__gen_e_acsl__4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_A;
+    __e_acsl_mpz_t __gen_e_acsl_;
+    __e_acsl_mpz_t __gen_e_acsl_mul;
+    long __gen_e_acsl__2;
+    __e_acsl_mpz_t __gen_e_acsl__3;
+    __e_acsl_mpz_t __gen_e_acsl_add;
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_A,A);
+    __gmpz_init_set_si(__gen_e_acsl_,3L);
+    __gmpz_init(__gen_e_acsl_mul);
+    __gmpz_mul(__gen_e_acsl_mul,(__e_acsl_mpz_struct const *)(__gen_e_acsl_),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_A));
+    __gen_e_acsl__2 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_mul));
+    /*@ assert
+        Value: signed_overflow: -9223372036854775808 ≤ __gen_e_acsl__2 - 1;
+    */
+    __gmpz_init_set_si(__gen_e_acsl__3,__gen_e_acsl__2 - 1L);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_A),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
+    __gmpz_init_set_si(__gen_e_acsl__4,(long)(-1));
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"A + (long)((long)(3 * A) - 1) == -1",8);
+    __gmpz_clear(__gen_e_acsl_A);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl_mul);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
index 3a492d48a04..f42bdb277e3 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
@@ -18,24 +18,20 @@ int main(void)
   i = -1;
   /*@ assert ¬\valid_read(&t[i]); */
   {
-    {
-      int __gen_e_acsl_valid_read;
-      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(& t[i]),
-                                                    sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_valid_read,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\valid_read(&t[i])",9);
-    }
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(& t[i]),
+                                                  sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_valid_read,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\valid_read(&t[i])",9);
   }
   p = t;
   /*@ assert ¬\valid_read(p + i); */
   {
-    {
-      int __gen_e_acsl_valid_read_2;
-      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(p + i),
-                                                      sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_valid_read_2,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\valid_read(p + i)",11);
-    }
+    int __gen_e_acsl_valid_read_2;
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(p + i),
+                                                    sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_valid_read_2,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\valid_read(p + i)",11);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& p));
diff --git a/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf.c
index 46d7ef3a5c1..27863938989 100644
--- a/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf.c
@@ -15,12 +15,10 @@ void f(void)
   m = 123;
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"f",(char *)"\\initialized(p)",10);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",(char *)"f",
+                    (char *)"\\initialized(p)",10);
   }
   __e_acsl_delete_block((void *)(& p));
   __e_acsl_delete_block((void *)(& u));
diff --git a/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf2.c b/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf2.c
index 3dd31d81396..6a753014472 100644
--- a/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf2.c
+++ b/src/plugins/e-acsl/tests/full-mmodel/oracle/gen_addrOf2.c
@@ -15,12 +15,10 @@ void f(void)
   m = 123;
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"f",(char *)"\\initialized(p)",10);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",(char *)"f",
+                    (char *)"\\initialized(p)",10);
   }
   __e_acsl_delete_block((void *)(& p));
   __e_acsl_delete_block((void *)(& u));
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
index 56530af0d60..be202dfc93d 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith.c
@@ -31,33 +31,30 @@ int main(void)
                   (char *)"x / 3 == -1",17);
   /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_;
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      int __gen_e_acsl_div_guard;
-      __e_acsl_mpz_t __gen_e_acsl_div;
-      long __gen_e_acsl__3;
-      __gmpz_init_set_str(__gen_e_acsl_,"309485009821345068724781055",10);
-      __gmpz_init_set_si(__gen_e_acsl__2,0L);
-      __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
-                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __gmpz_init(__gen_e_acsl_div);
-      /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
-                      18);
-      __gmpz_tdiv_q(__gen_e_acsl_div,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __gen_e_acsl__3 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_div));
-      __e_acsl_assert(__gen_e_acsl__3 == 1,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1",
-                      18);
-      __gmpz_clear(__gen_e_acsl_);
-      __gmpz_clear(__gen_e_acsl__2);
-      __gmpz_clear(__gen_e_acsl_div);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_;
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_div_guard;
+    __e_acsl_mpz_t __gen_e_acsl_div;
+    long __gen_e_acsl__3;
+    __gmpz_init_set_str(__gen_e_acsl_,"309485009821345068724781055",10);
+    __gmpz_init_set_si(__gen_e_acsl__2,0L);
+    __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
+                                        (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __gmpz_init(__gen_e_acsl_div);
+    /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
+                    18);
+    __gmpz_tdiv_q(__gen_e_acsl_div,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __gen_e_acsl__3 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_div));
+    __e_acsl_assert(__gen_e_acsl__3 == 1,(char *)"Assertion",(char *)"main",
+                    (char *)"0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1",
+                    18);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_div);
   }
   /*@ assert x % 2 ≡ -1; */
   __e_acsl_assert(x % 2 == -1,(char *)"Assertion",(char *)"main",
@@ -88,57 +85,50 @@ int main(void)
   __e_acsl_assert((0 != 0) == ! (1 != 0),(char *)"Assertion",(char *)"main",
                   (char *)"(0 != 0) == !(1 != 0)",30);
   /*@ assert 4 / y ≡ 2; */
-  {
-    __e_acsl_assert(y != 0,(char *)"RTE",(char *)"main",
-                    (char *)"division_by_zero: y != 0",31);
-    __e_acsl_assert(4 / y == 2,(char *)"Assertion",(char *)"main",
-                    (char *)"4 / y == 2",31);
-  }
+  __e_acsl_assert(y != 0,(char *)"RTE",(char *)"main",
+                  (char *)"division_by_zero: y != 0",31);
+  __e_acsl_assert(4 / y == 2,(char *)"Assertion",(char *)"main",
+                  (char *)"4 / y == 2",31);
   /*@ assert 1 + (z + 1) / (y - 123456789123456789) ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_z;
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      __e_acsl_mpz_t __gen_e_acsl_add;
-      __e_acsl_mpz_t __gen_e_acsl__5;
-      __e_acsl_mpz_t __gen_e_acsl__6;
-      int __gen_e_acsl_div_guard_2;
-      __e_acsl_mpz_t __gen_e_acsl_div_2;
-      long __gen_e_acsl__7;
-      __gmpz_init_set_si(__gen_e_acsl_z,z);
-      __gmpz_init_set_si(__gen_e_acsl__4,1L);
-      __gmpz_init(__gen_e_acsl_add);
-      __gmpz_add(__gen_e_acsl_add,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __gmpz_init_set_si(__gen_e_acsl__5,y - 123456789123456789L);
-      __gmpz_init_set_si(__gen_e_acsl__6,0L);
-      __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
-      __gmpz_init(__gen_e_acsl_div_2);
-      /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard_2 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"y - 123456789123456789 == 0",
-                      34);
-      __gmpz_tdiv_q(__gen_e_acsl_div_2,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-      __gen_e_acsl__7 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_2));
-      /*@ assert Value: signed_overflow: -2147483648 ≤ 1 + __gen_e_acsl__7;
-      */
-      /*@ assert Value: signed_overflow: 1 + __gen_e_acsl__7 ≤ 2147483647;
-      */
-      __e_acsl_assert(1 + __gen_e_acsl__7 == 1,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"1 + (z + 1) / (y - 123456789123456789) == 1",
-                      34);
-      __gmpz_clear(__gen_e_acsl_z);
-      __gmpz_clear(__gen_e_acsl__4);
-      __gmpz_clear(__gen_e_acsl_add);
-      __gmpz_clear(__gen_e_acsl__5);
-      __gmpz_clear(__gen_e_acsl__6);
-      __gmpz_clear(__gen_e_acsl_div_2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_z;
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    __e_acsl_mpz_t __gen_e_acsl_add;
+    __e_acsl_mpz_t __gen_e_acsl__5;
+    __e_acsl_mpz_t __gen_e_acsl__6;
+    int __gen_e_acsl_div_guard_2;
+    __e_acsl_mpz_t __gen_e_acsl_div_2;
+    long __gen_e_acsl__7;
+    __gmpz_init_set_si(__gen_e_acsl_z,z);
+    __gmpz_init_set_si(__gen_e_acsl__4,1L);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __gmpz_init_set_si(__gen_e_acsl__5,y - 123456789123456789L);
+    __gmpz_init_set_si(__gen_e_acsl__6,0L);
+    __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
+    __gmpz_init(__gen_e_acsl_div_2);
+    /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_2 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"y - 123456789123456789 == 0",34);
+    __gmpz_tdiv_q(__gen_e_acsl_div_2,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+    __gen_e_acsl__7 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_2));
+    /*@ assert Value: signed_overflow: -2147483648 ≤ 1 + __gen_e_acsl__7;
+    */
+    /*@ assert Value: signed_overflow: 1 + __gen_e_acsl__7 ≤ 2147483647; */
+    __e_acsl_assert(1 + __gen_e_acsl__7 == 1,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"1 + (z + 1) / (y - 123456789123456789) == 1",34);
+    __gmpz_clear(__gen_e_acsl_z);
+    __gmpz_clear(__gen_e_acsl__4);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl__6);
+    __gmpz_clear(__gen_e_acsl_div_2);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
index fc3b73b7c6f..ce2f8dd9692 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_arith2.c
@@ -10,683 +10,642 @@ int main(void)
   z = 2L;
   /*@ assert -3 ≡ x; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_;
-      __e_acsl_mpz_t __gen_e_acsl_neg;
-      __e_acsl_mpz_t __gen_e_acsl_x;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl_,3L);
-      __gmpz_init(__gen_e_acsl_neg);
-      __gmpz_neg(__gen_e_acsl_neg,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"-3 == x",10);
-      __gmpz_clear(__gen_e_acsl_);
-      __gmpz_clear(__gen_e_acsl_neg);
-      __gmpz_clear(__gen_e_acsl_x);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_;
+    __e_acsl_mpz_t __gen_e_acsl_neg;
+    __e_acsl_mpz_t __gen_e_acsl_x;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,3L);
+    __gmpz_init(__gen_e_acsl_neg);
+    __gmpz_neg(__gen_e_acsl_neg,(__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"-3 == x",10);
+    __gmpz_clear(__gen_e_acsl_);
+    __gmpz_clear(__gen_e_acsl_neg);
+    __gmpz_clear(__gen_e_acsl_x);
   }
   /*@ assert x ≡ -3; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_2;
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      __e_acsl_mpz_t __gen_e_acsl_neg_2;
-      int __gen_e_acsl_eq_2;
-      __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__2,3L);
-      __gmpz_init(__gen_e_acsl_neg_2);
-      __gmpz_neg(__gen_e_acsl_neg_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_2));
-      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x == -3",11);
-      __gmpz_clear(__gen_e_acsl_x_2);
-      __gmpz_clear(__gen_e_acsl__2);
-      __gmpz_clear(__gen_e_acsl_neg_2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_2;
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    __e_acsl_mpz_t __gen_e_acsl_neg_2;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__2,3L);
+    __gmpz_init(__gen_e_acsl_neg_2);
+    __gmpz_neg(__gen_e_acsl_neg_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x == -3",11);
+    __gmpz_clear(__gen_e_acsl_x_2);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl_neg_2);
   }
   /*@ assert 0 ≢ ~0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__3;
-      __e_acsl_mpz_t __gen_e_acsl_bnot;
-      int __gen_e_acsl_ne;
-      __gmpz_init_set_si(__gen_e_acsl__3,0L);
-      __gmpz_init(__gen_e_acsl_bnot);
-      __gmpz_com(__gen_e_acsl_bnot,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
-      __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_bnot));
-      __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
-                      (char *)"main",(char *)"0 != ~0",12);
-      __gmpz_clear(__gen_e_acsl__3);
-      __gmpz_clear(__gen_e_acsl_bnot);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__3;
+    __e_acsl_mpz_t __gen_e_acsl_bnot;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__3,0L);
+    __gmpz_init(__gen_e_acsl_bnot);
+    __gmpz_com(__gen_e_acsl_bnot,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
+    __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_bnot));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+                    (char *)"0 != ~0",12);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl_bnot);
   }
   /*@ assert x + 1 ≡ -2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_3;
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      __e_acsl_mpz_t __gen_e_acsl_add;
-      __e_acsl_mpz_t __gen_e_acsl__5;
-      __e_acsl_mpz_t __gen_e_acsl_neg_3;
-      int __gen_e_acsl_eq_3;
-      __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__4,1L);
-      __gmpz_init(__gen_e_acsl_add);
-      __gmpz_add(__gen_e_acsl_add,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __gmpz_init_set_si(__gen_e_acsl__5,2L);
-      __gmpz_init(__gen_e_acsl_neg_3);
-      __gmpz_neg(__gen_e_acsl_neg_3,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-      __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_3));
-      __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x + 1 == -2",14);
-      __gmpz_clear(__gen_e_acsl_x_3);
-      __gmpz_clear(__gen_e_acsl__4);
-      __gmpz_clear(__gen_e_acsl_add);
-      __gmpz_clear(__gen_e_acsl__5);
-      __gmpz_clear(__gen_e_acsl_neg_3);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_3;
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    __e_acsl_mpz_t __gen_e_acsl_add;
+    __e_acsl_mpz_t __gen_e_acsl__5;
+    __e_acsl_mpz_t __gen_e_acsl_neg_3;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__4,1L);
+    __gmpz_init(__gen_e_acsl_add);
+    __gmpz_add(__gen_e_acsl_add,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __gmpz_init_set_si(__gen_e_acsl__5,2L);
+    __gmpz_init(__gen_e_acsl_neg_3);
+    __gmpz_neg(__gen_e_acsl_neg_3,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_3));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x + 1 == -2",14);
+    __gmpz_clear(__gen_e_acsl_x_3);
+    __gmpz_clear(__gen_e_acsl__4);
+    __gmpz_clear(__gen_e_acsl_add);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl_neg_3);
   }
   /*@ assert x - 1 ≡ -4; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_4;
-      __e_acsl_mpz_t __gen_e_acsl__6;
-      __e_acsl_mpz_t __gen_e_acsl_sub;
-      __e_acsl_mpz_t __gen_e_acsl__7;
-      __e_acsl_mpz_t __gen_e_acsl_neg_4;
-      int __gen_e_acsl_eq_4;
-      __gmpz_init_set_si(__gen_e_acsl_x_4,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__6,1L);
-      __gmpz_init(__gen_e_acsl_sub);
-      __gmpz_sub(__gen_e_acsl_sub,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
-      __gmpz_init_set_si(__gen_e_acsl__7,4L);
-      __gmpz_init(__gen_e_acsl_neg_4);
-      __gmpz_neg(__gen_e_acsl_neg_4,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__7));
-      __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_sub),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_4));
-      __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x - 1 == -4",15);
-      __gmpz_clear(__gen_e_acsl_x_4);
-      __gmpz_clear(__gen_e_acsl__6);
-      __gmpz_clear(__gen_e_acsl_sub);
-      __gmpz_clear(__gen_e_acsl__7);
-      __gmpz_clear(__gen_e_acsl_neg_4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_4;
+    __e_acsl_mpz_t __gen_e_acsl__6;
+    __e_acsl_mpz_t __gen_e_acsl_sub;
+    __e_acsl_mpz_t __gen_e_acsl__7;
+    __e_acsl_mpz_t __gen_e_acsl_neg_4;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl_x_4,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__6,1L);
+    __gmpz_init(__gen_e_acsl_sub);
+    __gmpz_sub(__gen_e_acsl_sub,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
+    __gmpz_init_set_si(__gen_e_acsl__7,4L);
+    __gmpz_init(__gen_e_acsl_neg_4);
+    __gmpz_neg(__gen_e_acsl_neg_4,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__7));
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_sub),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_4));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x - 1 == -4",15);
+    __gmpz_clear(__gen_e_acsl_x_4);
+    __gmpz_clear(__gen_e_acsl__6);
+    __gmpz_clear(__gen_e_acsl_sub);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl_neg_4);
   }
   /*@ assert x * 3 ≡ -9; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_5;
-      __e_acsl_mpz_t __gen_e_acsl__8;
-      __e_acsl_mpz_t __gen_e_acsl_mul;
-      __e_acsl_mpz_t __gen_e_acsl__9;
-      __e_acsl_mpz_t __gen_e_acsl_neg_5;
-      int __gen_e_acsl_eq_5;
-      __gmpz_init_set_si(__gen_e_acsl_x_5,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__8,3L);
-      __gmpz_init(__gen_e_acsl_mul);
-      __gmpz_mul(__gen_e_acsl_mul,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
-      __gmpz_init_set_si(__gen_e_acsl__9,9L);
-      __gmpz_init(__gen_e_acsl_neg_5);
-      __gmpz_neg(__gen_e_acsl_neg_5,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__9));
-      __gen_e_acsl_eq_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mul),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5));
-      __e_acsl_assert(__gen_e_acsl_eq_5 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x * 3 == -9",16);
-      __gmpz_clear(__gen_e_acsl_x_5);
-      __gmpz_clear(__gen_e_acsl__8);
-      __gmpz_clear(__gen_e_acsl_mul);
-      __gmpz_clear(__gen_e_acsl__9);
-      __gmpz_clear(__gen_e_acsl_neg_5);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_5;
+    __e_acsl_mpz_t __gen_e_acsl__8;
+    __e_acsl_mpz_t __gen_e_acsl_mul;
+    __e_acsl_mpz_t __gen_e_acsl__9;
+    __e_acsl_mpz_t __gen_e_acsl_neg_5;
+    int __gen_e_acsl_eq_5;
+    __gmpz_init_set_si(__gen_e_acsl_x_5,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__8,3L);
+    __gmpz_init(__gen_e_acsl_mul);
+    __gmpz_mul(__gen_e_acsl_mul,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
+    __gmpz_init_set_si(__gen_e_acsl__9,9L);
+    __gmpz_init(__gen_e_acsl_neg_5);
+    __gmpz_neg(__gen_e_acsl_neg_5,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__9));
+    __gen_e_acsl_eq_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mul),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5));
+    __e_acsl_assert(__gen_e_acsl_eq_5 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x * 3 == -9",16);
+    __gmpz_clear(__gen_e_acsl_x_5);
+    __gmpz_clear(__gen_e_acsl__8);
+    __gmpz_clear(__gen_e_acsl_mul);
+    __gmpz_clear(__gen_e_acsl__9);
+    __gmpz_clear(__gen_e_acsl_neg_5);
   }
   /*@ assert x / 3 ≡ -1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_6;
-      __e_acsl_mpz_t __gen_e_acsl__10;
-      __e_acsl_mpz_t __gen_e_acsl__11;
-      int __gen_e_acsl_div_guard;
-      __e_acsl_mpz_t __gen_e_acsl_div;
-      __e_acsl_mpz_t __gen_e_acsl__12;
-      __e_acsl_mpz_t __gen_e_acsl_neg_6;
-      int __gen_e_acsl_eq_6;
-      __gmpz_init_set_si(__gen_e_acsl_x_6,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__10,3L);
-      __gmpz_init_set_si(__gen_e_acsl__11,0L);
-      __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__10),
-                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__11));
-      __gmpz_init(__gen_e_acsl_div);
-      /*@ assert E_ACSL: 3 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"3 == 0",17);
-      __gmpz_tdiv_q(__gen_e_acsl_div,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
-      __gmpz_init_set_si(__gen_e_acsl__12,1L);
-      __gmpz_init(__gen_e_acsl_neg_6);
-      __gmpz_neg(__gen_e_acsl_neg_6,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__12));
-      __gen_e_acsl_eq_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_6));
-      __e_acsl_assert(__gen_e_acsl_eq_6 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x / 3 == -1",17);
-      __gmpz_clear(__gen_e_acsl_x_6);
-      __gmpz_clear(__gen_e_acsl__10);
-      __gmpz_clear(__gen_e_acsl__11);
-      __gmpz_clear(__gen_e_acsl_div);
-      __gmpz_clear(__gen_e_acsl__12);
-      __gmpz_clear(__gen_e_acsl_neg_6);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_6;
+    __e_acsl_mpz_t __gen_e_acsl__10;
+    __e_acsl_mpz_t __gen_e_acsl__11;
+    int __gen_e_acsl_div_guard;
+    __e_acsl_mpz_t __gen_e_acsl_div;
+    __e_acsl_mpz_t __gen_e_acsl__12;
+    __e_acsl_mpz_t __gen_e_acsl_neg_6;
+    int __gen_e_acsl_eq_6;
+    __gmpz_init_set_si(__gen_e_acsl_x_6,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__10,3L);
+    __gmpz_init_set_si(__gen_e_acsl__11,0L);
+    __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__10),
+                                        (__e_acsl_mpz_struct const *)(__gen_e_acsl__11));
+    __gmpz_init(__gen_e_acsl_div);
+    /*@ assert E_ACSL: 3 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"3 == 0",17);
+    __gmpz_tdiv_q(__gen_e_acsl_div,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
+    __gmpz_init_set_si(__gen_e_acsl__12,1L);
+    __gmpz_init(__gen_e_acsl_neg_6);
+    __gmpz_neg(__gen_e_acsl_neg_6,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__12));
+    __gen_e_acsl_eq_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_6));
+    __e_acsl_assert(__gen_e_acsl_eq_6 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x / 3 == -1",17);
+    __gmpz_clear(__gen_e_acsl_x_6);
+    __gmpz_clear(__gen_e_acsl__10);
+    __gmpz_clear(__gen_e_acsl__11);
+    __gmpz_clear(__gen_e_acsl_div);
+    __gmpz_clear(__gen_e_acsl__12);
+    __gmpz_clear(__gen_e_acsl_neg_6);
   }
   /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__13;
-      __e_acsl_mpz_t __gen_e_acsl__14;
-      int __gen_e_acsl_div_guard_2;
-      __e_acsl_mpz_t __gen_e_acsl_div_2;
-      __e_acsl_mpz_t __gen_e_acsl__15;
-      int __gen_e_acsl_eq_7;
-      __gmpz_init_set_str(__gen_e_acsl__13,"309485009821345068724781055",10);
-      __gmpz_init_set_si(__gen_e_acsl__14,0L);
-      __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__13),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
-      __gmpz_init(__gen_e_acsl_div_2);
-      /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard_2 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
-                      18);
-      __gmpz_tdiv_q(__gen_e_acsl_div_2,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__13),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
-      __gmpz_init_set_si(__gen_e_acsl__15,1L);
-      __gen_e_acsl_eq_7 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
-      __e_acsl_assert(__gen_e_acsl_eq_7 == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1",
-                      18);
-      __gmpz_clear(__gen_e_acsl__13);
-      __gmpz_clear(__gen_e_acsl__14);
-      __gmpz_clear(__gen_e_acsl_div_2);
-      __gmpz_clear(__gen_e_acsl__15);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__13;
+    __e_acsl_mpz_t __gen_e_acsl__14;
+    int __gen_e_acsl_div_guard_2;
+    __e_acsl_mpz_t __gen_e_acsl_div_2;
+    __e_acsl_mpz_t __gen_e_acsl__15;
+    int __gen_e_acsl_eq_7;
+    __gmpz_init_set_str(__gen_e_acsl__13,"309485009821345068724781055",10);
+    __gmpz_init_set_si(__gen_e_acsl__14,0L);
+    __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__13),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
+    __gmpz_init(__gen_e_acsl_div_2);
+    /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_2 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"0xffffffffffffffffffffff == 0",
+                    18);
+    __gmpz_tdiv_q(__gen_e_acsl_div_2,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__13),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
+    __gmpz_init_set_si(__gen_e_acsl__15,1L);
+    __gen_e_acsl_eq_7 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
+    __e_acsl_assert(__gen_e_acsl_eq_7 == 0,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1",
+                    18);
+    __gmpz_clear(__gen_e_acsl__13);
+    __gmpz_clear(__gen_e_acsl__14);
+    __gmpz_clear(__gen_e_acsl_div_2);
+    __gmpz_clear(__gen_e_acsl__15);
   }
   /*@ assert x % 2 ≡ -1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_7;
-      __e_acsl_mpz_t __gen_e_acsl__16;
-      __e_acsl_mpz_t __gen_e_acsl__17;
-      int __gen_e_acsl_mod_guard;
-      __e_acsl_mpz_t __gen_e_acsl_mod;
-      __e_acsl_mpz_t __gen_e_acsl__18;
-      __e_acsl_mpz_t __gen_e_acsl_neg_7;
-      int __gen_e_acsl_eq_8;
-      __gmpz_init_set_si(__gen_e_acsl_x_7,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__16,2L);
-      __gmpz_init_set_si(__gen_e_acsl__17,0L);
-      __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__16),
-                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
-      __gmpz_init(__gen_e_acsl_mod);
-      /*@ assert E_ACSL: 2 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"2 == 0",19);
-      __gmpz_tdiv_r(__gen_e_acsl_mod,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__16));
-      __gmpz_init_set_si(__gen_e_acsl__18,1L);
-      __gmpz_init(__gen_e_acsl_neg_7);
-      __gmpz_neg(__gen_e_acsl_neg_7,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
-      __gen_e_acsl_eq_8 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_7));
-      __e_acsl_assert(__gen_e_acsl_eq_8 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x % 2 == -1",19);
-      __gmpz_clear(__gen_e_acsl_x_7);
-      __gmpz_clear(__gen_e_acsl__16);
-      __gmpz_clear(__gen_e_acsl__17);
-      __gmpz_clear(__gen_e_acsl_mod);
-      __gmpz_clear(__gen_e_acsl__18);
-      __gmpz_clear(__gen_e_acsl_neg_7);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_7;
+    __e_acsl_mpz_t __gen_e_acsl__16;
+    __e_acsl_mpz_t __gen_e_acsl__17;
+    int __gen_e_acsl_mod_guard;
+    __e_acsl_mpz_t __gen_e_acsl_mod;
+    __e_acsl_mpz_t __gen_e_acsl__18;
+    __e_acsl_mpz_t __gen_e_acsl_neg_7;
+    int __gen_e_acsl_eq_8;
+    __gmpz_init_set_si(__gen_e_acsl_x_7,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__16,2L);
+    __gmpz_init_set_si(__gen_e_acsl__17,0L);
+    __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__16),
+                                        (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
+    __gmpz_init(__gen_e_acsl_mod);
+    /*@ assert E_ACSL: 2 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"2 == 0",19);
+    __gmpz_tdiv_r(__gen_e_acsl_mod,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__16));
+    __gmpz_init_set_si(__gen_e_acsl__18,1L);
+    __gmpz_init(__gen_e_acsl_neg_7);
+    __gmpz_neg(__gen_e_acsl_neg_7,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
+    __gen_e_acsl_eq_8 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_7));
+    __e_acsl_assert(__gen_e_acsl_eq_8 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"x % 2 == -1",19);
+    __gmpz_clear(__gen_e_acsl_x_7);
+    __gmpz_clear(__gen_e_acsl__16);
+    __gmpz_clear(__gen_e_acsl__17);
+    __gmpz_clear(__gen_e_acsl_mod);
+    __gmpz_clear(__gen_e_acsl__18);
+    __gmpz_clear(__gen_e_acsl_neg_7);
   }
   /*@ assert -3 % -2 ≡ -1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__19;
-      __e_acsl_mpz_t __gen_e_acsl_neg_8;
-      __e_acsl_mpz_t __gen_e_acsl__20;
-      __e_acsl_mpz_t __gen_e_acsl_neg_9;
-      __e_acsl_mpz_t __gen_e_acsl__21;
-      int __gen_e_acsl_mod_guard_2;
-      __e_acsl_mpz_t __gen_e_acsl_mod_2;
-      __e_acsl_mpz_t __gen_e_acsl__22;
-      __e_acsl_mpz_t __gen_e_acsl_neg_10;
-      int __gen_e_acsl_eq_9;
-      __gmpz_init_set_si(__gen_e_acsl__19,3L);
-      __gmpz_init(__gen_e_acsl_neg_8);
-      __gmpz_neg(__gen_e_acsl_neg_8,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
-      __gmpz_init_set_si(__gen_e_acsl__20,2L);
-      __gmpz_init(__gen_e_acsl_neg_9);
-      __gmpz_neg(__gen_e_acsl_neg_9,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__20));
-      __gmpz_init_set_si(__gen_e_acsl__21,0L);
-      __gen_e_acsl_mod_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_9),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
-      __gmpz_init(__gen_e_acsl_mod_2);
-      /*@ assert E_ACSL: -2 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_mod_guard_2 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"-2 == 0",20);
-      __gmpz_tdiv_r(__gen_e_acsl_mod_2,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_8),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_9));
-      __gmpz_init_set_si(__gen_e_acsl__22,1L);
-      __gmpz_init(__gen_e_acsl_neg_10);
-      __gmpz_neg(__gen_e_acsl_neg_10,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
-      __gen_e_acsl_eq_9 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_10));
-      __e_acsl_assert(__gen_e_acsl_eq_9 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"-3 % -2 == -1",20);
-      __gmpz_clear(__gen_e_acsl__19);
-      __gmpz_clear(__gen_e_acsl_neg_8);
-      __gmpz_clear(__gen_e_acsl__20);
-      __gmpz_clear(__gen_e_acsl_neg_9);
-      __gmpz_clear(__gen_e_acsl__21);
-      __gmpz_clear(__gen_e_acsl_mod_2);
-      __gmpz_clear(__gen_e_acsl__22);
-      __gmpz_clear(__gen_e_acsl_neg_10);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__19;
+    __e_acsl_mpz_t __gen_e_acsl_neg_8;
+    __e_acsl_mpz_t __gen_e_acsl__20;
+    __e_acsl_mpz_t __gen_e_acsl_neg_9;
+    __e_acsl_mpz_t __gen_e_acsl__21;
+    int __gen_e_acsl_mod_guard_2;
+    __e_acsl_mpz_t __gen_e_acsl_mod_2;
+    __e_acsl_mpz_t __gen_e_acsl__22;
+    __e_acsl_mpz_t __gen_e_acsl_neg_10;
+    int __gen_e_acsl_eq_9;
+    __gmpz_init_set_si(__gen_e_acsl__19,3L);
+    __gmpz_init(__gen_e_acsl_neg_8);
+    __gmpz_neg(__gen_e_acsl_neg_8,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
+    __gmpz_init_set_si(__gen_e_acsl__20,2L);
+    __gmpz_init(__gen_e_acsl_neg_9);
+    __gmpz_neg(__gen_e_acsl_neg_9,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__20));
+    __gmpz_init_set_si(__gen_e_acsl__21,0L);
+    __gen_e_acsl_mod_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_9),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
+    __gmpz_init(__gen_e_acsl_mod_2);
+    /*@ assert E_ACSL: -2 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard_2 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"-2 == 0",20);
+    __gmpz_tdiv_r(__gen_e_acsl_mod_2,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_8),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_9));
+    __gmpz_init_set_si(__gen_e_acsl__22,1L);
+    __gmpz_init(__gen_e_acsl_neg_10);
+    __gmpz_neg(__gen_e_acsl_neg_10,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
+    __gen_e_acsl_eq_9 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_10));
+    __e_acsl_assert(__gen_e_acsl_eq_9 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-3 % -2 == -1",20);
+    __gmpz_clear(__gen_e_acsl__19);
+    __gmpz_clear(__gen_e_acsl_neg_8);
+    __gmpz_clear(__gen_e_acsl__20);
+    __gmpz_clear(__gen_e_acsl_neg_9);
+    __gmpz_clear(__gen_e_acsl__21);
+    __gmpz_clear(__gen_e_acsl_mod_2);
+    __gmpz_clear(__gen_e_acsl__22);
+    __gmpz_clear(__gen_e_acsl_neg_10);
   }
   /*@ assert 3 % -2 ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__23;
-      __e_acsl_mpz_t __gen_e_acsl__24;
-      __e_acsl_mpz_t __gen_e_acsl_neg_11;
-      __e_acsl_mpz_t __gen_e_acsl__25;
-      int __gen_e_acsl_mod_guard_3;
-      __e_acsl_mpz_t __gen_e_acsl_mod_3;
-      __e_acsl_mpz_t __gen_e_acsl__26;
-      int __gen_e_acsl_eq_10;
-      __gmpz_init_set_si(__gen_e_acsl__23,3L);
-      __gmpz_init_set_si(__gen_e_acsl__24,2L);
-      __gmpz_init(__gen_e_acsl_neg_11);
-      __gmpz_neg(__gen_e_acsl_neg_11,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
-      __gmpz_init_set_si(__gen_e_acsl__25,0L);
-      __gen_e_acsl_mod_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_11),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__25));
-      __gmpz_init(__gen_e_acsl_mod_3);
-      /*@ assert E_ACSL: -2 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_mod_guard_3 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"-2 == 0",21);
-      __gmpz_tdiv_r(__gen_e_acsl_mod_3,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__23),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_11));
-      __gmpz_init_set_si(__gen_e_acsl__26,1L);
-      __gen_e_acsl_eq_10 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod_3),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__26));
-      __e_acsl_assert(__gen_e_acsl_eq_10 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"3 % -2 == 1",21);
-      __gmpz_clear(__gen_e_acsl__23);
-      __gmpz_clear(__gen_e_acsl__24);
-      __gmpz_clear(__gen_e_acsl_neg_11);
-      __gmpz_clear(__gen_e_acsl__25);
-      __gmpz_clear(__gen_e_acsl_mod_3);
-      __gmpz_clear(__gen_e_acsl__26);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__23;
+    __e_acsl_mpz_t __gen_e_acsl__24;
+    __e_acsl_mpz_t __gen_e_acsl_neg_11;
+    __e_acsl_mpz_t __gen_e_acsl__25;
+    int __gen_e_acsl_mod_guard_3;
+    __e_acsl_mpz_t __gen_e_acsl_mod_3;
+    __e_acsl_mpz_t __gen_e_acsl__26;
+    int __gen_e_acsl_eq_10;
+    __gmpz_init_set_si(__gen_e_acsl__23,3L);
+    __gmpz_init_set_si(__gen_e_acsl__24,2L);
+    __gmpz_init(__gen_e_acsl_neg_11);
+    __gmpz_neg(__gen_e_acsl_neg_11,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
+    __gmpz_init_set_si(__gen_e_acsl__25,0L);
+    __gen_e_acsl_mod_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_11),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__25));
+    __gmpz_init(__gen_e_acsl_mod_3);
+    /*@ assert E_ACSL: -2 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_mod_guard_3 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"-2 == 0",21);
+    __gmpz_tdiv_r(__gen_e_acsl_mod_3,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__23),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_11));
+    __gmpz_init_set_si(__gen_e_acsl__26,1L);
+    __gen_e_acsl_eq_10 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod_3),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__26));
+    __e_acsl_assert(__gen_e_acsl_eq_10 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"3 % -2 == 1",21);
+    __gmpz_clear(__gen_e_acsl__23);
+    __gmpz_clear(__gen_e_acsl__24);
+    __gmpz_clear(__gen_e_acsl_neg_11);
+    __gmpz_clear(__gen_e_acsl__25);
+    __gmpz_clear(__gen_e_acsl_mod_3);
+    __gmpz_clear(__gen_e_acsl__26);
   }
   /*@ assert ((x * 2 + (3 + y)) - 4) + (x - y) ≡ -10; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_8;
-      __e_acsl_mpz_t __gen_e_acsl__27;
-      __e_acsl_mpz_t __gen_e_acsl_mul_2;
-      __e_acsl_mpz_t __gen_e_acsl__28;
-      __e_acsl_mpz_t __gen_e_acsl_y;
-      __e_acsl_mpz_t __gen_e_acsl_add_2;
-      __e_acsl_mpz_t __gen_e_acsl_add_3;
-      __e_acsl_mpz_t __gen_e_acsl__29;
-      __e_acsl_mpz_t __gen_e_acsl_sub_2;
-      __e_acsl_mpz_t __gen_e_acsl_sub_3;
-      __e_acsl_mpz_t __gen_e_acsl_add_4;
-      __e_acsl_mpz_t __gen_e_acsl__30;
-      __e_acsl_mpz_t __gen_e_acsl_neg_12;
-      int __gen_e_acsl_eq_11;
-      __gmpz_init_set_si(__gen_e_acsl_x_8,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl__27,2L);
-      __gmpz_init(__gen_e_acsl_mul_2);
-      __gmpz_mul(__gen_e_acsl_mul_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_8),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__27));
-      __gmpz_init_set_si(__gen_e_acsl__28,3L);
-      __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
-      __gmpz_init(__gen_e_acsl_add_2);
-      __gmpz_add(__gen_e_acsl_add_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__28),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
-      __gmpz_init(__gen_e_acsl_add_3);
-      __gmpz_add(__gen_e_acsl_add_3,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_mul_2),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2));
-      __gmpz_init_set_si(__gen_e_acsl__29,4L);
-      __gmpz_init(__gen_e_acsl_sub_2);
-      __gmpz_sub(__gen_e_acsl_sub_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_3),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__29));
-      __gmpz_init(__gen_e_acsl_sub_3);
-      __gmpz_sub(__gen_e_acsl_sub_3,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_8),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
-      __gmpz_init(__gen_e_acsl_add_4);
-      __gmpz_add(__gen_e_acsl_add_4,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_2),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_3));
-      __gmpz_init_set_si(__gen_e_acsl__30,10L);
-      __gmpz_init(__gen_e_acsl_neg_12);
-      __gmpz_neg(__gen_e_acsl_neg_12,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__30));
-      __gen_e_acsl_eq_11 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_4),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_12));
-      __e_acsl_assert(__gen_e_acsl_eq_11 == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"((x * 2 + (3 + y)) - 4) + (x - y) == -10",23);
-      __gmpz_clear(__gen_e_acsl_x_8);
-      __gmpz_clear(__gen_e_acsl__27);
-      __gmpz_clear(__gen_e_acsl_mul_2);
-      __gmpz_clear(__gen_e_acsl__28);
-      __gmpz_clear(__gen_e_acsl_y);
-      __gmpz_clear(__gen_e_acsl_add_2);
-      __gmpz_clear(__gen_e_acsl_add_3);
-      __gmpz_clear(__gen_e_acsl__29);
-      __gmpz_clear(__gen_e_acsl_sub_2);
-      __gmpz_clear(__gen_e_acsl_sub_3);
-      __gmpz_clear(__gen_e_acsl_add_4);
-      __gmpz_clear(__gen_e_acsl__30);
-      __gmpz_clear(__gen_e_acsl_neg_12);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_8;
+    __e_acsl_mpz_t __gen_e_acsl__27;
+    __e_acsl_mpz_t __gen_e_acsl_mul_2;
+    __e_acsl_mpz_t __gen_e_acsl__28;
+    __e_acsl_mpz_t __gen_e_acsl_y;
+    __e_acsl_mpz_t __gen_e_acsl_add_2;
+    __e_acsl_mpz_t __gen_e_acsl_add_3;
+    __e_acsl_mpz_t __gen_e_acsl__29;
+    __e_acsl_mpz_t __gen_e_acsl_sub_2;
+    __e_acsl_mpz_t __gen_e_acsl_sub_3;
+    __e_acsl_mpz_t __gen_e_acsl_add_4;
+    __e_acsl_mpz_t __gen_e_acsl__30;
+    __e_acsl_mpz_t __gen_e_acsl_neg_12;
+    int __gen_e_acsl_eq_11;
+    __gmpz_init_set_si(__gen_e_acsl_x_8,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl__27,2L);
+    __gmpz_init(__gen_e_acsl_mul_2);
+    __gmpz_mul(__gen_e_acsl_mul_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_8),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__27));
+    __gmpz_init_set_si(__gen_e_acsl__28,3L);
+    __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
+    __gmpz_init(__gen_e_acsl_add_2);
+    __gmpz_add(__gen_e_acsl_add_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__28),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
+    __gmpz_init(__gen_e_acsl_add_3);
+    __gmpz_add(__gen_e_acsl_add_3,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_mul_2),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2));
+    __gmpz_init_set_si(__gen_e_acsl__29,4L);
+    __gmpz_init(__gen_e_acsl_sub_2);
+    __gmpz_sub(__gen_e_acsl_sub_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_3),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__29));
+    __gmpz_init(__gen_e_acsl_sub_3);
+    __gmpz_sub(__gen_e_acsl_sub_3,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_8),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
+    __gmpz_init(__gen_e_acsl_add_4);
+    __gmpz_add(__gen_e_acsl_add_4,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_2),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_3));
+    __gmpz_init_set_si(__gen_e_acsl__30,10L);
+    __gmpz_init(__gen_e_acsl_neg_12);
+    __gmpz_neg(__gen_e_acsl_neg_12,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__30));
+    __gen_e_acsl_eq_11 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_4),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_12));
+    __e_acsl_assert(__gen_e_acsl_eq_11 == 0,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"((x * 2 + (3 + y)) - 4) + (x - y) == -10",23);
+    __gmpz_clear(__gen_e_acsl_x_8);
+    __gmpz_clear(__gen_e_acsl__27);
+    __gmpz_clear(__gen_e_acsl_mul_2);
+    __gmpz_clear(__gen_e_acsl__28);
+    __gmpz_clear(__gen_e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_add_2);
+    __gmpz_clear(__gen_e_acsl_add_3);
+    __gmpz_clear(__gen_e_acsl__29);
+    __gmpz_clear(__gen_e_acsl_sub_2);
+    __gmpz_clear(__gen_e_acsl_sub_3);
+    __gmpz_clear(__gen_e_acsl_add_4);
+    __gmpz_clear(__gen_e_acsl__30);
+    __gmpz_clear(__gen_e_acsl_neg_12);
   }
   /*@ assert (0 ≡ 1) ≡ !(0 ≡ 0); */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__31;
-      __e_acsl_mpz_t __gen_e_acsl__32;
-      int __gen_e_acsl_eq_12;
-      __e_acsl_mpz_t __gen_e_acsl__33;
-      int __gen_e_acsl_eq_13;
-      __e_acsl_mpz_t __gen_e_acsl__34;
-      int __gen_e_acsl_not;
-      __e_acsl_mpz_t __gen_e_acsl__35;
-      int __gen_e_acsl_eq_14;
-      __gmpz_init_set_si(__gen_e_acsl__31,0L);
-      __gmpz_init_set_si(__gen_e_acsl__32,1L);
-      __gen_e_acsl_eq_12 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
-      __gmpz_init_set_si(__gen_e_acsl__33,(long)(__gen_e_acsl_eq_12 == 0));
-      __gen_e_acsl_eq_13 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__31));
-      __gmpz_init_set_si(__gen_e_acsl__34,(long)(__gen_e_acsl_eq_13 == 0));
-      __gen_e_acsl_not = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__34),
+    __e_acsl_mpz_t __gen_e_acsl__31;
+    __e_acsl_mpz_t __gen_e_acsl__32;
+    int __gen_e_acsl_eq_12;
+    __e_acsl_mpz_t __gen_e_acsl__33;
+    int __gen_e_acsl_eq_13;
+    __e_acsl_mpz_t __gen_e_acsl__34;
+    int __gen_e_acsl_not;
+    __e_acsl_mpz_t __gen_e_acsl__35;
+    int __gen_e_acsl_eq_14;
+    __gmpz_init_set_si(__gen_e_acsl__31,0L);
+    __gmpz_init_set_si(__gen_e_acsl__32,1L);
+    __gen_e_acsl_eq_12 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
+    __gmpz_init_set_si(__gen_e_acsl__33,(long)(__gen_e_acsl_eq_12 == 0));
+    __gen_e_acsl_eq_13 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__31));
-      __gmpz_init_set_si(__gen_e_acsl__35,(long)(__gen_e_acsl_not == 0));
-      __gen_e_acsl_eq_14 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__33),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__35));
-      __e_acsl_assert(__gen_e_acsl_eq_14 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"(0 == 1) == !(0 == 0)",25);
-      __gmpz_clear(__gen_e_acsl__31);
-      __gmpz_clear(__gen_e_acsl__32);
-      __gmpz_clear(__gen_e_acsl__33);
-      __gmpz_clear(__gen_e_acsl__34);
-      __gmpz_clear(__gen_e_acsl__35);
-    }
+    __gmpz_init_set_si(__gen_e_acsl__34,(long)(__gen_e_acsl_eq_13 == 0));
+    __gen_e_acsl_not = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__34),
+                                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__31));
+    __gmpz_init_set_si(__gen_e_acsl__35,(long)(__gen_e_acsl_not == 0));
+    __gen_e_acsl_eq_14 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__33),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__35));
+    __e_acsl_assert(__gen_e_acsl_eq_14 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0 == 1) == !(0 == 0)",25);
+    __gmpz_clear(__gen_e_acsl__31);
+    __gmpz_clear(__gen_e_acsl__32);
+    __gmpz_clear(__gen_e_acsl__33);
+    __gmpz_clear(__gen_e_acsl__34);
+    __gmpz_clear(__gen_e_acsl__35);
   }
   /*@ assert (0 ≤ -1) ≡ (0 > 0); */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__36;
-      __e_acsl_mpz_t __gen_e_acsl__37;
-      __e_acsl_mpz_t __gen_e_acsl_neg_13;
-      int __gen_e_acsl_le;
-      __e_acsl_mpz_t __gen_e_acsl__38;
-      int __gen_e_acsl_gt;
-      __e_acsl_mpz_t __gen_e_acsl__39;
-      int __gen_e_acsl_eq_15;
-      __gmpz_init_set_si(__gen_e_acsl__36,0L);
-      __gmpz_init_set_si(__gen_e_acsl__37,1L);
-      __gmpz_init(__gen_e_acsl_neg_13);
-      __gmpz_neg(__gen_e_acsl_neg_13,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__37));
-      __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__36),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_13));
-      __gmpz_init_set_si(__gen_e_acsl__38,(long)(__gen_e_acsl_le <= 0));
-      __gen_e_acsl_gt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__36),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__36));
-      __gmpz_init_set_si(__gen_e_acsl__39,(long)(__gen_e_acsl_gt > 0));
-      __gen_e_acsl_eq_15 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__38),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__39));
-      __e_acsl_assert(__gen_e_acsl_eq_15 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"(0 <= -1) == (0 > 0)",26);
-      __gmpz_clear(__gen_e_acsl__36);
-      __gmpz_clear(__gen_e_acsl__37);
-      __gmpz_clear(__gen_e_acsl_neg_13);
-      __gmpz_clear(__gen_e_acsl__38);
-      __gmpz_clear(__gen_e_acsl__39);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__36;
+    __e_acsl_mpz_t __gen_e_acsl__37;
+    __e_acsl_mpz_t __gen_e_acsl_neg_13;
+    int __gen_e_acsl_le;
+    __e_acsl_mpz_t __gen_e_acsl__38;
+    int __gen_e_acsl_gt;
+    __e_acsl_mpz_t __gen_e_acsl__39;
+    int __gen_e_acsl_eq_15;
+    __gmpz_init_set_si(__gen_e_acsl__36,0L);
+    __gmpz_init_set_si(__gen_e_acsl__37,1L);
+    __gmpz_init(__gen_e_acsl_neg_13);
+    __gmpz_neg(__gen_e_acsl_neg_13,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__37));
+    __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__36),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_13));
+    __gmpz_init_set_si(__gen_e_acsl__38,(long)(__gen_e_acsl_le <= 0));
+    __gen_e_acsl_gt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__36),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__36));
+    __gmpz_init_set_si(__gen_e_acsl__39,(long)(__gen_e_acsl_gt > 0));
+    __gen_e_acsl_eq_15 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__38),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__39));
+    __e_acsl_assert(__gen_e_acsl_eq_15 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0 <= -1) == (0 > 0)",26);
+    __gmpz_clear(__gen_e_acsl__36);
+    __gmpz_clear(__gen_e_acsl__37);
+    __gmpz_clear(__gen_e_acsl_neg_13);
+    __gmpz_clear(__gen_e_acsl__38);
+    __gmpz_clear(__gen_e_acsl__39);
   }
   /*@ assert (0 ≥ -1) ≡ (0 ≤ 0); */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__40;
-      __e_acsl_mpz_t __gen_e_acsl__41;
-      __e_acsl_mpz_t __gen_e_acsl_neg_14;
-      int __gen_e_acsl_ge;
-      __e_acsl_mpz_t __gen_e_acsl__42;
-      int __gen_e_acsl_le_2;
-      __e_acsl_mpz_t __gen_e_acsl__43;
-      int __gen_e_acsl_eq_16;
-      __gmpz_init_set_si(__gen_e_acsl__40,0L);
-      __gmpz_init_set_si(__gen_e_acsl__41,1L);
-      __gmpz_init(__gen_e_acsl_neg_14);
-      __gmpz_neg(__gen_e_acsl_neg_14,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__41));
-      __gen_e_acsl_ge = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__40),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_14));
-      __gmpz_init_set_si(__gen_e_acsl__42,(long)(__gen_e_acsl_ge >= 0));
-      __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__40),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__40));
-      __gmpz_init_set_si(__gen_e_acsl__43,(long)(__gen_e_acsl_le_2 <= 0));
-      __gen_e_acsl_eq_16 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__42),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__43));
-      __e_acsl_assert(__gen_e_acsl_eq_16 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"(0 >= -1) == (0 <= 0)",27);
-      __gmpz_clear(__gen_e_acsl__40);
-      __gmpz_clear(__gen_e_acsl__41);
-      __gmpz_clear(__gen_e_acsl_neg_14);
-      __gmpz_clear(__gen_e_acsl__42);
-      __gmpz_clear(__gen_e_acsl__43);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__40;
+    __e_acsl_mpz_t __gen_e_acsl__41;
+    __e_acsl_mpz_t __gen_e_acsl_neg_14;
+    int __gen_e_acsl_ge;
+    __e_acsl_mpz_t __gen_e_acsl__42;
+    int __gen_e_acsl_le_2;
+    __e_acsl_mpz_t __gen_e_acsl__43;
+    int __gen_e_acsl_eq_16;
+    __gmpz_init_set_si(__gen_e_acsl__40,0L);
+    __gmpz_init_set_si(__gen_e_acsl__41,1L);
+    __gmpz_init(__gen_e_acsl_neg_14);
+    __gmpz_neg(__gen_e_acsl_neg_14,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__41));
+    __gen_e_acsl_ge = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__40),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_14));
+    __gmpz_init_set_si(__gen_e_acsl__42,(long)(__gen_e_acsl_ge >= 0));
+    __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__40),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__40));
+    __gmpz_init_set_si(__gen_e_acsl__43,(long)(__gen_e_acsl_le_2 <= 0));
+    __gen_e_acsl_eq_16 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__42),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__43));
+    __e_acsl_assert(__gen_e_acsl_eq_16 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0 >= -1) == (0 <= 0)",27);
+    __gmpz_clear(__gen_e_acsl__40);
+    __gmpz_clear(__gen_e_acsl__41);
+    __gmpz_clear(__gen_e_acsl_neg_14);
+    __gmpz_clear(__gen_e_acsl__42);
+    __gmpz_clear(__gen_e_acsl__43);
   }
   /*@ assert (0 ≢ 1) ≡ !(0 ≢ 0); */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__44;
-      __e_acsl_mpz_t __gen_e_acsl__45;
-      int __gen_e_acsl_ne_2;
-      __e_acsl_mpz_t __gen_e_acsl__46;
-      int __gen_e_acsl_ne_3;
-      __e_acsl_mpz_t __gen_e_acsl__47;
-      int __gen_e_acsl_not_2;
-      __e_acsl_mpz_t __gen_e_acsl__48;
-      int __gen_e_acsl_eq_17;
-      __gmpz_init_set_si(__gen_e_acsl__44,0L);
-      __gmpz_init_set_si(__gen_e_acsl__45,1L);
-      __gen_e_acsl_ne_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__44),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__45));
-      __gmpz_init_set_si(__gen_e_acsl__46,(long)(__gen_e_acsl_ne_2 != 0));
-      __gen_e_acsl_ne_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__44),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__44));
-      __gmpz_init_set_si(__gen_e_acsl__47,(long)(__gen_e_acsl_ne_3 != 0));
-      __gen_e_acsl_not_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__47),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__44));
-      __gmpz_init_set_si(__gen_e_acsl__48,(long)(__gen_e_acsl_not_2 == 0));
-      __gen_e_acsl_eq_17 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__46),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__48));
-      __e_acsl_assert(__gen_e_acsl_eq_17 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"(0 != 1) == !(0 != 0)",28);
-      __gmpz_clear(__gen_e_acsl__44);
-      __gmpz_clear(__gen_e_acsl__45);
-      __gmpz_clear(__gen_e_acsl__46);
-      __gmpz_clear(__gen_e_acsl__47);
-      __gmpz_clear(__gen_e_acsl__48);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__44;
+    __e_acsl_mpz_t __gen_e_acsl__45;
+    int __gen_e_acsl_ne_2;
+    __e_acsl_mpz_t __gen_e_acsl__46;
+    int __gen_e_acsl_ne_3;
+    __e_acsl_mpz_t __gen_e_acsl__47;
+    int __gen_e_acsl_not_2;
+    __e_acsl_mpz_t __gen_e_acsl__48;
+    int __gen_e_acsl_eq_17;
+    __gmpz_init_set_si(__gen_e_acsl__44,0L);
+    __gmpz_init_set_si(__gen_e_acsl__45,1L);
+    __gen_e_acsl_ne_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__44),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__45));
+    __gmpz_init_set_si(__gen_e_acsl__46,(long)(__gen_e_acsl_ne_2 != 0));
+    __gen_e_acsl_ne_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__44),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__44));
+    __gmpz_init_set_si(__gen_e_acsl__47,(long)(__gen_e_acsl_ne_3 != 0));
+    __gen_e_acsl_not_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__47),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__44));
+    __gmpz_init_set_si(__gen_e_acsl__48,(long)(__gen_e_acsl_not_2 == 0));
+    __gen_e_acsl_eq_17 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__46),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__48));
+    __e_acsl_assert(__gen_e_acsl_eq_17 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0 != 1) == !(0 != 0)",28);
+    __gmpz_clear(__gen_e_acsl__44);
+    __gmpz_clear(__gen_e_acsl__45);
+    __gmpz_clear(__gen_e_acsl__46);
+    __gmpz_clear(__gen_e_acsl__47);
+    __gmpz_clear(__gen_e_acsl__48);
   }
   /*@ assert (0 ≢ 0) ≡ !(1 ≢ 0); */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__49;
-      int __gen_e_acsl_ne_4;
-      __e_acsl_mpz_t __gen_e_acsl__50;
-      __e_acsl_mpz_t __gen_e_acsl__51;
-      int __gen_e_acsl_ne_5;
-      __e_acsl_mpz_t __gen_e_acsl__52;
-      int __gen_e_acsl_not_3;
-      __e_acsl_mpz_t __gen_e_acsl__53;
-      int __gen_e_acsl_eq_18;
-      __gmpz_init_set_si(__gen_e_acsl__49,0L);
-      __gen_e_acsl_ne_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__49),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
-      __gmpz_init_set_si(__gen_e_acsl__50,(long)(__gen_e_acsl_ne_4 != 0));
-      __gmpz_init_set_si(__gen_e_acsl__51,1L);
-      __gen_e_acsl_ne_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__51),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
-      __gmpz_init_set_si(__gen_e_acsl__52,(long)(__gen_e_acsl_ne_5 != 0));
-      __gen_e_acsl_not_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__52),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
-      __gmpz_init_set_si(__gen_e_acsl__53,(long)(__gen_e_acsl_not_3 == 0));
-      __gen_e_acsl_eq_18 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__50),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__53));
-      __e_acsl_assert(__gen_e_acsl_eq_18 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"(0 != 0) == !(1 != 0)",30);
-      __gmpz_clear(__gen_e_acsl__49);
-      __gmpz_clear(__gen_e_acsl__50);
-      __gmpz_clear(__gen_e_acsl__51);
-      __gmpz_clear(__gen_e_acsl__52);
-      __gmpz_clear(__gen_e_acsl__53);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__49;
+    int __gen_e_acsl_ne_4;
+    __e_acsl_mpz_t __gen_e_acsl__50;
+    __e_acsl_mpz_t __gen_e_acsl__51;
+    int __gen_e_acsl_ne_5;
+    __e_acsl_mpz_t __gen_e_acsl__52;
+    int __gen_e_acsl_not_3;
+    __e_acsl_mpz_t __gen_e_acsl__53;
+    int __gen_e_acsl_eq_18;
+    __gmpz_init_set_si(__gen_e_acsl__49,0L);
+    __gen_e_acsl_ne_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__49),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__50,(long)(__gen_e_acsl_ne_4 != 0));
+    __gmpz_init_set_si(__gen_e_acsl__51,1L);
+    __gen_e_acsl_ne_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__51),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__52,(long)(__gen_e_acsl_ne_5 != 0));
+    __gen_e_acsl_not_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__52),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__49));
+    __gmpz_init_set_si(__gen_e_acsl__53,(long)(__gen_e_acsl_not_3 == 0));
+    __gen_e_acsl_eq_18 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__50),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__53));
+    __e_acsl_assert(__gen_e_acsl_eq_18 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"(0 != 0) == !(1 != 0)",30);
+    __gmpz_clear(__gen_e_acsl__49);
+    __gmpz_clear(__gen_e_acsl__50);
+    __gmpz_clear(__gen_e_acsl__51);
+    __gmpz_clear(__gen_e_acsl__52);
+    __gmpz_clear(__gen_e_acsl__53);
   }
   /*@ assert 4 / y ≡ 2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__54;
-      __e_acsl_mpz_t __gen_e_acsl_y_2;
-      __e_acsl_mpz_t __gen_e_acsl__55;
-      int __gen_e_acsl_div_guard_3;
-      __e_acsl_mpz_t __gen_e_acsl_div_3;
-      __e_acsl_mpz_t __gen_e_acsl__56;
-      int __gen_e_acsl_eq_19;
-      __gmpz_init_set_si(__gen_e_acsl__54,4L);
-      __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
-      __gmpz_init_set_si(__gen_e_acsl__55,0L);
-      __gen_e_acsl_div_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__55));
-      __gmpz_init(__gen_e_acsl_div_3);
-      /*@ assert E_ACSL: y ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard_3 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"y == 0",31);
-      __gmpz_tdiv_q(__gen_e_acsl_div_3,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__54),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2));
-      __gmpz_init_set_si(__gen_e_acsl__56,2L);
-      __gen_e_acsl_eq_19 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_3),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__56));
-      __e_acsl_assert(__gen_e_acsl_eq_19 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"4 / y == 2",31);
-      __gmpz_clear(__gen_e_acsl__54);
-      __gmpz_clear(__gen_e_acsl_y_2);
-      __gmpz_clear(__gen_e_acsl__55);
-      __gmpz_clear(__gen_e_acsl_div_3);
-      __gmpz_clear(__gen_e_acsl__56);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__54;
+    __e_acsl_mpz_t __gen_e_acsl_y_2;
+    __e_acsl_mpz_t __gen_e_acsl__55;
+    int __gen_e_acsl_div_guard_3;
+    __e_acsl_mpz_t __gen_e_acsl_div_3;
+    __e_acsl_mpz_t __gen_e_acsl__56;
+    int __gen_e_acsl_eq_19;
+    __gmpz_init_set_si(__gen_e_acsl__54,4L);
+    __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl__55,0L);
+    __gen_e_acsl_div_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__55));
+    __gmpz_init(__gen_e_acsl_div_3);
+    /*@ assert E_ACSL: y ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_3 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"y == 0",31);
+    __gmpz_tdiv_q(__gen_e_acsl_div_3,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__54),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2));
+    __gmpz_init_set_si(__gen_e_acsl__56,2L);
+    __gen_e_acsl_eq_19 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_3),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__56));
+    __e_acsl_assert(__gen_e_acsl_eq_19 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"4 / y == 2",31);
+    __gmpz_clear(__gen_e_acsl__54);
+    __gmpz_clear(__gen_e_acsl_y_2);
+    __gmpz_clear(__gen_e_acsl__55);
+    __gmpz_clear(__gen_e_acsl_div_3);
+    __gmpz_clear(__gen_e_acsl__56);
   }
   /*@ assert 1 + (z + 1) / (y - 123456789123456789) ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__57;
-      __e_acsl_mpz_t __gen_e_acsl_z;
-      __e_acsl_mpz_t __gen_e_acsl_add_5;
-      __e_acsl_mpz_t __gen_e_acsl_y_3;
-      __e_acsl_mpz_t __gen_e_acsl__58;
-      __e_acsl_mpz_t __gen_e_acsl_sub_4;
-      __e_acsl_mpz_t __gen_e_acsl__59;
-      int __gen_e_acsl_div_guard_4;
-      __e_acsl_mpz_t __gen_e_acsl_div_4;
-      __e_acsl_mpz_t __gen_e_acsl_add_6;
-      int __gen_e_acsl_eq_20;
-      __gmpz_init_set_si(__gen_e_acsl__57,1L);
-      __gmpz_init_set_si(__gen_e_acsl_z,z);
-      __gmpz_init(__gen_e_acsl_add_5);
-      __gmpz_add(__gen_e_acsl_add_5,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__57));
-      __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
-      __gmpz_init_set_ui(__gen_e_acsl__58,123456789123456789UL);
-      __gmpz_init(__gen_e_acsl_sub_4);
-      __gmpz_sub(__gen_e_acsl_sub_4,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_3),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__58));
-      __gmpz_init_set_si(__gen_e_acsl__59,0L);
-      __gen_e_acsl_div_guard_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_4),
-                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__59));
-      __gmpz_init(__gen_e_acsl_div_4);
-      /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */
-      __e_acsl_assert(! (__gen_e_acsl_div_guard_4 == 0),(char *)"Assertion",
-                      (char *)"main",(char *)"y - 123456789123456789 == 0",
-                      34);
-      __gmpz_tdiv_q(__gen_e_acsl_div_4,
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_5),
-                    (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_4));
-      __gmpz_init(__gen_e_acsl_add_6);
-      __gmpz_add(__gen_e_acsl_add_6,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__57),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_div_4));
-      __gen_e_acsl_eq_20 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_6),
-                                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__57));
-      __e_acsl_assert(__gen_e_acsl_eq_20 == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"1 + (z + 1) / (y - 123456789123456789) == 1",
-                      34);
-      __gmpz_clear(__gen_e_acsl__57);
-      __gmpz_clear(__gen_e_acsl_z);
-      __gmpz_clear(__gen_e_acsl_add_5);
-      __gmpz_clear(__gen_e_acsl_y_3);
-      __gmpz_clear(__gen_e_acsl__58);
-      __gmpz_clear(__gen_e_acsl_sub_4);
-      __gmpz_clear(__gen_e_acsl__59);
-      __gmpz_clear(__gen_e_acsl_div_4);
-      __gmpz_clear(__gen_e_acsl_add_6);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__57;
+    __e_acsl_mpz_t __gen_e_acsl_z;
+    __e_acsl_mpz_t __gen_e_acsl_add_5;
+    __e_acsl_mpz_t __gen_e_acsl_y_3;
+    __e_acsl_mpz_t __gen_e_acsl__58;
+    __e_acsl_mpz_t __gen_e_acsl_sub_4;
+    __e_acsl_mpz_t __gen_e_acsl__59;
+    int __gen_e_acsl_div_guard_4;
+    __e_acsl_mpz_t __gen_e_acsl_div_4;
+    __e_acsl_mpz_t __gen_e_acsl_add_6;
+    int __gen_e_acsl_eq_20;
+    __gmpz_init_set_si(__gen_e_acsl__57,1L);
+    __gmpz_init_set_si(__gen_e_acsl_z,z);
+    __gmpz_init(__gen_e_acsl_add_5);
+    __gmpz_add(__gen_e_acsl_add_5,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__57));
+    __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
+    __gmpz_init_set_ui(__gen_e_acsl__58,123456789123456789UL);
+    __gmpz_init(__gen_e_acsl_sub_4);
+    __gmpz_sub(__gen_e_acsl_sub_4,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_3),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__58));
+    __gmpz_init_set_si(__gen_e_acsl__59,0L);
+    __gen_e_acsl_div_guard_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_4),
+                                          (__e_acsl_mpz_struct const *)(__gen_e_acsl__59));
+    __gmpz_init(__gen_e_acsl_div_4);
+    /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */
+    __e_acsl_assert(! (__gen_e_acsl_div_guard_4 == 0),(char *)"Assertion",
+                    (char *)"main",(char *)"y - 123456789123456789 == 0",34);
+    __gmpz_tdiv_q(__gen_e_acsl_div_4,
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_5),
+                  (__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_4));
+    __gmpz_init(__gen_e_acsl_add_6);
+    __gmpz_add(__gen_e_acsl_add_6,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__57),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_div_4));
+    __gen_e_acsl_eq_20 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_6),
+                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__57));
+    __e_acsl_assert(__gen_e_acsl_eq_20 == 0,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"1 + (z + 1) / (y - 123456789123456789) == 1",34);
+    __gmpz_clear(__gen_e_acsl__57);
+    __gmpz_clear(__gen_e_acsl_z);
+    __gmpz_clear(__gen_e_acsl_add_5);
+    __gmpz_clear(__gen_e_acsl_y_3);
+    __gmpz_clear(__gen_e_acsl__58);
+    __gmpz_clear(__gen_e_acsl_sub_4);
+    __gmpz_clear(__gen_e_acsl__59);
+    __gmpz_clear(__gen_e_acsl_div_4);
+    __gmpz_clear(__gen_e_acsl_add_6);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
index 4a5071bb3d8..c806f6bf455 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_at.c
@@ -83,17 +83,15 @@ void g(int *p, int *q)
   L3:
     /*@ assert \at(*(p + \at(*q,L1)),Here) ≡ 2; */
     {
-      {
-        int __gen_e_acsl_valid_read_4;
-        __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(p + __gen_e_acsl_at_3),
-                                                        sizeof(int));
-        __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",(char *)"g",
-                        (char *)"mem_access: \\valid_read(p + __gen_e_acsl_at_3)",
-                        28);
-        __e_acsl_assert(*(p + __gen_e_acsl_at_3) == 2,(char *)"Assertion",
-                        (char *)"g",
-                        (char *)"\\at(*(p + \\at(*q,L1)),Here) == 2",28);
-      }
+      int __gen_e_acsl_valid_read_4;
+      __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(p + __gen_e_acsl_at_3),
+                                                      sizeof(int));
+      __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",(char *)"g",
+                      (char *)"mem_access: \\valid_read(p + __gen_e_acsl_at_3)",
+                      28);
+      __e_acsl_assert(*(p + __gen_e_acsl_at_3) == 2,(char *)"Assertion",
+                      (char *)"g",
+                      (char *)"\\at(*(p + \\at(*q,L1)),Here) == 2",28);
     }
     __e_acsl_delete_block((void *)(& p));
     __e_acsl_delete_block((void *)(& q));
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
index 05325507dda..cb70a1ea031 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_at2.c
@@ -37,58 +37,50 @@ void f(void)
     A = 2;
   /*@ assert \at(A,Pre) ≡ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl_,0L);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"f",
-                      (char *)"\\at(A,Pre) == 0",11);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,0L);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"f",
+                    (char *)"\\at(A,Pre) == 0",11);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert \at(A,F) ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      int __gen_e_acsl_eq_2;
-      __gmpz_init_set_si(__gen_e_acsl__2,1L);
-      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"f",
-                      (char *)"\\at(A,F) == 1",12);
-      __gmpz_clear(__gen_e_acsl__2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__2,1L);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"f",
+                    (char *)"\\at(A,F) == 1",12);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   /*@ assert \at(A,Here) ≡ 2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_A_3;
-      __e_acsl_mpz_t __gen_e_acsl__3;
-      int __gen_e_acsl_eq_3;
-      __gmpz_init_set_si(__gen_e_acsl_A_3,(long)A);
-      __gmpz_init_set_si(__gen_e_acsl__3,2L);
-      __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_A_3),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
-      __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"f",
-                      (char *)"\\at(A,Here) == 2",13);
-      __gmpz_clear(__gen_e_acsl_A_3);
-      __gmpz_clear(__gen_e_acsl__3);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_A_3;
+    __e_acsl_mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl_A_3,(long)A);
+    __gmpz_init_set_si(__gen_e_acsl__3,2L);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_A_3),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",(char *)"f",
+                    (char *)"\\at(A,Here) == 2",13);
+    __gmpz_clear(__gen_e_acsl_A_3);
+    __gmpz_clear(__gen_e_acsl__3);
   }
   /*@ assert \at(\at(A,Pre),F) ≡ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      int __gen_e_acsl_eq_4;
-      __gmpz_init_set_si(__gen_e_acsl__4,0L);
-      __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_3),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"f",
-                      (char *)"\\at(\\at(A,Pre),F) == 0",14);
-      __gmpz_clear(__gen_e_acsl__4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl__4,0L);
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_3),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",(char *)"f",
+                    (char *)"\\at(\\at(A,Pre),F) == 0",14);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   A = 3;
   __gmpz_clear(__gen_e_acsl_at);
@@ -148,34 +140,29 @@ void g(int *p, int *q)
     A = 4;
   /*@ assert \at(*(p + \at(*q,L1)),L2) ≡ 2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl__2,2L);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"g",
-                      (char *)"\\at(*(p + \\at(*q,L1)),L2) == 2",26);
-      __gmpz_clear(__gen_e_acsl__2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl__2,2L);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"g",
+                    (char *)"\\at(*(p + \\at(*q,L1)),L2) == 2",26);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   L3:
     /*@ assert \at(*(p + \at(*q,L1)),Here) ≡ 2; */
     {
-      {
-        __e_acsl_mpz_t __gen_e_acsl__3;
-        __e_acsl_mpz_t __gen_e_acsl__4;
-        int __gen_e_acsl_eq_2;
-        __gmpz_init_set_si(__gen_e_acsl__3,(long)*(p + __gen_e_acsl_at_3));
-        __gmpz_init_set_si(__gen_e_acsl__4,2L);
-        __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
-                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-        __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
-                        (char *)"g",
-                        (char *)"\\at(*(p + \\at(*q,L1)),Here) == 2",28);
-        __gmpz_clear(__gen_e_acsl__3);
-        __gmpz_clear(__gen_e_acsl__4);
-      }
+      __e_acsl_mpz_t __gen_e_acsl__3;
+      __e_acsl_mpz_t __gen_e_acsl__4;
+      int __gen_e_acsl_eq_2;
+      __gmpz_init_set_si(__gen_e_acsl__3,(long)*(p + __gen_e_acsl_at_3));
+      __gmpz_init_set_si(__gen_e_acsl__4,2L);
+      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
+                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",(char *)"g",
+                      (char *)"\\at(*(p + \\at(*q,L1)),Here) == 2",28);
+      __gmpz_clear(__gen_e_acsl__3);
+      __gmpz_clear(__gen_e_acsl__4);
     }
     __e_acsl_delete_block((void *)(& p));
     __e_acsl_delete_block((void *)(& q));
@@ -239,19 +226,17 @@ int main(void)
     }
     /*@ assert x ≡ 0; */
     {
-      {
-        __e_acsl_mpz_t __gen_e_acsl_x;
-        __e_acsl_mpz_t __gen_e_acsl_;
-        int __gen_e_acsl_eq;
-        __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
-        __gmpz_init_set_si(__gen_e_acsl_,0L);
-        __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-        __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                        (char *)"main",(char *)"x == 0",43);
-        __gmpz_clear(__gen_e_acsl_x);
-        __gmpz_clear(__gen_e_acsl_);
-      }
+      __e_acsl_mpz_t __gen_e_acsl_x;
+      __e_acsl_mpz_t __gen_e_acsl_;
+      int __gen_e_acsl_eq;
+      __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+      __gmpz_init_set_si(__gen_e_acsl_,0L);
+      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
+                      (char *)"main",(char *)"x == 0",43);
+      __gmpz_clear(__gen_e_acsl_x);
+      __gmpz_clear(__gen_e_acsl_);
     }
     __e_acsl_full_init((void *)(& x));
     x = 1;
@@ -260,48 +245,42 @@ int main(void)
   __gen_e_acsl_f();
   /*@ assert \at(x,L) ≡ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      int __gen_e_acsl_eq_2;
-      __gmpz_init_set_si(__gen_e_acsl__2,0L);
-      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"\\at(x,L) == 0",48);
-      __gmpz_clear(__gen_e_acsl__2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__2,0L);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x,L) == 0",48);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   /*@ assert \at(x + 1,L) ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      int __gen_e_acsl_eq_3;
-      __gmpz_init_set_si(__gen_e_acsl__4,1L);
-      __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"\\at(x + 1,L) == 1",49);
-      __gmpz_clear(__gen_e_acsl__4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_si(__gen_e_acsl__4,1L);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_at_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x + 1,L) == 1",49);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert \at(x,L) + 1 ≡ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__5;
-      __e_acsl_mpz_t __gen_e_acsl_add_2;
-      int __gen_e_acsl_eq_4;
-      __gmpz_init_set_si(__gen_e_acsl__5,1L);
-      __gmpz_init(__gen_e_acsl_add_2);
-      __gmpz_add(__gen_e_acsl_add_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-      __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-      __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"\\at(x,L) + 1 == 1",50);
-      __gmpz_clear(__gen_e_acsl__5);
-      __gmpz_clear(__gen_e_acsl_add_2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__5;
+    __e_acsl_mpz_t __gen_e_acsl_add_2;
+    int __gen_e_acsl_eq_4;
+    __gmpz_init_set_si(__gen_e_acsl__5,1L);
+    __gmpz_init(__gen_e_acsl_add_2);
+    __gmpz_add(__gen_e_acsl_add_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl_at),
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+    __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+    __e_acsl_assert(__gen_e_acsl_eq_4 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"\\at(x,L) + 1 == 1",50);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl_add_2);
   }
   g(t,& x);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
index af5d4476e59..86502dd2c7f 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_comparison2.c
@@ -9,67 +9,59 @@ int main(void)
   y = 1;
   /*@ assert x < y; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x;
-      __e_acsl_mpz_t __gen_e_acsl_y;
-      int __gen_e_acsl_lt;
-      __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
-      __gen_e_acsl_lt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
-      __e_acsl_assert(__gen_e_acsl_lt < 0,(char *)"Assertion",(char *)"main",
-                      (char *)"x < y",7);
-      __gmpz_clear(__gen_e_acsl_x);
-      __gmpz_clear(__gen_e_acsl_y);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x;
+    __e_acsl_mpz_t __gen_e_acsl_y;
+    int __gen_e_acsl_lt;
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_y,(long)y);
+    __gen_e_acsl_lt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
+    __e_acsl_assert(__gen_e_acsl_lt < 0,(char *)"Assertion",(char *)"main",
+                    (char *)"x < y",7);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_y);
   }
   /*@ assert y > x; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_y_2;
-      __e_acsl_mpz_t __gen_e_acsl_x_2;
-      int __gen_e_acsl_gt;
-      __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
-      __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
-      __gen_e_acsl_gt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2));
-      __e_acsl_assert(__gen_e_acsl_gt > 0,(char *)"Assertion",(char *)"main",
-                      (char *)"y > x",8);
-      __gmpz_clear(__gen_e_acsl_y_2);
-      __gmpz_clear(__gen_e_acsl_x_2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_y_2;
+    __e_acsl_mpz_t __gen_e_acsl_x_2;
+    int __gen_e_acsl_gt;
+    __gmpz_init_set_si(__gen_e_acsl_y_2,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+    __gen_e_acsl_gt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2));
+    __e_acsl_assert(__gen_e_acsl_gt > 0,(char *)"Assertion",(char *)"main",
+                    (char *)"y > x",8);
+    __gmpz_clear(__gen_e_acsl_y_2);
+    __gmpz_clear(__gen_e_acsl_x_2);
   }
   /*@ assert x ≤ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x_3;
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_le;
-      __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl_,0L);
-      __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_le <= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x <= 0",9);
-      __gmpz_clear(__gen_e_acsl_x_3);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x_3;
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_le;
+    __gmpz_init_set_si(__gen_e_acsl_x_3,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_,0L);
+    __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_le <= 0,(char *)"Assertion",(char *)"main",
+                    (char *)"x <= 0",9);
+    __gmpz_clear(__gen_e_acsl_x_3);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert y ≥ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_y_3;
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      int __gen_e_acsl_ge;
-      __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
-      __gmpz_init_set_si(__gen_e_acsl__2,1L);
-      __gen_e_acsl_ge = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_3),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-      __e_acsl_assert(__gen_e_acsl_ge >= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"y >= 1",10);
-      __gmpz_clear(__gen_e_acsl_y_3);
-      __gmpz_clear(__gen_e_acsl__2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_y_3;
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    int __gen_e_acsl_ge;
+    __gmpz_init_set_si(__gen_e_acsl_y_3,(long)y);
+    __gmpz_init_set_si(__gen_e_acsl__2,1L);
+    __gen_e_acsl_ge = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_3),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+    __e_acsl_assert(__gen_e_acsl_ge >= 0,(char *)"Assertion",(char *)"main",
+                    (char *)"y >= 1",10);
+    __gmpz_clear(__gen_e_acsl_y_3);
+    __gmpz_clear(__gen_e_acsl__2);
   }
   s = (char *)"toto";
   /*@ assert s ≡ s; */
@@ -77,219 +69,195 @@ int main(void)
                   12);
   /*@ assert 5 < 18; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__3;
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      int __gen_e_acsl_lt_2;
-      __gmpz_init_set_si(__gen_e_acsl__3,5L);
-      __gmpz_init_set_si(__gen_e_acsl__4,18L);
-      __gen_e_acsl_lt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __e_acsl_assert(__gen_e_acsl_lt_2 < 0,(char *)"Assertion",
-                      (char *)"main",(char *)"5 < 18",15);
-      __gmpz_clear(__gen_e_acsl__3);
-      __gmpz_clear(__gen_e_acsl__4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__3;
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_lt_2;
+    __gmpz_init_set_si(__gen_e_acsl__3,5L);
+    __gmpz_init_set_si(__gen_e_acsl__4,18L);
+    __gen_e_acsl_lt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__3),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_lt_2 < 0,(char *)"Assertion",(char *)"main",
+                    (char *)"5 < 18",15);
+    __gmpz_clear(__gen_e_acsl__3);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert 32 > 3; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__5;
-      __e_acsl_mpz_t __gen_e_acsl__6;
-      int __gen_e_acsl_gt_2;
-      __gmpz_init_set_si(__gen_e_acsl__5,32L);
-      __gmpz_init_set_si(__gen_e_acsl__6,3L);
-      __gen_e_acsl_gt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
-      __e_acsl_assert(__gen_e_acsl_gt_2 > 0,(char *)"Assertion",
-                      (char *)"main",(char *)"32 > 3",16);
-      __gmpz_clear(__gen_e_acsl__5);
-      __gmpz_clear(__gen_e_acsl__6);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__5;
+    __e_acsl_mpz_t __gen_e_acsl__6;
+    int __gen_e_acsl_gt_2;
+    __gmpz_init_set_si(__gen_e_acsl__5,32L);
+    __gmpz_init_set_si(__gen_e_acsl__6,3L);
+    __gen_e_acsl_gt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
+    __e_acsl_assert(__gen_e_acsl_gt_2 > 0,(char *)"Assertion",(char *)"main",
+                    (char *)"32 > 3",16);
+    __gmpz_clear(__gen_e_acsl__5);
+    __gmpz_clear(__gen_e_acsl__6);
   }
   /*@ assert 12 ≤ 13; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__7;
-      __e_acsl_mpz_t __gen_e_acsl__8;
-      int __gen_e_acsl_le_2;
-      __gmpz_init_set_si(__gen_e_acsl__7,12L);
-      __gmpz_init_set_si(__gen_e_acsl__8,13L);
-      __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__7),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
-      __e_acsl_assert(__gen_e_acsl_le_2 <= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"12 <= 13",17);
-      __gmpz_clear(__gen_e_acsl__7);
-      __gmpz_clear(__gen_e_acsl__8);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__7;
+    __e_acsl_mpz_t __gen_e_acsl__8;
+    int __gen_e_acsl_le_2;
+    __gmpz_init_set_si(__gen_e_acsl__7,12L);
+    __gmpz_init_set_si(__gen_e_acsl__8,13L);
+    __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__7),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
+    __e_acsl_assert(__gen_e_acsl_le_2 <= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"12 <= 13",17);
+    __gmpz_clear(__gen_e_acsl__7);
+    __gmpz_clear(__gen_e_acsl__8);
   }
   /*@ assert 123 ≥ 12; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__9;
-      __e_acsl_mpz_t __gen_e_acsl__10;
-      int __gen_e_acsl_ge_2;
-      __gmpz_init_set_si(__gen_e_acsl__9,123L);
-      __gmpz_init_set_si(__gen_e_acsl__10,12L);
-      __gen_e_acsl_ge_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__9),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
-      __e_acsl_assert(__gen_e_acsl_ge_2 >= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"123 >= 12",18);
-      __gmpz_clear(__gen_e_acsl__9);
-      __gmpz_clear(__gen_e_acsl__10);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__9;
+    __e_acsl_mpz_t __gen_e_acsl__10;
+    int __gen_e_acsl_ge_2;
+    __gmpz_init_set_si(__gen_e_acsl__9,123L);
+    __gmpz_init_set_si(__gen_e_acsl__10,12L);
+    __gen_e_acsl_ge_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__9),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
+    __e_acsl_assert(__gen_e_acsl_ge_2 >= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"123 >= 12",18);
+    __gmpz_clear(__gen_e_acsl__9);
+    __gmpz_clear(__gen_e_acsl__10);
   }
   /*@ assert 0xff ≡ 0xff; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__11;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl__11,255L);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__11),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__11));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"0xff == 0xff",19);
-      __gmpz_clear(__gen_e_acsl__11);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__11;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl__11,255L);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__11),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__11));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"0xff == 0xff",19);
+    __gmpz_clear(__gen_e_acsl__11);
   }
   /*@ assert 1 ≢ 2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__12;
-      __e_acsl_mpz_t __gen_e_acsl__13;
-      int __gen_e_acsl_ne;
-      __gmpz_init_set_si(__gen_e_acsl__12,1L);
-      __gmpz_init_set_si(__gen_e_acsl__13,2L);
-      __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__12),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
-      __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
-                      (char *)"main",(char *)"1 != 2",20);
-      __gmpz_clear(__gen_e_acsl__12);
-      __gmpz_clear(__gen_e_acsl__13);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__12;
+    __e_acsl_mpz_t __gen_e_acsl__13;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__12,1L);
+    __gmpz_init_set_si(__gen_e_acsl__13,2L);
+    __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__12),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+                    (char *)"1 != 2",20);
+    __gmpz_clear(__gen_e_acsl__12);
+    __gmpz_clear(__gen_e_acsl__13);
   }
   /*@ assert -5 < 18; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__14;
-      __e_acsl_mpz_t __gen_e_acsl_neg;
-      __e_acsl_mpz_t __gen_e_acsl__15;
-      int __gen_e_acsl_lt_3;
-      __gmpz_init_set_si(__gen_e_acsl__14,5L);
-      __gmpz_init(__gen_e_acsl_neg);
-      __gmpz_neg(__gen_e_acsl_neg,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
-      __gmpz_init_set_si(__gen_e_acsl__15,18L);
-      __gen_e_acsl_lt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
-      __e_acsl_assert(__gen_e_acsl_lt_3 < 0,(char *)"Assertion",
-                      (char *)"main",(char *)"-5 < 18",22);
-      __gmpz_clear(__gen_e_acsl__14);
-      __gmpz_clear(__gen_e_acsl_neg);
-      __gmpz_clear(__gen_e_acsl__15);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__14;
+    __e_acsl_mpz_t __gen_e_acsl_neg;
+    __e_acsl_mpz_t __gen_e_acsl__15;
+    int __gen_e_acsl_lt_3;
+    __gmpz_init_set_si(__gen_e_acsl__14,5L);
+    __gmpz_init(__gen_e_acsl_neg);
+    __gmpz_neg(__gen_e_acsl_neg,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
+    __gmpz_init_set_si(__gen_e_acsl__15,18L);
+    __gen_e_acsl_lt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
+    __e_acsl_assert(__gen_e_acsl_lt_3 < 0,(char *)"Assertion",(char *)"main",
+                    (char *)"-5 < 18",22);
+    __gmpz_clear(__gen_e_acsl__14);
+    __gmpz_clear(__gen_e_acsl_neg);
+    __gmpz_clear(__gen_e_acsl__15);
   }
   /*@ assert 32 > -3; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__16;
-      __e_acsl_mpz_t __gen_e_acsl__17;
-      __e_acsl_mpz_t __gen_e_acsl_neg_2;
-      int __gen_e_acsl_gt_3;
-      __gmpz_init_set_si(__gen_e_acsl__16,32L);
-      __gmpz_init_set_si(__gen_e_acsl__17,3L);
-      __gmpz_init(__gen_e_acsl_neg_2);
-      __gmpz_neg(__gen_e_acsl_neg_2,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
-      __gen_e_acsl_gt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__16),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_2));
-      __e_acsl_assert(__gen_e_acsl_gt_3 > 0,(char *)"Assertion",
-                      (char *)"main",(char *)"32 > -3",23);
-      __gmpz_clear(__gen_e_acsl__16);
-      __gmpz_clear(__gen_e_acsl__17);
-      __gmpz_clear(__gen_e_acsl_neg_2);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__16;
+    __e_acsl_mpz_t __gen_e_acsl__17;
+    __e_acsl_mpz_t __gen_e_acsl_neg_2;
+    int __gen_e_acsl_gt_3;
+    __gmpz_init_set_si(__gen_e_acsl__16,32L);
+    __gmpz_init_set_si(__gen_e_acsl__17,3L);
+    __gmpz_init(__gen_e_acsl_neg_2);
+    __gmpz_neg(__gen_e_acsl_neg_2,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
+    __gen_e_acsl_gt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__16),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_2));
+    __e_acsl_assert(__gen_e_acsl_gt_3 > 0,(char *)"Assertion",(char *)"main",
+                    (char *)"32 > -3",23);
+    __gmpz_clear(__gen_e_acsl__16);
+    __gmpz_clear(__gen_e_acsl__17);
+    __gmpz_clear(__gen_e_acsl_neg_2);
   }
   /*@ assert -12 ≤ 13; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__18;
-      __e_acsl_mpz_t __gen_e_acsl_neg_3;
-      __e_acsl_mpz_t __gen_e_acsl__19;
-      int __gen_e_acsl_le_3;
-      __gmpz_init_set_si(__gen_e_acsl__18,12L);
-      __gmpz_init(__gen_e_acsl_neg_3);
-      __gmpz_neg(__gen_e_acsl_neg_3,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
-      __gmpz_init_set_si(__gen_e_acsl__19,13L);
-      __gen_e_acsl_le_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_3),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
-      __e_acsl_assert(__gen_e_acsl_le_3 <= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"-12 <= 13",24);
-      __gmpz_clear(__gen_e_acsl__18);
-      __gmpz_clear(__gen_e_acsl_neg_3);
-      __gmpz_clear(__gen_e_acsl__19);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__18;
+    __e_acsl_mpz_t __gen_e_acsl_neg_3;
+    __e_acsl_mpz_t __gen_e_acsl__19;
+    int __gen_e_acsl_le_3;
+    __gmpz_init_set_si(__gen_e_acsl__18,12L);
+    __gmpz_init(__gen_e_acsl_neg_3);
+    __gmpz_neg(__gen_e_acsl_neg_3,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
+    __gmpz_init_set_si(__gen_e_acsl__19,13L);
+    __gen_e_acsl_le_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_3),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
+    __e_acsl_assert(__gen_e_acsl_le_3 <= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-12 <= 13",24);
+    __gmpz_clear(__gen_e_acsl__18);
+    __gmpz_clear(__gen_e_acsl_neg_3);
+    __gmpz_clear(__gen_e_acsl__19);
   }
   /*@ assert 123 ≥ -12; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__20;
-      __e_acsl_mpz_t __gen_e_acsl__21;
-      __e_acsl_mpz_t __gen_e_acsl_neg_4;
-      int __gen_e_acsl_ge_3;
-      __gmpz_init_set_si(__gen_e_acsl__20,123L);
-      __gmpz_init_set_si(__gen_e_acsl__21,12L);
-      __gmpz_init(__gen_e_acsl_neg_4);
-      __gmpz_neg(__gen_e_acsl_neg_4,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
-      __gen_e_acsl_ge_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__20),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_4));
-      __e_acsl_assert(__gen_e_acsl_ge_3 >= 0,(char *)"Assertion",
-                      (char *)"main",(char *)"123 >= -12",25);
-      __gmpz_clear(__gen_e_acsl__20);
-      __gmpz_clear(__gen_e_acsl__21);
-      __gmpz_clear(__gen_e_acsl_neg_4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__20;
+    __e_acsl_mpz_t __gen_e_acsl__21;
+    __e_acsl_mpz_t __gen_e_acsl_neg_4;
+    int __gen_e_acsl_ge_3;
+    __gmpz_init_set_si(__gen_e_acsl__20,123L);
+    __gmpz_init_set_si(__gen_e_acsl__21,12L);
+    __gmpz_init(__gen_e_acsl_neg_4);
+    __gmpz_neg(__gen_e_acsl_neg_4,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
+    __gen_e_acsl_ge_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__20),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_4));
+    __e_acsl_assert(__gen_e_acsl_ge_3 >= 0,(char *)"Assertion",
+                    (char *)"main",(char *)"123 >= -12",25);
+    __gmpz_clear(__gen_e_acsl__20);
+    __gmpz_clear(__gen_e_acsl__21);
+    __gmpz_clear(__gen_e_acsl_neg_4);
   }
   /*@ assert -0xff ≡ -0xff; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__22;
-      __e_acsl_mpz_t __gen_e_acsl_neg_5;
-      int __gen_e_acsl_eq_2;
-      __gmpz_init_set_si(__gen_e_acsl__22,255L);
-      __gmpz_init(__gen_e_acsl_neg_5);
-      __gmpz_neg(__gen_e_acsl_neg_5,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
-      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5));
-      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"-0xff == -0xff",26);
-      __gmpz_clear(__gen_e_acsl__22);
-      __gmpz_clear(__gen_e_acsl_neg_5);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__22;
+    __e_acsl_mpz_t __gen_e_acsl_neg_5;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_si(__gen_e_acsl__22,255L);
+    __gmpz_init(__gen_e_acsl_neg_5);
+    __gmpz_neg(__gen_e_acsl_neg_5,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_5));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",(char *)"-0xff == -0xff",26);
+    __gmpz_clear(__gen_e_acsl__22);
+    __gmpz_clear(__gen_e_acsl_neg_5);
   }
   /*@ assert 1 ≢ -2; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__23;
-      __e_acsl_mpz_t __gen_e_acsl__24;
-      __e_acsl_mpz_t __gen_e_acsl_neg_6;
-      int __gen_e_acsl_ne_2;
-      __gmpz_init_set_si(__gen_e_acsl__23,1L);
-      __gmpz_init_set_si(__gen_e_acsl__24,2L);
-      __gmpz_init(__gen_e_acsl_neg_6);
-      __gmpz_neg(__gen_e_acsl_neg_6,
-                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
-      __gen_e_acsl_ne_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__23),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_6));
-      __e_acsl_assert(__gen_e_acsl_ne_2 != 0,(char *)"Assertion",
-                      (char *)"main",(char *)"1 != -2",27);
-      __gmpz_clear(__gen_e_acsl__23);
-      __gmpz_clear(__gen_e_acsl__24);
-      __gmpz_clear(__gen_e_acsl_neg_6);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__23;
+    __e_acsl_mpz_t __gen_e_acsl__24;
+    __e_acsl_mpz_t __gen_e_acsl_neg_6;
+    int __gen_e_acsl_ne_2;
+    __gmpz_init_set_si(__gen_e_acsl__23,1L);
+    __gmpz_init_set_si(__gen_e_acsl__24,2L);
+    __gmpz_init(__gen_e_acsl_neg_6);
+    __gmpz_neg(__gen_e_acsl_neg_6,
+               (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
+    __gen_e_acsl_ne_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__23),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_6));
+    __e_acsl_assert(__gen_e_acsl_ne_2 != 0,(char *)"Assertion",
+                    (char *)"main",(char *)"1 != -2",27);
+    __gmpz_clear(__gen_e_acsl__23);
+    __gmpz_clear(__gen_e_acsl__24);
+    __gmpz_clear(__gen_e_acsl_neg_6);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
index efc79833e3f..1d5fef4dc6f 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant.c
@@ -20,19 +20,16 @@ int main(void)
       0xffffffffffffffffffffffffffffffff;
   */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_str(__gen_e_acsl_,
-                          "340282366920938463463374607431768211455",10);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
-                      11);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_str(__gen_e_acsl_,
+                        "340282366920938463463374607431768211455",10);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
+                    11);
+    __gmpz_clear(__gen_e_acsl_);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
index 66fe6e49946..1bd4c2b153d 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_integer_constant2.c
@@ -5,67 +5,59 @@ int main(void)
   int x;
   /*@ assert 0 ≡ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl_,0L);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"0 == 0",6);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_,0L);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"0 == 0",6);
+    __gmpz_clear(__gen_e_acsl_);
   }
   x = 0;
   x ++;
   /*@ assert 0 ≢ 1; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__2;
-      __e_acsl_mpz_t __gen_e_acsl__3;
-      int __gen_e_acsl_ne;
-      __gmpz_init_set_si(__gen_e_acsl__2,0L);
-      __gmpz_init_set_si(__gen_e_acsl__3,1L);
-      __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__2),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
-      __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
-                      (char *)"main",(char *)"0 != 1",8);
-      __gmpz_clear(__gen_e_acsl__2);
-      __gmpz_clear(__gen_e_acsl__3);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__2;
+    __e_acsl_mpz_t __gen_e_acsl__3;
+    int __gen_e_acsl_ne;
+    __gmpz_init_set_si(__gen_e_acsl__2,0L);
+    __gmpz_init_set_si(__gen_e_acsl__3,1L);
+    __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__2),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
+    __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",(char *)"main",
+                    (char *)"0 != 1",8);
+    __gmpz_clear(__gen_e_acsl__2);
+    __gmpz_clear(__gen_e_acsl__3);
   }
   /*@ assert 1152921504606846975 ≡ 0xfffffffffffffff; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__4;
-      int __gen_e_acsl_eq_2;
-      __gmpz_init_set_ui(__gen_e_acsl__4,1152921504606846975UL);
-      __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__4),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-      __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"1152921504606846975 == 0xfffffffffffffff",9);
-      __gmpz_clear(__gen_e_acsl__4);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__4;
+    int __gen_e_acsl_eq_2;
+    __gmpz_init_set_ui(__gen_e_acsl__4,1152921504606846975UL);
+    __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__4),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+    __e_acsl_assert(__gen_e_acsl_eq_2 == 0,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"1152921504606846975 == 0xfffffffffffffff",9);
+    __gmpz_clear(__gen_e_acsl__4);
   }
   /*@ assert
       0xffffffffffffffffffffffffffffffff ≡
       0xffffffffffffffffffffffffffffffff;
   */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl__5;
-      int __gen_e_acsl_eq_3;
-      __gmpz_init_set_str(__gen_e_acsl__5,
-                          "340282366920938463463374607431768211455",10);
-      __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-      __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
-                      11);
-      __gmpz_clear(__gen_e_acsl__5);
-    }
+    __e_acsl_mpz_t __gen_e_acsl__5;
+    int __gen_e_acsl_eq_3;
+    __gmpz_init_set_str(__gen_e_acsl__5,
+                        "340282366920938463463374607431768211455",10);
+    __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+    __e_acsl_assert(__gen_e_acsl_eq_3 == 0,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff",
+                    11);
+    __gmpz_clear(__gen_e_acsl__5);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
index 1d975679dd3..00612a60206 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_not2.c
@@ -6,36 +6,32 @@ int main(void)
   x = 0;
   /*@ assert x ≡ 0; */
   {
-    {
-      __e_acsl_mpz_t __gen_e_acsl_x;
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_eq;
-      __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
-      __gmpz_init_set_si(__gen_e_acsl_,0L);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",(char *)"x == 0",6);
-      __gmpz_clear(__gen_e_acsl_x);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    __e_acsl_mpz_t __gen_e_acsl_x;
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gmpz_init_set_si(__gen_e_acsl_x,(long)x);
+    __gmpz_init_set_si(__gen_e_acsl_,0L);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 0",6);
+    __gmpz_clear(__gen_e_acsl_x);
+    __gmpz_clear(__gen_e_acsl_);
   }
   if (x) {
     /*@ assert x ≢ 0; */
     {
-      {
-        __e_acsl_mpz_t __gen_e_acsl_x_2;
-        __e_acsl_mpz_t __gen_e_acsl__2;
-        int __gen_e_acsl_ne;
-        __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
-        __gmpz_init_set_si(__gen_e_acsl__2,0L);
-        __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
-                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-        __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
-                        (char *)"main",(char *)"x != 0",7);
-        __gmpz_clear(__gen_e_acsl_x_2);
-        __gmpz_clear(__gen_e_acsl__2);
-      }
+      __e_acsl_mpz_t __gen_e_acsl_x_2;
+      __e_acsl_mpz_t __gen_e_acsl__2;
+      int __gen_e_acsl_ne;
+      __gmpz_init_set_si(__gen_e_acsl_x_2,(long)x);
+      __gmpz_init_set_si(__gen_e_acsl__2,0L);
+      __gen_e_acsl_ne = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
+                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+      __e_acsl_assert(__gen_e_acsl_ne != 0,(char *)"Assertion",
+                      (char *)"main",(char *)"x != 0",7);
+      __gmpz_clear(__gen_e_acsl_x_2);
+      __gmpz_clear(__gen_e_acsl__2);
     }
   }
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
index f4f995dc102..6de83bb5f87 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif.c
@@ -4,156 +4,140 @@ int main(void)
   int __retres;
   /*@ assert ∀ ℤ x; 0 ≤ x ≤ 1 ⇒ x ≡ 0 ∨ x ≡ 1; */
   {
-    {
-      int __gen_e_acsl_forall;
-      int __gen_e_acsl_x;
-      __gen_e_acsl_forall = 1;
-      __gen_e_acsl_x = 0;
-      while (1) {
-        if (__gen_e_acsl_x <= 1) ; else break;
-        {
-          int __gen_e_acsl_or;
-          if (__gen_e_acsl_x == 0) __gen_e_acsl_or = 1;
-          else __gen_e_acsl_or = __gen_e_acsl_x == 1;
-          if (__gen_e_acsl_or) ;
-          else {
-            __gen_e_acsl_forall = 0;
-            goto e_acsl_end_loop1;
-          }
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_x;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_x = 0;
+    while (1) {
+      if (__gen_e_acsl_x <= 1) ; else break;
+      {
+        int __gen_e_acsl_or;
+        if (__gen_e_acsl_x == 0) __gen_e_acsl_or = 1;
+        else __gen_e_acsl_or = __gen_e_acsl_x == 1;
+        if (__gen_e_acsl_or) ;
+        else {
+          __gen_e_acsl_forall = 0;
+          goto e_acsl_end_loop1;
         }
-        __gen_e_acsl_x ++;
       }
-      e_acsl_end_loop1: ;
-      __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
-                      (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
-                      9);
+      __gen_e_acsl_x ++;
     }
+    e_acsl_end_loop1: ;
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
+                    9);
   }
   /*@ assert ∀ ℤ x; 0 < x ≤ 1 ⇒ x ≡ 1; */
   {
-    {
-      int __gen_e_acsl_forall_2;
-      int __gen_e_acsl_x_2;
-      __gen_e_acsl_forall_2 = 1;
-      __gen_e_acsl_x_2 = 0 + 1;
-      while (1) {
-        if (__gen_e_acsl_x_2 <= 1) ; else break;
-        if (__gen_e_acsl_x_2 == 1) ;
-        else {
-          __gen_e_acsl_forall_2 = 0;
-          goto e_acsl_end_loop2;
-        }
-        __gen_e_acsl_x_2 ++;
+    int __gen_e_acsl_forall_2;
+    int __gen_e_acsl_x_2;
+    __gen_e_acsl_forall_2 = 1;
+    __gen_e_acsl_x_2 = 0 + 1;
+    while (1) {
+      if (__gen_e_acsl_x_2 <= 1) ; else break;
+      if (__gen_e_acsl_x_2 == 1) ;
+      else {
+        __gen_e_acsl_forall_2 = 0;
+        goto e_acsl_end_loop2;
       }
-      e_acsl_end_loop2: ;
-      __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
+      __gen_e_acsl_x_2 ++;
     }
+    e_acsl_end_loop2: ;
+    __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
   }
   /*@ assert ∀ ℤ x; 0 < x < 1 ⇒ \false; */
   {
-    {
-      int __gen_e_acsl_forall_3;
-      int __gen_e_acsl_x_3;
-      __gen_e_acsl_forall_3 = 1;
-      __gen_e_acsl_x_3 = 0 + 1;
-      while (1) {
-        if (__gen_e_acsl_x_3 < 1) ; else break;
-        if (0) ;
-        else {
-          __gen_e_acsl_forall_3 = 0;
-          goto e_acsl_end_loop3;
-        }
-        __gen_e_acsl_x_3 ++;
+    int __gen_e_acsl_forall_3;
+    int __gen_e_acsl_x_3;
+    __gen_e_acsl_forall_3 = 1;
+    __gen_e_acsl_x_3 = 0 + 1;
+    while (1) {
+      if (__gen_e_acsl_x_3 < 1) ; else break;
+      if (0) ;
+      else {
+        __gen_e_acsl_forall_3 = 0;
+        goto e_acsl_end_loop3;
       }
-      e_acsl_end_loop3: ;
-      __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
+      __gen_e_acsl_x_3 ++;
     }
+    e_acsl_end_loop3: ;
+    __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
   }
   /*@ assert ∀ ℤ x; 0 ≤ x < 1 ⇒ x ≡ 0; */
   {
-    {
-      int __gen_e_acsl_forall_4;
-      int __gen_e_acsl_x_4;
-      __gen_e_acsl_forall_4 = 1;
-      __gen_e_acsl_x_4 = 0;
-      while (1) {
-        if (__gen_e_acsl_x_4 < 1) ; else break;
-        if (__gen_e_acsl_x_4 == 0) ;
-        else {
-          __gen_e_acsl_forall_4 = 0;
-          goto e_acsl_end_loop4;
-        }
-        __gen_e_acsl_x_4 ++;
+    int __gen_e_acsl_forall_4;
+    int __gen_e_acsl_x_4;
+    __gen_e_acsl_forall_4 = 1;
+    __gen_e_acsl_x_4 = 0;
+    while (1) {
+      if (__gen_e_acsl_x_4 < 1) ; else break;
+      if (__gen_e_acsl_x_4 == 0) ;
+      else {
+        __gen_e_acsl_forall_4 = 0;
+        goto e_acsl_end_loop4;
       }
-      e_acsl_end_loop4: ;
-      __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
+      __gen_e_acsl_x_4 ++;
     }
+    e_acsl_end_loop4: ;
+    __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
   }
   /*@ assert
       ∀ ℤ x, ℤ y, ℤ z;
         0 ≤ x < 2 ∧ 0 ≤ y < 5 ∧ 0 ≤ z ≤ y ⇒ x + z ≤ y + 1;
   */
   {
-    {
-      int __gen_e_acsl_forall_5;
-      int __gen_e_acsl_x_5;
-      int __gen_e_acsl_y;
-      int __gen_e_acsl_z;
-      __gen_e_acsl_forall_5 = 1;
-      __gen_e_acsl_x_5 = 0;
+    int __gen_e_acsl_forall_5;
+    int __gen_e_acsl_x_5;
+    int __gen_e_acsl_y;
+    int __gen_e_acsl_z;
+    __gen_e_acsl_forall_5 = 1;
+    __gen_e_acsl_x_5 = 0;
+    while (1) {
+      if (__gen_e_acsl_x_5 < 2) ; else break;
+      __gen_e_acsl_y = 0;
       while (1) {
-        if (__gen_e_acsl_x_5 < 2) ; else break;
-        __gen_e_acsl_y = 0;
+        if (__gen_e_acsl_y < 5) ; else break;
+        __gen_e_acsl_z = 0;
         while (1) {
-          if (__gen_e_acsl_y < 5) ; else break;
-          __gen_e_acsl_z = 0;
-          while (1) {
-            if (__gen_e_acsl_z <= __gen_e_acsl_y) ; else break;
-            if (__gen_e_acsl_x_5 + __gen_e_acsl_z <= __gen_e_acsl_y + 1) 
-              ;
-            else {
-              __gen_e_acsl_forall_5 = 0;
-              goto e_acsl_end_loop5;
-            }
-            __gen_e_acsl_z ++;
+          if (__gen_e_acsl_z <= __gen_e_acsl_y) ; else break;
+          if (__gen_e_acsl_x_5 + __gen_e_acsl_z <= __gen_e_acsl_y + 1) 
+            ;
+          else {
+            __gen_e_acsl_forall_5 = 0;
+            goto e_acsl_end_loop5;
           }
-          __gen_e_acsl_y ++;
+          __gen_e_acsl_z ++;
         }
-        __gen_e_acsl_x_5 ++;
+        __gen_e_acsl_y ++;
       }
-      e_acsl_end_loop5: ;
-      __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x + z <= y + 1",
-                      16);
+      __gen_e_acsl_x_5 ++;
     }
+    e_acsl_end_loop5: ;
+    __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x + z <= y + 1",
+                    16);
   }
   /*@ assert ∃ int x; 0 ≤ x < 10 ∧ x ≡ 5; */
   {
-    {
-      int __gen_e_acsl_exists;
-      int __gen_e_acsl_x_6;
-      __gen_e_acsl_exists = 0;
-      __gen_e_acsl_x_6 = 0;
-      while (1) {
-        if (__gen_e_acsl_x_6 < 10) ; else break;
-        if (! (__gen_e_acsl_x_6 == 5)) ;
-        else {
-          __gen_e_acsl_exists = 1;
-          goto e_acsl_end_loop6;
-        }
-        __gen_e_acsl_x_6 ++;
+    int __gen_e_acsl_exists;
+    int __gen_e_acsl_x_6;
+    __gen_e_acsl_exists = 0;
+    __gen_e_acsl_x_6 = 0;
+    while (1) {
+      if (__gen_e_acsl_x_6 < 10) ; else break;
+      if (! (__gen_e_acsl_x_6 == 5)) ;
+      else {
+        __gen_e_acsl_exists = 1;
+        goto e_acsl_end_loop6;
       }
-      e_acsl_end_loop6: ;
-      __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
-                      (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
+      __gen_e_acsl_x_6 ++;
     }
+    e_acsl_end_loop6: ;
+    __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
+                    (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
   }
   /*@ assert
       ∀ int x;
@@ -161,47 +145,44 @@ int main(void)
         x % 2 ≡ 0 ⇒ (∃ ℤ y; 0 ≤ y ≤ x / 2 ∧ x ≡ 2 * y);
   */
   {
-    {
-      int __gen_e_acsl_forall_6;
-      int __gen_e_acsl_x_7;
-      __gen_e_acsl_forall_6 = 1;
-      __gen_e_acsl_x_7 = 0;
-      while (1) {
-        if (__gen_e_acsl_x_7 < 10) ; else break;
-        {
-          int __gen_e_acsl_implies;
-          if (! (__gen_e_acsl_x_7 % 2 == 0)) __gen_e_acsl_implies = 1;
-          else {
-            int __gen_e_acsl_exists_2;
-            int __gen_e_acsl_y_2;
-            __gen_e_acsl_exists_2 = 0;
-            __gen_e_acsl_y_2 = 0;
-            while (1) {
-              if (__gen_e_acsl_y_2 <= __gen_e_acsl_x_7 / 2) ; else break;
-              if (! (__gen_e_acsl_x_7 == 2 * __gen_e_acsl_y_2)) ;
-              else {
-                __gen_e_acsl_exists_2 = 1;
-                goto e_acsl_end_loop7;
-              }
-              __gen_e_acsl_y_2 ++;
+    int __gen_e_acsl_forall_6;
+    int __gen_e_acsl_x_7;
+    __gen_e_acsl_forall_6 = 1;
+    __gen_e_acsl_x_7 = 0;
+    while (1) {
+      if (__gen_e_acsl_x_7 < 10) ; else break;
+      {
+        int __gen_e_acsl_implies;
+        if (! (__gen_e_acsl_x_7 % 2 == 0)) __gen_e_acsl_implies = 1;
+        else {
+          int __gen_e_acsl_exists_2;
+          int __gen_e_acsl_y_2;
+          __gen_e_acsl_exists_2 = 0;
+          __gen_e_acsl_y_2 = 0;
+          while (1) {
+            if (__gen_e_acsl_y_2 <= __gen_e_acsl_x_7 / 2) ; else break;
+            if (! (__gen_e_acsl_x_7 == 2 * __gen_e_acsl_y_2)) ;
+            else {
+              __gen_e_acsl_exists_2 = 1;
+              goto e_acsl_end_loop7;
             }
-            e_acsl_end_loop7: ;
-            __gen_e_acsl_implies = __gen_e_acsl_exists_2;
-          }
-          if (__gen_e_acsl_implies) ;
-          else {
-            __gen_e_acsl_forall_6 = 0;
-            goto e_acsl_end_loop8;
+            __gen_e_acsl_y_2 ++;
           }
+          e_acsl_end_loop7: ;
+          __gen_e_acsl_implies = __gen_e_acsl_exists_2;
+        }
+        if (__gen_e_acsl_implies) ;
+        else {
+          __gen_e_acsl_forall_6 = 0;
+          goto e_acsl_end_loop8;
         }
-        __gen_e_acsl_x_7 ++;
       }
-      e_acsl_end_loop8: ;
-      __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall int x;\n  0 <= x < 10 ==>\n  x % 2 == 0 ==> (\\exists integer y; 0 <= y <= x / 2 && x == 2 * y)",
-                      25);
+      __gen_e_acsl_x_7 ++;
     }
+    e_acsl_end_loop8: ;
+    __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall int x;\n  0 <= x < 10 ==>\n  x % 2 == 0 ==> (\\exists integer y; 0 <= y <= x / 2 && x == 2 * y)",
+                    25);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
index 553c2671415..623c7d8a756 100644
--- a/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
+++ b/src/plugins/e-acsl/tests/gmp/oracle/gen_quantif2.c
@@ -4,446 +4,430 @@ int main(void)
   int __retres;
   /*@ assert ∀ ℤ x; 0 ≤ x ≤ 1 ⇒ x ≡ 0 ∨ x ≡ 1; */
   {
+    int __gen_e_acsl_forall;
+    __e_acsl_mpz_t __gen_e_acsl_x;
+    __gen_e_acsl_forall = 1;
+    __gmpz_init(__gen_e_acsl_x);
     {
-      int __gen_e_acsl_forall;
-      __e_acsl_mpz_t __gen_e_acsl_x;
-      __gen_e_acsl_forall = 1;
-      __gmpz_init(__gen_e_acsl_x);
+      __e_acsl_mpz_t __gen_e_acsl__3;
+      __gmpz_init_set_si(__gen_e_acsl__3,0L);
+      __gmpz_set(__gen_e_acsl_x,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
+      __gmpz_clear(__gen_e_acsl__3);
+    }
+    while (1) {
       {
-        __e_acsl_mpz_t __gen_e_acsl__3;
-        __gmpz_init_set_si(__gen_e_acsl__3,0L);
-        __gmpz_set(__gen_e_acsl_x,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__3));
-        __gmpz_clear(__gen_e_acsl__3);
+        __e_acsl_mpz_t __gen_e_acsl__4;
+        int __gen_e_acsl_le;
+        __gmpz_init_set_si(__gen_e_acsl__4,1L);
+        __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
+        if (__gen_e_acsl_le <= 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__4);
       }
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__4;
-          int __gen_e_acsl_le;
-          __gmpz_init_set_si(__gen_e_acsl__4,1L);
-          __gen_e_acsl_le = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__4));
-          if (__gen_e_acsl_le <= 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__4);
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl_;
-          int __gen_e_acsl_eq;
-          int __gen_e_acsl_or;
-          __gmpz_init_set_si(__gen_e_acsl_,0L);
-          __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-          if (__gen_e_acsl_eq == 0) __gen_e_acsl_or = 1;
-          else {
-            __e_acsl_mpz_t __gen_e_acsl__2;
-            int __gen_e_acsl_eq_2;
-            __gmpz_init_set_si(__gen_e_acsl__2,1L);
-            __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                                           (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
-            __gen_e_acsl_or = __gen_e_acsl_eq_2 == 0;
-            __gmpz_clear(__gen_e_acsl__2);
-          }
-          __gmpz_clear(__gen_e_acsl_);
-          if (__gen_e_acsl_or) ;
-          else {
-            __gen_e_acsl_forall = 0;
-            goto e_acsl_end_loop1;
-          }
+      {
+        __e_acsl_mpz_t __gen_e_acsl_;
+        int __gen_e_acsl_eq;
+        int __gen_e_acsl_or;
+        __gmpz_init_set_si(__gen_e_acsl_,0L);
+        __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+        if (__gen_e_acsl_eq == 0) __gen_e_acsl_or = 1;
+        else {
+          __e_acsl_mpz_t __gen_e_acsl__2;
+          int __gen_e_acsl_eq_2;
+          __gmpz_init_set_si(__gen_e_acsl__2,1L);
+          __gen_e_acsl_eq_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__2));
+          __gen_e_acsl_or = __gen_e_acsl_eq_2 == 0;
+          __gmpz_clear(__gen_e_acsl__2);
         }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__5;
-          __e_acsl_mpz_t __gen_e_acsl_add;
-          __gmpz_init_set_si(__gen_e_acsl__5,1L);
-          __gmpz_init(__gen_e_acsl_add);
-          __gmpz_add(__gen_e_acsl_add,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
-          __gmpz_set(__gen_e_acsl_x,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add));
-          __gmpz_clear(__gen_e_acsl__5);
-          __gmpz_clear(__gen_e_acsl_add);
+        __gmpz_clear(__gen_e_acsl_);
+        if (__gen_e_acsl_or) ;
+        else {
+          __gen_e_acsl_forall = 0;
+          goto e_acsl_end_loop1;
         }
       }
-      e_acsl_end_loop1: ;
-      __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
-                      (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
-                      9);
-      __gmpz_clear(__gen_e_acsl_x);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__5;
+        __e_acsl_mpz_t __gen_e_acsl_add;
+        __gmpz_init_set_si(__gen_e_acsl__5,1L);
+        __gmpz_init(__gen_e_acsl_add);
+        __gmpz_add(__gen_e_acsl_add,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__5));
+        __gmpz_set(__gen_e_acsl_x,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add));
+        __gmpz_clear(__gen_e_acsl__5);
+        __gmpz_clear(__gen_e_acsl_add);
+      }
     }
+    e_acsl_end_loop1: ;
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1",
+                    9);
+    __gmpz_clear(__gen_e_acsl_x);
   }
   /*@ assert ∀ ℤ x; 0 < x ≤ 1 ⇒ x ≡ 1; */
   {
+    int __gen_e_acsl_forall_2;
+    __e_acsl_mpz_t __gen_e_acsl_x_2;
+    __gen_e_acsl_forall_2 = 1;
+    __gmpz_init(__gen_e_acsl_x_2);
     {
-      int __gen_e_acsl_forall_2;
-      __e_acsl_mpz_t __gen_e_acsl_x_2;
-      __gen_e_acsl_forall_2 = 1;
-      __gmpz_init(__gen_e_acsl_x_2);
+      __e_acsl_mpz_t __gen_e_acsl__7;
+      __e_acsl_mpz_t __gen_e_acsl__8;
+      __e_acsl_mpz_t __gen_e_acsl_add_2;
+      __gmpz_init_set_si(__gen_e_acsl__7,0L);
+      __gmpz_init_set_si(__gen_e_acsl__8,1L);
+      __gmpz_init(__gen_e_acsl_add_2);
+      __gmpz_add(__gen_e_acsl_add_2,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__7),
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
+      __gmpz_set(__gen_e_acsl_x_2,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2));
+      __gmpz_clear(__gen_e_acsl__7);
+      __gmpz_clear(__gen_e_acsl__8);
+      __gmpz_clear(__gen_e_acsl_add_2);
+    }
+    while (1) {
       {
-        __e_acsl_mpz_t __gen_e_acsl__7;
-        __e_acsl_mpz_t __gen_e_acsl__8;
-        __e_acsl_mpz_t __gen_e_acsl_add_2;
-        __gmpz_init_set_si(__gen_e_acsl__7,0L);
-        __gmpz_init_set_si(__gen_e_acsl__8,1L);
-        __gmpz_init(__gen_e_acsl_add_2);
-        __gmpz_add(__gen_e_acsl_add_2,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__7),
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__8));
-        __gmpz_set(__gen_e_acsl_x_2,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2));
-        __gmpz_clear(__gen_e_acsl__7);
-        __gmpz_clear(__gen_e_acsl__8);
-        __gmpz_clear(__gen_e_acsl_add_2);
+        __e_acsl_mpz_t __gen_e_acsl__9;
+        int __gen_e_acsl_le_2;
+        __gmpz_init_set_si(__gen_e_acsl__9,1L);
+        __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__9));
+        if (__gen_e_acsl_le_2 <= 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__9);
       }
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__9;
-          int __gen_e_acsl_le_2;
-          __gmpz_init_set_si(__gen_e_acsl__9,1L);
-          __gen_e_acsl_le_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__9));
-          if (__gen_e_acsl_le_2 <= 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__9);
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__6;
-          int __gen_e_acsl_eq_3;
-          __gmpz_init_set_si(__gen_e_acsl__6,1L);
-          __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
-          __gmpz_clear(__gen_e_acsl__6);
-          if (__gen_e_acsl_eq_3 == 0) ;
-          else {
-            __gen_e_acsl_forall_2 = 0;
-            goto e_acsl_end_loop2;
-          }
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__10;
-          __e_acsl_mpz_t __gen_e_acsl_add_3;
-          __gmpz_init_set_si(__gen_e_acsl__10,1L);
-          __gmpz_init(__gen_e_acsl_add_3);
-          __gmpz_add(__gen_e_acsl_add_3,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
-          __gmpz_set(__gen_e_acsl_x_2,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_3));
-          __gmpz_clear(__gen_e_acsl__10);
-          __gmpz_clear(__gen_e_acsl_add_3);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__6;
+        int __gen_e_acsl_eq_3;
+        __gmpz_init_set_si(__gen_e_acsl__6,1L);
+        __gen_e_acsl_eq_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__6));
+        __gmpz_clear(__gen_e_acsl__6);
+        if (__gen_e_acsl_eq_3 == 0) ;
+        else {
+          __gen_e_acsl_forall_2 = 0;
+          goto e_acsl_end_loop2;
         }
       }
-      e_acsl_end_loop2: ;
-      __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
-      __gmpz_clear(__gen_e_acsl_x_2);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__10;
+        __e_acsl_mpz_t __gen_e_acsl_add_3;
+        __gmpz_init_set_si(__gen_e_acsl__10,1L);
+        __gmpz_init(__gen_e_acsl_add_3);
+        __gmpz_add(__gen_e_acsl_add_3,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_2),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__10));
+        __gmpz_set(__gen_e_acsl_x_2,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_3));
+        __gmpz_clear(__gen_e_acsl__10);
+        __gmpz_clear(__gen_e_acsl_add_3);
+      }
     }
+    e_acsl_end_loop2: ;
+    __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 < x <= 1 ==> x == 1",10);
+    __gmpz_clear(__gen_e_acsl_x_2);
   }
   /*@ assert ∀ ℤ x; 0 < x < 1 ⇒ \false; */
   {
+    int __gen_e_acsl_forall_3;
+    __e_acsl_mpz_t __gen_e_acsl_x_3;
+    __gen_e_acsl_forall_3 = 1;
+    __gmpz_init(__gen_e_acsl_x_3);
     {
-      int __gen_e_acsl_forall_3;
-      __e_acsl_mpz_t __gen_e_acsl_x_3;
-      __gen_e_acsl_forall_3 = 1;
-      __gmpz_init(__gen_e_acsl_x_3);
+      __e_acsl_mpz_t __gen_e_acsl__11;
+      __e_acsl_mpz_t __gen_e_acsl__12;
+      __e_acsl_mpz_t __gen_e_acsl_add_4;
+      __gmpz_init_set_si(__gen_e_acsl__11,0L);
+      __gmpz_init_set_si(__gen_e_acsl__12,1L);
+      __gmpz_init(__gen_e_acsl_add_4);
+      __gmpz_add(__gen_e_acsl_add_4,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__11),
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__12));
+      __gmpz_set(__gen_e_acsl_x_3,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_4));
+      __gmpz_clear(__gen_e_acsl__11);
+      __gmpz_clear(__gen_e_acsl__12);
+      __gmpz_clear(__gen_e_acsl_add_4);
+    }
+    while (1) {
       {
-        __e_acsl_mpz_t __gen_e_acsl__11;
-        __e_acsl_mpz_t __gen_e_acsl__12;
-        __e_acsl_mpz_t __gen_e_acsl_add_4;
-        __gmpz_init_set_si(__gen_e_acsl__11,0L);
-        __gmpz_init_set_si(__gen_e_acsl__12,1L);
-        __gmpz_init(__gen_e_acsl_add_4);
-        __gmpz_add(__gen_e_acsl_add_4,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__11),
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__12));
-        __gmpz_set(__gen_e_acsl_x_3,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_4));
-        __gmpz_clear(__gen_e_acsl__11);
-        __gmpz_clear(__gen_e_acsl__12);
-        __gmpz_clear(__gen_e_acsl_add_4);
+        __e_acsl_mpz_t __gen_e_acsl__13;
+        int __gen_e_acsl_lt;
+        __gmpz_init_set_si(__gen_e_acsl__13,1L);
+        __gen_e_acsl_lt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
+                                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
+        if (__gen_e_acsl_lt < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__13);
       }
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__13;
-          int __gen_e_acsl_lt;
-          __gmpz_init_set_si(__gen_e_acsl__13,1L);
-          __gen_e_acsl_lt = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
-                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__13));
-          if (__gen_e_acsl_lt < 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__13);
-        }
-        if (0) ;
-        else {
-          __gen_e_acsl_forall_3 = 0;
-          goto e_acsl_end_loop3;
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__14;
-          __e_acsl_mpz_t __gen_e_acsl_add_5;
-          __gmpz_init_set_si(__gen_e_acsl__14,1L);
-          __gmpz_init(__gen_e_acsl_add_5);
-          __gmpz_add(__gen_e_acsl_add_5,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
-          __gmpz_set(__gen_e_acsl_x_3,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_5));
-          __gmpz_clear(__gen_e_acsl__14);
-          __gmpz_clear(__gen_e_acsl_add_5);
-        }
+      if (0) ;
+      else {
+        __gen_e_acsl_forall_3 = 0;
+        goto e_acsl_end_loop3;
+      }
+      {
+        __e_acsl_mpz_t __gen_e_acsl__14;
+        __e_acsl_mpz_t __gen_e_acsl_add_5;
+        __gmpz_init_set_si(__gen_e_acsl__14,1L);
+        __gmpz_init(__gen_e_acsl_add_5);
+        __gmpz_add(__gen_e_acsl_add_5,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_3),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__14));
+        __gmpz_set(__gen_e_acsl_x_3,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_5));
+        __gmpz_clear(__gen_e_acsl__14);
+        __gmpz_clear(__gen_e_acsl_add_5);
       }
-      e_acsl_end_loop3: ;
-      __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
-      __gmpz_clear(__gen_e_acsl_x_3);
     }
+    e_acsl_end_loop3: ;
+    __e_acsl_assert(__gen_e_acsl_forall_3,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 < x < 1 ==> \\false",11);
+    __gmpz_clear(__gen_e_acsl_x_3);
   }
   /*@ assert ∀ ℤ x; 0 ≤ x < 1 ⇒ x ≡ 0; */
   {
+    int __gen_e_acsl_forall_4;
+    __e_acsl_mpz_t __gen_e_acsl_x_4;
+    __gen_e_acsl_forall_4 = 1;
+    __gmpz_init(__gen_e_acsl_x_4);
     {
-      int __gen_e_acsl_forall_4;
-      __e_acsl_mpz_t __gen_e_acsl_x_4;
-      __gen_e_acsl_forall_4 = 1;
-      __gmpz_init(__gen_e_acsl_x_4);
+      __e_acsl_mpz_t __gen_e_acsl__16;
+      __gmpz_init_set_si(__gen_e_acsl__16,0L);
+      __gmpz_set(__gen_e_acsl_x_4,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__16));
+      __gmpz_clear(__gen_e_acsl__16);
+    }
+    while (1) {
       {
-        __e_acsl_mpz_t __gen_e_acsl__16;
-        __gmpz_init_set_si(__gen_e_acsl__16,0L);
-        __gmpz_set(__gen_e_acsl_x_4,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__16));
-        __gmpz_clear(__gen_e_acsl__16);
+        __e_acsl_mpz_t __gen_e_acsl__17;
+        int __gen_e_acsl_lt_2;
+        __gmpz_init_set_si(__gen_e_acsl__17,1L);
+        __gen_e_acsl_lt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
+        if (__gen_e_acsl_lt_2 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__17);
       }
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__17;
-          int __gen_e_acsl_lt_2;
-          __gmpz_init_set_si(__gen_e_acsl__17,1L);
-          __gen_e_acsl_lt_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__17));
-          if (__gen_e_acsl_lt_2 < 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__17);
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__15;
-          int __gen_e_acsl_eq_4;
-          __gmpz_init_set_si(__gen_e_acsl__15,0L);
-          __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
-          __gmpz_clear(__gen_e_acsl__15);
-          if (__gen_e_acsl_eq_4 == 0) ;
-          else {
-            __gen_e_acsl_forall_4 = 0;
-            goto e_acsl_end_loop4;
-          }
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__18;
-          __e_acsl_mpz_t __gen_e_acsl_add_6;
-          __gmpz_init_set_si(__gen_e_acsl__18,1L);
-          __gmpz_init(__gen_e_acsl_add_6);
-          __gmpz_add(__gen_e_acsl_add_6,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
-          __gmpz_set(__gen_e_acsl_x_4,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_6));
-          __gmpz_clear(__gen_e_acsl__18);
-          __gmpz_clear(__gen_e_acsl_add_6);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__15;
+        int __gen_e_acsl_eq_4;
+        __gmpz_init_set_si(__gen_e_acsl__15,0L);
+        __gen_e_acsl_eq_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__15));
+        __gmpz_clear(__gen_e_acsl__15);
+        if (__gen_e_acsl_eq_4 == 0) ;
+        else {
+          __gen_e_acsl_forall_4 = 0;
+          goto e_acsl_end_loop4;
         }
       }
-      e_acsl_end_loop4: ;
-      __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
-      __gmpz_clear(__gen_e_acsl_x_4);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__18;
+        __e_acsl_mpz_t __gen_e_acsl_add_6;
+        __gmpz_init_set_si(__gen_e_acsl__18,1L);
+        __gmpz_init(__gen_e_acsl_add_6);
+        __gmpz_add(__gen_e_acsl_add_6,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_4),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__18));
+        __gmpz_set(__gen_e_acsl_x_4,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_6));
+        __gmpz_clear(__gen_e_acsl__18);
+        __gmpz_clear(__gen_e_acsl_add_6);
+      }
     }
+    e_acsl_end_loop4: ;
+    __e_acsl_assert(__gen_e_acsl_forall_4,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x; 0 <= x < 1 ==> x == 0",12);
+    __gmpz_clear(__gen_e_acsl_x_4);
   }
   /*@ assert
       ∀ ℤ x, ℤ y, ℤ z;
         0 ≤ x < 2 ∧ 0 ≤ y < 5 ∧ 0 ≤ z ≤ y ⇒ x + z ≤ y + 1;
   */
   {
+    int __gen_e_acsl_forall_5;
+    __e_acsl_mpz_t __gen_e_acsl_x_5;
+    __e_acsl_mpz_t __gen_e_acsl_y;
+    __e_acsl_mpz_t __gen_e_acsl_z;
+    __gen_e_acsl_forall_5 = 1;
+    __gmpz_init(__gen_e_acsl_x_5);
+    __gmpz_init(__gen_e_acsl_y);
+    __gmpz_init(__gen_e_acsl_z);
     {
-      int __gen_e_acsl_forall_5;
-      __e_acsl_mpz_t __gen_e_acsl_x_5;
-      __e_acsl_mpz_t __gen_e_acsl_y;
-      __e_acsl_mpz_t __gen_e_acsl_z;
-      __gen_e_acsl_forall_5 = 1;
-      __gmpz_init(__gen_e_acsl_x_5);
-      __gmpz_init(__gen_e_acsl_y);
-      __gmpz_init(__gen_e_acsl_z);
+      __e_acsl_mpz_t __gen_e_acsl__25;
+      __gmpz_init_set_si(__gen_e_acsl__25,0L);
+      __gmpz_set(__gen_e_acsl_x_5,
+                 (__e_acsl_mpz_struct const *)(__gen_e_acsl__25));
+      __gmpz_clear(__gen_e_acsl__25);
+    }
+    while (1) {
       {
-        __e_acsl_mpz_t __gen_e_acsl__25;
-        __gmpz_init_set_si(__gen_e_acsl__25,0L);
-        __gmpz_set(__gen_e_acsl_x_5,
-                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__25));
-        __gmpz_clear(__gen_e_acsl__25);
+        __e_acsl_mpz_t __gen_e_acsl__26;
+        int __gen_e_acsl_lt_4;
+        __gmpz_init_set_si(__gen_e_acsl__26,2L);
+        __gen_e_acsl_lt_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__26));
+        if (__gen_e_acsl_lt_4 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__26);
+      }
+      {
+        __e_acsl_mpz_t __gen_e_acsl__22;
+        __gmpz_init_set_si(__gen_e_acsl__22,0L);
+        __gmpz_set(__gen_e_acsl_y,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
+        __gmpz_clear(__gen_e_acsl__22);
       }
       while (1) {
         {
-          __e_acsl_mpz_t __gen_e_acsl__26;
-          int __gen_e_acsl_lt_4;
-          __gmpz_init_set_si(__gen_e_acsl__26,2L);
-          __gen_e_acsl_lt_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__26));
-          if (__gen_e_acsl_lt_4 < 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__26);
+          __e_acsl_mpz_t __gen_e_acsl__23;
+          int __gen_e_acsl_lt_3;
+          __gmpz_init_set_si(__gen_e_acsl__23,5L);
+          __gen_e_acsl_lt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
+                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__23));
+          if (__gen_e_acsl_lt_3 < 0) ; else break;
+          __gmpz_clear(__gen_e_acsl__23);
         }
         {
-          __e_acsl_mpz_t __gen_e_acsl__22;
-          __gmpz_init_set_si(__gen_e_acsl__22,0L);
-          __gmpz_set(__gen_e_acsl_y,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__22));
-          __gmpz_clear(__gen_e_acsl__22);
+          __e_acsl_mpz_t __gen_e_acsl__20;
+          __gmpz_init_set_si(__gen_e_acsl__20,0L);
+          __gmpz_set(__gen_e_acsl_z,
+                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__20));
+          __gmpz_clear(__gen_e_acsl__20);
         }
         while (1) {
           {
-            __e_acsl_mpz_t __gen_e_acsl__23;
-            int __gen_e_acsl_lt_3;
-            __gmpz_init_set_si(__gen_e_acsl__23,5L);
-            __gen_e_acsl_lt_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
-                                           (__e_acsl_mpz_struct const *)(__gen_e_acsl__23));
-            if (__gen_e_acsl_lt_3 < 0) ; else break;
-            __gmpz_clear(__gen_e_acsl__23);
+            int __gen_e_acsl_le_4;
+            __gen_e_acsl_le_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
+                                           (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
+            if (__gen_e_acsl_le_4 <= 0) ; else break;
           }
           {
-            __e_acsl_mpz_t __gen_e_acsl__20;
-            __gmpz_init_set_si(__gen_e_acsl__20,0L);
-            __gmpz_set(__gen_e_acsl_z,
-                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__20));
-            __gmpz_clear(__gen_e_acsl__20);
-          }
-          while (1) {
-            {
-              int __gen_e_acsl_le_4;
-              __gen_e_acsl_le_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
-                                             (__e_acsl_mpz_struct const *)(__gen_e_acsl_y));
-              if (__gen_e_acsl_le_4 <= 0) ; else break;
-            }
-            {
-              __e_acsl_mpz_t __gen_e_acsl_add_7;
-              __e_acsl_mpz_t __gen_e_acsl__19;
-              __e_acsl_mpz_t __gen_e_acsl_add_8;
-              int __gen_e_acsl_le_3;
-              __gmpz_init(__gen_e_acsl_add_7);
-              __gmpz_add(__gen_e_acsl_add_7,
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_z));
-              __gmpz_init_set_si(__gen_e_acsl__19,1L);
-              __gmpz_init(__gen_e_acsl_add_8);
-              __gmpz_add(__gen_e_acsl_add_8,
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
-              __gen_e_acsl_le_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_7),
-                                             (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_8));
-              __gmpz_clear(__gen_e_acsl_add_7);
-              __gmpz_clear(__gen_e_acsl__19);
-              __gmpz_clear(__gen_e_acsl_add_8);
-              if (__gen_e_acsl_le_3 <= 0) ;
-              else {
-                __gen_e_acsl_forall_5 = 0;
-                goto e_acsl_end_loop5;
-              }
-            }
-            {
-              __e_acsl_mpz_t __gen_e_acsl__21;
-              __e_acsl_mpz_t __gen_e_acsl_add_9;
-              __gmpz_init_set_si(__gen_e_acsl__21,1L);
-              __gmpz_init(__gen_e_acsl_add_9);
-              __gmpz_add(__gen_e_acsl_add_9,
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
-              __gmpz_set(__gen_e_acsl_z,
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_9));
-              __gmpz_clear(__gen_e_acsl__21);
-              __gmpz_clear(__gen_e_acsl_add_9);
+            __e_acsl_mpz_t __gen_e_acsl_add_7;
+            __e_acsl_mpz_t __gen_e_acsl__19;
+            __e_acsl_mpz_t __gen_e_acsl_add_8;
+            int __gen_e_acsl_le_3;
+            __gmpz_init(__gen_e_acsl_add_7);
+            __gmpz_add(__gen_e_acsl_add_7,
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_z));
+            __gmpz_init_set_si(__gen_e_acsl__19,1L);
+            __gmpz_init(__gen_e_acsl_add_8);
+            __gmpz_add(__gen_e_acsl_add_8,
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__19));
+            __gen_e_acsl_le_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_7),
+                                           (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_8));
+            __gmpz_clear(__gen_e_acsl_add_7);
+            __gmpz_clear(__gen_e_acsl__19);
+            __gmpz_clear(__gen_e_acsl_add_8);
+            if (__gen_e_acsl_le_3 <= 0) ;
+            else {
+              __gen_e_acsl_forall_5 = 0;
+              goto e_acsl_end_loop5;
             }
           }
           {
-            __e_acsl_mpz_t __gen_e_acsl__24;
-            __e_acsl_mpz_t __gen_e_acsl_add_10;
-            __gmpz_init_set_si(__gen_e_acsl__24,1L);
-            __gmpz_init(__gen_e_acsl_add_10);
-            __gmpz_add(__gen_e_acsl_add_10,
-                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
-                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
-            __gmpz_set(__gen_e_acsl_y,
-                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_10));
-            __gmpz_clear(__gen_e_acsl__24);
-            __gmpz_clear(__gen_e_acsl_add_10);
+            __e_acsl_mpz_t __gen_e_acsl__21;
+            __e_acsl_mpz_t __gen_e_acsl_add_9;
+            __gmpz_init_set_si(__gen_e_acsl__21,1L);
+            __gmpz_init(__gen_e_acsl_add_9);
+            __gmpz_add(__gen_e_acsl_add_9,
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_z),
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__21));
+            __gmpz_set(__gen_e_acsl_z,
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_9));
+            __gmpz_clear(__gen_e_acsl__21);
+            __gmpz_clear(__gen_e_acsl_add_9);
           }
         }
         {
-          __e_acsl_mpz_t __gen_e_acsl__27;
-          __e_acsl_mpz_t __gen_e_acsl_add_11;
-          __gmpz_init_set_si(__gen_e_acsl__27,1L);
-          __gmpz_init(__gen_e_acsl_add_11);
-          __gmpz_add(__gen_e_acsl_add_11,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__27));
-          __gmpz_set(__gen_e_acsl_x_5,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_11));
-          __gmpz_clear(__gen_e_acsl__27);
-          __gmpz_clear(__gen_e_acsl_add_11);
+          __e_acsl_mpz_t __gen_e_acsl__24;
+          __e_acsl_mpz_t __gen_e_acsl_add_10;
+          __gmpz_init_set_si(__gen_e_acsl__24,1L);
+          __gmpz_init(__gen_e_acsl_add_10);
+          __gmpz_add(__gen_e_acsl_add_10,
+                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_y),
+                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__24));
+          __gmpz_set(__gen_e_acsl_y,
+                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_10));
+          __gmpz_clear(__gen_e_acsl__24);
+          __gmpz_clear(__gen_e_acsl_add_10);
         }
       }
-      e_acsl_end_loop5: ;
-      __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x + z <= y + 1",
-                      16);
-      __gmpz_clear(__gen_e_acsl_x_5);
-      __gmpz_clear(__gen_e_acsl_y);
-      __gmpz_clear(__gen_e_acsl_z);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__27;
+        __e_acsl_mpz_t __gen_e_acsl_add_11;
+        __gmpz_init_set_si(__gen_e_acsl__27,1L);
+        __gmpz_init(__gen_e_acsl_add_11);
+        __gmpz_add(__gen_e_acsl_add_11,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_5),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__27));
+        __gmpz_set(__gen_e_acsl_x_5,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_11));
+        __gmpz_clear(__gen_e_acsl__27);
+        __gmpz_clear(__gen_e_acsl_add_11);
+      }
     }
+    e_acsl_end_loop5: ;
+    __e_acsl_assert(__gen_e_acsl_forall_5,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall integer x, integer y, integer z;\n  0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x + z <= y + 1",
+                    16);
+    __gmpz_clear(__gen_e_acsl_x_5);
+    __gmpz_clear(__gen_e_acsl_y);
+    __gmpz_clear(__gen_e_acsl_z);
   }
   /*@ assert ∃ int x; 0 ≤ x < 10 ∧ x ≡ 5; */
   {
-    {
-      int __gen_e_acsl_exists;
-      __e_acsl_mpz_t __gen_e_acsl_x_6;
-      __gen_e_acsl_exists = 0;
-      __gmpz_init(__gen_e_acsl_x_6);
-      __gmpz_set_si(__gen_e_acsl_x_6,0L);
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__29;
-          int __gen_e_acsl_lt_5;
-          __gmpz_init_set_si(__gen_e_acsl__29,10L);
-          __gen_e_acsl_lt_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__29));
-          if (__gen_e_acsl_lt_5 < 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__29);
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__28;
-          int __gen_e_acsl_eq_5;
-          __gmpz_init_set_si(__gen_e_acsl__28,5L);
-          __gen_e_acsl_eq_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__28));
-          __gmpz_clear(__gen_e_acsl__28);
-          if (! (__gen_e_acsl_eq_5 == 0)) ;
-          else {
-            __gen_e_acsl_exists = 1;
-            goto e_acsl_end_loop6;
-          }
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__30;
-          __e_acsl_mpz_t __gen_e_acsl_add_12;
-          __gmpz_init_set_si(__gen_e_acsl__30,1L);
-          __gmpz_init(__gen_e_acsl_add_12);
-          __gmpz_add(__gen_e_acsl_add_12,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__30));
-          __gmpz_set(__gen_e_acsl_x_6,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_12));
-          __gmpz_clear(__gen_e_acsl__30);
-          __gmpz_clear(__gen_e_acsl_add_12);
+    int __gen_e_acsl_exists;
+    __e_acsl_mpz_t __gen_e_acsl_x_6;
+    __gen_e_acsl_exists = 0;
+    __gmpz_init(__gen_e_acsl_x_6);
+    __gmpz_set_si(__gen_e_acsl_x_6,0L);
+    while (1) {
+      {
+        __e_acsl_mpz_t __gen_e_acsl__29;
+        int __gen_e_acsl_lt_5;
+        __gmpz_init_set_si(__gen_e_acsl__29,10L);
+        __gen_e_acsl_lt_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__29));
+        if (__gen_e_acsl_lt_5 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__29);
+      }
+      {
+        __e_acsl_mpz_t __gen_e_acsl__28;
+        int __gen_e_acsl_eq_5;
+        __gmpz_init_set_si(__gen_e_acsl__28,5L);
+        __gen_e_acsl_eq_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__28));
+        __gmpz_clear(__gen_e_acsl__28);
+        if (! (__gen_e_acsl_eq_5 == 0)) ;
+        else {
+          __gen_e_acsl_exists = 1;
+          goto e_acsl_end_loop6;
         }
       }
-      e_acsl_end_loop6: ;
-      __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
-                      (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
-      __gmpz_clear(__gen_e_acsl_x_6);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__30;
+        __e_acsl_mpz_t __gen_e_acsl_add_12;
+        __gmpz_init_set_si(__gen_e_acsl__30,1L);
+        __gmpz_init(__gen_e_acsl_add_12);
+        __gmpz_add(__gen_e_acsl_add_12,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_6),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__30));
+        __gmpz_set(__gen_e_acsl_x_6,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_12));
+        __gmpz_clear(__gen_e_acsl__30);
+        __gmpz_clear(__gen_e_acsl_add_12);
+      }
     }
+    e_acsl_end_loop6: ;
+    __e_acsl_assert(__gen_e_acsl_exists,(char *)"Assertion",(char *)"main",
+                    (char *)"\\exists int x; 0 <= x < 10 && x == 5",21);
+    __gmpz_clear(__gen_e_acsl_x_6);
   }
   /*@ assert
       ∀ int x;
@@ -451,149 +435,145 @@ int main(void)
         x % 2 ≡ 0 ⇒ (∃ ℤ y; 0 ≤ y ≤ x / 2 ∧ x ≡ 2 * y);
   */
   {
-    {
-      int __gen_e_acsl_forall_6;
-      __e_acsl_mpz_t __gen_e_acsl_x_7;
-      __gen_e_acsl_forall_6 = 1;
-      __gmpz_init(__gen_e_acsl_x_7);
-      __gmpz_set_si(__gen_e_acsl_x_7,0L);
-      while (1) {
-        {
-          __e_acsl_mpz_t __gen_e_acsl__38;
-          int __gen_e_acsl_lt_6;
-          __gmpz_init_set_si(__gen_e_acsl__38,10L);
-          __gen_e_acsl_lt_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__38));
-          if (__gen_e_acsl_lt_6 < 0) ; else break;
-          __gmpz_clear(__gen_e_acsl__38);
-        }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__31;
-          __e_acsl_mpz_t __gen_e_acsl__32;
-          int __gen_e_acsl_mod_guard;
-          __e_acsl_mpz_t __gen_e_acsl_mod;
-          int __gen_e_acsl_eq_6;
-          int __gen_e_acsl_implies;
-          __gmpz_init_set_si(__gen_e_acsl__31,2L);
-          __gmpz_init_set_si(__gen_e_acsl__32,0L);
-          __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
-                                              (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
-          __gmpz_init(__gen_e_acsl_mod);
-          /*@ assert E_ACSL: 2 ≢ 0; */
-          __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),
-                          (char *)"Assertion",(char *)"main",
-                          (char *)"2 == 0",26);
-          __gmpz_tdiv_r(__gen_e_acsl_mod,
-                        (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                        (__e_acsl_mpz_struct const *)(__gen_e_acsl__31));
-          __gen_e_acsl_eq_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod),
-                                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
-          if (! (__gen_e_acsl_eq_6 == 0)) __gen_e_acsl_implies = 1;
-          else {
-            int __gen_e_acsl_exists_2;
-            __e_acsl_mpz_t __gen_e_acsl_y_2;
-            __gen_e_acsl_exists_2 = 0;
-            __gmpz_init(__gen_e_acsl_y_2);
+    int __gen_e_acsl_forall_6;
+    __e_acsl_mpz_t __gen_e_acsl_x_7;
+    __gen_e_acsl_forall_6 = 1;
+    __gmpz_init(__gen_e_acsl_x_7);
+    __gmpz_set_si(__gen_e_acsl_x_7,0L);
+    while (1) {
+      {
+        __e_acsl_mpz_t __gen_e_acsl__38;
+        int __gen_e_acsl_lt_6;
+        __gmpz_init_set_si(__gen_e_acsl__38,10L);
+        __gen_e_acsl_lt_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__38));
+        if (__gen_e_acsl_lt_6 < 0) ; else break;
+        __gmpz_clear(__gen_e_acsl__38);
+      }
+      {
+        __e_acsl_mpz_t __gen_e_acsl__31;
+        __e_acsl_mpz_t __gen_e_acsl__32;
+        int __gen_e_acsl_mod_guard;
+        __e_acsl_mpz_t __gen_e_acsl_mod;
+        int __gen_e_acsl_eq_6;
+        int __gen_e_acsl_implies;
+        __gmpz_init_set_si(__gen_e_acsl__31,2L);
+        __gmpz_init_set_si(__gen_e_acsl__32,0L);
+        __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__31),
+                                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
+        __gmpz_init(__gen_e_acsl_mod);
+        /*@ assert E_ACSL: 2 ≢ 0; */
+        __e_acsl_assert(! (__gen_e_acsl_mod_guard == 0),(char *)"Assertion",
+                        (char *)"main",(char *)"2 == 0",26);
+        __gmpz_tdiv_r(__gen_e_acsl_mod,
+                      (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                      (__e_acsl_mpz_struct const *)(__gen_e_acsl__31));
+        __gen_e_acsl_eq_6 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_mod),
+                                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__32));
+        if (! (__gen_e_acsl_eq_6 == 0)) __gen_e_acsl_implies = 1;
+        else {
+          int __gen_e_acsl_exists_2;
+          __e_acsl_mpz_t __gen_e_acsl_y_2;
+          __gen_e_acsl_exists_2 = 0;
+          __gmpz_init(__gen_e_acsl_y_2);
+          {
+            __e_acsl_mpz_t __gen_e_acsl__34;
+            __gmpz_init_set_si(__gen_e_acsl__34,0L);
+            __gmpz_set(__gen_e_acsl_y_2,
+                       (__e_acsl_mpz_struct const *)(__gen_e_acsl__34));
+            __gmpz_clear(__gen_e_acsl__34);
+          }
+          while (1) {
             {
-              __e_acsl_mpz_t __gen_e_acsl__34;
-              __gmpz_init_set_si(__gen_e_acsl__34,0L);
-              __gmpz_set(__gen_e_acsl_y_2,
-                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__34));
-              __gmpz_clear(__gen_e_acsl__34);
+              __e_acsl_mpz_t __gen_e_acsl__35;
+              __e_acsl_mpz_t __gen_e_acsl__36;
+              int __gen_e_acsl_div_guard;
+              __e_acsl_mpz_t __gen_e_acsl_div;
+              int __gen_e_acsl_le_5;
+              __gmpz_init_set_si(__gen_e_acsl__35,2L);
+              __gmpz_init_set_si(__gen_e_acsl__36,0L);
+              __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__35),
+                                                  (__e_acsl_mpz_struct const *)(__gen_e_acsl__36));
+              __gmpz_init(__gen_e_acsl_div);
+              /*@ assert E_ACSL: 2 ≢ 0; */
+              __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),
+                              (char *)"Assertion",(char *)"main",
+                              (char *)"2 == 0",26);
+              __gmpz_tdiv_q(__gen_e_acsl_div,
+                            (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                            (__e_acsl_mpz_struct const *)(__gen_e_acsl__35));
+              __gen_e_acsl_le_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
+                                             (__e_acsl_mpz_struct const *)(__gen_e_acsl_div));
+              if (__gen_e_acsl_le_5 <= 0) ; else break;
+              __gmpz_clear(__gen_e_acsl__35);
+              __gmpz_clear(__gen_e_acsl__36);
+              __gmpz_clear(__gen_e_acsl_div);
             }
-            while (1) {
-              {
-                __e_acsl_mpz_t __gen_e_acsl__35;
-                __e_acsl_mpz_t __gen_e_acsl__36;
-                int __gen_e_acsl_div_guard;
-                __e_acsl_mpz_t __gen_e_acsl_div;
-                int __gen_e_acsl_le_5;
-                __gmpz_init_set_si(__gen_e_acsl__35,2L);
-                __gmpz_init_set_si(__gen_e_acsl__36,0L);
-                __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__35),
-                                                    (__e_acsl_mpz_struct const *)(__gen_e_acsl__36));
-                __gmpz_init(__gen_e_acsl_div);
-                /*@ assert E_ACSL: 2 ≢ 0; */
-                __e_acsl_assert(! (__gen_e_acsl_div_guard == 0),
-                                (char *)"Assertion",(char *)"main",
-                                (char *)"2 == 0",26);
-                __gmpz_tdiv_q(__gen_e_acsl_div,
-                              (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                              (__e_acsl_mpz_struct const *)(__gen_e_acsl__35));
-                __gen_e_acsl_le_5 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
-                                               (__e_acsl_mpz_struct const *)(__gen_e_acsl_div));
-                if (__gen_e_acsl_le_5 <= 0) ; else break;
-                __gmpz_clear(__gen_e_acsl__35);
-                __gmpz_clear(__gen_e_acsl__36);
-                __gmpz_clear(__gen_e_acsl_div);
-              }
-              {
-                __e_acsl_mpz_t __gen_e_acsl__33;
-                __e_acsl_mpz_t __gen_e_acsl_mul;
-                int __gen_e_acsl_eq_7;
-                __gmpz_init_set_si(__gen_e_acsl__33,2L);
-                __gmpz_init(__gen_e_acsl_mul);
-                __gmpz_mul(__gen_e_acsl_mul,
-                           (__e_acsl_mpz_struct const *)(__gen_e_acsl__33),
-                           (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2));
-                __gen_e_acsl_eq_7 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                                               (__e_acsl_mpz_struct const *)(__gen_e_acsl_mul));
-                __gmpz_clear(__gen_e_acsl__33);
-                __gmpz_clear(__gen_e_acsl_mul);
-                if (! (__gen_e_acsl_eq_7 == 0)) ;
-                else {
-                  __gen_e_acsl_exists_2 = 1;
-                  goto e_acsl_end_loop7;
-                }
-              }
-              {
-                __e_acsl_mpz_t __gen_e_acsl__37;
-                __e_acsl_mpz_t __gen_e_acsl_add_13;
-                __gmpz_init_set_si(__gen_e_acsl__37,1L);
-                __gmpz_init(__gen_e_acsl_add_13);
-                __gmpz_add(__gen_e_acsl_add_13,
-                           (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
-                           (__e_acsl_mpz_struct const *)(__gen_e_acsl__37));
-                __gmpz_set(__gen_e_acsl_y_2,
-                           (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_13));
-                __gmpz_clear(__gen_e_acsl__37);
-                __gmpz_clear(__gen_e_acsl_add_13);
+            {
+              __e_acsl_mpz_t __gen_e_acsl__33;
+              __e_acsl_mpz_t __gen_e_acsl_mul;
+              int __gen_e_acsl_eq_7;
+              __gmpz_init_set_si(__gen_e_acsl__33,2L);
+              __gmpz_init(__gen_e_acsl_mul);
+              __gmpz_mul(__gen_e_acsl_mul,
+                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__33),
+                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2));
+              __gen_e_acsl_eq_7 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                                             (__e_acsl_mpz_struct const *)(__gen_e_acsl_mul));
+              __gmpz_clear(__gen_e_acsl__33);
+              __gmpz_clear(__gen_e_acsl_mul);
+              if (! (__gen_e_acsl_eq_7 == 0)) ;
+              else {
+                __gen_e_acsl_exists_2 = 1;
+                goto e_acsl_end_loop7;
               }
             }
-            e_acsl_end_loop7: ;
-            __gen_e_acsl_implies = __gen_e_acsl_exists_2;
-            __gmpz_clear(__gen_e_acsl_y_2);
-          }
-          __gmpz_clear(__gen_e_acsl__31);
-          __gmpz_clear(__gen_e_acsl__32);
-          __gmpz_clear(__gen_e_acsl_mod);
-          if (__gen_e_acsl_implies) ;
-          else {
-            __gen_e_acsl_forall_6 = 0;
-            goto e_acsl_end_loop8;
+            {
+              __e_acsl_mpz_t __gen_e_acsl__37;
+              __e_acsl_mpz_t __gen_e_acsl_add_13;
+              __gmpz_init_set_si(__gen_e_acsl__37,1L);
+              __gmpz_init(__gen_e_acsl_add_13);
+              __gmpz_add(__gen_e_acsl_add_13,
+                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2),
+                         (__e_acsl_mpz_struct const *)(__gen_e_acsl__37));
+              __gmpz_set(__gen_e_acsl_y_2,
+                         (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_13));
+              __gmpz_clear(__gen_e_acsl__37);
+              __gmpz_clear(__gen_e_acsl_add_13);
+            }
           }
+          e_acsl_end_loop7: ;
+          __gen_e_acsl_implies = __gen_e_acsl_exists_2;
+          __gmpz_clear(__gen_e_acsl_y_2);
         }
-        {
-          __e_acsl_mpz_t __gen_e_acsl__39;
-          __e_acsl_mpz_t __gen_e_acsl_add_14;
-          __gmpz_init_set_si(__gen_e_acsl__39,1L);
-          __gmpz_init(__gen_e_acsl_add_14);
-          __gmpz_add(__gen_e_acsl_add_14,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl__39));
-          __gmpz_set(__gen_e_acsl_x_7,
-                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_14));
-          __gmpz_clear(__gen_e_acsl__39);
-          __gmpz_clear(__gen_e_acsl_add_14);
+        __gmpz_clear(__gen_e_acsl__31);
+        __gmpz_clear(__gen_e_acsl__32);
+        __gmpz_clear(__gen_e_acsl_mod);
+        if (__gen_e_acsl_implies) ;
+        else {
+          __gen_e_acsl_forall_6 = 0;
+          goto e_acsl_end_loop8;
         }
       }
-      e_acsl_end_loop8: ;
-      __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\forall int x;\n  0 <= x < 10 ==>\n  x % 2 == 0 ==> (\\exists integer y; 0 <= y <= x / 2 && x == 2 * y)",
-                      25);
-      __gmpz_clear(__gen_e_acsl_x_7);
+      {
+        __e_acsl_mpz_t __gen_e_acsl__39;
+        __e_acsl_mpz_t __gen_e_acsl_add_14;
+        __gmpz_init_set_si(__gen_e_acsl__39,1L);
+        __gmpz_init(__gen_e_acsl_add_14);
+        __gmpz_add(__gen_e_acsl_add_14,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_x_7),
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl__39));
+        __gmpz_set(__gen_e_acsl_x_7,
+                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_add_14));
+        __gmpz_clear(__gen_e_acsl__39);
+        __gmpz_clear(__gen_e_acsl_add_14);
+      }
     }
+    e_acsl_end_loop8: ;
+    __e_acsl_assert(__gen_e_acsl_forall_6,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall int x;\n  0 <= x < 10 ==>\n  x % 2 == 0 ==> (\\exists integer y; 0 <= y <= x / 2 && x == 2 * y)",
+                    25);
+    __gmpz_clear(__gen_e_acsl_x_7);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_addrOf.c
index 46d7ef3a5c1..27863938989 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_addrOf.c
@@ -15,12 +15,10 @@ void f(void)
   m = 123;
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"f",(char *)"\\initialized(p)",10);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",(char *)"f",
+                    (char *)"\\initialized(p)",10);
   }
   __e_acsl_delete_block((void *)(& p));
   __e_acsl_delete_block((void *)(& u));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_alias.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_alias.c
index 4fabf481163..ff07e8528e0 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_alias.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_alias.c
@@ -22,13 +22,11 @@ int main(void)
   f(& i,255);
   /*@ assert \initialized(&i); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& i),
-                                                      sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&i)",14);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& i),
+                                                    sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&i)",14);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& i));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_base_addr.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_base_addr.c
index 40eeac836a6..b41e7a29e6a 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_base_addr.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_base_addr.c
@@ -36,52 +36,44 @@ int main(void)
   PA = (int *)(& A);
   /*@ assert \base_addr((int *)A) ≡ \base_addr(PA); */
   {
-    {
-      void *__gen_e_acsl_base_addr;
-      void *__gen_e_acsl_base_addr_2;
-      __gen_e_acsl_base_addr = __e_acsl_base_addr((void *)(A));
-      __gen_e_acsl_base_addr_2 = __e_acsl_base_addr((void *)PA);
-      __e_acsl_assert(__gen_e_acsl_base_addr == __gen_e_acsl_base_addr_2,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr((int *)A) == \\base_addr(PA)",13);
-    }
+    void *__gen_e_acsl_base_addr;
+    void *__gen_e_acsl_base_addr_2;
+    __gen_e_acsl_base_addr = __e_acsl_base_addr((void *)(A));
+    __gen_e_acsl_base_addr_2 = __e_acsl_base_addr((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_base_addr == __gen_e_acsl_base_addr_2,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr((int *)A) == \\base_addr(PA)",13);
   }
   /*@ assert \base_addr(&A[3]) ≡ \base_addr(PA); */
   {
-    {
-      void *__gen_e_acsl_base_addr_3;
-      void *__gen_e_acsl_base_addr_4;
-      __gen_e_acsl_base_addr_3 = __e_acsl_base_addr((void *)(& A[3L]));
-      __gen_e_acsl_base_addr_4 = __e_acsl_base_addr((void *)PA);
-      __e_acsl_assert(__gen_e_acsl_base_addr_3 == __gen_e_acsl_base_addr_4,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(&A[3]) == \\base_addr(PA)",14);
-    }
+    void *__gen_e_acsl_base_addr_3;
+    void *__gen_e_acsl_base_addr_4;
+    __gen_e_acsl_base_addr_3 = __e_acsl_base_addr((void *)(& A[3L]));
+    __gen_e_acsl_base_addr_4 = __e_acsl_base_addr((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_base_addr_3 == __gen_e_acsl_base_addr_4,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(&A[3]) == \\base_addr(PA)",14);
   }
   PA ++;
   /*@ assert \base_addr(PA) ≡ \base_addr((int *)A); */
   {
-    {
-      void *__gen_e_acsl_base_addr_5;
-      void *__gen_e_acsl_base_addr_6;
-      __gen_e_acsl_base_addr_5 = __e_acsl_base_addr((void *)PA);
-      __gen_e_acsl_base_addr_6 = __e_acsl_base_addr((void *)(A));
-      __e_acsl_assert(__gen_e_acsl_base_addr_5 == __gen_e_acsl_base_addr_6,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(PA) == \\base_addr((int *)A)",16);
-    }
+    void *__gen_e_acsl_base_addr_5;
+    void *__gen_e_acsl_base_addr_6;
+    __gen_e_acsl_base_addr_5 = __e_acsl_base_addr((void *)PA);
+    __gen_e_acsl_base_addr_6 = __e_acsl_base_addr((void *)(A));
+    __e_acsl_assert(__gen_e_acsl_base_addr_5 == __gen_e_acsl_base_addr_6,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(PA) == \\base_addr((int *)A)",16);
   }
   /*@ assert \base_addr(PA + 2) ≡ \base_addr(&A[3]); */
   {
-    {
-      void *__gen_e_acsl_base_addr_7;
-      void *__gen_e_acsl_base_addr_8;
-      __gen_e_acsl_base_addr_7 = __e_acsl_base_addr((void *)(PA + 2L));
-      __gen_e_acsl_base_addr_8 = __e_acsl_base_addr((void *)(& A[3L]));
-      __e_acsl_assert(__gen_e_acsl_base_addr_7 == __gen_e_acsl_base_addr_8,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(PA + 2) == \\base_addr(&A[3])",17);
-    }
+    void *__gen_e_acsl_base_addr_7;
+    void *__gen_e_acsl_base_addr_8;
+    __gen_e_acsl_base_addr_7 = __e_acsl_base_addr((void *)(PA + 2L));
+    __gen_e_acsl_base_addr_8 = __e_acsl_base_addr((void *)(& A[3L]));
+    __e_acsl_assert(__gen_e_acsl_base_addr_7 == __gen_e_acsl_base_addr_8,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(PA + 2) == \\base_addr(&A[3])",17);
   }
   __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
@@ -95,54 +87,46 @@ int main(void)
   pa = (int *)(& a);
   /*@ assert \base_addr((int *)a) ≡ \base_addr(pa); */
   {
-    {
-      void *__gen_e_acsl_base_addr_9;
-      void *__gen_e_acsl_base_addr_10;
-      __gen_e_acsl_base_addr_9 = __e_acsl_base_addr((void *)(a));
-      __gen_e_acsl_base_addr_10 = __e_acsl_base_addr((void *)pa);
-      __e_acsl_assert(__gen_e_acsl_base_addr_9 == __gen_e_acsl_base_addr_10,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr((int *)a) == \\base_addr(pa)",24);
-    }
+    void *__gen_e_acsl_base_addr_9;
+    void *__gen_e_acsl_base_addr_10;
+    __gen_e_acsl_base_addr_9 = __e_acsl_base_addr((void *)(a));
+    __gen_e_acsl_base_addr_10 = __e_acsl_base_addr((void *)pa);
+    __e_acsl_assert(__gen_e_acsl_base_addr_9 == __gen_e_acsl_base_addr_10,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr((int *)a) == \\base_addr(pa)",24);
   }
   /*@ assert \base_addr(&a[3]) ≡ \base_addr(pa); */
   {
-    {
-      void *__gen_e_acsl_base_addr_11;
-      void *__gen_e_acsl_base_addr_12;
-      __gen_e_acsl_base_addr_11 = __e_acsl_base_addr((void *)(& a[3L]));
-      __gen_e_acsl_base_addr_12 = __e_acsl_base_addr((void *)pa);
-      __e_acsl_assert(__gen_e_acsl_base_addr_11 == __gen_e_acsl_base_addr_12,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(&a[3]) == \\base_addr(pa)",25);
-    }
+    void *__gen_e_acsl_base_addr_11;
+    void *__gen_e_acsl_base_addr_12;
+    __gen_e_acsl_base_addr_11 = __e_acsl_base_addr((void *)(& a[3L]));
+    __gen_e_acsl_base_addr_12 = __e_acsl_base_addr((void *)pa);
+    __e_acsl_assert(__gen_e_acsl_base_addr_11 == __gen_e_acsl_base_addr_12,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(&a[3]) == \\base_addr(pa)",25);
   }
   __e_acsl_full_init((void *)(& pa));
   pa ++;
   /*@ assert \base_addr(pa) ≡ \base_addr((int *)a); */
   {
-    {
-      void *__gen_e_acsl_base_addr_13;
-      void *__gen_e_acsl_base_addr_14;
-      __gen_e_acsl_base_addr_13 = __e_acsl_base_addr((void *)pa);
-      __gen_e_acsl_base_addr_14 = __e_acsl_base_addr((void *)(a));
-      __e_acsl_assert(__gen_e_acsl_base_addr_13 == __gen_e_acsl_base_addr_14,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(pa) == \\base_addr((int *)a)",27);
-    }
+    void *__gen_e_acsl_base_addr_13;
+    void *__gen_e_acsl_base_addr_14;
+    __gen_e_acsl_base_addr_13 = __e_acsl_base_addr((void *)pa);
+    __gen_e_acsl_base_addr_14 = __e_acsl_base_addr((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_base_addr_13 == __gen_e_acsl_base_addr_14,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(pa) == \\base_addr((int *)a)",27);
   }
   /*@ assert \base_addr(pa + 2) ≡ \base_addr((int *)a); */
   {
-    {
-      void *__gen_e_acsl_base_addr_15;
-      void *__gen_e_acsl_base_addr_16;
-      __gen_e_acsl_base_addr_15 = __e_acsl_base_addr((void *)(pa + 2L));
-      __gen_e_acsl_base_addr_16 = __e_acsl_base_addr((void *)(a));
-      __e_acsl_assert(__gen_e_acsl_base_addr_15 == __gen_e_acsl_base_addr_16,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(pa + 2) == \\base_addr((int *)a)",
-                      28);
-    }
+    void *__gen_e_acsl_base_addr_15;
+    void *__gen_e_acsl_base_addr_16;
+    __gen_e_acsl_base_addr_15 = __e_acsl_base_addr((void *)(pa + 2L));
+    __gen_e_acsl_base_addr_16 = __e_acsl_base_addr((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_base_addr_15 == __gen_e_acsl_base_addr_16,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(pa + 2) == \\base_addr((int *)a)",
+                    28);
   }
   __e_acsl_full_init((void *)(& l));
   l = (long)4;
@@ -150,27 +134,23 @@ int main(void)
   pl = (char *)(& l);
   /*@ assert \base_addr(&l) ≡ \base_addr(pl); */
   {
-    {
-      void *__gen_e_acsl_base_addr_17;
-      void *__gen_e_acsl_base_addr_18;
-      __gen_e_acsl_base_addr_17 = __e_acsl_base_addr((void *)(& l));
-      __gen_e_acsl_base_addr_18 = __e_acsl_base_addr((void *)pl);
-      __e_acsl_assert(__gen_e_acsl_base_addr_17 == __gen_e_acsl_base_addr_18,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(&l) == \\base_addr(pl)",33);
-    }
+    void *__gen_e_acsl_base_addr_17;
+    void *__gen_e_acsl_base_addr_18;
+    __gen_e_acsl_base_addr_17 = __e_acsl_base_addr((void *)(& l));
+    __gen_e_acsl_base_addr_18 = __e_acsl_base_addr((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_base_addr_17 == __gen_e_acsl_base_addr_18,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(&l) == \\base_addr(pl)",33);
   }
   /*@ assert \base_addr(pl + 2) ≡ \base_addr(&l); */
   {
-    {
-      void *__gen_e_acsl_base_addr_19;
-      void *__gen_e_acsl_base_addr_20;
-      __gen_e_acsl_base_addr_19 = __e_acsl_base_addr((void *)(pl + 2L));
-      __gen_e_acsl_base_addr_20 = __e_acsl_base_addr((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_base_addr_19 == __gen_e_acsl_base_addr_20,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(pl + 2) == \\base_addr(&l)",34);
-    }
+    void *__gen_e_acsl_base_addr_19;
+    void *__gen_e_acsl_base_addr_20;
+    __gen_e_acsl_base_addr_19 = __e_acsl_base_addr((void *)(pl + 2L));
+    __gen_e_acsl_base_addr_20 = __e_acsl_base_addr((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_base_addr_19 == __gen_e_acsl_base_addr_20,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(pl + 2) == \\base_addr(&l)",34);
   }
   __e_acsl_full_init((void *)(& pi));
   pi = (short *)(& l);
@@ -180,27 +160,23 @@ int main(void)
   pl ++;
   /*@ assert \base_addr(pi) ≡ \base_addr(pl); */
   {
-    {
-      void *__gen_e_acsl_base_addr_21;
-      void *__gen_e_acsl_base_addr_22;
-      __gen_e_acsl_base_addr_21 = __e_acsl_base_addr((void *)pi);
-      __gen_e_acsl_base_addr_22 = __e_acsl_base_addr((void *)pl);
-      __e_acsl_assert(__gen_e_acsl_base_addr_21 == __gen_e_acsl_base_addr_22,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(pi) == \\base_addr(pl)",38);
-    }
+    void *__gen_e_acsl_base_addr_21;
+    void *__gen_e_acsl_base_addr_22;
+    __gen_e_acsl_base_addr_21 = __e_acsl_base_addr((void *)pi);
+    __gen_e_acsl_base_addr_22 = __e_acsl_base_addr((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_base_addr_21 == __gen_e_acsl_base_addr_22,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(pi) == \\base_addr(pl)",38);
   }
   /*@ assert \base_addr(pl) ≡ \base_addr(&l); */
   {
-    {
-      void *__gen_e_acsl_base_addr_23;
-      void *__gen_e_acsl_base_addr_24;
-      __gen_e_acsl_base_addr_23 = __e_acsl_base_addr((void *)pl);
-      __gen_e_acsl_base_addr_24 = __e_acsl_base_addr((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_base_addr_23 == __gen_e_acsl_base_addr_24,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(pl) == \\base_addr(&l)",39);
-    }
+    void *__gen_e_acsl_base_addr_23;
+    void *__gen_e_acsl_base_addr_24;
+    __gen_e_acsl_base_addr_23 = __e_acsl_base_addr((void *)pl);
+    __gen_e_acsl_base_addr_24 = __e_acsl_base_addr((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_base_addr_23 == __gen_e_acsl_base_addr_24,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(pl) == \\base_addr(&l)",39);
   }
   __e_acsl_full_init((void *)(& p));
   p = (char *)malloc((unsigned long)12);
@@ -208,66 +184,55 @@ int main(void)
   pd = p;
   /*@ assert \base_addr(p) ≡ \base_addr(pd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_25;
-      void *__gen_e_acsl_base_addr_26;
-      __gen_e_acsl_base_addr_25 = __e_acsl_base_addr((void *)p);
-      __gen_e_acsl_base_addr_26 = __e_acsl_base_addr((void *)pd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_25 == __gen_e_acsl_base_addr_26,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(p) == \\base_addr(pd)",44);
-    }
+    void *__gen_e_acsl_base_addr_25;
+    void *__gen_e_acsl_base_addr_26;
+    __gen_e_acsl_base_addr_25 = __e_acsl_base_addr((void *)p);
+    __gen_e_acsl_base_addr_26 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_25 == __gen_e_acsl_base_addr_26,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(p) == \\base_addr(pd)",44);
   }
   /*@ assert \base_addr(p + 1) ≡ \base_addr(pd + 5); */
   {
-    {
-      void *__gen_e_acsl_base_addr_27;
-      void *__gen_e_acsl_base_addr_28;
-      __gen_e_acsl_base_addr_27 = __e_acsl_base_addr((void *)(p + 1L));
-      __gen_e_acsl_base_addr_28 = __e_acsl_base_addr((void *)(pd + 5L));
-      __e_acsl_assert(__gen_e_acsl_base_addr_27 == __gen_e_acsl_base_addr_28,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(p + 1) == \\base_addr(pd + 5)",45);
-    }
+    void *__gen_e_acsl_base_addr_27;
+    void *__gen_e_acsl_base_addr_28;
+    __gen_e_acsl_base_addr_27 = __e_acsl_base_addr((void *)(p + 1L));
+    __gen_e_acsl_base_addr_28 = __e_acsl_base_addr((void *)(pd + 5L));
+    __e_acsl_assert(__gen_e_acsl_base_addr_27 == __gen_e_acsl_base_addr_28,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(p + 1) == \\base_addr(pd + 5)",45);
   }
   /*@ assert \base_addr(p + 11) ≡ \base_addr(pd + 1); */
   {
-    {
-      void *__gen_e_acsl_base_addr_29;
-      void *__gen_e_acsl_base_addr_30;
-      __gen_e_acsl_base_addr_29 = __e_acsl_base_addr((void *)(p + 11L));
-      __gen_e_acsl_base_addr_30 = __e_acsl_base_addr((void *)(pd + 1L));
-      __e_acsl_assert(__gen_e_acsl_base_addr_29 == __gen_e_acsl_base_addr_30,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(p + 11) == \\base_addr(pd + 1)",
-                      46);
-    }
+    void *__gen_e_acsl_base_addr_29;
+    void *__gen_e_acsl_base_addr_30;
+    __gen_e_acsl_base_addr_29 = __e_acsl_base_addr((void *)(p + 11L));
+    __gen_e_acsl_base_addr_30 = __e_acsl_base_addr((void *)(pd + 1L));
+    __e_acsl_assert(__gen_e_acsl_base_addr_29 == __gen_e_acsl_base_addr_30,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(p + 11) == \\base_addr(pd + 1)",46);
   }
   __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \base_addr(p + 5) ≡ \base_addr(pd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_31;
-      void *__gen_e_acsl_base_addr_32;
-      __gen_e_acsl_base_addr_31 = __e_acsl_base_addr((void *)(p + 5L));
-      __gen_e_acsl_base_addr_32 = __e_acsl_base_addr((void *)pd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_31 == __gen_e_acsl_base_addr_32,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(p + 5) == \\base_addr(pd)",48);
-    }
+    void *__gen_e_acsl_base_addr_31;
+    void *__gen_e_acsl_base_addr_32;
+    __gen_e_acsl_base_addr_31 = __e_acsl_base_addr((void *)(p + 5L));
+    __gen_e_acsl_base_addr_32 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_31 == __gen_e_acsl_base_addr_32,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(p + 5) == \\base_addr(pd)",48);
   }
   /*@ assert \base_addr(p - 5) ≡ \base_addr(pd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_33;
-      void *__gen_e_acsl_base_addr_34;
-      __gen_e_acsl_base_addr_33 = __e_acsl_base_addr((void *)(p - 5L));
-      __gen_e_acsl_base_addr_34 = __e_acsl_base_addr((void *)pd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_33 == __gen_e_acsl_base_addr_34,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(p - 5) == \\base_addr(pd)",49);
-    }
+    void *__gen_e_acsl_base_addr_33;
+    void *__gen_e_acsl_base_addr_34;
+    __gen_e_acsl_base_addr_33 = __e_acsl_base_addr((void *)(p - 5L));
+    __gen_e_acsl_base_addr_34 = __e_acsl_base_addr((void *)pd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_33 == __gen_e_acsl_base_addr_34,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(p - 5) == \\base_addr(pd)",49);
   }
   __e_acsl_full_init((void *)(& q));
   q = (long *)malloc((unsigned long)30 * sizeof(long));
@@ -275,57 +240,49 @@ int main(void)
   qd = q;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_35;
-      void *__gen_e_acsl_base_addr_36;
-      __gen_e_acsl_base_addr_35 = __e_acsl_base_addr((void *)q);
-      __gen_e_acsl_base_addr_36 = __e_acsl_base_addr((void *)qd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_35 == __gen_e_acsl_base_addr_36,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(q) == \\base_addr(qd)",55);
-    }
+    void *__gen_e_acsl_base_addr_35;
+    void *__gen_e_acsl_base_addr_36;
+    __gen_e_acsl_base_addr_35 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_36 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_35 == __gen_e_acsl_base_addr_36,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(q) == \\base_addr(qd)",55);
   }
   __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_37;
-      void *__gen_e_acsl_base_addr_38;
-      __gen_e_acsl_base_addr_37 = __e_acsl_base_addr((void *)q);
-      __gen_e_acsl_base_addr_38 = __e_acsl_base_addr((void *)qd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_37 == __gen_e_acsl_base_addr_38,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(q) == \\base_addr(qd)",57);
-    }
+    void *__gen_e_acsl_base_addr_37;
+    void *__gen_e_acsl_base_addr_38;
+    __gen_e_acsl_base_addr_37 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_38 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_37 == __gen_e_acsl_base_addr_38,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(q) == \\base_addr(qd)",57);
   }
   __e_acsl_full_init((void *)(& q));
   q += 2;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_39;
-      void *__gen_e_acsl_base_addr_40;
-      __gen_e_acsl_base_addr_39 = __e_acsl_base_addr((void *)q);
-      __gen_e_acsl_base_addr_40 = __e_acsl_base_addr((void *)qd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_39 == __gen_e_acsl_base_addr_40,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(q) == \\base_addr(qd)",59);
-    }
+    void *__gen_e_acsl_base_addr_39;
+    void *__gen_e_acsl_base_addr_40;
+    __gen_e_acsl_base_addr_39 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_40 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_39 == __gen_e_acsl_base_addr_40,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(q) == \\base_addr(qd)",59);
   }
   __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \base_addr(q) ≡ \base_addr(qd); */
   {
-    {
-      void *__gen_e_acsl_base_addr_41;
-      void *__gen_e_acsl_base_addr_42;
-      __gen_e_acsl_base_addr_41 = __e_acsl_base_addr((void *)q);
-      __gen_e_acsl_base_addr_42 = __e_acsl_base_addr((void *)qd);
-      __e_acsl_assert(__gen_e_acsl_base_addr_41 == __gen_e_acsl_base_addr_42,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\base_addr(q) == \\base_addr(qd)",61);
-    }
+    void *__gen_e_acsl_base_addr_41;
+    void *__gen_e_acsl_base_addr_42;
+    __gen_e_acsl_base_addr_41 = __e_acsl_base_addr((void *)q);
+    __gen_e_acsl_base_addr_42 = __e_acsl_base_addr((void *)qd);
+    __e_acsl_assert(__gen_e_acsl_base_addr_41 == __gen_e_acsl_base_addr_42,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\base_addr(q) == \\base_addr(qd)",61);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& PA));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_block_length.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_block_length.c
index 9577c30f51b..60f6a336e24 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_block_length.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_block_length.c
@@ -40,66 +40,54 @@ int main(void)
   __e_acsl_store_block((void *)(& zero),0UL);
   /*@ assert \block_length(&ZERO) ≡ 0; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length;
-      __gen_e_acsl_block_length = __e_acsl_block_length((void *)(& ZERO));
-      __e_acsl_assert(__gen_e_acsl_block_length == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\block_length(&ZERO) == 0",15);
-    }
+    unsigned long __gen_e_acsl_block_length;
+    __gen_e_acsl_block_length = __e_acsl_block_length((void *)(& ZERO));
+    __e_acsl_assert(__gen_e_acsl_block_length == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(&ZERO) == 0",15);
   }
   /*@ assert \block_length(&zero) ≡ 0; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_2;
-      __gen_e_acsl_block_length_2 = __e_acsl_block_length((void *)(& zero));
-      __e_acsl_assert(__gen_e_acsl_block_length_2 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\block_length(&zero) == 0",16);
-    }
+    unsigned long __gen_e_acsl_block_length_2;
+    __gen_e_acsl_block_length_2 = __e_acsl_block_length((void *)(& zero));
+    __e_acsl_assert(__gen_e_acsl_block_length_2 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(&zero) == 0",16);
   }
   PA = (int *)(& A);
   /*@ assert \block_length((int *)A) ≡ sizeof(A); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_3;
-      __gen_e_acsl_block_length_3 = __e_acsl_block_length((void *)(A));
-      __e_acsl_assert(__gen_e_acsl_block_length_3 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length((int *)A) == sizeof(A)",20);
-    }
+    unsigned long __gen_e_acsl_block_length_3;
+    __gen_e_acsl_block_length_3 = __e_acsl_block_length((void *)(A));
+    __e_acsl_assert(__gen_e_acsl_block_length_3 == 16,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length((int *)A) == sizeof(A)",20);
   }
   /*@ assert \block_length(&A[3]) ≡ sizeof(A); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_4;
-      __gen_e_acsl_block_length_4 = __e_acsl_block_length((void *)(& A[3L]));
-      __e_acsl_assert(__gen_e_acsl_block_length_4 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(&A[3]) == sizeof(A)",21);
-    }
+    unsigned long __gen_e_acsl_block_length_4;
+    __gen_e_acsl_block_length_4 = __e_acsl_block_length((void *)(& A[3L]));
+    __e_acsl_assert(__gen_e_acsl_block_length_4 == 16,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length(&A[3]) == sizeof(A)",21);
   }
   /*@ assert \block_length(PA) ≡ sizeof(A); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_5;
-      __gen_e_acsl_block_length_5 = __e_acsl_block_length((void *)PA);
-      __e_acsl_assert(__gen_e_acsl_block_length_5 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(PA) == sizeof(A)",22);
-    }
+    unsigned long __gen_e_acsl_block_length_5;
+    __gen_e_acsl_block_length_5 = __e_acsl_block_length((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_block_length_5 == 16,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(PA) == sizeof(A)",
+                    22);
   }
   PA ++;
   /*@ assert \block_length(PA + 1) ≡ \block_length(&A[1]); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_6;
-      unsigned long __gen_e_acsl_block_length_7;
-      __gen_e_acsl_block_length_6 = __e_acsl_block_length((void *)(PA + 1L));
-      __gen_e_acsl_block_length_7 = __e_acsl_block_length((void *)(& A[1L]));
-      __e_acsl_assert(__gen_e_acsl_block_length_6 == __gen_e_acsl_block_length_7,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(PA + 1) == \\block_length(&A[1])",
-                      24);
-    }
+    unsigned long __gen_e_acsl_block_length_6;
+    unsigned long __gen_e_acsl_block_length_7;
+    __gen_e_acsl_block_length_6 = __e_acsl_block_length((void *)(PA + 1L));
+    __gen_e_acsl_block_length_7 = __e_acsl_block_length((void *)(& A[1L]));
+    __e_acsl_assert(__gen_e_acsl_block_length_6 == __gen_e_acsl_block_length_7,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(PA + 1) == \\block_length(&A[1])",
+                    24);
   }
   __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
@@ -113,48 +101,40 @@ int main(void)
   pa = (int *)(& a);
   /*@ assert \block_length((int *)a) ≡ sizeof(a); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_8;
-      __gen_e_acsl_block_length_8 = __e_acsl_block_length((void *)(a));
-      __e_acsl_assert(__gen_e_acsl_block_length_8 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length((int *)a) == sizeof(a)",29);
-    }
+    unsigned long __gen_e_acsl_block_length_8;
+    __gen_e_acsl_block_length_8 = __e_acsl_block_length((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_block_length_8 == 16,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length((int *)a) == sizeof(a)",29);
   }
   /*@ assert \block_length(&a[3]) ≡ sizeof(a); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_9;
-      __gen_e_acsl_block_length_9 = __e_acsl_block_length((void *)(& a[3L]));
-      __e_acsl_assert(__gen_e_acsl_block_length_9 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(&a[3]) == sizeof(a)",30);
-    }
+    unsigned long __gen_e_acsl_block_length_9;
+    __gen_e_acsl_block_length_9 = __e_acsl_block_length((void *)(& a[3L]));
+    __e_acsl_assert(__gen_e_acsl_block_length_9 == 16,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length(&a[3]) == sizeof(a)",30);
   }
   /*@ assert \block_length(pa) ≡ sizeof(a); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_10;
-      __gen_e_acsl_block_length_10 = __e_acsl_block_length((void *)pa);
-      __e_acsl_assert(__gen_e_acsl_block_length_10 == 16,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(pa) == sizeof(a)",31);
-    }
+    unsigned long __gen_e_acsl_block_length_10;
+    __gen_e_acsl_block_length_10 = __e_acsl_block_length((void *)pa);
+    __e_acsl_assert(__gen_e_acsl_block_length_10 == 16,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(pa) == sizeof(a)",
+                    31);
   }
   __e_acsl_full_init((void *)(& pa));
   pa ++;
   /*@ assert \block_length(pa + 1) ≡ \block_length(&a[1]); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_11;
-      unsigned long __gen_e_acsl_block_length_12;
-      __gen_e_acsl_block_length_11 = __e_acsl_block_length((void *)(pa + 1L));
-      __gen_e_acsl_block_length_12 = __e_acsl_block_length((void *)(& a[1L]));
-      __e_acsl_assert(__gen_e_acsl_block_length_11 == __gen_e_acsl_block_length_12,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(pa + 1) == \\block_length(&a[1])",
-                      33);
-    }
+    unsigned long __gen_e_acsl_block_length_11;
+    unsigned long __gen_e_acsl_block_length_12;
+    __gen_e_acsl_block_length_11 = __e_acsl_block_length((void *)(pa + 1L));
+    __gen_e_acsl_block_length_12 = __e_acsl_block_length((void *)(& a[1L]));
+    __e_acsl_assert(__gen_e_acsl_block_length_11 == __gen_e_acsl_block_length_12,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(pa + 1) == \\block_length(&a[1])",
+                    33);
   }
   __e_acsl_full_init((void *)(& l));
   l = (long)4;
@@ -162,124 +142,101 @@ int main(void)
   pl = (char *)(& l);
   /*@ assert \block_length(&l) ≡ sizeof(long); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_13;
-      __gen_e_acsl_block_length_13 = __e_acsl_block_length((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_block_length_13 == 8,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(&l) == sizeof(long)",39);
-    }
+    unsigned long __gen_e_acsl_block_length_13;
+    __gen_e_acsl_block_length_13 = __e_acsl_block_length((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_block_length_13 == 8,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length(&l) == sizeof(long)",39);
   }
   /*@ assert \block_length(pl) ≡ sizeof(long); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_14;
-      __gen_e_acsl_block_length_14 = __e_acsl_block_length((void *)pl);
-      __e_acsl_assert(__gen_e_acsl_block_length_14 == 8,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(pl) == sizeof(long)",40);
-    }
+    unsigned long __gen_e_acsl_block_length_14;
+    __gen_e_acsl_block_length_14 = __e_acsl_block_length((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_block_length_14 == 8,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length(pl) == sizeof(long)",40);
   }
   /*@ assert \block_length(pl + 7) ≡ sizeof(long); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_15;
-      __gen_e_acsl_block_length_15 = __e_acsl_block_length((void *)(pl + 7L));
-      __e_acsl_assert(__gen_e_acsl_block_length_15 == 8,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(pl + 7) == sizeof(long)",41);
-    }
+    unsigned long __gen_e_acsl_block_length_15;
+    __gen_e_acsl_block_length_15 = __e_acsl_block_length((void *)(pl + 7L));
+    __e_acsl_assert(__gen_e_acsl_block_length_15 == 8,(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"\\block_length(pl + 7) == sizeof(long)",41);
   }
   __e_acsl_full_init((void *)(& pi));
   pi = (int *)(& l);
   /*@ assert \block_length(pi) ≡ \block_length(&l); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_16;
-      unsigned long __gen_e_acsl_block_length_17;
-      __gen_e_acsl_block_length_16 = __e_acsl_block_length((void *)pi);
-      __gen_e_acsl_block_length_17 = __e_acsl_block_length((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_block_length_16 == __gen_e_acsl_block_length_17,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(pi) == \\block_length(&l)",43);
-    }
+    unsigned long __gen_e_acsl_block_length_16;
+    unsigned long __gen_e_acsl_block_length_17;
+    __gen_e_acsl_block_length_16 = __e_acsl_block_length((void *)pi);
+    __gen_e_acsl_block_length_17 = __e_acsl_block_length((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_block_length_16 == __gen_e_acsl_block_length_17,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(pi) == \\block_length(&l)",43);
   }
   __e_acsl_full_init((void *)(& pi));
   pi ++;
   /*@ assert \block_length(pi) ≡ \block_length(&l); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_18;
-      unsigned long __gen_e_acsl_block_length_19;
-      __gen_e_acsl_block_length_18 = __e_acsl_block_length((void *)pi);
-      __gen_e_acsl_block_length_19 = __e_acsl_block_length((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_block_length_18 == __gen_e_acsl_block_length_19,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(pi) == \\block_length(&l)",45);
-    }
+    unsigned long __gen_e_acsl_block_length_18;
+    unsigned long __gen_e_acsl_block_length_19;
+    __gen_e_acsl_block_length_18 = __e_acsl_block_length((void *)pi);
+    __gen_e_acsl_block_length_19 = __e_acsl_block_length((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_block_length_18 == __gen_e_acsl_block_length_19,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(pi) == \\block_length(&l)",45);
   }
   size = (unsigned long)12;
   __e_acsl_full_init((void *)(& p));
   p = (char *)malloc(size);
   /*@ assert \block_length(p) ≡ size; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_20;
-      __gen_e_acsl_block_length_20 = __e_acsl_block_length((void *)p);
-      __e_acsl_assert(__gen_e_acsl_block_length_20 == size,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(p) == size",50);
-    }
+    unsigned long __gen_e_acsl_block_length_20;
+    __gen_e_acsl_block_length_20 = __e_acsl_block_length((void *)p);
+    __e_acsl_assert(__gen_e_acsl_block_length_20 == size,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(p) == size",50);
   }
   /*@ assert \block_length(p + 11) ≡ size; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_21;
-      __gen_e_acsl_block_length_21 = __e_acsl_block_length((void *)(p + 11L));
-      __e_acsl_assert(__gen_e_acsl_block_length_21 == size,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(p + 11) == size",51);
-    }
+    unsigned long __gen_e_acsl_block_length_21;
+    __gen_e_acsl_block_length_21 = __e_acsl_block_length((void *)(p + 11L));
+    __e_acsl_assert(__gen_e_acsl_block_length_21 == size,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(p + 11) == size",
+                    51);
   }
   __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \block_length(p + 5) ≡ \block_length(p - 5); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_22;
-      unsigned long __gen_e_acsl_block_length_23;
-      __gen_e_acsl_block_length_22 = __e_acsl_block_length((void *)(p + 5L));
-      __gen_e_acsl_block_length_23 = __e_acsl_block_length((void *)(p - 5L));
-      __e_acsl_assert(__gen_e_acsl_block_length_22 == __gen_e_acsl_block_length_23,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(p + 5) == \\block_length(p - 5)",
-                      53);
-    }
+    unsigned long __gen_e_acsl_block_length_22;
+    unsigned long __gen_e_acsl_block_length_23;
+    __gen_e_acsl_block_length_22 = __e_acsl_block_length((void *)(p + 5L));
+    __gen_e_acsl_block_length_23 = __e_acsl_block_length((void *)(p - 5L));
+    __e_acsl_assert(__gen_e_acsl_block_length_22 == __gen_e_acsl_block_length_23,
+                    (char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(p + 5) == \\block_length(p - 5)",
+                    53);
   }
   size = (unsigned long)30 * sizeof(long);
   __e_acsl_full_init((void *)(& q));
   q = (long *)malloc(size);
   /*@ assert \block_length(q) ≡ size; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_24;
-      __gen_e_acsl_block_length_24 = __e_acsl_block_length((void *)q);
-      __e_acsl_assert(__gen_e_acsl_block_length_24 == size,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(q) == size",59);
-    }
+    unsigned long __gen_e_acsl_block_length_24;
+    __gen_e_acsl_block_length_24 = __e_acsl_block_length((void *)q);
+    __e_acsl_assert(__gen_e_acsl_block_length_24 == size,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(q) == size",59);
   }
   __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \block_length(q) ≡ size; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_25;
-      __gen_e_acsl_block_length_25 = __e_acsl_block_length((void *)q);
-      __e_acsl_assert(__gen_e_acsl_block_length_25 == size,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(q) == size",61);
-    }
+    unsigned long __gen_e_acsl_block_length_25;
+    __gen_e_acsl_block_length_25 = __e_acsl_block_length((void *)q);
+    __e_acsl_assert(__gen_e_acsl_block_length_25 == size,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(q) == size",61);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& ZERO));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_compound_initializers.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_compound_initializers.c
index 5987df01f5c..867f7946083 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_compound_initializers.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_compound_initializers.c
@@ -65,107 +65,88 @@ int main(int argc, char **argv)
   __e_acsl_globals_init();
   /*@ assert \valid((char **)_A); */
   {
-    {
-      int __gen_e_acsl_valid;
-      __gen_e_acsl_valid = __e_acsl_valid((void *)(_A),sizeof(char *));
-      __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid((char **)_A)",33);
-    }
+    int __gen_e_acsl_valid;
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(_A),sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid((char **)_A)",33);
   }
   /*@ assert \valid_read(_A[0]); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(_A),
-                                                      sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_read;
-        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)_A[0L],
-                                                      sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid_read;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid_read(_A[0])",34);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(_A),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)_A[0L],
+                                                    sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid_read(_A[0])",34);
   }
   /*@ assert \valid_read(_A[1]); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      int __gen_e_acsl_and_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& _A[1L]),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_2) {
-        int __gen_e_acsl_valid_read_2;
-        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)_A[1L],
-                                                        sizeof(char));
-        __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_2;
-      }
-      else __gen_e_acsl_and_2 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid_read(_A[1])",35);
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& _A[1L]),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_2;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)_A[1L],
+                                                      sizeof(char));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_2;
     }
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid_read(_A[1])",35);
   }
   /*@ assert \valid_read(_B); */
   {
-    {
-      int __gen_e_acsl_valid_read_3;
-      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)_B,
-                                                      sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid_read(_B)",36);
-    }
+    int __gen_e_acsl_valid_read_3;
+    __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)_B,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"Assertion",
+                    (char *)"main",(char *)"\\valid_read(_B)",36);
   }
   /*@ assert \valid(&_C); */
   {
-    {
-      int __gen_e_acsl_valid_2;
-      __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& _C),sizeof(char *));
-      __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid(&_C)",37);
-    }
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& _C),sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&_C)",37);
   }
   /*@ assert \valid((int *)_D); */
   {
-    {
-      int __gen_e_acsl_valid_3;
-      __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(_D),sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_valid_3,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid((int *)_D)",38);
-    }
+    int __gen_e_acsl_valid_3;
+    __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(_D),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_3,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid((int *)_D)",38);
   }
   /*@ assert \valid(&_E); */
   {
-    {
-      int __gen_e_acsl_valid_4;
-      __gen_e_acsl_valid_4 = __e_acsl_valid((void *)(& _E),sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_valid_4,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid(&_E)",39);
-    }
+    int __gen_e_acsl_valid_4;
+    __gen_e_acsl_valid_4 = __e_acsl_valid((void *)(& _E),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_4,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&_E)",39);
   }
   /*@ assert \valid(&_F); */
   {
-    {
-      int __gen_e_acsl_valid_5;
-      __gen_e_acsl_valid_5 = __e_acsl_valid((void *)(& _F),sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_valid_5,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid(&_F)",40);
-    }
+    int __gen_e_acsl_valid_5;
+    __gen_e_acsl_valid_5 = __e_acsl_valid((void *)(& _F),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid_5,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&_F)",40);
   }
   /*@ assert _E ≡ 44; */
   __e_acsl_assert(_E == 44,(char *)"Assertion",(char *)"main",
                   (char *)"_E == 44",41);
   /*@ assert \valid(&_G); */
   {
-    {
-      int __gen_e_acsl_valid_6;
-      __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(& _G),
-                                            sizeof(struct ST [2]));
-      __e_acsl_assert(__gen_e_acsl_valid_6,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid(&_G)",42);
-    }
+    int __gen_e_acsl_valid_6;
+    __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(& _G),
+                                          sizeof(struct ST [2]));
+    __e_acsl_assert(__gen_e_acsl_valid_6,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&_G)",42);
   }
   /*@ assert _G[0].num ≡ 99; */
   __e_acsl_assert(_G[0L].num == 99,(char *)"Assertion",(char *)"main",
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_ctype_macros.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_ctype_macros.c
index ca1c9e181ae..c25ea39a532 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_ctype_macros.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_ctype_macros.c
@@ -15,20 +15,18 @@ int main(int argc, char const **argv)
   d = & c;
   /*@ assert \valid(d); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& d),
-                                                      sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid;
-        __gen_e_acsl_valid = __e_acsl_valid((void *)d,sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(d)",39);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& d),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)d,sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(d)",39);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& d));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_errno.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_errno.c
index 272da24e99b..9ed31d52411 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_errno.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_errno.c
@@ -17,20 +17,18 @@ int main(int argc, char const **argv)
   p = & __FC_errno;
   /*@ assert \valid(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                      sizeof(int *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid;
-        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
-        __gen_e_acsl_and = __gen_e_acsl_valid;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(p)",11);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(p)",11);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& __FC_errno));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_init.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_init.c
index 536af661a41..ea0f4fc3c47 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_init.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_init.c
@@ -28,22 +28,17 @@ int main(void)
                   (char *)"\\initialized(&b)",9);
   /*@ assert \initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)q,sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(q)",10);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",10);
   }
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)p,
-                                                        sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(p)",11);
-    }
+    int __gen_e_acsl_initialized_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(p)",11);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& b));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_initialized.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_initialized.c
index a68bd6e3616..a58b359e104 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_initialized.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_initialized.c
@@ -45,22 +45,17 @@ int main(void)
                   (char *)"\\initialized(&B)",17);
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(p)",18);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(p)",18);
   }
   /*@ assert \initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)q,
-                                                        sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(q)",19);
-    }
+    int __gen_e_acsl_initialized_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_2,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",19);
   }
   __e_acsl_full_init((void *)(& a));
   a = 0;
@@ -74,289 +69,228 @@ int main(void)
   q = & b;
   /*@ assert \initialized(&a); */
   {
-    {
-      int __gen_e_acsl_initialized_3;
-      __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
-                                                        sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_3,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&a)",30);
-    }
+    int __gen_e_acsl_initialized_3;
+    __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_3,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&a)",30);
   }
   /*@ assert ¬\initialized(&b); */
   {
-    {
-      int __gen_e_acsl_initialized_4;
-      __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& b),
-                                                        sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_4,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&b)",31);
-    }
+    int __gen_e_acsl_initialized_4;
+    __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& b),
+                                                      sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_4,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&b)",31);
   }
   /*@ assert \initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized_5;
-      __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)p,
-                                                        sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_5,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(p)",32);
-    }
+    int __gen_e_acsl_initialized_5;
+    __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_5,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(p)",32);
   }
   /*@ assert ¬\initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_6;
-      __gen_e_acsl_initialized_6 = __e_acsl_initialized((void *)q,
-                                                        sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_6,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(q)",33);
-    }
+    int __gen_e_acsl_initialized_6;
+    __gen_e_acsl_initialized_6 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_6,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(q)",33);
   }
   /*@ assert \initialized(&c); */
   {
-    {
-      int __gen_e_acsl_initialized_7;
-      __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& c),
-                                                        sizeof(long [2]));
-      __e_acsl_assert(__gen_e_acsl_initialized_7,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&c)",34);
-    }
+    int __gen_e_acsl_initialized_7;
+    __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& c),
+                                                      sizeof(long [2]));
+    __e_acsl_assert(__gen_e_acsl_initialized_7,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&c)",34);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    {
-      int __gen_e_acsl_initialized_8;
-      __gen_e_acsl_initialized_8 = __e_acsl_initialized((void *)(& d),
-                                                        sizeof(long [2]));
-      __e_acsl_assert(! __gen_e_acsl_initialized_8,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&d)",35);
-    }
+    int __gen_e_acsl_initialized_8;
+    __gen_e_acsl_initialized_8 = __e_acsl_initialized((void *)(& d),
+                                                      sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_8,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&d)",35);
   }
   __e_acsl_full_init((void *)(& b));
   b = 0;
   /*@ assert \initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_9;
-      __gen_e_acsl_initialized_9 = __e_acsl_initialized((void *)q,
-                                                        sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_9,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(q)",39);
-    }
+    int __gen_e_acsl_initialized_9;
+    __gen_e_acsl_initialized_9 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_9,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",39);
   }
   /*@ assert \initialized(&b); */
   {
-    {
-      int __gen_e_acsl_initialized_10;
-      __gen_e_acsl_initialized_10 = __e_acsl_initialized((void *)(& b),
-                                                         sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_10,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&b)",40);
-    }
+    int __gen_e_acsl_initialized_10;
+    __gen_e_acsl_initialized_10 = __e_acsl_initialized((void *)(& b),
+                                                       sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_10,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&b)",40);
   }
   __e_acsl_full_init((void *)(& r));
   r = d;
   /*@ assert ¬\initialized((long *)d); */
   {
-    {
-      int __gen_e_acsl_initialized_11;
-      __gen_e_acsl_initialized_11 = __e_acsl_initialized((void *)(d),
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_11,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized((long *)d)",43);
-    }
+    int __gen_e_acsl_initialized_11;
+    __gen_e_acsl_initialized_11 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_11,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized((long *)d)",43);
   }
   /*@ assert ¬\initialized(&d[1]); */
   {
-    {
-      int __gen_e_acsl_initialized_12;
-      __gen_e_acsl_initialized_12 = __e_acsl_initialized((void *)(& d[1L]),
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_12,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&d[1])",44);
-    }
+    int __gen_e_acsl_initialized_12;
+    __gen_e_acsl_initialized_12 = __e_acsl_initialized((void *)(& d[1L]),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_12,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&d[1])",44);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    {
-      int __gen_e_acsl_initialized_13;
-      __gen_e_acsl_initialized_13 = __e_acsl_initialized((void *)(& d),
-                                                         sizeof(long [2]));
-      __e_acsl_assert(! __gen_e_acsl_initialized_13,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&d)",45);
-    }
+    int __gen_e_acsl_initialized_13;
+    __gen_e_acsl_initialized_13 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_13,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&d)",45);
   }
   /*@ assert ¬\initialized(r); */
   {
-    {
-      int __gen_e_acsl_initialized_14;
-      __gen_e_acsl_initialized_14 = __e_acsl_initialized((void *)r,
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_14,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(r)",46);
-    }
+    int __gen_e_acsl_initialized_14;
+    __gen_e_acsl_initialized_14 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_14,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(r)",46);
   }
   /*@ assert ¬\initialized(r + 1); */
   {
-    {
-      int __gen_e_acsl_initialized_15;
-      __gen_e_acsl_initialized_15 = __e_acsl_initialized((void *)(r + 1L),
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_15,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(r + 1)",47);
-    }
+    int __gen_e_acsl_initialized_15;
+    __gen_e_acsl_initialized_15 = __e_acsl_initialized((void *)(r + 1L),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_15,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(r + 1)",47);
   }
   __e_acsl_initialize((void *)(d),sizeof(long));
   d[0] = (long)1;
   /*@ assert \initialized((long *)d); */
   {
-    {
-      int __gen_e_acsl_initialized_16;
-      __gen_e_acsl_initialized_16 = __e_acsl_initialized((void *)(d),
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_16,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized((long *)d)",50);
-    }
+    int __gen_e_acsl_initialized_16;
+    __gen_e_acsl_initialized_16 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_16,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized((long *)d)",50);
   }
   /*@ assert ¬\initialized(&d[1]); */
   {
-    {
-      int __gen_e_acsl_initialized_17;
-      __gen_e_acsl_initialized_17 = __e_acsl_initialized((void *)(& d[1L]),
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_17,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&d[1])",51);
-    }
+    int __gen_e_acsl_initialized_17;
+    __gen_e_acsl_initialized_17 = __e_acsl_initialized((void *)(& d[1L]),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_17,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&d[1])",51);
   }
   /*@ assert ¬\initialized(&d); */
   {
-    {
-      int __gen_e_acsl_initialized_18;
-      __gen_e_acsl_initialized_18 = __e_acsl_initialized((void *)(& d),
-                                                         sizeof(long [2]));
-      __e_acsl_assert(! __gen_e_acsl_initialized_18,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(&d)",52);
-    }
+    int __gen_e_acsl_initialized_18;
+    __gen_e_acsl_initialized_18 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(! __gen_e_acsl_initialized_18,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(&d)",52);
   }
   /*@ assert \initialized(r); */
   {
-    {
-      int __gen_e_acsl_initialized_19;
-      __gen_e_acsl_initialized_19 = __e_acsl_initialized((void *)r,
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_19,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(r)",53);
-    }
+    int __gen_e_acsl_initialized_19;
+    __gen_e_acsl_initialized_19 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_19,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(r)",53);
   }
   /*@ assert ¬\initialized(r + 1); */
   {
-    {
-      int __gen_e_acsl_initialized_20;
-      __gen_e_acsl_initialized_20 = __e_acsl_initialized((void *)(r + 1L),
-                                                         sizeof(long));
-      __e_acsl_assert(! __gen_e_acsl_initialized_20,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(r + 1)",54);
-    }
+    int __gen_e_acsl_initialized_20;
+    __gen_e_acsl_initialized_20 = __e_acsl_initialized((void *)(r + 1L),
+                                                       sizeof(long));
+    __e_acsl_assert(! __gen_e_acsl_initialized_20,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(r + 1)",54);
   }
   __e_acsl_initialize((void *)(& d[1]),sizeof(long));
   d[1] = (long)1;
   /*@ assert \initialized((long *)d); */
   {
-    {
-      int __gen_e_acsl_initialized_21;
-      __gen_e_acsl_initialized_21 = __e_acsl_initialized((void *)(d),
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_21,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized((long *)d)",57);
-    }
+    int __gen_e_acsl_initialized_21;
+    __gen_e_acsl_initialized_21 = __e_acsl_initialized((void *)(d),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_21,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized((long *)d)",57);
   }
   /*@ assert \initialized(&d[1]); */
   {
-    {
-      int __gen_e_acsl_initialized_22;
-      __gen_e_acsl_initialized_22 = __e_acsl_initialized((void *)(& d[1L]),
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_22,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&d[1])",58);
-    }
+    int __gen_e_acsl_initialized_22;
+    __gen_e_acsl_initialized_22 = __e_acsl_initialized((void *)(& d[1L]),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_22,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&d[1])",58);
   }
   /*@ assert \initialized(&d); */
   {
-    {
-      int __gen_e_acsl_initialized_23;
-      __gen_e_acsl_initialized_23 = __e_acsl_initialized((void *)(& d),
-                                                         sizeof(long [2]));
-      __e_acsl_assert(__gen_e_acsl_initialized_23,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&d)",59);
-    }
+    int __gen_e_acsl_initialized_23;
+    __gen_e_acsl_initialized_23 = __e_acsl_initialized((void *)(& d),
+                                                       sizeof(long [2]));
+    __e_acsl_assert(__gen_e_acsl_initialized_23,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&d)",59);
   }
   /*@ assert \initialized(r); */
   {
-    {
-      int __gen_e_acsl_initialized_24;
-      __gen_e_acsl_initialized_24 = __e_acsl_initialized((void *)r,
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_24,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(r)",60);
-    }
+    int __gen_e_acsl_initialized_24;
+    __gen_e_acsl_initialized_24 = __e_acsl_initialized((void *)r,
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_24,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(r)",60);
   }
   /*@ assert \initialized(r + 1); */
   {
-    {
-      int __gen_e_acsl_initialized_25;
-      __gen_e_acsl_initialized_25 = __e_acsl_initialized((void *)(r + 1L),
-                                                         sizeof(long));
-      __e_acsl_assert(__gen_e_acsl_initialized_25,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(r + 1)",61);
-    }
+    int __gen_e_acsl_initialized_25;
+    __gen_e_acsl_initialized_25 = __e_acsl_initialized((void *)(r + 1L),
+                                                       sizeof(long));
+    __e_acsl_assert(__gen_e_acsl_initialized_25,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(r + 1)",61);
   }
   __e_acsl_full_init((void *)(& p));
   p = (int *)malloc(sizeof(int *));
   /*@ assert ¬\initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized_26;
-      __gen_e_acsl_initialized_26 = __e_acsl_initialized((void *)p,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_26,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(p)",65);
-    }
+    int __gen_e_acsl_initialized_26;
+    __gen_e_acsl_initialized_26 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_26,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(p)",65);
   }
   __e_acsl_full_init((void *)(& q));
   q = (int *)calloc((unsigned long)1,sizeof(int));
   /*@ assert \initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_27;
-      __gen_e_acsl_initialized_27 = __e_acsl_initialized((void *)q,
-                                                         sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_27,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(q)",69);
-    }
+    int __gen_e_acsl_initialized_27;
+    __gen_e_acsl_initialized_27 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_27,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",69);
   }
   __e_acsl_full_init((void *)(& q));
   q = (int *)realloc((void *)q,(unsigned long)2 * sizeof(int));
   /*@ assert \initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_28;
-      __gen_e_acsl_initialized_28 = __e_acsl_initialized((void *)q,
-                                                         sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_initialized_28,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(q)",74);
-    }
+    int __gen_e_acsl_initialized_28;
+    __gen_e_acsl_initialized_28 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_initialized_28,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(q)",74);
   }
   __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert ¬\initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_29;
-      __gen_e_acsl_initialized_29 = __e_acsl_initialized((void *)q,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_29,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(q)",76);
-    }
+    int __gen_e_acsl_initialized_29;
+    __gen_e_acsl_initialized_29 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_29,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(q)",76);
   }
   __e_acsl_full_init((void *)(& q));
   q --;
@@ -364,23 +298,17 @@ int main(void)
   free((void *)q);
   /*@ assert ¬\initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized_30;
-      __gen_e_acsl_initialized_30 = __e_acsl_initialized((void *)p,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_30,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(p)",84);
-    }
+    int __gen_e_acsl_initialized_30;
+    __gen_e_acsl_initialized_30 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_30,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(p)",84);
   }
   /*@ assert ¬\initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_31;
-      __gen_e_acsl_initialized_31 = __e_acsl_initialized((void *)q,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_31,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(q)",85);
-    }
+    int __gen_e_acsl_initialized_31;
+    __gen_e_acsl_initialized_31 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_31,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(q)",85);
   }
   __e_acsl_full_init((void *)(& q));
   q = (int *)(& q - 1024 * 5);
@@ -388,25 +316,19 @@ int main(void)
   q = (int *)128;
   /*@ assert ¬\initialized(q); */
   {
-    {
-      int __gen_e_acsl_initialized_32;
-      __gen_e_acsl_initialized_32 = __e_acsl_initialized((void *)q,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_32,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(q)",93);
-    }
+    int __gen_e_acsl_initialized_32;
+    __gen_e_acsl_initialized_32 = __e_acsl_initialized((void *)q,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_32,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(q)",93);
   }
   __e_acsl_full_init((void *)(& p));
   p = (int *)0;
   /*@ assert ¬\initialized(p); */
   {
-    {
-      int __gen_e_acsl_initialized_33;
-      __gen_e_acsl_initialized_33 = __e_acsl_initialized((void *)p,
-                                                         sizeof(int));
-      __e_acsl_assert(! __gen_e_acsl_initialized_33,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\initialized(p)",96);
-    }
+    int __gen_e_acsl_initialized_33;
+    __gen_e_acsl_initialized_33 = __e_acsl_initialized((void *)p,sizeof(int));
+    __e_acsl_assert(! __gen_e_acsl_initialized_33,(char *)"Assertion",
+                    (char *)"main",(char *)"!\\initialized(p)",96);
   }
   size = 100;
   partsc = (char *)malloc((unsigned long)size * sizeof(char));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_lazy.c
index b672dc9cb33..511f0520ce6 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_lazy.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_lazy.c
@@ -8,192 +8,158 @@ int main(void)
   y = 1;
   /*@ assert x ≡ 0 ∧ y ≡ 1; */
   {
-    {
-      int __gen_e_acsl_and;
-      if (x == 0) __gen_e_acsl_and = y == 1; else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"x == 0 && y == 1",9);
-    }
+    int __gen_e_acsl_and;
+    if (x == 0) __gen_e_acsl_and = y == 1; else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 0 && y == 1",9);
   }
   /*@ assert ¬(x ≢ 0 ∧ y ≡ 1 / 0); */
   {
-    {
-      int __gen_e_acsl_and_2;
-      if (x != 0) {
-        __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
-                        (char *)"division_by_zero: 0 != 0",10);
-        __gen_e_acsl_and_2 = y == 1 / 0;
-      }
-      else __gen_e_acsl_and_2 = 0;
-      __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",
-                      (char *)"main",(char *)"!(x != 0 && y == 1 / 0)",10);
+    int __gen_e_acsl_and_2;
+    if (x != 0) {
+      __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
+                      (char *)"division_by_zero: 0 != 0",10);
+      __gen_e_acsl_and_2 = y == 1 / 0;
     }
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
+                    (char *)"!(x != 0 && y == 1 / 0)",10);
   }
   /*@ assert y ≡ 1 ∨ x ≡ 1; */
   {
-    {
-      int __gen_e_acsl_or;
-      if (y == 1) __gen_e_acsl_or = 1; else __gen_e_acsl_or = x == 1;
-      __e_acsl_assert(__gen_e_acsl_or,(char *)"Assertion",(char *)"main",
-                      (char *)"y == 1 || x == 1",11);
-    }
+    int __gen_e_acsl_or;
+    if (y == 1) __gen_e_acsl_or = 1; else __gen_e_acsl_or = x == 1;
+    __e_acsl_assert(__gen_e_acsl_or,(char *)"Assertion",(char *)"main",
+                    (char *)"y == 1 || x == 1",11);
   }
   /*@ assert x ≡ 0 ∨ y ≡ 1 / 0; */
   {
-    {
-      int __gen_e_acsl_or_2;
-      if (x == 0) __gen_e_acsl_or_2 = 1;
-      else {
-        __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
-                        (char *)"division_by_zero: 0 != 0",12);
-        __gen_e_acsl_or_2 = y == 1 / 0;
-      }
-      __e_acsl_assert(__gen_e_acsl_or_2,(char *)"Assertion",(char *)"main",
-                      (char *)"x == 0 || y == 1 / 0",12);
+    int __gen_e_acsl_or_2;
+    if (x == 0) __gen_e_acsl_or_2 = 1;
+    else {
+      __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
+                      (char *)"division_by_zero: 0 != 0",12);
+      __gen_e_acsl_or_2 = y == 1 / 0;
     }
+    __e_acsl_assert(__gen_e_acsl_or_2,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 0 || y == 1 / 0",12);
   }
   /*@ assert x ≡ 0 ⇒ y ≡ 1; */
   {
-    {
-      int __gen_e_acsl_implies;
-      if (! (x == 0)) __gen_e_acsl_implies = 1;
-      else __gen_e_acsl_implies = y == 1;
-      __e_acsl_assert(__gen_e_acsl_implies,(char *)"Assertion",
-                      (char *)"main",(char *)"x == 0 ==> y == 1",13);
-    }
+    int __gen_e_acsl_implies;
+    if (! (x == 0)) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = y == 1;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 0 ==> y == 1",13);
   }
   /*@ assert x ≡ 1 ⇒ y ≡ 1 / 0; */
   {
-    {
-      int __gen_e_acsl_implies_2;
-      if (! (x == 1)) __gen_e_acsl_implies_2 = 1;
-      else {
-        __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
-                        (char *)"division_by_zero: 0 != 0",14);
-        __gen_e_acsl_implies_2 = y == 1 / 0;
-      }
-      __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Assertion",
-                      (char *)"main",(char *)"x == 1 ==> y == 1 / 0",14);
+    int __gen_e_acsl_implies_2;
+    if (! (x == 1)) __gen_e_acsl_implies_2 = 1;
+    else {
+      __e_acsl_assert(0 != 0,(char *)"RTE",(char *)"main",
+                      (char *)"division_by_zero: 0 != 0",14);
+      __gen_e_acsl_implies_2 = y == 1 / 0;
     }
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Assertion",
+                    (char *)"main",(char *)"x == 1 ==> y == 1 / 0",14);
   }
   /*@ assert x ≢ 0? x ≢ 0: y ≢ 0; */
   {
-    {
-      int __gen_e_acsl_if;
-      if (x != 0) __gen_e_acsl_if = x != 0; else __gen_e_acsl_if = y != 0;
-      __e_acsl_assert(__gen_e_acsl_if,(char *)"Assertion",(char *)"main",
-                      (char *)"x != 0? x != 0: y != 0",15);
-    }
+    int __gen_e_acsl_if;
+    if (x != 0) __gen_e_acsl_if = x != 0; else __gen_e_acsl_if = y != 0;
+    __e_acsl_assert(__gen_e_acsl_if,(char *)"Assertion",(char *)"main",
+                    (char *)"x != 0? x != 0: y != 0",15);
   }
   /*@ assert y ≢ 0? y ≢ 0: x ≢ 0; */
   {
-    {
-      int __gen_e_acsl_if_2;
-      if (y != 0) __gen_e_acsl_if_2 = y != 0;
-      else __gen_e_acsl_if_2 = x != 0;
-      __e_acsl_assert(__gen_e_acsl_if_2,(char *)"Assertion",(char *)"main",
-                      (char *)"y != 0? y != 0: x != 0",16);
-    }
+    int __gen_e_acsl_if_2;
+    if (y != 0) __gen_e_acsl_if_2 = y != 0; else __gen_e_acsl_if_2 = x != 0;
+    __e_acsl_assert(__gen_e_acsl_if_2,(char *)"Assertion",(char *)"main",
+                    (char *)"y != 0? y != 0: x != 0",16);
   }
   /*@ assert x ≡ 1? x ≡ 18: x ≡ 0; */
   {
-    {
-      int __gen_e_acsl_if_3;
-      if (x == 1) __gen_e_acsl_if_3 = x == 18;
-      else __gen_e_acsl_if_3 = x == 0;
-      __e_acsl_assert(__gen_e_acsl_if_3,(char *)"Assertion",(char *)"main",
-                      (char *)"x == 1? x == 18: x == 0",17);
-    }
+    int __gen_e_acsl_if_3;
+    if (x == 1) __gen_e_acsl_if_3 = x == 18; else __gen_e_acsl_if_3 = x == 0;
+    __e_acsl_assert(__gen_e_acsl_if_3,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 1? x == 18: x == 0",17);
   }
   /*@ assert x ≡ 2 ⇔ y ≡ 3; */
   {
-    {
-      int __gen_e_acsl_implies_3;
-      int __gen_e_acsl_equiv;
-      if (! (x == 2)) __gen_e_acsl_implies_3 = 1;
-      else __gen_e_acsl_implies_3 = y == 3;
-      if (__gen_e_acsl_implies_3) {
-        int __gen_e_acsl_implies_4;
-        if (! (y == 3)) __gen_e_acsl_implies_4 = 1;
-        else __gen_e_acsl_implies_4 = x == 2;
-        __gen_e_acsl_equiv = __gen_e_acsl_implies_4;
-      }
-      else __gen_e_acsl_equiv = 0;
-      __e_acsl_assert(__gen_e_acsl_equiv,(char *)"Assertion",(char *)"main",
-                      (char *)"x == 2 <==> y == 3",20);
+    int __gen_e_acsl_implies_3;
+    int __gen_e_acsl_equiv;
+    if (! (x == 2)) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = y == 3;
+    if (__gen_e_acsl_implies_3) {
+      int __gen_e_acsl_implies_4;
+      if (! (y == 3)) __gen_e_acsl_implies_4 = 1;
+      else __gen_e_acsl_implies_4 = x == 2;
+      __gen_e_acsl_equiv = __gen_e_acsl_implies_4;
     }
+    else __gen_e_acsl_equiv = 0;
+    __e_acsl_assert(__gen_e_acsl_equiv,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 2 <==> y == 3",20);
   }
   /*@ assert x ≡ 0 ⇔ y ≡ 1; */
   {
-    {
-      int __gen_e_acsl_implies_5;
-      int __gen_e_acsl_equiv_2;
-      if (! (x == 0)) __gen_e_acsl_implies_5 = 1;
-      else __gen_e_acsl_implies_5 = y == 1;
-      if (__gen_e_acsl_implies_5) {
-        int __gen_e_acsl_implies_6;
-        if (! (y == 1)) __gen_e_acsl_implies_6 = 1;
-        else __gen_e_acsl_implies_6 = x == 0;
-        __gen_e_acsl_equiv_2 = __gen_e_acsl_implies_6;
-      }
-      else __gen_e_acsl_equiv_2 = 0;
-      __e_acsl_assert(__gen_e_acsl_equiv_2,(char *)"Assertion",
-                      (char *)"main",(char *)"x == 0 <==> y == 1",21);
+    int __gen_e_acsl_implies_5;
+    int __gen_e_acsl_equiv_2;
+    if (! (x == 0)) __gen_e_acsl_implies_5 = 1;
+    else __gen_e_acsl_implies_5 = y == 1;
+    if (__gen_e_acsl_implies_5) {
+      int __gen_e_acsl_implies_6;
+      if (! (y == 1)) __gen_e_acsl_implies_6 = 1;
+      else __gen_e_acsl_implies_6 = x == 0;
+      __gen_e_acsl_equiv_2 = __gen_e_acsl_implies_6;
     }
+    else __gen_e_acsl_equiv_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_equiv_2,(char *)"Assertion",(char *)"main",
+                    (char *)"x == 0 <==> y == 1",21);
   }
   /*@ assert ((x ≢ 0? x: y) ≢ 0) ≡ (x ≡ 0); */
   {
-    {
-      int __gen_e_acsl_if_4;
-      if (x != 0) __gen_e_acsl_if_4 = x; else __gen_e_acsl_if_4 = y;
-      __e_acsl_assert((__gen_e_acsl_if_4 != 0) == (x == 0),
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"((x != 0? x: y) != 0) == (x == 0)",24);
-    }
+    int __gen_e_acsl_if_4;
+    if (x != 0) __gen_e_acsl_if_4 = x; else __gen_e_acsl_if_4 = y;
+    __e_acsl_assert((__gen_e_acsl_if_4 != 0) == (x == 0),(char *)"Assertion",
+                    (char *)"main",
+                    (char *)"((x != 0? x: y) != 0) == (x == 0)",24);
   }
   /*@ assert (x ≢ 0 ∧ y ≢ 0) ∨ y ≢ 0; */
   {
-    {
-      int __gen_e_acsl_and_3;
-      int __gen_e_acsl_or_3;
-      if (x != 0) __gen_e_acsl_and_3 = y != 0; else __gen_e_acsl_and_3 = 0;
-      if (__gen_e_acsl_and_3) __gen_e_acsl_or_3 = 1;
-      else __gen_e_acsl_or_3 = y != 0;
-      __e_acsl_assert(__gen_e_acsl_or_3,(char *)"Assertion",(char *)"main",
-                      (char *)"(x != 0 && y != 0) || y != 0",25);
-    }
+    int __gen_e_acsl_and_3;
+    int __gen_e_acsl_or_3;
+    if (x != 0) __gen_e_acsl_and_3 = y != 0; else __gen_e_acsl_and_3 = 0;
+    if (__gen_e_acsl_and_3) __gen_e_acsl_or_3 = 1;
+    else __gen_e_acsl_or_3 = y != 0;
+    __e_acsl_assert(__gen_e_acsl_or_3,(char *)"Assertion",(char *)"main",
+                    (char *)"(x != 0 && y != 0) || y != 0",25);
   }
   /*@ assert (x ≢ 0 ∨ y ≢ 0) ∧ y ≡ 1; */
   {
-    {
-      int __gen_e_acsl_or_4;
-      int __gen_e_acsl_and_4;
-      if (x != 0) __gen_e_acsl_or_4 = 1; else __gen_e_acsl_or_4 = y != 0;
-      if (__gen_e_acsl_or_4) __gen_e_acsl_and_4 = y == 1;
-      else __gen_e_acsl_and_4 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_4,(char *)"Assertion",(char *)"main",
-                      (char *)"(x != 0 || y != 0) && y == 1",26);
-    }
+    int __gen_e_acsl_or_4;
+    int __gen_e_acsl_and_4;
+    if (x != 0) __gen_e_acsl_or_4 = 1; else __gen_e_acsl_or_4 = y != 0;
+    if (__gen_e_acsl_or_4) __gen_e_acsl_and_4 = y == 1;
+    else __gen_e_acsl_and_4 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_4,(char *)"Assertion",(char *)"main",
+                    (char *)"(x != 0 || y != 0) && y == 1",26);
   }
   /*@ assert (x ≢ 0 ∨ y ≢ 0) ≡ (y ≢ 0); */
   {
-    {
-      int __gen_e_acsl_or_5;
-      if (x != 0) __gen_e_acsl_or_5 = 1; else __gen_e_acsl_or_5 = y != 0;
-      __e_acsl_assert(__gen_e_acsl_or_5 == (y != 0),(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"(x != 0 || y != 0) == (y != 0)",27);
-    }
+    int __gen_e_acsl_or_5;
+    if (x != 0) __gen_e_acsl_or_5 = 1; else __gen_e_acsl_or_5 = y != 0;
+    __e_acsl_assert(__gen_e_acsl_or_5 == (y != 0),(char *)"Assertion",
+                    (char *)"main",(char *)"(x != 0 || y != 0) == (y != 0)",
+                    27);
   }
   /*@ assert (x ≢ 0 ∧ y ≢ 0) ≡ (x ≢ 0); */
   {
-    {
-      int __gen_e_acsl_and_5;
-      if (x != 0) __gen_e_acsl_and_5 = y != 0; else __gen_e_acsl_and_5 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_5 == (x != 0),(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"(x != 0 && y != 0) == (x != 0)",28);
-    }
+    int __gen_e_acsl_and_5;
+    if (x != 0) __gen_e_acsl_and_5 = y != 0; else __gen_e_acsl_and_5 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_5 == (x != 0),(char *)"Assertion",
+                    (char *)"main",(char *)"(x != 0 && y != 0) == (x != 0)",
+                    28);
   }
   __retres = 0;
   return __retres;
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_linear_search.c
index 166f4b74a49..bdeb487fca7 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_linear_search.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_linear_search.c
@@ -28,78 +28,75 @@ int search(int elt)
   int k;
   k = 0;
   {
-    {
-      int __gen_e_acsl_forall;
-      int __gen_e_acsl_i;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_forall = 1;
-      __gen_e_acsl_i = 0;
-      while (1) {
-        if (__gen_e_acsl_i < k) ; else break;
-        __e_acsl_assert(__gen_e_acsl_i < 10,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: __gen_e_acsl_i < 10",18);
-        __e_acsl_assert(0 <= __gen_e_acsl_i,(char *)"RTE",(char *)"search",
-                        (char *)"index_bound: 0 <= __gen_e_acsl_i",18);
-        if (A[__gen_e_acsl_i] < elt) ;
-        else {
-          __gen_e_acsl_forall = 0;
-          goto e_acsl_end_loop1;
-        }
-        __gen_e_acsl_i = (int)(__gen_e_acsl_i + 1L);
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_i;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_i = 0;
+    while (1) {
+      if (__gen_e_acsl_i < k) ; else break;
+      __e_acsl_assert(__gen_e_acsl_i < 10,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: __gen_e_acsl_i < 10",18);
+      __e_acsl_assert(0 <= __gen_e_acsl_i,(char *)"RTE",(char *)"search",
+                      (char *)"index_bound: 0 <= __gen_e_acsl_i",18);
+      if (A[__gen_e_acsl_i] < elt) ;
+      else {
+        __gen_e_acsl_forall = 0;
+        goto e_acsl_end_loop1;
       }
-      e_acsl_end_loop1: ;
-      __e_acsl_assert(__gen_e_acsl_forall,(char *)"Invariant",
-                      (char *)"search",
-                      (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
-                      18);
-      if (0 <= k) __gen_e_acsl_and = k <= 10; else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",(char *)"search",
-                      (char *)"0 <= k <= 10",17);
-      /*@ loop invariant 0 ≤ k ≤ 10;
-          loop invariant ∀ ℤ i; 0 ≤ i < k ⇒ A[i] < elt;
-      */
-      while (k < 10) {
-        if (A[k] == elt) {
-          __retres = 1;
+      __gen_e_acsl_i = (int)(__gen_e_acsl_i + 1L);
+    }
+    e_acsl_end_loop1: ;
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Invariant",(char *)"search",
+                    (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
+                    18);
+    if (0 <= k) __gen_e_acsl_and = k <= 10; else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Invariant",(char *)"search",
+                    (char *)"0 <= k <= 10",17);
+    /*@ loop invariant 0 ≤ k ≤ 10;
+        loop invariant ∀ ℤ i; 0 ≤ i < k ⇒ A[i] < elt;
+    */
+    while (k < 10) {
+      if (A[k] == elt) {
+        __retres = 1;
+        goto return_label;
+      }
+      else 
+        if (A[k] > elt) {
+          __retres = 0;
           goto return_label;
         }
-        else 
-          if (A[k] > elt) {
-            __retres = 0;
-            goto return_label;
-          }
-        {
-          int __gen_e_acsl_and_2;
-          int __gen_e_acsl_forall_2;
-          int __gen_e_acsl_i_2;
-          k ++;
-          if (0 <= k) __gen_e_acsl_and_2 = k <= 10;
-          else __gen_e_acsl_and_2 = 0;
-          __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
-                          (char *)"search",(char *)"0 <= k <= 10",17);
-          __gen_e_acsl_forall_2 = 1;
-          __gen_e_acsl_i_2 = 0;
-          while (1) {
-            if (__gen_e_acsl_i_2 < k) ; else break;
-            __e_acsl_assert(__gen_e_acsl_i_2 < 10,(char *)"RTE",
-                            (char *)"search",
-                            (char *)"index_bound: __gen_e_acsl_i_2 < 10",18);
-            __e_acsl_assert(0 <= __gen_e_acsl_i_2,(char *)"RTE",
-                            (char *)"search",
-                            (char *)"index_bound: 0 <= __gen_e_acsl_i_2",18);
-            if (A[__gen_e_acsl_i_2] < elt) ;
-            else {
-              __gen_e_acsl_forall_2 = 0;
-              goto e_acsl_end_loop2;
-            }
-            __gen_e_acsl_i_2 = (int)(__gen_e_acsl_i_2 + 1L);
-          }
-          e_acsl_end_loop2: ;
-          __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Invariant",
+      {
+        int __gen_e_acsl_and_2;
+        int __gen_e_acsl_forall_2;
+        int __gen_e_acsl_i_2;
+        k ++;
+        if (0 <= k) __gen_e_acsl_and_2 = k <= 10;
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Invariant",
+                        (char *)"search",(char *)"0 <= k <= 10",17);
+        __gen_e_acsl_forall_2 = 1;
+        __gen_e_acsl_i_2 = 0;
+        while (1) {
+          if (__gen_e_acsl_i_2 < k) ; else break;
+          __e_acsl_assert(__gen_e_acsl_i_2 < 10,(char *)"RTE",
                           (char *)"search",
-                          (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
-                          18);
+                          (char *)"index_bound: __gen_e_acsl_i_2 < 10",18);
+          __e_acsl_assert(0 <= __gen_e_acsl_i_2,(char *)"RTE",
+                          (char *)"search",
+                          (char *)"index_bound: 0 <= __gen_e_acsl_i_2",18);
+          if (A[__gen_e_acsl_i_2] < elt) ;
+          else {
+            __gen_e_acsl_forall_2 = 0;
+            goto e_acsl_end_loop2;
+          }
+          __gen_e_acsl_i_2 = (int)(__gen_e_acsl_i_2 + 1L);
         }
+        e_acsl_end_loop2: ;
+        __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Invariant",
+                        (char *)"search",
+                        (char *)"\\forall integer i; 0 <= i < k ==> A[i] < elt",
+                        18);
       }
     }
   }
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_literal_string.c
index a0c21dc4490..a31690db1c3 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_literal_string.c
@@ -13,15 +13,13 @@ void f(void)
 {
   /*@ assert *(T + G) ≡ 'b'; */
   {
-    {
-      int __gen_e_acsl_valid_read;
-      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(T + G),
-                                                    sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"f",
-                      (char *)"mem_access: \\valid_read(T + G)",11);
-      __e_acsl_assert(*(T + G) == 'b',(char *)"Assertion",(char *)"f",
-                      (char *)"*(T + G) == \'b\'",11);
-    }
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(T + G),
+                                                  sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"f",
+                    (char *)"mem_access: \\valid_read(T + G)",11);
+    __e_acsl_assert(*(T + G) == 'b',(char *)"Assertion",(char *)"f",
+                    (char *)"*(T + G) == \'b\'",11);
   }
   G ++;
   return;
@@ -86,51 +84,42 @@ int main(void)
   SS = (char *)__gen_e_acsl_literal_string;
   /*@ assert *(S + G2) ≡ 'o'; */
   {
-    {
-      int __gen_e_acsl_valid_read;
-      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(S + G2),
-                                                    sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
-                      (char *)"mem_access: \\valid_read(S + G2)",25);
-      __e_acsl_assert(*(S + G2) == 'o',(char *)"Assertion",(char *)"main",
-                      (char *)"*(S + G2) == \'o\'",25);
-    }
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(S + G2),
+                                                  sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
+                    (char *)"mem_access: \\valid_read(S + G2)",25);
+    __e_acsl_assert(*(S + G2) == 'o',(char *)"Assertion",(char *)"main",
+                    (char *)"*(S + G2) == \'o\'",25);
   }
   /*@ assert \initialized(S); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)S,sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(S)",26);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)S,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(S)",26);
   }
   /*@ assert \valid_read(S2); */
   {
-    {
-      int __gen_e_acsl_valid_read_2;
-      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)S2,
-                                                      sizeof(char));
-      __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid_read(S2)",27);
-    }
+    int __gen_e_acsl_valid_read_2;
+    __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)S2,sizeof(char));
+    __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"Assertion",
+                    (char *)"main",(char *)"\\valid_read(S2)",27);
   }
   /*@ assert ¬\valid(SS); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& SS),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_2) {
-        int __gen_e_acsl_valid;
-        __gen_e_acsl_valid = __e_acsl_valid((void *)SS,sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"!\\valid(SS)",28);
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& SS),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)SS,sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"!\\valid(SS)",28);
   }
   f();
   s_str ++;
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_mainargs.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_mainargs.c
index ba7bf4973a9..66fd17084e0 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_mainargs.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_mainargs.c
@@ -6,109 +6,94 @@ int main(int argc, char **argv)
   __e_acsl_memory_init(& argc,& argv,8UL);
   /*@ assert \valid(&argc); */
   {
-    {
-      int __gen_e_acsl_valid;
-      __e_acsl_store_block((void *)(& argc),4UL);
-      __e_acsl_store_block((void *)(& argv),8UL);
-      __gen_e_acsl_valid = __e_acsl_valid((void *)(& argc),sizeof(int));
-      __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(&argc)",10);
-    }
+    int __gen_e_acsl_valid;
+    __e_acsl_store_block((void *)(& argc),4UL);
+    __e_acsl_store_block((void *)(& argv),8UL);
+    __gen_e_acsl_valid = __e_acsl_valid((void *)(& argc),sizeof(int));
+    __e_acsl_assert(__gen_e_acsl_valid,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&argc)",10);
   }
   /*@ assert \valid(&argv); */
   {
-    {
-      int __gen_e_acsl_valid_2;
-      __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& argv),sizeof(char **));
-      __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\valid(&argv)",11);
-    }
+    int __gen_e_acsl_valid_2;
+    __gen_e_acsl_valid_2 = __e_acsl_valid((void *)(& argv),sizeof(char **));
+    __e_acsl_assert(__gen_e_acsl_valid_2,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(&argv)",11);
   }
   /*@ assert ∀ int k; 0 ≤ k < argc ⇒ \valid(argv + k); */
   {
-    {
-      int __gen_e_acsl_forall;
-      int __gen_e_acsl_k;
-      __gen_e_acsl_forall = 1;
-      __gen_e_acsl_k = 0;
-      while (1) {
-        if (__gen_e_acsl_k < argc) ; else break;
-        {
-          int __gen_e_acsl_valid_3;
-          __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(argv + __gen_e_acsl_k),
-                                                sizeof(char *));
-          if (__gen_e_acsl_valid_3) ;
-          else {
-            __gen_e_acsl_forall = 0;
-            goto e_acsl_end_loop1;
-          }
+    int __gen_e_acsl_forall;
+    int __gen_e_acsl_k;
+    __gen_e_acsl_forall = 1;
+    __gen_e_acsl_k = 0;
+    while (1) {
+      if (__gen_e_acsl_k < argc) ; else break;
+      {
+        int __gen_e_acsl_valid_3;
+        __gen_e_acsl_valid_3 = __e_acsl_valid((void *)(argv + __gen_e_acsl_k),
+                                              sizeof(char *));
+        if (__gen_e_acsl_valid_3) ;
+        else {
+          __gen_e_acsl_forall = 0;
+          goto e_acsl_end_loop1;
         }
-        __gen_e_acsl_k = (int)(__gen_e_acsl_k + 1L);
       }
-      e_acsl_end_loop1: ;
-      __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
-                      (char *)"\\forall int k; 0 <= k < argc ==> \\valid(argv + k)",
-                      12);
+      __gen_e_acsl_k = (int)(__gen_e_acsl_k + 1L);
     }
+    e_acsl_end_loop1: ;
+    __e_acsl_assert(__gen_e_acsl_forall,(char *)"Assertion",(char *)"main",
+                    (char *)"\\forall int k; 0 <= k < argc ==> \\valid(argv + k)",
+                    12);
   }
   /*@ assert \block_length(argv) ≡ (argc + 1) * sizeof(char *); */
   {
-    {
-      unsigned long __gen_e_acsl_block_length;
-      __e_acsl_mpz_t __gen_e_acsl_block_length_2;
-      __e_acsl_mpz_t __gen_e_acsl_;
-      int __gen_e_acsl_eq;
-      __gen_e_acsl_block_length = __e_acsl_block_length((void *)argv);
-      __gmpz_init_set_ui(__gen_e_acsl_block_length_2,
-                         __gen_e_acsl_block_length);
-      __gmpz_init_set_si(__gen_e_acsl_,(argc + 1L) * 8);
-      __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_block_length_2),
-                                   (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
-      __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\block_length(argv) == (argc + 1) * sizeof(char *)",
-                      13);
-      __gmpz_clear(__gen_e_acsl_block_length_2);
-      __gmpz_clear(__gen_e_acsl_);
-    }
+    unsigned long __gen_e_acsl_block_length;
+    __e_acsl_mpz_t __gen_e_acsl_block_length_2;
+    __e_acsl_mpz_t __gen_e_acsl_;
+    int __gen_e_acsl_eq;
+    __gen_e_acsl_block_length = __e_acsl_block_length((void *)argv);
+    __gmpz_init_set_ui(__gen_e_acsl_block_length_2,__gen_e_acsl_block_length);
+    __gmpz_init_set_si(__gen_e_acsl_,(argc + 1L) * 8);
+    __gen_e_acsl_eq = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_block_length_2),
+                                 (__e_acsl_mpz_struct const *)(__gen_e_acsl_));
+    __e_acsl_assert(__gen_e_acsl_eq == 0,(char *)"Assertion",(char *)"main",
+                    (char *)"\\block_length(argv) == (argc + 1) * sizeof(char *)",
+                    13);
+    __gmpz_clear(__gen_e_acsl_block_length_2);
+    __gmpz_clear(__gen_e_acsl_);
   }
   /*@ assert *(argv + argc) ≡ \null; */
   {
-    {
-      int __gen_e_acsl_valid_read;
-      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(argv + argc),
-                                                    sizeof(char *));
-      __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
-                      (char *)"mem_access: \\valid_read(argv + argc)",15);
-      /*@ assert Value: mem_access: \valid_read(argv + argc); */
-      __e_acsl_assert(*(argv + argc) == (void *)0,(char *)"Assertion",
-                      (char *)"main",(char *)"*(argv + argc) == \\null",15);
-    }
+    int __gen_e_acsl_valid_read;
+    __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(argv + argc),
+                                                  sizeof(char *));
+    __e_acsl_assert(__gen_e_acsl_valid_read,(char *)"RTE",(char *)"main",
+                    (char *)"mem_access: \\valid_read(argv + argc)",15);
+    /*@ assert Value: mem_access: \valid_read(argv + argc); */
+    __e_acsl_assert(*(argv + argc) == (void *)0,(char *)"Assertion",
+                    (char *)"main",(char *)"*(argv + argc) == \\null",15);
   }
   /*@ assert ¬\valid(*(argv + argc)); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(argv + argc),
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(argv + argc),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read_2;
+      int __gen_e_acsl_valid_4;
+      __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(argv + argc),
                                                       sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_read_2;
-        int __gen_e_acsl_valid_4;
-        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(argv + argc),
-                                                        sizeof(char *));
-        __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
-                        (char *)"main",
-                        (char *)"mem_access: \\valid_read(argv + argc)",16);
-        /*@ assert Value: mem_access: \valid_read(argv + argc); */
-        __gen_e_acsl_valid_4 = __e_acsl_valid((void *)*(argv + argc),
-                                              sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid_4;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"!\\valid(*(argv + argc))",16);
+      __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",(char *)"main",
+                      (char *)"mem_access: \\valid_read(argv + argc)",16);
+      /*@ assert Value: mem_access: \valid_read(argv + argc); */
+      __gen_e_acsl_valid_4 = __e_acsl_valid((void *)*(argv + argc),
+                                            sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid_4;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(! __gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"!\\valid(*(argv + argc))",16);
   }
   i = 0;
   while (i < argc) {
@@ -119,65 +104,58 @@ int main(int argc, char **argv)
       len = (int)tmp;
       /*@ assert \valid(*(argv + i)); */
       {
-        {
-          int __gen_e_acsl_initialized_2;
-          int __gen_e_acsl_and_2;
-          __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(
-                                                            argv + i),
-                                                            sizeof(char *));
-          if (__gen_e_acsl_initialized_2) {
-            int __gen_e_acsl_valid_read_3;
-            int __gen_e_acsl_valid_5;
-            __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)(
-                                                            argv + i),
-                                                            sizeof(char *));
-            __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",
-                            (char *)"main",
-                            (char *)"mem_access: \\valid_read(argv + i)",19);
-            __gen_e_acsl_valid_5 = __e_acsl_valid((void *)*(argv + i),
-                                                  sizeof(char));
-            __gen_e_acsl_and_2 = __gen_e_acsl_valid_5;
-          }
-          else __gen_e_acsl_and_2 = 0;
-          __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",
-                          (char *)"main",(char *)"\\valid(*(argv + i))",19);
+        int __gen_e_acsl_initialized_2;
+        int __gen_e_acsl_and_2;
+        __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(argv + i),
+                                                          sizeof(char *));
+        if (__gen_e_acsl_initialized_2) {
+          int __gen_e_acsl_valid_read_3;
+          int __gen_e_acsl_valid_5;
+          __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)(argv + i),
+                                                          sizeof(char *));
+          __e_acsl_assert(__gen_e_acsl_valid_read_3,(char *)"RTE",
+                          (char *)"main",
+                          (char *)"mem_access: \\valid_read(argv + i)",19);
+          __gen_e_acsl_valid_5 = __e_acsl_valid((void *)*(argv + i),
+                                                sizeof(char));
+          __gen_e_acsl_and_2 = __gen_e_acsl_valid_5;
         }
+        else __gen_e_acsl_and_2 = 0;
+        __e_acsl_assert(__gen_e_acsl_and_2,(char *)"Assertion",
+                        (char *)"main",(char *)"\\valid(*(argv + i))",19);
       }
       /*@ assert ∀ int k; 0 ≤ k ≤ len ⇒ \valid(*(argv + i) + k); */
       {
-        {
-          int __gen_e_acsl_forall_2;
-          long __gen_e_acsl_k_2;
-          __gen_e_acsl_forall_2 = 1;
-          __gen_e_acsl_k_2 = 0;
-          while (1) {
-            if (__gen_e_acsl_k_2 <= len) ; else break;
-            {
-              int __gen_e_acsl_valid_read_4;
-              int __gen_e_acsl_valid_6;
-              __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(
-                                                              argv + i),
-                                                              sizeof(char *));
-              __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",
-                              (char *)"main",
-                              (char *)"mem_access: \\valid_read(argv + i)",
-                              20);
-              __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(*(argv + i) + __gen_e_acsl_k_2),
-                                                    sizeof(char));
-              if (__gen_e_acsl_valid_6) ;
-              else {
-                __gen_e_acsl_forall_2 = 0;
-                goto e_acsl_end_loop2;
-              }
+        int __gen_e_acsl_forall_2;
+        long __gen_e_acsl_k_2;
+        __gen_e_acsl_forall_2 = 1;
+        __gen_e_acsl_k_2 = 0;
+        while (1) {
+          if (__gen_e_acsl_k_2 <= len) ; else break;
+          {
+            int __gen_e_acsl_valid_read_4;
+            int __gen_e_acsl_valid_6;
+            __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(
+                                                            argv + i),
+                                                            sizeof(char *));
+            __e_acsl_assert(__gen_e_acsl_valid_read_4,(char *)"RTE",
+                            (char *)"main",
+                            (char *)"mem_access: \\valid_read(argv + i)",20);
+            __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(*(argv + i) + __gen_e_acsl_k_2),
+                                                  sizeof(char));
+            if (__gen_e_acsl_valid_6) ;
+            else {
+              __gen_e_acsl_forall_2 = 0;
+              goto e_acsl_end_loop2;
             }
-            __gen_e_acsl_k_2 ++;
           }
-          e_acsl_end_loop2: ;
-          __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",
-                          (char *)"main",
-                          (char *)"\\forall int k; 0 <= k <= len ==> \\valid(*(argv + i) + k)",
-                          20);
+          __gen_e_acsl_k_2 ++;
         }
+        e_acsl_end_loop2: ;
+        __e_acsl_assert(__gen_e_acsl_forall_2,(char *)"Assertion",
+                        (char *)"main",
+                        (char *)"\\forall int k; 0 <= k <= len ==> \\valid(*(argv + i) + k)",
+                        20);
       }
     }
     i ++;
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_memalign.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_memalign.c
index af96acce120..12ea8064355 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_memalign.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_memalign.c
@@ -18,56 +18,48 @@ int main(int argc, char const **argv)
   p = *memptr;
   /*@ assert \valid(p); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                      sizeof(char *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid;
-        __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(char));
-        __gen_e_acsl_and = __gen_e_acsl_valid;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(p)",15);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(char *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid;
+      __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(char));
+      __gen_e_acsl_and = __gen_e_acsl_valid;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(p)",15);
   }
   /*@ assert \block_length(p) ≡ 15; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length;
-      __gen_e_acsl_block_length = __e_acsl_block_length((void *)p);
-      __e_acsl_assert(__gen_e_acsl_block_length == 15UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\block_length(p) == 15",16);
-    }
+    unsigned long __gen_e_acsl_block_length;
+    __gen_e_acsl_block_length = __e_acsl_block_length((void *)p);
+    __e_acsl_assert(__gen_e_acsl_block_length == 15UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(p) == 15",16);
   }
   /*@ assert \freeable(p); */
   {
-    {
-      int __gen_e_acsl_freeable;
-      __gen_e_acsl_freeable = __e_acsl_freeable((void *)p);
-      __e_acsl_assert(__gen_e_acsl_freeable,(char *)"Assertion",
-                      (char *)"main",(char *)"\\freeable(p)",17);
-    }
+    int __gen_e_acsl_freeable;
+    __gen_e_acsl_freeable = __e_acsl_freeable((void *)p);
+    __e_acsl_assert(__gen_e_acsl_freeable,(char *)"Assertion",(char *)"main",
+                    (char *)"\\freeable(p)",17);
   }
   free((void *)p);
   /*@ assert ¬\valid(p); */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      int __gen_e_acsl_and_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_2) {
-        int __gen_e_acsl_valid_2;
-        __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(char));
-        __gen_e_acsl_and_2 = __gen_e_acsl_valid_2;
-      }
-      else __gen_e_acsl_and_2 = 0;
-      __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\valid(p)",19);
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_2;
+      __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(char));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_2;
     }
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(! __gen_e_acsl_and_2,(char *)"Assertion",(char *)"main",
+                    (char *)"!\\valid(p)",19);
   }
   __e_acsl_full_init((void *)(& a));
   a = (char *)aligned_alloc((unsigned long)256,(unsigned long)12);
@@ -91,57 +83,48 @@ int main(int argc, char const **argv)
                   (char *)"a != \\null",32);
   /*@ assert \valid(a); */
   {
-    {
-      int __gen_e_acsl_initialized_3;
-      int __gen_e_acsl_and_3;
-      __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_3) {
-        int __gen_e_acsl_valid_3;
-        __gen_e_acsl_valid_3 = __e_acsl_valid((void *)a,sizeof(char));
-        __gen_e_acsl_and_3 = __gen_e_acsl_valid_3;
-      }
-      else __gen_e_acsl_and_3 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_3,(char *)"Assertion",(char *)"main",
-                      (char *)"\\valid(a)",33);
+    int __gen_e_acsl_initialized_3;
+    int __gen_e_acsl_and_3;
+    __gen_e_acsl_initialized_3 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_3) {
+      int __gen_e_acsl_valid_3;
+      __gen_e_acsl_valid_3 = __e_acsl_valid((void *)a,sizeof(char));
+      __gen_e_acsl_and_3 = __gen_e_acsl_valid_3;
     }
+    else __gen_e_acsl_and_3 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_3,(char *)"Assertion",(char *)"main",
+                    (char *)"\\valid(a)",33);
   }
   /*@ assert \block_length(a) ≡ 512; */
   {
-    {
-      unsigned long __gen_e_acsl_block_length_2;
-      __gen_e_acsl_block_length_2 = __e_acsl_block_length((void *)a);
-      __e_acsl_assert(__gen_e_acsl_block_length_2 == 512UL,
-                      (char *)"Assertion",(char *)"main",
-                      (char *)"\\block_length(a) == 512",34);
-    }
+    unsigned long __gen_e_acsl_block_length_2;
+    __gen_e_acsl_block_length_2 = __e_acsl_block_length((void *)a);
+    __e_acsl_assert(__gen_e_acsl_block_length_2 == 512UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\block_length(a) == 512",34);
   }
   /*@ assert \freeable(a); */
   {
-    {
-      int __gen_e_acsl_freeable_2;
-      __gen_e_acsl_freeable_2 = __e_acsl_freeable((void *)a);
-      __e_acsl_assert(__gen_e_acsl_freeable_2,(char *)"Assertion",
-                      (char *)"main",(char *)"\\freeable(a)",35);
-    }
+    int __gen_e_acsl_freeable_2;
+    __gen_e_acsl_freeable_2 = __e_acsl_freeable((void *)a);
+    __e_acsl_assert(__gen_e_acsl_freeable_2,(char *)"Assertion",
+                    (char *)"main",(char *)"\\freeable(a)",35);
   }
   free((void *)a);
   /*@ assert ¬\valid(a); */
   {
-    {
-      int __gen_e_acsl_initialized_4;
-      int __gen_e_acsl_and_4;
-      __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& a),
-                                                        sizeof(char *));
-      if (__gen_e_acsl_initialized_4) {
-        int __gen_e_acsl_valid_4;
-        __gen_e_acsl_valid_4 = __e_acsl_valid((void *)a,sizeof(char));
-        __gen_e_acsl_and_4 = __gen_e_acsl_valid_4;
-      }
-      else __gen_e_acsl_and_4 = 0;
-      __e_acsl_assert(! __gen_e_acsl_and_4,(char *)"Assertion",
-                      (char *)"main",(char *)"!\\valid(a)",38);
+    int __gen_e_acsl_initialized_4;
+    int __gen_e_acsl_and_4;
+    __gen_e_acsl_initialized_4 = __e_acsl_initialized((void *)(& a),
+                                                      sizeof(char *));
+    if (__gen_e_acsl_initialized_4) {
+      int __gen_e_acsl_valid_4;
+      __gen_e_acsl_valid_4 = __e_acsl_valid((void *)a,sizeof(char));
+      __gen_e_acsl_and_4 = __gen_e_acsl_valid_4;
     }
+    else __gen_e_acsl_and_4 = 0;
+    __e_acsl_assert(! __gen_e_acsl_and_4,(char *)"Assertion",(char *)"main",
+                    (char *)"!\\valid(a)",38);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& a));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_offset.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_offset.c
index 828b4fa4e4d..09b87d75c8b 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_offset.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_offset.c
@@ -30,40 +30,32 @@ int main(void)
   PA = (int *)(& A);
   /*@ assert \offset((int *)A) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset;
-      __gen_e_acsl_offset = __e_acsl_offset((void *)(A));
-      __e_acsl_assert(__gen_e_acsl_offset == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset((int *)A) == 0",13);
-    }
+    int __gen_e_acsl_offset;
+    __gen_e_acsl_offset = __e_acsl_offset((void *)(A));
+    __e_acsl_assert(__gen_e_acsl_offset == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset((int *)A) == 0",13);
   }
   /*@ assert \offset(&A[3]) ≡ 12; */
   {
-    {
-      int __gen_e_acsl_offset_2;
-      __gen_e_acsl_offset_2 = __e_acsl_offset((void *)(& A[3L]));
-      __e_acsl_assert(__gen_e_acsl_offset_2 == 12UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(&A[3]) == 12",14);
-    }
+    int __gen_e_acsl_offset_2;
+    __gen_e_acsl_offset_2 = __e_acsl_offset((void *)(& A[3L]));
+    __e_acsl_assert(__gen_e_acsl_offset_2 == 12UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(&A[3]) == 12",14);
   }
   /*@ assert \offset(PA) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_3;
-      __gen_e_acsl_offset_3 = __e_acsl_offset((void *)PA);
-      __e_acsl_assert(__gen_e_acsl_offset_3 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(PA) == 0",15);
-    }
+    int __gen_e_acsl_offset_3;
+    __gen_e_acsl_offset_3 = __e_acsl_offset((void *)PA);
+    __e_acsl_assert(__gen_e_acsl_offset_3 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(PA) == 0",15);
   }
   PA ++;
   /*@ assert \offset(PA + 1) ≡ 8; */
   {
-    {
-      int __gen_e_acsl_offset_4;
-      __gen_e_acsl_offset_4 = __e_acsl_offset((void *)(PA + 1L));
-      __e_acsl_assert(__gen_e_acsl_offset_4 == 8UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(PA + 1) == 8",17);
-    }
+    int __gen_e_acsl_offset_4;
+    __gen_e_acsl_offset_4 = __e_acsl_offset((void *)(PA + 1L));
+    __e_acsl_assert(__gen_e_acsl_offset_4 == 8UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(PA + 1) == 8",17);
   }
   __e_acsl_initialize((void *)(a),sizeof(int));
   a[0] = 1;
@@ -75,30 +67,24 @@ int main(void)
   a[3] = 4;
   /*@ assert \offset((int *)a) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_5;
-      __gen_e_acsl_offset_5 = __e_acsl_offset((void *)(a));
-      __e_acsl_assert(__gen_e_acsl_offset_5 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset((int *)a) == 0",21);
-    }
+    int __gen_e_acsl_offset_5;
+    __gen_e_acsl_offset_5 = __e_acsl_offset((void *)(a));
+    __e_acsl_assert(__gen_e_acsl_offset_5 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset((int *)a) == 0",21);
   }
   /*@ assert \offset(&a[1]) ≡ 4; */
   {
-    {
-      int __gen_e_acsl_offset_6;
-      __gen_e_acsl_offset_6 = __e_acsl_offset((void *)(& a[1L]));
-      __e_acsl_assert(__gen_e_acsl_offset_6 == 4UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(&a[1]) == 4",22);
-    }
+    int __gen_e_acsl_offset_6;
+    __gen_e_acsl_offset_6 = __e_acsl_offset((void *)(& a[1L]));
+    __e_acsl_assert(__gen_e_acsl_offset_6 == 4UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(&a[1]) == 4",22);
   }
   /*@ assert \offset(&a[3]) ≡ 12; */
   {
-    {
-      int __gen_e_acsl_offset_7;
-      __gen_e_acsl_offset_7 = __e_acsl_offset((void *)(& a[3L]));
-      __e_acsl_assert(__gen_e_acsl_offset_7 == 12UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(&a[3]) == 12",23);
-    }
+    int __gen_e_acsl_offset_7;
+    __gen_e_acsl_offset_7 = __e_acsl_offset((void *)(& a[3L]));
+    __e_acsl_assert(__gen_e_acsl_offset_7 == 12UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(&a[3]) == 12",23);
   }
   __e_acsl_full_init((void *)(& l));
   l = (long)4;
@@ -106,157 +92,126 @@ int main(void)
   pl = (char *)(& l);
   /*@ assert \offset(&l) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_8;
-      __gen_e_acsl_offset_8 = __e_acsl_offset((void *)(& l));
-      __e_acsl_assert(__gen_e_acsl_offset_8 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(&l) == 0",28);
-    }
+    int __gen_e_acsl_offset_8;
+    __gen_e_acsl_offset_8 = __e_acsl_offset((void *)(& l));
+    __e_acsl_assert(__gen_e_acsl_offset_8 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(&l) == 0",28);
   }
   /*@ assert \offset(pl) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_9;
-      __gen_e_acsl_offset_9 = __e_acsl_offset((void *)pl);
-      __e_acsl_assert(__gen_e_acsl_offset_9 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(pl) == 0",29);
-    }
+    int __gen_e_acsl_offset_9;
+    __gen_e_acsl_offset_9 = __e_acsl_offset((void *)pl);
+    __e_acsl_assert(__gen_e_acsl_offset_9 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(pl) == 0",29);
   }
   /*@ assert \offset(pl + 1) ≡ 1; */
   {
-    {
-      int __gen_e_acsl_offset_10;
-      __gen_e_acsl_offset_10 = __e_acsl_offset((void *)(pl + 1L));
-      __e_acsl_assert(__gen_e_acsl_offset_10 == 1UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(pl + 1) == 1",30);
-    }
+    int __gen_e_acsl_offset_10;
+    __gen_e_acsl_offset_10 = __e_acsl_offset((void *)(pl + 1L));
+    __e_acsl_assert(__gen_e_acsl_offset_10 == 1UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(pl + 1) == 1",30);
   }
   /*@ assert \offset(pl + 7) ≡ 7; */
   {
-    {
-      int __gen_e_acsl_offset_11;
-      __gen_e_acsl_offset_11 = __e_acsl_offset((void *)(pl + 7L));
-      __e_acsl_assert(__gen_e_acsl_offset_11 == 7UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(pl + 7) == 7",31);
-    }
+    int __gen_e_acsl_offset_11;
+    __gen_e_acsl_offset_11 = __e_acsl_offset((void *)(pl + 7L));
+    __e_acsl_assert(__gen_e_acsl_offset_11 == 7UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(pl + 7) == 7",31);
   }
   __e_acsl_full_init((void *)(& pi));
   pi = (int *)(& l);
   /*@ assert \offset(pi) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_12;
-      __gen_e_acsl_offset_12 = __e_acsl_offset((void *)pi);
-      __e_acsl_assert(__gen_e_acsl_offset_12 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(pi) == 0",33);
-    }
+    int __gen_e_acsl_offset_12;
+    __gen_e_acsl_offset_12 = __e_acsl_offset((void *)pi);
+    __e_acsl_assert(__gen_e_acsl_offset_12 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(pi) == 0",33);
   }
   __e_acsl_full_init((void *)(& pi));
   pi ++;
   /*@ assert \offset(pi) ≡ 4; */
   {
-    {
-      int __gen_e_acsl_offset_13;
-      __gen_e_acsl_offset_13 = __e_acsl_offset((void *)pi);
-      __e_acsl_assert(__gen_e_acsl_offset_13 == 4UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(pi) == 4",35);
-    }
+    int __gen_e_acsl_offset_13;
+    __gen_e_acsl_offset_13 = __e_acsl_offset((void *)pi);
+    __e_acsl_assert(__gen_e_acsl_offset_13 == 4UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(pi) == 4",35);
   }
   __e_acsl_full_init((void *)(& p));
   p = (char *)malloc((unsigned long)12);
   /*@ assert \offset(p) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_14;
-      __gen_e_acsl_offset_14 = __e_acsl_offset((void *)p);
-      __e_acsl_assert(__gen_e_acsl_offset_14 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(p) == 0",39);
-    }
+    int __gen_e_acsl_offset_14;
+    __gen_e_acsl_offset_14 = __e_acsl_offset((void *)p);
+    __e_acsl_assert(__gen_e_acsl_offset_14 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(p) == 0",39);
   }
   /*@ assert \offset(p + 1) ≡ 1; */
   {
-    {
-      int __gen_e_acsl_offset_15;
-      __gen_e_acsl_offset_15 = __e_acsl_offset((void *)(p + 1L));
-      __e_acsl_assert(__gen_e_acsl_offset_15 == 1UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(p + 1) == 1",40);
-    }
+    int __gen_e_acsl_offset_15;
+    __gen_e_acsl_offset_15 = __e_acsl_offset((void *)(p + 1L));
+    __e_acsl_assert(__gen_e_acsl_offset_15 == 1UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(p + 1) == 1",40);
   }
   /*@ assert \offset(p + 11) ≡ 11; */
   {
-    {
-      int __gen_e_acsl_offset_16;
-      __gen_e_acsl_offset_16 = __e_acsl_offset((void *)(p + 11L));
-      __e_acsl_assert(__gen_e_acsl_offset_16 == 11UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(p + 11) == 11",41);
-    }
+    int __gen_e_acsl_offset_16;
+    __gen_e_acsl_offset_16 = __e_acsl_offset((void *)(p + 11L));
+    __e_acsl_assert(__gen_e_acsl_offset_16 == 11UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(p + 11) == 11",41);
   }
   __e_acsl_full_init((void *)(& p));
   p += 5;
   /*@ assert \offset(p + 5) ≡ 10; */
   {
-    {
-      int __gen_e_acsl_offset_17;
-      __gen_e_acsl_offset_17 = __e_acsl_offset((void *)(p + 5L));
-      __e_acsl_assert(__gen_e_acsl_offset_17 == 10UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(p + 5) == 10",43);
-    }
+    int __gen_e_acsl_offset_17;
+    __gen_e_acsl_offset_17 = __e_acsl_offset((void *)(p + 5L));
+    __e_acsl_assert(__gen_e_acsl_offset_17 == 10UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(p + 5) == 10",43);
   }
   /*@ assert \offset(p - 5) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_18;
-      __gen_e_acsl_offset_18 = __e_acsl_offset((void *)(p - 5L));
-      __e_acsl_assert(__gen_e_acsl_offset_18 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(p - 5) == 0",44);
-    }
+    int __gen_e_acsl_offset_18;
+    __gen_e_acsl_offset_18 = __e_acsl_offset((void *)(p - 5L));
+    __e_acsl_assert(__gen_e_acsl_offset_18 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(p - 5) == 0",44);
   }
   __e_acsl_full_init((void *)(& q));
   q = (long *)malloc((unsigned long)30 * sizeof(long));
   /*@ assert \offset(q) ≡ 0; */
   {
-    {
-      int __gen_e_acsl_offset_19;
-      __gen_e_acsl_offset_19 = __e_acsl_offset((void *)q);
-      __e_acsl_assert(__gen_e_acsl_offset_19 == 0UL,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(q) == 0",49);
-    }
+    int __gen_e_acsl_offset_19;
+    __gen_e_acsl_offset_19 = __e_acsl_offset((void *)q);
+    __e_acsl_assert(__gen_e_acsl_offset_19 == 0UL,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(q) == 0",49);
   }
   __e_acsl_full_init((void *)(& q));
   q ++;
   /*@ assert \offset(q) ≡ sizeof(long); */
   {
-    {
-      int __gen_e_acsl_offset_20;
-      __gen_e_acsl_offset_20 = __e_acsl_offset((void *)q);
-      __e_acsl_assert(__gen_e_acsl_offset_20 == 8,(char *)"Assertion",
-                      (char *)"main",(char *)"\\offset(q) == sizeof(long)",
-                      51);
-    }
+    int __gen_e_acsl_offset_20;
+    __gen_e_acsl_offset_20 = __e_acsl_offset((void *)q);
+    __e_acsl_assert(__gen_e_acsl_offset_20 == 8,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(q) == sizeof(long)",51);
   }
   __e_acsl_full_init((void *)(& q));
   q += 2;
   /*@ assert \offset(q) ≡ sizeof(long) * 3; */
   {
-    {
-      int __gen_e_acsl_offset_21;
-      __gen_e_acsl_offset_21 = __e_acsl_offset((void *)q);
-      __e_acsl_assert(__gen_e_acsl_offset_21 == 8 * 3,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\offset(q) == sizeof(long) * 3",53);
-    }
+    int __gen_e_acsl_offset_21;
+    __gen_e_acsl_offset_21 = __e_acsl_offset((void *)q);
+    __e_acsl_assert(__gen_e_acsl_offset_21 == 8 * 3,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(q) == sizeof(long) * 3",
+                    53);
   }
   __e_acsl_full_init((void *)(& q));
   q += 4;
   /*@ assert \offset(q) ≡ sizeof(long) * 7; */
   {
-    {
-      int __gen_e_acsl_offset_22;
-      __gen_e_acsl_offset_22 = __e_acsl_offset((void *)q);
-      __e_acsl_assert(__gen_e_acsl_offset_22 == 8 * 7,(char *)"Assertion",
-                      (char *)"main",
-                      (char *)"\\offset(q) == sizeof(long) * 7",55);
-    }
+    int __gen_e_acsl_offset_22;
+    __gen_e_acsl_offset_22 = __e_acsl_offset((void *)q);
+    __e_acsl_assert(__gen_e_acsl_offset_22 == 8 * 7,(char *)"Assertion",
+                    (char *)"main",(char *)"\\offset(q) == sizeof(long) * 7",
+                    55);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& PA));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr.c
index 9cd5dc9cb8a..b8c9fdd7a72 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr.c
@@ -21,22 +21,20 @@ int main(void)
   p = & x;
   /*@ assert *p ≡ 1; */
   {
-    {
-      int __gen_e_acsl_initialized;
-      int __gen_e_acsl_and;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
-                                                      sizeof(int *));
-      if (__gen_e_acsl_initialized) {
-        int __gen_e_acsl_valid_read;
-        __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)p,sizeof(int));
-        __gen_e_acsl_and = __gen_e_acsl_valid_read;
-      }
-      else __gen_e_acsl_and = 0;
-      __e_acsl_assert(__gen_e_acsl_and,(char *)"RTE",(char *)"main",
-                      (char *)"mem_access: \\valid_read(p)",11);
-      __e_acsl_assert(*p == 1,(char *)"Assertion",(char *)"main",
-                      (char *)"*p == 1",11);
+    int __gen_e_acsl_initialized;
+    int __gen_e_acsl_and;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& p),
+                                                    sizeof(int *));
+    if (__gen_e_acsl_initialized) {
+      int __gen_e_acsl_valid_read;
+      __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)p,sizeof(int));
+      __gen_e_acsl_and = __gen_e_acsl_valid_read;
     }
+    else __gen_e_acsl_and = 0;
+    __e_acsl_assert(__gen_e_acsl_and,(char *)"RTE",(char *)"main",
+                    (char *)"mem_access: \\valid_read(p)",11);
+    __e_acsl_assert(*p == 1,(char *)"Assertion",(char *)"main",
+                    (char *)"*p == 1",11);
   }
   /*@ assert t[0] ≡ 2; */
   __e_acsl_assert(t[0L] == 2,(char *)"Assertion",(char *)"main",
@@ -52,35 +50,29 @@ int main(void)
     i = 0;
     while (i < 2) {
       /*@ assert t[i] ≡ i + 2; */
-      {
-        __e_acsl_assert(i < 3,(char *)"RTE",(char *)"main",
-                        (char *)"index_bound: i < 3",17);
-        __e_acsl_assert(0 <= i,(char *)"RTE",(char *)"main",
-                        (char *)"index_bound: 0 <= i",17);
-        __e_acsl_assert(t[i] == i + 2L,(char *)"Assertion",(char *)"main",
-                        (char *)"t[i] == i + 2",17);
-      }
+      __e_acsl_assert(i < 3,(char *)"RTE",(char *)"main",
+                      (char *)"index_bound: i < 3",17);
+      __e_acsl_assert(0 <= i,(char *)"RTE",(char *)"main",
+                      (char *)"index_bound: 0 <= i",17);
+      __e_acsl_assert(t[i] == i + 2L,(char *)"Assertion",(char *)"main",
+                      (char *)"t[i] == i + 2",17);
       /*@ assert t[2 - i] ≡ 4 - i; */
-      {
-        __e_acsl_assert(2L - i < 3L,(char *)"RTE",(char *)"main",
-                        (char *)"index_bound: (long)(2 - i) < 3",18);
-        __e_acsl_assert(0L <= 2L - i,(char *)"RTE",(char *)"main",
-                        (char *)"index_bound: 0 <= (long)(2 - i)",18);
-        __e_acsl_assert(t[2L - i] == 4L - i,(char *)"Assertion",
-                        (char *)"main",(char *)"t[2 - i] == 4 - i",18);
-      }
+      __e_acsl_assert(2L - i < 3L,(char *)"RTE",(char *)"main",
+                      (char *)"index_bound: (long)(2 - i) < 3",18);
+      __e_acsl_assert(0L <= 2L - i,(char *)"RTE",(char *)"main",
+                      (char *)"index_bound: 0 <= (long)(2 - i)",18);
+      __e_acsl_assert(t[2L - i] == 4L - i,(char *)"Assertion",(char *)"main",
+                      (char *)"t[2 - i] == 4 - i",18);
       /*@ assert *(&t[2] - i) ≡ 4 - i; */
       {
-        {
-          int __gen_e_acsl_valid_read_2;
-          __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(& t[2L] - i),
-                                                          sizeof(int));
-          __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
-                          (char *)"main",
-                          (char *)"mem_access: \\valid_read(&t[2] - i)",19);
-          __e_acsl_assert(*(& t[2L] - i) == 4L - i,(char *)"Assertion",
-                          (char *)"main",(char *)"*(&t[2] - i) == 4 - i",19);
-        }
+        int __gen_e_acsl_valid_read_2;
+        __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(& t[2L] - i),
+                                                        sizeof(int));
+        __e_acsl_assert(__gen_e_acsl_valid_read_2,(char *)"RTE",
+                        (char *)"main",
+                        (char *)"mem_access: \\valid_read(&t[2] - i)",19);
+        __e_acsl_assert(*(& t[2L] - i) == 4L - i,(char *)"Assertion",
+                        (char *)"main",(char *)"*(&t[2] - i) == 4 - i",19);
       }
       i ++;
     }
@@ -91,23 +83,20 @@ int main(void)
   t[2] = 5;
   /*@ assert *p ≡ 5; */
   {
-    {
-      int __gen_e_acsl_initialized_2;
-      int __gen_e_acsl_and_2;
-      __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
-                                                        sizeof(int *));
-      if (__gen_e_acsl_initialized_2) {
-        int __gen_e_acsl_valid_read_3;
-        __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)p,
-                                                        sizeof(int));
-        __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
-      }
-      else __gen_e_acsl_and_2 = 0;
-      __e_acsl_assert(__gen_e_acsl_and_2,(char *)"RTE",(char *)"main",
-                      (char *)"mem_access: \\valid_read(p)",25);
-      __e_acsl_assert(*p == 5,(char *)"Assertion",(char *)"main",
-                      (char *)"*p == 5",25);
+    int __gen_e_acsl_initialized_2;
+    int __gen_e_acsl_and_2;
+    __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& p),
+                                                      sizeof(int *));
+    if (__gen_e_acsl_initialized_2) {
+      int __gen_e_acsl_valid_read_3;
+      __gen_e_acsl_valid_read_3 = __e_acsl_valid_read((void *)p,sizeof(int));
+      __gen_e_acsl_and_2 = __gen_e_acsl_valid_read_3;
     }
+    else __gen_e_acsl_and_2 = 0;
+    __e_acsl_assert(__gen_e_acsl_and_2,(char *)"RTE",(char *)"main",
+                    (char *)"mem_access: \\valid_read(p)",25);
+    __e_acsl_assert(*p == 5,(char *)"Assertion",(char *)"main",
+                    (char *)"*p == 5",25);
   }
   __retres = 0;
   __e_acsl_delete_block((void *)(& p));
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr_init.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr_init.c
index 50bc97ca19e..778e22486b6 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr_init.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_ptr_init.c
@@ -10,11 +10,9 @@ void f(void)
 void g(int *C, int *D)
 {
   /*@ assert \initialized(&C); */
-  {
-    __e_acsl_store_block((void *)(& C),8UL);
-    __e_acsl_assert(1,(char *)"Assertion",(char *)"g",
-                    (char *)"\\initialized(&C)",16);
-  }
+  __e_acsl_store_block((void *)(& C),8UL);
+  __e_acsl_assert(1,(char *)"Assertion",(char *)"g",
+                  (char *)"\\initialized(&C)",16);
   __e_acsl_delete_block((void *)(& C));
   return;
 }
@@ -48,13 +46,11 @@ int main(void)
                   (char *)"\\initialized(&A)",25);
   /*@ assert \initialized(&x); */
   {
-    {
-      int __gen_e_acsl_initialized;
-      __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& x),
-                                                      sizeof(int *));
-      __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
-                      (char *)"main",(char *)"\\initialized(&x)",26);
-    }
+    int __gen_e_acsl_initialized;
+    __gen_e_acsl_initialized = __e_acsl_initialized((void *)(& x),
+                                                    sizeof(int *));
+    __e_acsl_assert(__gen_e_acsl_initialized,(char *)"Assertion",
+                    (char *)"main",(char *)"\\initialized(&x)",26);
   }
   g(x,y);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/runtime/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/runtime/oracle/gen_stmt_contract.c
index 79680b69a4a..e3b05075701 100644
--- a/src/plugins/e-acsl/tests/runtime/oracle/gen_stmt_contract.c
+++ b/src/plugins/e-acsl/tests/runtime/oracle/gen_stmt_contract.c
@@ -22,20 +22,16 @@ int main(void)
                     (char *)"y == 2",12);
   }
   /*@ requires x ≡ 2; */
-  {
-    __e_acsl_assert(x == 2,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 2",15);
-    x ++;
-  }
+  __e_acsl_assert(x == 2,(char *)"Precondition",(char *)"main",
+                  (char *)"x == 2",15);
+  x ++;
   /*@ requires x ≡ 3;
       requires y ≡ 2; */
-  {
-    __e_acsl_assert(x == 3,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 3",18);
-    __e_acsl_assert(y == 2,(char *)"Precondition",(char *)"main",
-                    (char *)"y == 2",19);
-    x += y;
-  }
+  __e_acsl_assert(x == 3,(char *)"Precondition",(char *)"main",
+                  (char *)"x == 3",18);
+  __e_acsl_assert(y == 2,(char *)"Precondition",(char *)"main",
+                  (char *)"y == 2",19);
+  x += y;
   /*@ behavior b1:
         requires x ≡ 5;
         ensures x ≡ 3;
@@ -69,53 +65,45 @@ int main(void)
         requires x + y ≡ 5;
   */
   {
-    {
-      int __gen_e_acsl_implies;
-      int __gen_e_acsl_and;
-      int __gen_e_acsl_implies_2;
-      int __gen_e_acsl_and_2;
-      int __gen_e_acsl_implies_3;
-      if (! (x == 1)) __gen_e_acsl_implies = 1;
-      else __gen_e_acsl_implies = x == 0;
-      __e_acsl_assert(__gen_e_acsl_implies,(char *)"Precondition",
-                      (char *)"main",(char *)"x == 1 ==> x == 0",33);
-      if (x == 3) __gen_e_acsl_and = y == 2; else __gen_e_acsl_and = 0;
-      if (! __gen_e_acsl_and) __gen_e_acsl_implies_2 = 1;
-      else __gen_e_acsl_implies_2 = x == 3;
-      __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Precondition",
-                      (char *)"main",(char *)"x == 3 && y == 2 ==> x == 3",
-                      37);
-      if (x == 3) __gen_e_acsl_and_2 = y == 2; else __gen_e_acsl_and_2 = 0;
-      if (! __gen_e_acsl_and_2) __gen_e_acsl_implies_3 = 1;
-      else __gen_e_acsl_implies_3 = x + y == 5L;
-      __e_acsl_assert(__gen_e_acsl_implies_3,(char *)"Precondition",
-                      (char *)"main",
-                      (char *)"x == 3 && y == 2 ==> x + y == 5",38);
-      x += y;
-    }
+    int __gen_e_acsl_implies;
+    int __gen_e_acsl_and;
+    int __gen_e_acsl_implies_2;
+    int __gen_e_acsl_and_2;
+    int __gen_e_acsl_implies_3;
+    if (! (x == 1)) __gen_e_acsl_implies = 1;
+    else __gen_e_acsl_implies = x == 0;
+    __e_acsl_assert(__gen_e_acsl_implies,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 1 ==> x == 0",33);
+    if (x == 3) __gen_e_acsl_and = y == 2; else __gen_e_acsl_and = 0;
+    if (! __gen_e_acsl_and) __gen_e_acsl_implies_2 = 1;
+    else __gen_e_acsl_implies_2 = x == 3;
+    __e_acsl_assert(__gen_e_acsl_implies_2,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 3 && y == 2 ==> x == 3",37);
+    if (x == 3) __gen_e_acsl_and_2 = y == 2; else __gen_e_acsl_and_2 = 0;
+    if (! __gen_e_acsl_and_2) __gen_e_acsl_implies_3 = 1;
+    else __gen_e_acsl_implies_3 = x + y == 5L;
+    __e_acsl_assert(__gen_e_acsl_implies_3,(char *)"Precondition",
+                    (char *)"main",(char *)"x == 3 && y == 2 ==> x + y == 5",
+                    38);
+    x += y;
   }
   /*@ requires x ≡ 5; */
-  {
-    __e_acsl_assert(x == 5,(char *)"Precondition",(char *)"main",
-                    (char *)"x == 5",41);
-    /*@ requires y ≡ 2; */
-    {
-      __e_acsl_assert(y == 2,(char *)"Precondition",(char *)"main",
-                      (char *)"y == 2",42);
-      x += y;
-    }
-  }
+  __e_acsl_assert(x == 5,(char *)"Precondition",(char *)"main",
+                  (char *)"x == 5",41);
+  /*@ requires y ≡ 2; */
+  __e_acsl_assert(y == 2,(char *)"Precondition",(char *)"main",
+                  (char *)"y == 2",42);
+  x += y;
   /*@ requires x ≡ 7;
       ensures x ≡ 7; */
   {
     __e_acsl_assert(x == 7,(char *)"Precondition",(char *)"main",
                     (char *)"x == 7",45);
     __retres = 0;
-    goto return_label;
     __e_acsl_assert(x == 7,(char *)"Postcondition",(char *)"main",
                     (char *)"x == 7",46);
   }
-  return_label: return __retres;
+  return __retres;
 }
 
 
-- 
GitLab