From b387e3bd081b996fcadebbb3796bdc463f42ae6d Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 18 Mar 2022 16:13:59 +0100
Subject: [PATCH] [kernel] Better casts introduction

- always remove FC's internal attribute everywhere before deciding whether
  a cast is needed.
- ACSL and C decisions to cast are similar
- only unroll type for checking equality. If a cast is needed, keep
  typedef (if any) as target
---
 src/kernel_internals/typing/cabs2cil.ml       |  30 +-
 src/kernel_services/ast_queries/cil.ml        |  33 +-
 .../ast_queries/logic_utils.ml                |  16 +-
 .../e-acsl/tests/arith/oracle/gen_arith.c     |   2 +-
 .../e-acsl/tests/arith/oracle/gen_array.c     |  22 +-
 .../e-acsl/tests/arith/oracle/gen_at.c        |  16 +-
 .../oracle/gen_at_on-purely-logic-variables.c |  34 +-
 .../e-acsl/tests/arith/oracle/gen_bitwise.c   |   2 +-
 .../e-acsl/tests/arith/oracle/gen_cast.c      |   2 +-
 .../tests/arith/oracle/gen_comparison.c       |   2 +-
 .../arith/oracle/gen_extended_quantifiers.c   |   2 +-
 .../e-acsl/tests/arith/oracle/gen_functions.c |   2 +-
 .../tests/arith/oracle/gen_functions_rec.c    |   2 +-
 .../tests/arith/oracle/gen_integer_constant.c |   2 +-
 .../e-acsl/tests/arith/oracle/gen_let.c       |   6 +-
 .../e-acsl/tests/arith/oracle/gen_longlong.c  |   5 +-
 .../e-acsl/tests/arith/oracle/gen_not.c       |   2 +-
 .../e-acsl/tests/arith/oracle/gen_quantif.c   |   4 +-
 .../e-acsl/tests/arith/oracle/gen_rationals.c |   2 +-
 .../e-acsl/tests/bts/oracle/gen_bts1304.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1307.c     |  44 +-
 .../e-acsl/tests/bts/oracle/gen_bts1324.c     |  12 +-
 .../e-acsl/tests/bts/oracle/gen_bts1326.c     |  14 +-
 .../oracle/gen_bts1386_complex_flowgraph.c    | 268 ++++----
 .../e-acsl/tests/bts/oracle/gen_bts1390.c     |  26 +-
 .../e-acsl/tests/bts/oracle/gen_bts1395.c     |   2 +-
 .../e-acsl/tests/bts/oracle/gen_bts1398.c     |   2 +-
 .../e-acsl/tests/bts/oracle/gen_bts1399.c     |   4 +-
 .../e-acsl/tests/bts/oracle/gen_bts1478.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1700.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1717.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1718.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1740.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts1837.c     |  10 +-
 .../e-acsl/tests/bts/oracle/gen_bts2191.c     |   4 +-
 .../e-acsl/tests/bts/oracle/gen_bts2192.c     |   6 +-
 .../e-acsl/tests/bts/oracle/gen_bts2231.c     |   2 +-
 .../e-acsl/tests/bts/oracle/gen_bts2252.c     |  16 +-
 .../e-acsl/tests/bts/oracle/gen_bts2305.c     |   4 +-
 .../e-acsl/tests/bts/oracle/gen_bts2386.c     |   8 +-
 .../e-acsl/tests/bts/oracle/gen_bts2406.c     |   6 +-
 .../tests/bts/oracle/gen_issue-eacsl-105.c    |   4 +-
 .../tests/bts/oracle/gen_issue-eacsl-139.c    |   8 +-
 .../tests/bts/oracle/gen_issue-eacsl-145.c    |   4 +-
 .../tests/bts/oracle/gen_issue-eacsl-149.c    |   2 +-
 .../tests/bts/oracle/gen_issue-eacsl-172.c    |   2 +-
 .../tests/bts/oracle/gen_issue-eacsl-177.c    |   2 +-
 .../tests/bts/oracle/gen_issue-eacsl-187.c    |   2 +-
 .../tests/bts/oracle/gen_issue-eacsl-40.c     |  15 +-
 .../tests/bts/oracle/gen_issue-eacsl-91.c     |  16 +-
 .../e-acsl/tests/bts/oracle/gen_issue69.c     |   2 +-
 .../oracle/gen_builtin_literal_string.c       |   2 +-
 .../gen_builtin_literal_string_local_init.c   |   2 +-
 .../e-acsl/tests/builtin/oracle/gen_strcat.c  | 135 ++--
 .../e-acsl/tests/builtin/oracle/gen_strcmp.c  | 108 ++--
 .../e-acsl/tests/builtin/oracle/gen_strcpy.c  |  95 ++-
 .../e-acsl/tests/builtin/oracle/gen_strlen.c  |  30 +-
 .../concurrency/oracle/gen_parallel_threads.c | 258 ++++----
 .../oracle/gen_sequential_threads.c           |  88 +--
 .../concurrency/oracle/gen_threads_debug.c    | 230 ++++---
 .../oracle/gen_threads_safe_locations.c       |  76 +--
 .../tests/constructs/oracle/gen_acsl_check.c  |   6 +-
 .../tests/constructs/oracle/gen_decrease.c    |   6 +-
 .../tests/constructs/oracle/gen_false.c       |   2 +-
 .../constructs/oracle/gen_function_contract.c |  82 ++-
 .../tests/constructs/oracle/gen_ghost.c       |   8 +-
 .../tests/constructs/oracle/gen_invariant.c   |   2 +-
 .../constructs/oracle/gen_labeled_stmt.c      |   2 +-
 .../e-acsl/tests/constructs/oracle/gen_lazy.c |   2 +-
 .../e-acsl/tests/constructs/oracle/gen_loop.c |   2 +-
 .../constructs/oracle/gen_nested_code_annot.c |   2 +-
 .../constructs/oracle/gen_printed_data.c      |  64 +-
 .../tests/constructs/oracle/gen_result.c      |   2 +-
 .../e-acsl/tests/constructs/oracle/gen_rte.c  |  10 +-
 .../constructs/oracle/gen_stmt_contract.c     |  42 +-
 .../e-acsl/tests/constructs/oracle/gen_true.c |   2 +-
 .../tests/constructs/oracle/gen_typedef.c     |   4 +-
 .../examples/oracle/gen_functions_contiki.c   |  10 +-
 .../tests/examples/oracle/gen_linear_search.c |  12 +-
 .../e-acsl/tests/format/oracle/gen_fprintf.c  |  66 +-
 .../e-acsl/tests/format/oracle/gen_printf.c   | 598 +++++++++---------
 .../e-acsl/tests/format/oracle/gen_sprintf.c  |  12 +-
 .../tests/full-mtracking/oracle/gen_addrOf.c  |  14 +-
 .../e-acsl/tests/gmp-only/oracle/gen_arith.c  |   2 +-
 .../oracle/gen_extended_quantifiers.c         |   2 +-
 .../tests/gmp-only/oracle/gen_functions.c     |   2 +-
 .../e-acsl/tests/libc/oracle/gen_file.c       |  19 +-
 .../e-acsl/tests/libc/oracle/gen_mem.c        |  29 +-
 .../e-acsl/tests/libc/oracle/gen_sprintf.c    |  16 +-
 .../e-acsl/tests/libc/oracle/gen_str.c        |  52 +-
 .../e-acsl/tests/memory/oracle/gen_addrOf.c   |   8 +-
 .../e-acsl/tests/memory/oracle/gen_alias.c    |   8 +-
 .../tests/memory/oracle/gen_array_overflow.c  |  12 +-
 .../tests/memory/oracle/gen_base_addr.c       |  26 +-
 .../tests/memory/oracle/gen_block_length.c    |  22 +-
 .../tests/memory/oracle/gen_block_valid.c     |  18 +-
 .../tests/memory/oracle/gen_bypassed_var.c    |   6 +-
 .../e-acsl/tests/memory/oracle/gen_call.c     |  18 +-
 .../memory/oracle/gen_compound_initializers.c |  16 +-
 .../tests/memory/oracle/gen_constructor.c     |   2 +-
 .../tests/memory/oracle/gen_ctype_macros.c    |  16 +-
 .../tests/memory/oracle/gen_decl_in_switch.c  |  42 +-
 .../tests/memory/oracle/gen_early_exit.c      |  50 +-
 .../e-acsl/tests/memory/oracle/gen_errno.c    |   6 +-
 .../e-acsl/tests/memory/oracle/gen_freeable.c |   6 +-
 .../memory/oracle/gen_ghost_parameters.c      |   2 +-
 .../e-acsl/tests/memory/oracle/gen_goto.c     |   6 +-
 .../tests/memory/oracle/gen_hidden_malloc.c   |   2 +-
 .../e-acsl/tests/memory/oracle/gen_init.c     |  10 +-
 .../tests/memory/oracle/gen_init_function.c   |   4 +-
 .../tests/memory/oracle/gen_initialized.c     |  30 +-
 .../tests/memory/oracle/gen_literal_string.c  |  14 +-
 .../tests/memory/oracle/gen_local_goto.c      |   6 +-
 .../tests/memory/oracle/gen_local_init.c      |   6 +-
 .../tests/memory/oracle/gen_local_var.c       |   8 +-
 .../e-acsl/tests/memory/oracle/gen_mainargs.c |   6 +-
 .../e-acsl/tests/memory/oracle/gen_memalign.c |  27 +-
 .../e-acsl/tests/memory/oracle/gen_memsize.c  |  16 +-
 .../e-acsl/tests/memory/oracle/gen_null.c     |   2 +-
 .../e-acsl/tests/memory/oracle/gen_offset.c   |  20 +-
 .../tests/memory/oracle/gen_other_constants.c |   2 +-
 .../e-acsl/tests/memory/oracle/gen_ptr.c      |   8 +-
 .../e-acsl/tests/memory/oracle/gen_ptr_init.c |  12 +-
 .../memory/oracle/gen_ranges_in_builtins.c    |  30 +-
 .../tests/memory/oracle/gen_separated.c       |  72 +--
 .../e-acsl/tests/memory/oracle/gen_sizeof.c   |   2 +-
 .../e-acsl/tests/memory/oracle/gen_stdout.c   |   8 +-
 .../memory/oracle/gen_struct_initialized.c    |   6 +-
 .../e-acsl/tests/memory/oracle/gen_valid.c    |  30 +-
 .../tests/memory/oracle/gen_valid_alias.c     |   6 +-
 .../memory/oracle/gen_valid_in_contract.c     |  20 +-
 .../e-acsl/tests/memory/oracle/gen_vdso.c     |  40 +-
 .../e-acsl/tests/memory/oracle/gen_vector.c   |  10 +-
 .../e-acsl/tests/memory/oracle/gen_vla.c      |   4 +-
 .../e-acsl/tests/special/oracle/gen_builtin.c |   2 +-
 .../special/oracle/gen_e-acsl-bittree-model.c |   4 +-
 .../oracle/gen_e-acsl-compile-dlmalloc.c      |   2 +-
 .../oracle/gen_e-acsl-external-print-value.c  |   4 +-
 .../special/oracle/gen_e-acsl-functions.c     |   8 +-
 .../special/oracle/gen_e-acsl-instrument.c    |  22 +-
 .../oracle/gen_e-acsl-no-assert-print-data.c  |   4 +-
 .../special/oracle/gen_e-acsl-rt-debug.c      |   2 +-
 .../special/oracle/gen_e-acsl-segment-model.c |   4 +-
 .../tests/special/oracle/gen_e-acsl-valid.c   |  22 +-
 .../tests/temporal/oracle/gen_t_addr-by-val.c |  10 +-
 .../e-acsl/tests/temporal/oracle/gen_t_args.c |   2 +-
 .../tests/temporal/oracle/gen_t_array.c       |   8 +-
 .../e-acsl/tests/temporal/oracle/gen_t_char.c |  10 +-
 .../tests/temporal/oracle/gen_t_darray.c      |  20 +-
 .../tests/temporal/oracle/gen_t_dpointer.c    |   4 +-
 .../e-acsl/tests/temporal/oracle/gen_t_fptr.c |  10 +-
 .../tests/temporal/oracle/gen_t_fun_lib.c     |  12 +-
 .../tests/temporal/oracle/gen_t_fun_ptr.c     |  12 +-
 .../tests/temporal/oracle/gen_t_getenv.c      |   8 +-
 .../tests/temporal/oracle/gen_t_global_init.c |  20 +-
 .../tests/temporal/oracle/gen_t_labels.c      |  14 +-
 .../tests/temporal/oracle/gen_t_lit_string.c  |  10 +-
 .../tests/temporal/oracle/gen_t_local_init.c  |  28 +-
 .../tests/temporal/oracle/gen_t_malloc-asan.c |  12 +-
 .../tests/temporal/oracle/gen_t_malloc.c      |  10 +-
 .../tests/temporal/oracle/gen_t_memcpy.c      |  36 +-
 .../tests/temporal/oracle/gen_t_scope.c       |  12 +-
 .../tests/temporal/oracle/gen_t_struct.c      |  26 +-
 .../tests/temporal/oracle/gen_t_while.c       |  10 +-
 .../tests/stdlib/oracle/calloc.res.oracle     |  36 +-
 .../tests/stdlib/oracle/malloc.res.oracle     |   8 +-
 .../stdlib/oracle/no_fc_stdlib.res.oracle     |   4 +-
 .../tests/string/oracle/memcmp.res.oracle     |   8 +-
 .../tests/string/oracle/memcpy.res.oracle     |  18 +-
 .../tests/string/oracle/memmove.res.oracle    |  18 +-
 .../tests/string/oracle/memset_0.res.oracle   |  40 +-
 .../tests/string/oracle/memset_FF.res.oracle  |  42 +-
 .../string/oracle/memset_value.res.oracle     |  48 +-
 .../tests/known/oracle/openat.res.oracle      |   2 +-
 .../tests/known/oracle/printf.res.oracle      |   6 +-
 .../oracle/printf_garbled_mix.res.oracle      |   3 +-
 .../tests/known/oracle/snprintf.res.oracle    |   2 +-
 .../tests/known/oracle/swprintf.res.oracle    |   2 +-
 .../tests/known/oracle/wchar.res.oracle       |   4 +-
 tests/builtins/oracle/memset.res.oracle       |   3 +-
 tests/cil/oracle/cpu_a.res.oracle             |   2 +-
 tests/cil/oracle/cpu_b.res.oracle             |   2 +-
 tests/libc/oracle/argz_c.res.oracle           |   2 +
 tests/libc/oracle/fc_libc.1.res.oracle        | 328 +++++-----
 tests/libc/oracle/glob_c.res.oracle           |   6 +-
 tests/libc/oracle/stdio_c.res.oracle          |   2 +-
 tests/libc/oracle/stdlib_c.0.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c.1.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c.2.res.oracle       |   2 +-
 tests/libc/oracle/unistd_h.0.res.oracle       |   1 +
 tests/libc/oracle/unistd_h.1.res.oracle       |   1 +
 tests/rte/oracle/addsub_typedef.res.oracle    |   7 +-
 tests/rte/oracle/divmod_typedef.res.oracle    |  24 +-
 .../sparecode/oracle/glob_decls.0.res.oracle  |   2 +-
 .../sparecode/oracle/glob_decls.1.res.oracle  |   2 +-
 .../sparecode/oracle/glob_decls.2.res.oracle  |   2 +-
 .../oracle/acsl_basic_allocator.res.oracle    |   2 +-
 tests/spec/oracle/array_typedef.res.oracle    |   2 +-
 tests/spec/oracle/conversion.res.oracle       |   2 +-
 .../oracle/array_cast_bts1099.res.oracle      |   2 +-
 tests/syntax/oracle/assembly_gmp.0.res.oracle |  22 +-
 tests/syntax/oracle/assembly_gmp.1.res.oracle |  37 +-
 tests/syntax/oracle/assembly_gmp.2.res.oracle |  28 +-
 ...utes-declarations-definitions.0.res.oracle |   4 +-
 .../define_string_logic_pp_bts2101.res.oracle |   2 +-
 tests/syntax/oracle/enum_repr.0.res.oracle    |  53 +-
 tests/syntax/oracle/enum_repr.1.res.oracle    |  49 +-
 tests/syntax/oracle/enum_repr.2.res.oracle    |  46 +-
 tests/syntax/oracle/gcc_builtins.res.oracle   |  26 +-
 .../incompatible_qualifiers.1.res.oracle      |   2 +-
 tests/syntax/oracle/offset.res.oracle         |   4 +-
 tests/syntax/oracle/unroll_visit.res.oracle   |  20 +-
 tests/syntax/oracle/vla_strlen.res.oracle     |   3 +-
 .../value/oracle/backward_add_ptr.res.oracle  |  37 +-
 .../cmp_ptr_follow_all_branches.0.res.oracle  |   6 +-
 .../cmp_ptr_follow_all_branches.1.res.oracle  |   6 +-
 tests/value/oracle/fun_ptr.1.res.oracle       |   6 +-
 .../value/oracle/invalid_pointer.0.res.oracle |   3 +-
 218 files changed, 2358 insertions(+), 2451 deletions(-)

diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index 6565c42e26b..e5222b38364 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -2906,17 +2906,15 @@ let rec castTo ?context ?(fromsource=false)
   Kernel.debug ~dkey:Kernel.dkey_typing_cast "@[%t: castTo:%s %a->%a@\n@]"
     Cil.pp_thisloc (if fromsource then "(source)" else "")
     Cil_printer.pp_typ ot Cil_printer.pp_typ nt;
-  let ot' = unrollType ot in
-  let nt' = unrollType nt in
-  if not fromsource && not (need_cast ot' nt') then begin
+  if not fromsource && not (need_cast ot nt) then begin
     (* Do not put the cast if it is not necessary, unless it is from the
      * source. *)
     Kernel.debug ~dkey:Kernel.dkey_typing_cast "no cast to perform";
     (ot, e)
   end else begin
-    let nt' = if fromsource then nt' else !typeForInsertedCast e ot' nt' in
-    let result = (nt', if theMachine.insertImplicitCasts || fromsource then
-                    Cil.mkCastT ~force:true ~oldt:ot ~newt:nt' e else e)
+    let nt = if fromsource then nt else !typeForInsertedCast e ot nt in
+    let result = (nt, if theMachine.insertImplicitCasts || fromsource then
+                    Cil.mkCastT ~force:true ~oldt:ot ~newt:nt e else e)
     in
     let error s =
       if fromsource then abort_context s else Kernel.fatal ~current:true s
@@ -2925,10 +2923,10 @@ let rec castTo ?context ?(fromsource=false)
         ignore (check_strict_attributes true ot nt  && check_strict_attributes false nt ot);*)
     Kernel.debug ~dkey:Kernel.dkey_typing_cast
       "@[castTo: ot=%a nt=%a\n  result is %a@\n@]"
-      Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+      Cil_printer.pp_typ ot Cil_printer.pp_typ nt
       Cil_printer.pp_exp (snd result);
     (* Now see if we can have a cast here *)
-    match ot', nt' with
+    match Cil.unrollType ot, Cil.unrollType nt with
     | TNamed _, _
     | _, TNamed _ -> Kernel.fatal ~current:true "unrollType failed in castTo"
     | t, TInt(IBool,_) when is_scalar_type t ->
@@ -2936,7 +2934,7 @@ let rec castTo ?context ?(fromsource=false)
       else
         nt,
         Cil.mkCastT
-          ~oldt:ot ~newt:nt'
+          ~oldt:ot ~newt:nt
           (constFold true
              (new_exp  ~loc:e.eloc
                 (BinOp(Ne,e,Cil.integer ~loc:e.eloc 0,intType))))
@@ -2971,7 +2969,7 @@ let rec castTo ?context ?(fromsource=false)
         | Lval lv ->  Cil.mkAddrOf ~loc:e.eloc lv
         | _ -> e (* function decay into pointer anyway *)
       in
-      castTo ?context ~fromsource (TPtr (ot', [])) nt' clean_e
+      castTo ?context ~fromsource (TPtr (ot, [])) nt clean_e
 
     (* accept converting a ptr to function to/from a ptr to void, even though
        not really accepted by the standard. gcc supports it. though
@@ -3025,10 +3023,10 @@ let rec castTo ?context ?(fromsource=false)
     | TArray _, TPtr _ -> result
 
     | TArray(t1,_,_), TArray(t2,None,_)
-      when Cil_datatype.Typ.equal t1 t2 -> (nt', e)
+      when Cil_datatype.Typ.equal t1 t2 -> (nt, e)
 
     | TPtr _, TArray(_,_,_) ->
-      error "Cast over a non-scalar type %a" Cil_printer.pp_typ nt';
+      error "Cast over a non-scalar type %a" Cil_printer.pp_typ nt;
 
     | TEnum _, TInt _ -> result
     | TFloat _, (TInt _|TEnum _) -> result
@@ -3039,7 +3037,7 @@ let rec castTo ?context ?(fromsource=false)
        | Const (CEnum { eihost = ei'})
          when ei.ename = ei'.ename && not fromsource &&
               Cil.bytesSizeOfInt ik = Cil.bytesSizeOfInt ei'.ekind
-         -> (nt',e)
+         -> (nt,e)
        | _ -> result)
     | TEnum _, TEnum _ -> result
 
@@ -3077,7 +3075,7 @@ let rec castTo ?context ?(fromsource=false)
         match isTransparentUnion ot with
         | None ->
           Kernel.fatal ~current:true "castTo %a -> %a"
-            Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+            Cil_printer.pp_typ ot Cil_printer.pp_typ nt
         | Some fstfield -> begin
             (* We do it now only if the expression is an lval *)
             let e' =
@@ -3091,11 +3089,11 @@ let rec castTo ?context ?(fromsource=false)
                   Cil_printer.pp_exp e
             in
             (* Continue casting *)
-            castTo ?context ~fromsource:fromsource fstfield.ftype nt' e'
+            castTo ?context ~fromsource:fromsource fstfield.ftype nt e'
           end
       end
     | _ ->
-      error "cannot cast from %a to %a@\n" Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+      error "cannot cast from %a to %a@\n" Cil_printer.pp_typ ot Cil_printer.pp_typ nt
   end
 
 (* Create and cache varinfo's for globals. Starts with a varinfo but if the
diff --git a/src/kernel_services/ast_queries/cil.ml b/src/kernel_services/ast_queries/cil.ml
index 676477f238b..225682ce162 100644
--- a/src/kernel_services/ast_queries/cil.ml
+++ b/src/kernel_services/ast_queries/cil.ml
@@ -392,6 +392,8 @@ let setTypeAttrs t a =
 
 let qualifier_attributes = [ "const"; "restrict"; "volatile"; "ghost" ]
 
+let fc_internal_attributes = ["declspec"; "arraylen"; "fc_stdlib"]
+
 let filter_qualifier_attributes al =
   List.filter
     (fun a -> List.mem (attributeName a) qualifier_attributes) al
@@ -4611,7 +4613,8 @@ and constFold (machdep: bool) (e: exp) : exp =
       Kernel.debug ~dkey "ConstFold CAST to %a@." !pp_typ_ref t ;
       let e = constFold machdep e in
       match e.enode, unrollType t with
-      | Const(CInt64(i,_k,_)),(TInt(nk,a)|TEnum({ekind = nk},a)) when a = [] ->
+      | Const(CInt64(i,_k,_)),(TInt(nk,a)|TEnum({ekind = nk},a))
+        when dropAttributes fc_internal_attributes a = [] ->
         begin
           (* If the cast has attributes, leave it alone. *)
           Kernel.debug ~dkey "ConstFold to %a : %a@."
@@ -4984,30 +4987,26 @@ let mk_behavior ?(name=default_behavior_name) ?(assumes=[]) ?(requires=[])
     b_extended = extended;
   }
 
-let fc_internal_attributes = ["declspec"; "arraylen"; "fc_stdlib"]
-
 let spare_attributes_for_c_cast =
   fc_internal_attributes @ qualifier_attributes
 
-let type_remove_attributes_for_c_cast =
-  typeRemoveAttributes spare_attributes_for_c_cast
-
-let type_remove_attributes_for_c_cast_deep t =
+let type_remove_attributes_for_c_cast t =
   let t = typeRemoveAttributesDeep fc_internal_attributes t in
-  type_remove_attributes_for_c_cast t
+  typeRemoveAttributes spare_attributes_for_c_cast t
 
 let spare_attributes_for_logic_cast =
   spare_attributes_for_c_cast
 
-let type_remove_attributes_for_logic_type =
-  typeRemoveAttributes spare_attributes_for_logic_cast
+let type_remove_attributes_for_logic_type t =
+  let t = typeRemoveAttributesDeep fc_internal_attributes t in
+  typeRemoveAttributes spare_attributes_for_logic_cast t
 
 let () = Cil_datatype.drop_non_logic_attributes :=
     dropAttributes spare_attributes_for_logic_cast
 
 let need_cast ?(force=false) oldt newt =
-  let oldt = type_remove_attributes_for_c_cast_deep (unrollType oldt) in
-  let newt = type_remove_attributes_for_c_cast_deep (unrollType newt) in
+  let oldt = type_remove_attributes_for_c_cast (unrollType oldt) in
+  let newt = type_remove_attributes_for_c_cast (unrollType newt) in
   not (Cil_datatype.Typ.equal oldt newt) &&
   (force ||
    match oldt, newt with
@@ -5842,16 +5841,12 @@ let mkCastT ?(force=false) ~(oldt: typ) ~(newt: typ) e =
       (match e.enode with | Const(CEnum _) -> false | _ -> true)
      in *)
   if need_cast ~force oldt newt then begin
-    let target_type =
-      match newt with
-      | TNamed _ -> newt
-      | _ -> type_remove_attributes_for_c_cast newt
-    in
     let mk_cast exp = (* to new type [newt] *)
-      new_exp ~loc (CastE(target_type,exp))
+      new_exp ~loc (CastE(type_remove_qualifier_attributes newt,exp))
     in
+    let normalized_type = type_remove_attributes_for_c_cast (unrollType newt) in
     (* Watch out for constants and cast of cast to pointer *)
-    match unrollType newt, e.enode with
+    match normalized_type, e.enode with
     (* In the case were we have a representation for the literal,
        explicitly add the cast. *)
     | TInt(newik, []), Const(CInt64(i, _, None)) ->
diff --git a/src/kernel_services/ast_queries/logic_utils.ml b/src/kernel_services/ast_queries/logic_utils.ml
index abaf9ce3212..c9775138c19 100644
--- a/src/kernel_services/ast_queries/logic_utils.ml
+++ b/src/kernel_services/ast_queries/logic_utils.ml
@@ -225,24 +225,26 @@ let equal_ltype = Cil_datatype.Logic_type.equal
 
 (* Does the same kind of optimization than [Cil.mkCastT] for [Ctype]. *)
 let mk_cast ?loc ?(force=false) newt t =
-  let newt = Cil.type_remove_attributes_for_logic_type newt in
-  if equal_ltype (Ctype newt) t.term_type then t else
+  let newt' = Cil.type_remove_attributes_for_logic_type newt in
+  if equal_ltype (Ctype newt') t.term_type then t else
     let rec unroll_cast e = match e.term_node with
       | TCastE(oldt,e)
-        when (Cil.isPointerType newt && Cil.isPointerType oldt)
-          || equal_ltype (Ctype oldt) (Ctype newt)
+        when (Cil.isPointerType newt' && Cil.isPointerType oldt)
+          || equal_ltype
+               (Ctype (Cil.type_remove_attributes_for_logic_type oldt))
+               (Ctype newt')
         -> unroll_cast e
       | TLogic_coerce(Linteger,e)
-        when Cil.isArithmeticOrPointerType newt
+        when Cil.isArithmeticOrPointerType newt'
         -> unroll_cast e
       | TLogic_coerce(Lreal,e)
-        when Cil.isFloatingType newt
+        when Cil.isFloatingType newt'
         -> unroll_cast e
       | _ -> e
     in
     let tres = if force then t else unroll_cast t in
     let loc = match loc with None -> t.term_loc | Some loc -> loc in
-    Logic_const.term ~loc (TCastE (newt, tres)) (Ctype newt)
+    Logic_const.term ~loc (TCastE (newt, tres)) (Ctype newt')
 
 
 (* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
index 43aaec7eacd..a9569cdb54c 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = -3;
   int y = 2;
   long z = 2L;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
index de262a615a3..f6d5820bc95 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
@@ -14,10 +14,10 @@ void arrays(void)
 {
   int a[3] = {1, 2, 3};
   int b[3] = {4, 5, 6};
-  __e_acsl_store_block((void *)(b),(size_t)12);
+  __e_acsl_store_block((void *)(b),12UL);
   __e_acsl_full_init((void *)(& b));
   int c[3] = {1, 2, 3};
-  __e_acsl_store_block((void *)(c),(size_t)12);
+  __e_acsl_store_block((void *)(c),12UL);
   __e_acsl_full_init((void *)(& c));
   int d[6] = {1, 2, 3, 4, 5, 6};
   {
@@ -114,10 +114,10 @@ void arrays(void)
   /*@ assert a != d; */ ;
   int *e = a;
   int *f = b;
-  __e_acsl_store_block((void *)(& f),(size_t)8);
+  __e_acsl_store_block((void *)(& f),8UL);
   __e_acsl_full_init((void *)(& f));
   int *g = c;
-  __e_acsl_store_block((void *)(& g),(size_t)8);
+  __e_acsl_store_block((void *)(& g),8UL);
   __e_acsl_full_init((void *)(& g));
   int *h = a;
   {
@@ -476,13 +476,13 @@ void arrays(void)
   }
   /*@ assert a != *((int (*)[])f); */ ;
   int i[6] = {1, 2, 3, 4, 5, 6};
-  __e_acsl_store_block((void *)(i),(size_t)24);
+  __e_acsl_store_block((void *)(i),24UL);
   __e_acsl_full_init((void *)(& i));
   int j[6] = {4, 5, 6, 1, 2, 3};
-  __e_acsl_store_block((void *)(j),(size_t)24);
+  __e_acsl_store_block((void *)(j),24UL);
   __e_acsl_full_init((void *)(& j));
   int k[6] = {4, 5, 6, 4, 5, 6};
-  __e_acsl_store_block((void *)(k),(size_t)24);
+  __e_acsl_store_block((void *)(k),24UL);
   __e_acsl_full_init((void *)(& k));
   {
     int __gen_e_acsl_ne_5;
@@ -578,13 +578,13 @@ void arrays(void)
   }
   /*@ assert j != k; */ ;
   int *l = & i[3];
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   int *m = & j[3];
-  __e_acsl_store_block((void *)(& m),(size_t)8);
+  __e_acsl_store_block((void *)(& m),8UL);
   __e_acsl_full_init((void *)(& m));
   int *n = & k[3];
-  __e_acsl_store_block((void *)(& n),(size_t)8);
+  __e_acsl_store_block((void *)(& n),8UL);
   __e_acsl_full_init((void *)(& n));
   {
     int __gen_e_acsl_ne_8;
@@ -1025,7 +1025,7 @@ void vlas(int n)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int i = 0;
     while (i < 3) {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
index fc16d53dd1f..0831d63b160 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
@@ -151,8 +151,8 @@ void g(int *p, int *q)
   int __gen_e_acsl_at_3;
   int __gen_e_acsl_at_2;
   int __gen_e_acsl_at;
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_initialize((void *)p,sizeof(int));
   *p = 0;
   __e_acsl_initialize((void *)(p + 1),sizeof(int));
@@ -310,7 +310,7 @@ int __gen_e_acsl_h(int x);
 
 int h(int x)
 {
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_delete_block((void *)(& x));
   return x;
 }
@@ -367,9 +367,9 @@ int main(void)
   int __retres;
   int x;
   int t[2];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(t),(size_t)8);
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(t),8UL);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   x = __gen_e_acsl_h(0);
   L:
@@ -453,8 +453,8 @@ int __gen_e_acsl_h(int x)
 {
   int __gen_e_acsl_at;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
+  __e_acsl_store_block((void *)(& x),4UL);
   __gen_e_acsl_at = x;
   __retres = h(x);
   {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
index cae72156516..684d4c79513 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
@@ -17,7 +17,7 @@ void __gen_e_acsl_f(int *t);
 
 void f(int *t)
 {
-  __e_acsl_store_block((void *)(& t),(size_t)8);
+  __e_acsl_store_block((void *)(& t),8UL);
   __e_acsl_delete_block((void *)(& t));
   return;
 }
@@ -26,7 +26,7 @@ void g(void)
 {
   int *__gen_e_acsl_at;
   int m;
-  __gen_e_acsl_at = (int *)malloc((size_t)12);
+  __gen_e_acsl_at = (int *)malloc(12UL);
   m = 8;
   Q:
   {
@@ -110,15 +110,15 @@ int main(void)
   int *__gen_e_acsl_at;
   int __retres;
   int n;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __gen_e_acsl_at_8 = (long *)malloc((size_t)64);
-  __gen_e_acsl_at_7 = (int *)malloc((size_t)12000);
-  __gen_e_acsl_at_6 = (long *)malloc((size_t)3072);
-  __gen_e_acsl_at_5 = (int *)malloc((size_t)528);
-  __gen_e_acsl_at_3 = (int *)malloc((size_t)12);
-  __gen_e_acsl_at_2 = (long *)malloc((size_t)8);
-  __gen_e_acsl_at = (int *)malloc((size_t)4);
-  __e_acsl_store_block((void *)(& n),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __gen_e_acsl_at_8 = (long *)malloc(64UL);
+  __gen_e_acsl_at_7 = (int *)malloc(12000UL);
+  __gen_e_acsl_at_6 = (long *)malloc(3072UL);
+  __gen_e_acsl_at_5 = (int *)malloc(528UL);
+  __gen_e_acsl_at_3 = (int *)malloc(12UL);
+  __gen_e_acsl_at_2 = (long *)malloc(8UL);
+  __gen_e_acsl_at = (int *)malloc(4UL);
+  __e_acsl_store_block((void *)(& n),4UL);
   __e_acsl_full_init((void *)(& n));
   n = 7;
   L:
@@ -620,7 +620,7 @@ int main(void)
    */
   ;
   int t[5] = {9, 12, 12, 12, -4};
-  __e_acsl_store_block((void *)(t),(size_t)20);
+  __e_acsl_store_block((void *)(t),20UL);
   __e_acsl_full_init((void *)(& t));
   __gen_e_acsl_f(t);
   g();
@@ -773,11 +773,11 @@ void __gen_e_acsl_f(int *t)
   int *__gen_e_acsl_at_3;
   int *__gen_e_acsl_at_2;
   int *__gen_e_acsl_at;
-  __gen_e_acsl_at_4 = (int *)malloc((size_t)8);
-  __gen_e_acsl_at_3 = (int *)malloc((size_t)8);
-  __gen_e_acsl_at_2 = (int *)malloc((size_t)4);
-  __gen_e_acsl_at = (int *)malloc((size_t)4);
-  __e_acsl_store_block((void *)(& t),(size_t)8);
+  __gen_e_acsl_at_4 = (int *)malloc(8UL);
+  __gen_e_acsl_at_3 = (int *)malloc(8UL);
+  __gen_e_acsl_at_2 = (int *)malloc(4UL);
+  __gen_e_acsl_at = (int *)malloc(4UL);
+  __e_acsl_store_block((void *)(& t),8UL);
   {
     int __gen_e_acsl_m;
     __gen_e_acsl_m = 4;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
index 262014a4609..80633be3676 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
@@ -1145,7 +1145,7 @@ void g_unsigned(unsigned int a, unsigned int b)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int a = 4;
   int b = 8;
   f_signed(a,b);
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
index 9528698b9d9..1fb741243cd 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   long x = (long)0;
   int y = 0;
   {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
index 0aff0e2c744..bc8c548f391 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   int y = 1;
   {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
index 3bd32e0bc30..33868c6acdd 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   unsigned long x = (unsigned long)4294967295U;
   int y = 10;
   {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
index c8d40b091b9..30a4bf2cb68 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
@@ -94,7 +94,7 @@ int main(void)
 {
   int __retres;
   mystruct m;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 1;
   int y = 2;
   {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
index ec0918b3825..e193388060a 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
@@ -68,7 +68,7 @@ void __gen_e_acsl_f5_3(__e_acsl_mpz_t *__retres_arg, __e_acsl_mpz_struct * n);
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_mpz_t __gen_e_acsl_f1_8;
     __e_acsl_mpz_t __gen_e_acsl__7;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
index 94b8940d016..8e722b1ec7c 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
@@ -12,7 +12,7 @@ int main(void)
 {
   int __retres;
   int x;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
index 439187eb639..dcc0f5794a4 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
@@ -20,7 +20,7 @@ int main(void)
 {
   int __retres;
   union __anonunion_s_2 s;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int n = -2;
   {
     long __gen_e_acsl_u;
@@ -179,7 +179,7 @@ int main(void)
   }
   /*@ assert \let u = 'b'; c < u; */ ;
   float f = 1.0f;
-  __e_acsl_store_block((void *)(& f),(size_t)4);
+  __e_acsl_store_block((void *)(& f),4UL);
   __e_acsl_full_init((void *)(& f));
   {
     float __gen_e_acsl_u_10;
@@ -236,7 +236,7 @@ int main(void)
   }
   /*@ assert (\let u = &t[1]; 1) == 1; */ ;
   struct __anonstruct_r_1 r = {.x = 1, .y = 2};
-  __e_acsl_store_block((void *)(& r),(size_t)8);
+  __e_acsl_store_block((void *)(& r),8UL);
   __e_acsl_full_init((void *)(& r));
   {
     struct __anonstruct_r_1 __gen_e_acsl_u_13;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
index 801f24611f7..2e45f5d0a6b 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
@@ -31,7 +31,7 @@ unsigned long long my_pow(unsigned int x, unsigned int n)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   unsigned long long x = my_pow((unsigned int)2,(unsigned int)63);
   {
     __e_acsl_mpz_t __gen_e_acsl_;
@@ -47,8 +47,7 @@ int main(void)
     __gmpz_init_set_si(__gen_e_acsl_,2L);
     __e_acsl_assert_register_ulonglong(& __gen_e_acsl_assert_data,"x",0,x);
     __gmpz_init(__gen_e_acsl_x);
-    __gmpz_import(__gen_e_acsl_x,(size_t)1,1,(size_t)8,0,(size_t)0,
-                  (void const *)(& x));
+    __gmpz_import(__gen_e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
     __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_x));
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
index b665a1b486f..260e8a913d7 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
index c930ac243e7..6a2abd1e2af 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
@@ -34,7 +34,7 @@ int __gen_e_acsl_p4(int i, int j, int k);
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int __gen_e_acsl_forall;
     int __gen_e_acsl_x;
@@ -338,7 +338,7 @@ int main(void)
   ;
   {
     int buf[10];
-    __e_acsl_store_block((void *)(buf),(size_t)40);
+    __e_acsl_store_block((void *)(buf),40UL);
     unsigned long len = (unsigned long)9;
     {
       int __gen_e_acsl_forall_9;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
index 43188869d2b..a00d280f759 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
@@ -24,7 +24,7 @@ double avg(double a, double b)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_mpq_t __gen_e_acsl_;
     __e_acsl_mpq_t __gen_e_acsl__2;
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 7147183bf3f..dbfe1f01298 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
@@ -26,7 +26,7 @@ union msg {
 };
 void read_sensor_4(unsigned int *m)
 {
-  __e_acsl_store_block((void *)(& m),(size_t)8);
+  __e_acsl_store_block((void *)(& m),8UL);
   __e_acsl_initialize((void *)m,sizeof(unsigned int));
   *m = (unsigned int)0;
   __e_acsl_delete_block((void *)(& m));
@@ -38,8 +38,8 @@ int main(void)
   int __retres;
   unsigned char buf[sizeof(union msg)];
   int i;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(buf),(size_t)16);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(buf),16UL);
   i = 0;
   while ((unsigned long)i < sizeof(buf) / (unsigned long)4) {
     read_sensor_4((unsigned int *)(buf) + i);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
index d88f9586db8..d2617cab17c 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
@@ -22,9 +22,9 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out);
 
 void foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
 {
-  __e_acsl_store_block((void *)(& Mtmax_out),(size_t)8);
-  __e_acsl_store_block((void *)(& Mwmax),(size_t)8);
-  __e_acsl_store_block((void *)(& Mtmax_in),(size_t)8);
+  __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+  __e_acsl_store_block((void *)(& Mwmax),8UL);
+  __e_acsl_store_block((void *)(& Mtmax_in),8UL);
   __e_acsl_initialize((void *)Mtmax_out,sizeof(float));
   *Mtmax_out = (float)((double)*Mtmax_in + ((double)5 - (double)((float)(
                                                                  5 / 80) * *Mwmax) * 0.4));
@@ -49,9 +49,9 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out);
 
 void bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
 {
-  __e_acsl_store_block((void *)(& Mtmin_out),(size_t)8);
-  __e_acsl_store_block((void *)(& Mwmin),(size_t)8);
-  __e_acsl_store_block((void *)(& Mtmin_in),(size_t)8);
+  __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+  __e_acsl_store_block((void *)(& Mwmin),8UL);
+  __e_acsl_store_block((void *)(& Mtmin_in),8UL);
   __e_acsl_initialize((void *)Mtmin_out,sizeof(float));
   *Mtmin_out = (float)(0.85 * (double)*Mwmin);
   __e_acsl_delete_block((void *)(& Mtmin_out));
@@ -64,13 +64,13 @@ int main(void)
 {
   int __retres;
   float h;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& h),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& h),4UL);
   float f = (float)1.0;
-  __e_acsl_store_block((void *)(& f),(size_t)4);
+  __e_acsl_store_block((void *)(& f),4UL);
   __e_acsl_full_init((void *)(& f));
   float g = (float)1.0;
-  __e_acsl_store_block((void *)(& g),(size_t)4);
+  __e_acsl_store_block((void *)(& g),4UL);
   __e_acsl_full_init((void *)(& g));
   __gen_e_acsl_foo(& f,& g,& h);
   __gen_e_acsl_bar(& f,& g,& h);
@@ -103,13 +103,13 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
     int __gen_e_acsl_valid_3;
-    __e_acsl_store_block((void *)(& Mtmin_out),(size_t)8);
-    __e_acsl_store_block((void *)(& Mwmin),(size_t)8);
-    __e_acsl_store_block((void *)(& Mtmin_in),(size_t)8);
+    __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+    __e_acsl_store_block((void *)(& Mwmin),8UL);
+    __e_acsl_store_block((void *)(& Mtmin_in),8UL);
     __gen_e_acsl_at = Mtmin_in;
     __gen_e_acsl_at_2 = Mwmin;
     __gen_e_acsl_at_3 = Mtmin_out;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+    __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"Mtmin_in",
                                  (void *)Mtmin_in);
@@ -165,13 +165,13 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
     __gen_e_acsl_assert_data_3.line = 22;
     __e_acsl_assert(__gen_e_acsl_valid_3,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
   }
   bar(Mtmin_in,Mwmin,Mtmin_out);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid_read;
       int __gen_e_acsl_valid_read_2;
@@ -342,13 +342,13 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
     int __gen_e_acsl_valid_3;
-    __e_acsl_store_block((void *)(& Mtmax_out),(size_t)8);
-    __e_acsl_store_block((void *)(& Mwmax),(size_t)8);
-    __e_acsl_store_block((void *)(& Mtmax_in),(size_t)8);
+    __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+    __e_acsl_store_block((void *)(& Mwmax),8UL);
+    __e_acsl_store_block((void *)(& Mtmax_in),8UL);
     __gen_e_acsl_at = Mtmax_in;
     __gen_e_acsl_at_2 = Mwmax;
     __gen_e_acsl_at_3 = Mtmax_out;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+    __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"Mtmax_in",
                                  (void *)Mtmax_in);
@@ -404,13 +404,13 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
     __gen_e_acsl_assert_data_3.line = 7;
     __e_acsl_assert(__gen_e_acsl_valid_3,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
   }
   foo(Mtmax_in,Mwmax,Mtmax_out);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_mpq_t __gen_e_acsl_;
       __e_acsl_mpq_t __gen_e_acsl__2;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
index b666ed548a1..f954d6658c5 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
@@ -37,9 +37,9 @@ int sorted(int *t, int n)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int t[7] = {1, 4, 4, 5, 5, 5, 7};
-  __e_acsl_store_block((void *)(t),(size_t)28);
+  __e_acsl_store_block((void *)(t),28UL);
   __e_acsl_full_init((void *)(& t));
   int n = __gen_e_acsl_sorted(t,7);
   {
@@ -72,8 +72,8 @@ int __gen_e_acsl_sorted(int *t, int n)
   {
     int __gen_e_acsl_forall;
     int __gen_e_acsl_i;
-    __e_acsl_store_block((void *)(& t),(size_t)8);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+    __e_acsl_store_block((void *)(& t),8UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
     __gen_e_acsl_forall = 1;
     __gen_e_acsl_i = 0 + 1;
     while (1) {
@@ -133,14 +133,14 @@ int __gen_e_acsl_sorted(int *t, int n)
       __gen_e_acsl_i ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            __gen_e_acsl_forall);
   }
   __retres = sorted(t,n);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
index 0e739191004..565954f254d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
@@ -21,8 +21,8 @@ void __gen_e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
 
 void atp_NORMAL_computeAverageAccel(ArrayInt *Accel, int *AverageAccel)
 {
-  __e_acsl_store_block((void *)(& AverageAccel),(size_t)8);
-  __e_acsl_store_block((void *)(& Accel),(size_t)8);
+  __e_acsl_store_block((void *)(& AverageAccel),8UL);
+  __e_acsl_store_block((void *)(& Accel),8UL);
   __e_acsl_initialize((void *)AverageAccel,sizeof(int));
   *AverageAccel = (((((*Accel)[4] + (*Accel)[3]) + (*Accel)[2]) + (*Accel)[1]) + (*Accel)[0]) / 5;
   __e_acsl_delete_block((void *)(& AverageAccel));
@@ -34,10 +34,10 @@ int main(void)
 {
   int __retres;
   int av;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& av),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& av),4UL);
   ArrayInt Accel = {1, 2, 3, 4, 5};
-  __e_acsl_store_block((void *)(Accel),(size_t)20);
+  __e_acsl_store_block((void *)(Accel),20UL);
   __e_acsl_full_init((void *)(& Accel));
   __gen_e_acsl_atp_NORMAL_computeAverageAccel(& Accel,& av);
   __retres = 0;
@@ -59,8 +59,8 @@ void __gen_e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
 {
   int *__gen_e_acsl_at_2;
   ArrayInt *__gen_e_acsl_at;
-  __e_acsl_store_block((void *)(& AverageAccel),(size_t)8);
-  __e_acsl_store_block((void *)(& Accel),(size_t)8);
+  __e_acsl_store_block((void *)(& AverageAccel),8UL);
+  __e_acsl_store_block((void *)(& Accel),8UL);
   __gen_e_acsl_at = Accel;
   __gen_e_acsl_at_2 = AverageAccel;
   atp_NORMAL_computeAverageAccel(Accel,AverageAccel);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
index 0082fd03200..bbb7e386a67 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
@@ -10,8 +10,8 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 void duffcopy(char *to, char *from, int count)
 {
-  __e_acsl_store_block((void *)(& from),(size_t)8);
-  __e_acsl_store_block((void *)(& to),(size_t)8);
+  __e_acsl_store_block((void *)(& from),8UL);
+  __e_acsl_store_block((void *)(& to),8UL);
   int n = (count + 7) / 8;
   switch (count % 8) 
     case 0:
@@ -33,22 +33,22 @@ void duffcopy(char *to, char *from, int count)
         char *tmp_12;
         char *tmp_13;
         char *tmp_14;
-        __e_acsl_store_block((void *)(& tmp_14),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block((void *)(& tmp),(size_t)8);
+        __e_acsl_store_block((void *)(& tmp_14),8UL);
+        __e_acsl_store_block((void *)(& tmp_13),8UL);
+        __e_acsl_store_block((void *)(& tmp_12),8UL);
+        __e_acsl_store_block((void *)(& tmp_11),8UL);
+        __e_acsl_store_block((void *)(& tmp_10),8UL);
+        __e_acsl_store_block((void *)(& tmp_9),8UL);
+        __e_acsl_store_block((void *)(& tmp_8),8UL);
+        __e_acsl_store_block((void *)(& tmp_7),8UL);
+        __e_acsl_store_block((void *)(& tmp_6),8UL);
+        __e_acsl_store_block((void *)(& tmp_5),8UL);
+        __e_acsl_store_block((void *)(& tmp_4),8UL);
+        __e_acsl_store_block((void *)(& tmp_3),8UL);
+        __e_acsl_store_block((void *)(& tmp_2),8UL);
+        __e_acsl_store_block((void *)(& tmp_1),8UL);
+        __e_acsl_store_block((void *)(& tmp_0),8UL);
+        __e_acsl_store_block((void *)(& tmp),8UL);
         __e_acsl_full_init((void *)(& tmp));
         tmp = to;
         to ++;
@@ -58,22 +58,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp,sizeof(char));
         *tmp = *tmp_0;
         case 7:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_1));
         tmp_1 = to;
         to ++;
@@ -83,22 +83,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_1,sizeof(char));
         *tmp_1 = *tmp_2;
         case 6:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_3));
         tmp_3 = to;
         to ++;
@@ -108,22 +108,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_3,sizeof(char));
         *tmp_3 = *tmp_4;
         case 5:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_5));
         tmp_5 = to;
         to ++;
@@ -133,22 +133,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_5,sizeof(char));
         *tmp_5 = *tmp_6;
         case 4:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_7));
         tmp_7 = to;
         to ++;
@@ -158,22 +158,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_7,sizeof(char));
         *tmp_7 = *tmp_8;
         case 3:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_9));
         tmp_9 = to;
         to ++;
@@ -183,22 +183,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_9,sizeof(char));
         *tmp_9 = *tmp_10;
         case 2:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_11));
         tmp_11 = to;
         to ++;
@@ -208,22 +208,22 @@ void duffcopy(char *to, char *from, int count)
         __e_acsl_initialize((void *)tmp_11,sizeof(char));
         *tmp_11 = *tmp_12;
         case 1:
-        __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
-        __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+        __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+        __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
         __e_acsl_full_init((void *)(& tmp_13));
         tmp_13 = to;
         to ++;
@@ -260,7 +260,7 @@ void duffcopy(char *to, char *from, int count)
 void initialize(char *arr, int length)
 {
   int i;
-  __e_acsl_store_block((void *)(& arr),(size_t)8);
+  __e_acsl_store_block((void *)(& arr),8UL);
   i = 0;
   while (i < length) {
     __e_acsl_initialize((void *)(arr + i),sizeof(char));
@@ -278,9 +278,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(target),(size_t)100);
+    __e_acsl_store_block((void *)(target),100UL);
     __e_acsl_full_init((void *)(& target));
-    __e_acsl_store_block((void *)(source),(size_t)100);
+    __e_acsl_store_block((void *)(source),100UL);
     __e_acsl_full_init((void *)(& source));
   }
   return;
@@ -296,7 +296,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   initialize(source,100);
   duffcopy(source,target,43);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
index 1626dbd4ea4..04abe828aae 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
@@ -30,10 +30,10 @@ void *memchr(void const *buf, int c, size_t n)
 {
   void *__retres;
   int i;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& buf),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& buf),8UL);
   char *s = (char *)buf;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __e_acsl_full_init((void *)(& s));
   i = 0;
   while ((size_t)i < n) {
@@ -74,16 +74,16 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
   int __gen_e_acsl_at_2;
   void const *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_exists;
     unsigned int __gen_e_acsl_i;
     int __gen_e_acsl_forall;
     unsigned int __gen_e_acsl_k;
-    __e_acsl_store_block((void *)(& buf),(size_t)8);
+    __e_acsl_store_block((void *)(& buf),8UL);
     __gen_e_acsl_at = buf;
     __gen_e_acsl_at_2 = c;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __gen_e_acsl_exists = 0;
     __gen_e_acsl_i = 0U;
     while (1) {
@@ -121,7 +121,7 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
       __gen_e_acsl_i ++;
     }
     e_acsl_end_loop1: ;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            __gen_e_acsl_exists);
     __gen_e_acsl_forall = 1;
     __gen_e_acsl_k = 0U;
@@ -161,14 +161,14 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
       __gen_e_acsl_k ++;
     }
     e_acsl_end_loop2: ;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_forall);
   }
   __retres = memchr(buf,c,n);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_forall_2;
       unsigned int __gen_e_acsl_j;
@@ -233,7 +233,7 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
         {.values = (void *)0};
@@ -277,12 +277,12 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   __gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string,'o',
-                      (unsigned long)4);
+                      (size_t)4);
   __gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string_2,'o',
-                      (unsigned long)4);
+                      (size_t)4);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
index 00d4049eb3b..4a8ea82155e 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
@@ -28,7 +28,7 @@ int fact(int n)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = __gen_e_acsl_fact(5);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
index 2163ee05001..505aa569c92 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
@@ -27,7 +27,7 @@ int main(void)
 {
   int __retres;
   int t[2];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   int x = 0;
   int i = 1;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
index 2142ccecad2..3bd5ee23842 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
@@ -18,9 +18,9 @@ typedef struct spongeStateStruct spongeState;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   spongeState *state = malloc(sizeof(spongeState));
-  __e_acsl_store_block((void *)(& state),(size_t)8);
+  __e_acsl_store_block((void *)(& state),8UL);
   __e_acsl_full_init((void *)(& state));
   __e_acsl_initialize((void *)(& state->bitsInQueue),sizeof(unsigned int));
   state->bitsInQueue = (unsigned int)16;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
index ccc94a40bda..a6a260e7b23 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
@@ -86,9 +86,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& global_i_ptr),(size_t)8);
+    __e_acsl_store_block((void *)(& global_i_ptr),8UL);
     __e_acsl_full_init((void *)(& global_i_ptr));
-    __e_acsl_store_block((void *)(& global_i),(size_t)4);
+    __e_acsl_store_block((void *)(& global_i),4UL);
     __e_acsl_full_init((void *)(& global_i));
   }
   return;
@@ -104,7 +104,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   __gen_e_acsl_loop();
   __retres = 0;
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 74eed7516c5..12b064f615d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
@@ -16,9 +16,9 @@ int main(void)
   int __retres;
   struct toto s;
   struct toto *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
-  __e_acsl_store_block((void *)(& s),(size_t)0);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& s),0UL);
   {
     int __gen_e_acsl_valid;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
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 6479ce65549..5a4b4587b97 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
@@ -12,10 +12,10 @@ int main(void)
 {
   int __retres;
   int *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int a = 10;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   goto lbl_1;
   lbl_2:
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 23f2cb2d589..15de627e69b 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
@@ -12,10 +12,10 @@ int main(void)
 {
   int __retres;
   int *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int a = 10;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   goto lbl_1;
   lbl_2:
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
index b233499a490..05a08633624 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
@@ -12,11 +12,11 @@ int main(void)
 {
   int __retres;
   int *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int a = 0;
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& a),4UL);
     __e_acsl_full_init((void *)(& a));
     __e_acsl_full_init((void *)(& p));
     p = & a;
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 75bbcf73b86..e12f60d7fd0 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
@@ -16,10 +16,10 @@ int f(void)
 {
   int __retres;
   char *s1 = (char *)__gen_e_acsl_literal_string;
-  __e_acsl_store_block((void *)(& s1),(size_t)8);
+  __e_acsl_store_block((void *)(& s1),8UL);
   __e_acsl_full_init((void *)(& s1));
   char *s2 = (char *)__gen_e_acsl_literal_string_2;
-  __e_acsl_store_block((void *)(& s2),(size_t)8);
+  __e_acsl_store_block((void *)(& s2),8UL);
   __e_acsl_full_init((void *)(& s2));
   {
     int __gen_e_acsl_valid_read;
@@ -145,7 +145,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
-    __e_acsl_store_block((void *)(& S),(size_t)8);
+    __e_acsl_store_block((void *)(& S),8UL);
     __e_acsl_full_init((void *)(& S));
   }
   return;
@@ -160,7 +160,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   int i = 4;
   while (1) {
@@ -171,7 +171,7 @@ int main(void)
     if (! tmp) break;
     {
       char *s = (char *)__gen_e_acsl_literal_string_3;
-      __e_acsl_store_block((void *)(& s),(size_t)8);
+      __e_acsl_store_block((void *)(& s),8UL);
       __e_acsl_full_init((void *)(& s));
       {
         int __gen_e_acsl_initialized;
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 0f8a6d0b54f..d8622c2f450 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
@@ -32,7 +32,7 @@ void __e_acsl_globals_init(void)
                          sizeof("Struct_G[0]"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
-    __e_acsl_store_block((void *)(_G),(size_t)32);
+    __e_acsl_store_block((void *)(_G),32UL);
     __e_acsl_full_init((void *)(& _G));
   }
   return;
@@ -47,7 +47,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   __e_acsl_globals_init();
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
index 6ffc1e9e03c..c90d9bd61ae 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
@@ -27,7 +27,7 @@ int __gen_e_acsl_atoi(char const *nptr)
   int __retres;
   {
     int __gen_e_acsl_valid_read;
-    __e_acsl_store_block((void *)(& nptr),(size_t)8);
+    __e_acsl_store_block((void *)(& nptr),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"nptr",
                                  (void *)nptr);
@@ -64,7 +64,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("134"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string);
-    __e_acsl_store_block((void *)(& n),(size_t)8);
+    __e_acsl_store_block((void *)(& n),8UL);
     __e_acsl_full_init((void *)(& n));
   }
   return;
@@ -79,7 +79,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   __e_acsl_globals_init();
   argc = __gen_e_acsl_atoi((char const *)n);
   a = argc;
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 9adaa695ef7..0f76bca49c1 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
@@ -12,7 +12,7 @@ long A = (long)0;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_mpz_t __gen_e_acsl_A;
     __e_acsl_mpz_t __gen_e_acsl_;
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 fbedbcc8e9c..0cec43b9bcb 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
@@ -84,13 +84,13 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     unsigned long __gen_e_acsl__7;
     unsigned long __gen_e_acsl_if_5;
     int __gen_e_acsl_separated;
-    __e_acsl_store_block((void *)(& src),(size_t)8);
-    __e_acsl_store_block((void *)(& dest),(size_t)8);
+    __e_acsl_store_block((void *)(& src),8UL);
+    __e_acsl_store_block((void *)(& dest),8UL);
     __gen_e_acsl_at = dest;
     __gmpz_init_set_ui(__gen_e_acsl_n,n);
     __gmpz_init_set(__gen_e_acsl_at_2,
                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_n));
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
       {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_2,"dest",
@@ -240,7 +240,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
                                      __gen_e_acsl_size_5);
       __gen_e_acsl_if_5 = __gen_e_acsl_size_5;
     }
-    __gen_e_acsl_separated = __e_acsl_separated((size_t)2,dest + 1 * 0,
+    __gen_e_acsl_separated = __e_acsl_separated(2UL,dest + 1 * 0,
                                                 __gen_e_acsl_if_4,
                                                 src + 1 * 0,
                                                 __gen_e_acsl_if_5);
@@ -371,14 +371,14 @@ int main(void)
 {
   int __retres;
   int i;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   char *srcbuf = (char *)__gen_e_acsl_literal_string;
-  __e_acsl_store_block((void *)(& srcbuf),(size_t)8);
+  __e_acsl_store_block((void *)(& srcbuf),8UL);
   __e_acsl_full_init((void *)(& srcbuf));
   int loc = 1;
   char *destbuf = malloc((unsigned long)10 * sizeof(char));
-  __e_acsl_store_block((void *)(& destbuf),(size_t)8);
+  __e_acsl_store_block((void *)(& destbuf),8UL);
   __e_acsl_full_init((void *)(& destbuf));
   char ch = (char)'o';
   if (destbuf != (char *)0) {
@@ -415,7 +415,7 @@ int main(void)
       i ++;
     }
     __gen_e_acsl_strncpy(destbuf + loc,(char const *)(srcbuf + loc),
-                         (unsigned long)1);
+                         (size_t)1);
     free((void *)destbuf);
   }
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
index 1e8760b7779..a7ba41ff175 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
@@ -25,7 +25,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& t),(size_t)4);
+    __e_acsl_store_block((void *)(& t),4UL);
     __e_acsl_full_init((void *)(& t));
   }
   return;
@@ -40,7 +40,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char **argv)
 {
   int tmp;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   __e_acsl_globals_init();
   /*@ assert \valid_read(&t.j); */ ;
   /*@ assert \valid_read(&t.j + (1 .. 3)); */ ;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
index 3938fa0647b..c95d2dd5ca1 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
@@ -11,9 +11,9 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 void f(void const *s, int c, unsigned long n)
 {
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   unsigned char const *p = (unsigned char const *)s;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     __e_acsl_mpz_t __gen_e_acsl_;
@@ -84,10 +84,10 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   char const *s = __gen_e_acsl_literal_string;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __e_acsl_full_init((void *)(& s));
   f((void const *)s,'0',(unsigned long)11);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
index 9591977d2fc..909d44e55b8 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(t),(size_t)10);
+    __e_acsl_store_block((void *)(t),10UL);
     __e_acsl_full_init((void *)(& t));
   }
   return;
@@ -30,10 +30,10 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   char *p = (char *)(tab);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_size;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
index 34d4bc63358..bb6b00bfc41 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
@@ -12,7 +12,7 @@ int f(void)
 {
   int __retres;
   int a = 10;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   goto lbl_1;
   lbl_2:
@@ -49,7 +49,7 @@ int f(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   f();
   __retres = 0;
   __e_acsl_memory_clean();
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
index 7bccd9add24..c3b5d7a6223 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
@@ -16,7 +16,7 @@ void __gen_e_acsl_f(struct X *item);
 
 void f(struct X *item)
 {
-  __e_acsl_store_block((void *)(& item),(size_t)8);
+  __e_acsl_store_block((void *)(& item),8UL);
   __e_acsl_delete_block((void *)(& item));
   return;
 }
@@ -24,9 +24,9 @@ void f(struct X *item)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   struct X x = {.i = 1};
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   __gen_e_acsl_f(& x);
   __retres = 0;
@@ -42,7 +42,7 @@ void __gen_e_acsl_f(struct X *item)
   struct X *__gen_e_acsl_at;
   {
     int __gen_e_acsl_valid_read;
-    __e_acsl_store_block((void *)(& item),(size_t)8);
+    __e_acsl_store_block((void *)(& item),8UL);
     __gen_e_acsl_at = item;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"item",
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
index 21d386c35a3..fca8df4be70 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
@@ -14,7 +14,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& G),(size_t)4);
+    __e_acsl_store_block((void *)(& G),4UL);
     __e_acsl_full_init((void *)(& G));
   }
   return;
@@ -29,7 +29,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   {
     int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
index 2b0a6cbcfe1..653cc715d84 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   {
     int __gen_e_acsl_exists;
     int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
index f32019a4288..3ba8b805f28 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
@@ -12,7 +12,7 @@ double d2 = 11.;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_double(& __gen_e_acsl_assert_data,"d2",d2);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
index f758e49b2b4..9b3b82f7bad 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
@@ -22,7 +22,7 @@ void __gen_e_acsl_f_3(__e_acsl_mpz_t *__retres_arg, __e_acsl_mpz_struct * n);
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_mpz_t __gen_e_acsl_f_8;
     __e_acsl_mpz_t __gen_e_acsl__10;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
index 1b194d5d86d..72135b496ad 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
@@ -17,7 +17,7 @@ int __gen_e_acsl_p(int n);
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int __gen_e_acsl_p_2;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
index aecdee5351d..0521d11ed31 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
@@ -79,8 +79,8 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     unsigned long __gen_e_acsl_size_4;
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& stream),(size_t)8);
-    __e_acsl_store_block((void *)(& ptr),(size_t)8);
+    __e_acsl_store_block((void *)(& stream),8UL);
+    __e_acsl_store_block((void *)(& ptr),8UL);
     __gen_e_acsl_at = ptr;
     __gmpz_init_set_ui(__gen_e_acsl_size,size);
     __gmpz_init_set(__gen_e_acsl_at_2,
@@ -406,7 +406,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename,
                          char const * restrict mode)
 {
   FILE *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   __retres = fopen(filename,mode);
   __e_acsl_delete_block((void *)(& __retres));
   return __retres;
@@ -434,19 +434,18 @@ int main(void)
 {
   int __retres;
   char buf[4];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   FILE *f =
     __gen_e_acsl_fopen(__gen_e_acsl_literal_string_2,
                        __gen_e_acsl_literal_string);
-  __e_acsl_store_block((void *)(& f),(size_t)8);
+  __e_acsl_store_block((void *)(& f),8UL);
   __e_acsl_full_init((void *)(& f));
   if (f) {
     char buf_0[4];
     size_t tmp_0;
-    __e_acsl_store_block((void *)(buf_0),(size_t)4);
-    tmp_0 = __gen_e_acsl_fread((void *)(buf_0),(unsigned long)1,
-                               (unsigned long)4,f);
+    __e_acsl_store_block((void *)(buf_0),4UL);
+    tmp_0 = __gen_e_acsl_fread((void *)(buf_0),(size_t)1,(size_t)4,f);
     int res = (int)tmp_0;
     if (res == 4) {
       {
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
index 40c85c745e4..fcc437fd3e6 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
@@ -12,17 +12,17 @@ short a;
 char b(void)
 {
   char __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)1);
+  __e_acsl_store_block((void *)(& __retres),1UL);
   switch ((int)a) {
     int c = 0;
-    __e_acsl_store_block((void *)(& c),(size_t)4);
+    __e_acsl_store_block((void *)(& c),4UL);
     __e_acsl_full_init((void *)(& c));
     case 0:
-    __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
+    __e_acsl_store_block_duplicate((void *)(& c),4UL);
     __e_acsl_delete_block((void *)(& c));
     goto d;
     int tmp = c;
-    __e_acsl_store_block((void *)(& tmp),(size_t)4);
+    __e_acsl_store_block((void *)(& tmp),4UL);
     __e_acsl_full_init((void *)(& tmp));
     __e_acsl_delete_block((void *)(& tmp));
     __e_acsl_delete_block((void *)(& c));
@@ -38,9 +38,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& b),(size_t)1);
+    __e_acsl_store_block((void *)(& b),1UL);
     __e_acsl_full_init((void *)(& b));
-    __e_acsl_store_block((void *)(& a),(size_t)2);
+    __e_acsl_store_block((void *)(& a),2UL);
     __e_acsl_full_init((void *)(& a));
   }
   return;
@@ -56,9 +56,9 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   b();
   __e_acsl_full_init((void *)(& __retres));
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
index a6e1c019f52..6b9b1af1779 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int __gen_e_acsl_forall;
     int __gen_e_acsl_c;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
index d02f4b69146..c42390be165 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
@@ -26,7 +26,7 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   __e_acsl_builtin_strlen(__gen_e_acsl_literal_string);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
index 853a9641d8d..b3eb4f6d4cf 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
@@ -27,7 +27,7 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   size_t len = __e_acsl_builtin_strlen(__gen_e_acsl_literal_string);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
index 400997fa108..4dd51eba552 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
@@ -83,10 +83,10 @@ void test_memory_tracking(void)
 {
   {
     char dest[4];
-    __e_acsl_store_block((void *)(dest),(size_t)4);
+    __e_acsl_store_block((void *)(dest),4UL);
     __e_acsl_builtin_strcpy(dest,__gen_e_acsl_literal_string_6);
     char src[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src),(size_t)2);
+    __e_acsl_store_block((void *)(src),2UL);
     __e_acsl_full_init((void *)(& src));
     {
       int __gen_e_acsl_size;
@@ -265,10 +265,10 @@ void test_memory_tracking(void)
   }
   {
     char dest_0[4];
-    __e_acsl_store_block((void *)(dest_0),(size_t)4);
+    __e_acsl_store_block((void *)(dest_0),4UL);
     __e_acsl_builtin_strcpy(dest_0,__gen_e_acsl_literal_string_6);
     char src_0[3] = {(char)'b', (char)'c', (char)'\000'};
-    __e_acsl_store_block((void *)(src_0),(size_t)3);
+    __e_acsl_store_block((void *)(src_0),3UL);
     __e_acsl_full_init((void *)(& src_0));
     {
       int __gen_e_acsl_size_5;
@@ -384,7 +384,7 @@ void test_memory_tracking(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
     }
     /*@ assert \initialized(&src_0[0 .. 2]); */ ;
-    __e_acsl_builtin_strncat(dest_0,(char const *)(src_0),(unsigned long)1);
+    __e_acsl_builtin_strncat(dest_0,(char const *)(src_0),(size_t)1);
     {
       int __gen_e_acsl_size_8;
       int __gen_e_acsl_if_8;
@@ -452,10 +452,10 @@ void test_memory_tracking(void)
   }
   {
     char dest_1[4];
-    __e_acsl_store_block((void *)(dest_1),(size_t)4);
+    __e_acsl_store_block((void *)(dest_1),4UL);
     __e_acsl_builtin_strcpy(dest_1,__gen_e_acsl_literal_string_6);
     char src_1[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_1),(size_t)2);
+    __e_acsl_store_block((void *)(src_1),2UL);
     __e_acsl_full_init((void *)(& src_1));
     {
       int __gen_e_acsl_size_9;
@@ -571,7 +571,7 @@ void test_memory_tracking(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
     }
     /*@ assert \initialized(&src_1[0 .. 1]); */ ;
-    __e_acsl_builtin_strncat(dest_1,(char const *)(src_1),(unsigned long)2);
+    __e_acsl_builtin_strncat(dest_1,(char const *)(src_1),(size_t)2);
     {
       int __gen_e_acsl_size_12;
       int __gen_e_acsl_if_12;
@@ -705,15 +705,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -983,41 +983,41 @@ void __e_acsl_globals_init(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *const_str = (char *)__gen_e_acsl_literal_string_7;
-  char *unalloc_str = malloc((unsigned long)5);
-  char *_barrier = malloc((unsigned long)1);
+  char *unalloc_str = malloc((size_t)5);
+  char *_barrier = malloc((size_t)1);
   char *empty_str = (char *)__gen_e_acsl_literal_string_8;
   free((void *)unalloc_str);
   {
     char dest1[9] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest1),(size_t)9);
+    __e_acsl_store_block((void *)(dest1),9UL);
     __e_acsl_full_init((void *)(& dest1));
     char dest2[8] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest2),(size_t)8);
+    __e_acsl_store_block((void *)(dest2),8UL);
     __e_acsl_full_init((void *)(& dest2));
     char dest3[5] =
       {(char)'-', (char)'-', (char)'-', (char)'-', (char)'\000'};
-    __e_acsl_store_block((void *)(dest3),(size_t)5);
+    __e_acsl_store_block((void *)(dest3),5UL);
     __e_acsl_full_init((void *)(& dest3));
     char dest4[10] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest4),(size_t)10);
+    __e_acsl_store_block((void *)(dest4),10UL);
     __e_acsl_full_init((void *)(& dest4));
     char *pd1 = (char *)(& dest1);
-    __e_acsl_store_block((void *)(& pd1),(size_t)8);
+    __e_acsl_store_block((void *)(& pd1),8UL);
     __e_acsl_full_init((void *)(& pd1));
     char *pd2 = (char *)(& dest2);
-    __e_acsl_store_block((void *)(& pd2),(size_t)8);
+    __e_acsl_store_block((void *)(& pd2),8UL);
     __e_acsl_full_init((void *)(& pd2));
     char *pd3 = (char *)(& dest3);
-    __e_acsl_store_block((void *)(& pd3),(size_t)8);
+    __e_acsl_store_block((void *)(& pd3),8UL);
     __e_acsl_full_init((void *)(& pd3));
     char *pd4 = (char *)(& dest4);
-    __e_acsl_store_block((void *)(& pd4),(size_t)8);
+    __e_acsl_store_block((void *)(& pd4),8UL);
     __e_acsl_full_init((void *)(& pd4));
     {
       pid_t pid = __gen_e_acsl_fork();
@@ -1027,7 +1027,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status;
-        __e_acsl_store_block((void *)(& process_status),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status),4UL);
         __gen_e_acsl_waitpid(pid,& process_status,0);
         signal_eval(process_status,0,__gen_e_acsl_literal_string_9);
         __e_acsl_delete_block((void *)(& process_status));
@@ -1041,7 +1041,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_0;
-        __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_0),4UL);
         __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
         signal_eval(process_status_0,0,__gen_e_acsl_literal_string_10);
         __e_acsl_delete_block((void *)(& process_status_0));
@@ -1055,7 +1055,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_1;
-        __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_1),4UL);
         __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
         signal_eval(process_status_1,1,__gen_e_acsl_literal_string_11);
         __e_acsl_delete_block((void *)(& process_status_1));
@@ -1069,7 +1069,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_2;
-        __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_2),4UL);
         __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
         signal_eval(process_status_2,1,__gen_e_acsl_literal_string_12);
         __e_acsl_delete_block((void *)(& process_status_2));
@@ -1083,7 +1083,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_3;
-        __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_3),4UL);
         __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
         signal_eval(process_status_3,1,__gen_e_acsl_literal_string_13);
         __e_acsl_delete_block((void *)(& process_status_3));
@@ -1097,7 +1097,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_4;
-        __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_4),4UL);
         __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
         signal_eval(process_status_4,1,__gen_e_acsl_literal_string_14);
         __e_acsl_delete_block((void *)(& process_status_4));
@@ -1111,7 +1111,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_5;
-        __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_5),4UL);
         __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
         signal_eval(process_status_5,1,__gen_e_acsl_literal_string_15);
         __e_acsl_delete_block((void *)(& process_status_5));
@@ -1125,7 +1125,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_6;
-        __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_6),4UL);
         __gen_e_acsl_waitpid(pid_6,& process_status_6,0);
         signal_eval(process_status_6,1,__gen_e_acsl_literal_string_16);
         __e_acsl_delete_block((void *)(& process_status_6));
@@ -1139,7 +1139,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_7;
-        __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_7),4UL);
         __gen_e_acsl_waitpid(pid_7,& process_status_7,0);
         signal_eval(process_status_7,1,__gen_e_acsl_literal_string_17);
         __e_acsl_delete_block((void *)(& process_status_7));
@@ -1153,7 +1153,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_8;
-        __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_8),4UL);
         __gen_e_acsl_waitpid(pid_8,& process_status_8,0);
         signal_eval(process_status_8,1,__gen_e_acsl_literal_string_18);
         __e_acsl_delete_block((void *)(& process_status_8));
@@ -1167,7 +1167,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_9;
-        __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_9),4UL);
         __gen_e_acsl_waitpid(pid_9,& process_status_9,0);
         signal_eval(process_status_9,1,__gen_e_acsl_literal_string_19);
         __e_acsl_delete_block((void *)(& process_status_9));
@@ -1183,7 +1183,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_10;
-        __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_10),4UL);
         __gen_e_acsl_waitpid(pid_10,& process_status_10,0);
         signal_eval(process_status_10,0,__gen_e_acsl_literal_string_20);
         __e_acsl_delete_block((void *)(& process_status_10));
@@ -1201,42 +1201,41 @@ int main(int argc, char const **argv)
   {
     char dest1_0[9] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest1_0),(size_t)9);
+    __e_acsl_store_block((void *)(dest1_0),9UL);
     __e_acsl_full_init((void *)(& dest1_0));
     char dest2_0[8] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest2_0),(size_t)8);
+    __e_acsl_store_block((void *)(dest2_0),8UL);
     __e_acsl_full_init((void *)(& dest2_0));
     char dest3_0[5] =
       {(char)'-', (char)'-', (char)'-', (char)'-', (char)'\000'};
-    __e_acsl_store_block((void *)(dest3_0),(size_t)5);
+    __e_acsl_store_block((void *)(dest3_0),5UL);
     __e_acsl_full_init((void *)(& dest3_0));
     char dest4_0[10] =
       {(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
-    __e_acsl_store_block((void *)(dest4_0),(size_t)10);
+    __e_acsl_store_block((void *)(dest4_0),10UL);
     __e_acsl_full_init((void *)(& dest4_0));
     char *pd1_0 = (char *)(& dest1_0);
-    __e_acsl_store_block((void *)(& pd1_0),(size_t)8);
+    __e_acsl_store_block((void *)(& pd1_0),8UL);
     __e_acsl_full_init((void *)(& pd1_0));
     char *pd2_0 = (char *)(& dest2_0);
-    __e_acsl_store_block((void *)(& pd2_0),(size_t)8);
+    __e_acsl_store_block((void *)(& pd2_0),8UL);
     __e_acsl_full_init((void *)(& pd2_0));
     char *pd3_0 = (char *)(& dest3_0);
-    __e_acsl_store_block((void *)(& pd3_0),(size_t)8);
+    __e_acsl_store_block((void *)(& pd3_0),8UL);
     __e_acsl_full_init((void *)(& pd3_0));
     char *pd4_0 = (char *)(& dest4_0);
-    __e_acsl_store_block((void *)(& pd4_0),(size_t)8);
+    __e_acsl_store_block((void *)(& pd4_0),8UL);
     __e_acsl_full_init((void *)(& pd4_0));
     {
       pid_t pid_11 = __gen_e_acsl_fork();
       if (! pid_11) {
-        __e_acsl_builtin_strncat(dest1_0,(char const *)const_str,
-                                 (unsigned long)4);
+        __e_acsl_builtin_strncat(dest1_0,(char const *)const_str,(size_t)4);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_11;
-        __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_11),4UL);
         __gen_e_acsl_waitpid(pid_11,& process_status_11,0);
         signal_eval(process_status_11,0,__gen_e_acsl_literal_string_21);
         __e_acsl_delete_block((void *)(& process_status_11));
@@ -1245,13 +1244,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_12 = __gen_e_acsl_fork();
       if (! pid_12) {
-        __e_acsl_builtin_strncat(dest2_0,(char const *)const_str,
-                                 (unsigned long)4);
+        __e_acsl_builtin_strncat(dest2_0,(char const *)const_str,(size_t)4);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_12;
-        __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_12),4UL);
         __gen_e_acsl_waitpid(pid_12,& process_status_12,0);
         signal_eval(process_status_12,1,__gen_e_acsl_literal_string_22);
         __e_acsl_delete_block((void *)(& process_status_12));
@@ -1261,12 +1259,12 @@ int main(int argc, char const **argv)
       pid_t pid_13 = __gen_e_acsl_fork();
       if (! pid_13) {
         __e_acsl_builtin_strncat(unalloc_str,(char const *)const_str,
-                                 (unsigned long)1);
+                                 (size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_13;
-        __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_13),4UL);
         __gen_e_acsl_waitpid(pid_13,& process_status_13,0);
         signal_eval(process_status_13,1,__gen_e_acsl_literal_string_23);
         __e_acsl_delete_block((void *)(& process_status_13));
@@ -1275,13 +1273,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_14 = __gen_e_acsl_fork();
       if (! pid_14) {
-        __e_acsl_builtin_strncat(dest2_0,(char const *)unalloc_str,
-                                 (unsigned long)1);
+        __e_acsl_builtin_strncat(dest2_0,(char const *)unalloc_str,(size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_14;
-        __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_14),4UL);
         __gen_e_acsl_waitpid(pid_14,& process_status_14,0);
         signal_eval(process_status_14,1,__gen_e_acsl_literal_string_24);
         __e_acsl_delete_block((void *)(& process_status_14));
@@ -1290,13 +1287,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_15 = __gen_e_acsl_fork();
       if (! pid_15) {
-        __e_acsl_builtin_strncat((char *)0,(char const *)const_str,
-                                 (unsigned long)1);
+        __e_acsl_builtin_strncat((char *)0,(char const *)const_str,(size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_15;
-        __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_15),4UL);
         __gen_e_acsl_waitpid(pid_15,& process_status_15,0);
         signal_eval(process_status_15,1,__gen_e_acsl_literal_string_25);
         __e_acsl_delete_block((void *)(& process_status_15));
@@ -1305,12 +1301,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_16 = __gen_e_acsl_fork();
       if (! pid_16) {
-        __e_acsl_builtin_strncat(dest2_0,(char const *)0,(unsigned long)1);
+        __e_acsl_builtin_strncat(dest2_0,(char const *)0,(size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_16;
-        __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_16),4UL);
         __gen_e_acsl_waitpid(pid_16,& process_status_16,0);
         signal_eval(process_status_16,1,__gen_e_acsl_literal_string_26);
         __e_acsl_delete_block((void *)(& process_status_16));
@@ -1319,13 +1315,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_17 = __gen_e_acsl_fork();
       if (! pid_17) {
-        __e_acsl_builtin_strncat(const_str,(char const *)const_str,
-                                 (unsigned long)1);
+        __e_acsl_builtin_strncat(const_str,(char const *)const_str,(size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_17;
-        __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_17),4UL);
         __gen_e_acsl_waitpid(pid_17,& process_status_17,0);
         signal_eval(process_status_17,1,__gen_e_acsl_literal_string_27);
         __e_acsl_delete_block((void *)(& process_status_17));
@@ -1334,12 +1329,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_18 = __gen_e_acsl_fork();
       if (! pid_18) {
-        __e_acsl_builtin_strncat(pd1_0,(char const *)pd1_0,(unsigned long)1);
+        __e_acsl_builtin_strncat(pd1_0,(char const *)pd1_0,(size_t)1);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_18;
-        __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_18),4UL);
         __gen_e_acsl_waitpid(pid_18,& process_status_18,0);
         signal_eval(process_status_18,1,__gen_e_acsl_literal_string_28);
         __e_acsl_delete_block((void *)(& process_status_18));
@@ -1348,13 +1343,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_19 = __gen_e_acsl_fork();
       if (! pid_19) {
-        __e_acsl_builtin_strncat(pd1_0 + 3,(char const *)pd1_0,
-                                 (unsigned long)5);
+        __e_acsl_builtin_strncat(pd1_0 + 3,(char const *)pd1_0,(size_t)5);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_19;
-        __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_19),4UL);
         __gen_e_acsl_waitpid(pid_19,& process_status_19,0);
         signal_eval(process_status_19,1,__gen_e_acsl_literal_string_29);
         __e_acsl_delete_block((void *)(& process_status_19));
@@ -1363,13 +1357,12 @@ int main(int argc, char const **argv)
     {
       pid_t pid_20 = __gen_e_acsl_fork();
       if (! pid_20) {
-        __e_acsl_builtin_strncat(pd4_0 + 4,(char const *)pd4_0,
-                                 (unsigned long)5);
+        __e_acsl_builtin_strncat(pd4_0 + 4,(char const *)pd4_0,(size_t)5);
         __gen_e_acsl_exit(0);
       }
       else {
         int process_status_20;
-        __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_20),4UL);
         __gen_e_acsl_waitpid(pid_20,& process_status_20,0);
         signal_eval(process_status_20,1,__gen_e_acsl_literal_string_30);
         __e_acsl_delete_block((void *)(& process_status_20));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
index e1307d5a6ae..e709190a8d4 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
@@ -155,12 +155,12 @@ char *__gen_e_acsl_strdup(char const *s)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   char *__retres;
-  __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+  __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
   __retres = strdup(s);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -246,15 +246,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -558,7 +558,7 @@ int main(int argc, char const **argv)
 {
   int __retres;
   int res;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char const *cl = __gen_e_acsl_literal_string_6;
   char const *cr = __gen_e_acsl_literal_string_6;
@@ -578,7 +578,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status;
-      __e_acsl_store_block((void *)(& process_status),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status),4UL);
       __gen_e_acsl_waitpid(pid,& process_status,0);
       signal_eval(process_status,0,__gen_e_acsl_literal_string_8);
       __e_acsl_delete_block((void *)(& process_status));
@@ -596,7 +596,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_0;
-      __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_0),4UL);
       __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
       signal_eval(process_status_0,0,__gen_e_acsl_literal_string_9);
       __e_acsl_delete_block((void *)(& process_status_0));
@@ -614,7 +614,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_1;
-      __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_1),4UL);
       __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
       signal_eval(process_status_1,0,__gen_e_acsl_literal_string_10);
       __e_acsl_delete_block((void *)(& process_status_1));
@@ -633,7 +633,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_2;
-      __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_2),4UL);
       __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
       signal_eval(process_status_2,1,__gen_e_acsl_literal_string_11);
       __e_acsl_delete_block((void *)(& process_status_2));
@@ -653,7 +653,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_3;
-      __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_3),4UL);
       __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
       signal_eval(process_status_3,1,__gen_e_acsl_literal_string_12);
       __e_acsl_delete_block((void *)(& process_status_3));
@@ -672,7 +672,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_4;
-      __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_4),4UL);
       __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
       signal_eval(process_status_4,1,__gen_e_acsl_literal_string_13);
       __e_acsl_delete_block((void *)(& process_status_4));
@@ -692,7 +692,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_5;
-      __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_5),4UL);
       __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
       signal_eval(process_status_5,1,__gen_e_acsl_literal_string_14);
       __e_acsl_delete_block((void *)(& process_status_5));
@@ -710,7 +710,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_6;
-      __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_6),4UL);
       __gen_e_acsl_waitpid(pid_6,& process_status_6,0);
       signal_eval(process_status_6,1,__gen_e_acsl_literal_string_15);
       __e_acsl_delete_block((void *)(& process_status_6));
@@ -728,7 +728,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_7;
-      __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_7),4UL);
       __gen_e_acsl_waitpid(pid_7,& process_status_7,0);
       signal_eval(process_status_7,1,__gen_e_acsl_literal_string_16);
       __e_acsl_delete_block((void *)(& process_status_7));
@@ -748,7 +748,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_8;
-      __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_8),4UL);
       __gen_e_acsl_waitpid(pid_8,& process_status_8,0);
       signal_eval(process_status_8,1,__gen_e_acsl_literal_string_17);
       __e_acsl_delete_block((void *)(& process_status_8));
@@ -766,7 +766,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_9;
-      __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_9),4UL);
       __gen_e_acsl_waitpid(pid_9,& process_status_9,0);
       signal_eval(process_status_9,1,__gen_e_acsl_literal_string_18);
       __e_acsl_delete_block((void *)(& process_status_9));
@@ -781,14 +781,14 @@ int main(int argc, char const **argv)
     if (! pid_10) {
       int tmp_35;
       int tmp_36;
-      tmp_35 = __e_acsl_builtin_strncmp(cl,cr,(unsigned long)3);
-      tmp_36 = __e_acsl_builtin_strncmp(cl,cr,(unsigned long)3);
+      tmp_35 = __e_acsl_builtin_strncmp(cl,cr,(size_t)3);
+      tmp_36 = __e_acsl_builtin_strncmp(cl,cr,(size_t)3);
       fail_ncomp(tmp_36 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_35,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_10;
-      __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_10),4UL);
       __gen_e_acsl_waitpid(pid_10,& process_status_10,0);
       signal_eval(process_status_10,0,__gen_e_acsl_literal_string_19);
       __e_acsl_delete_block((void *)(& process_status_10));
@@ -800,15 +800,15 @@ int main(int argc, char const **argv)
       int tmp_38;
       int tmp_39;
       tmp_38 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)3);
+                                        (char const *)(nar),(size_t)3);
       tmp_39 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)3);
+                                        (char const *)(nar),(size_t)3);
       fail_ncomp(tmp_39 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_38,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_11;
-      __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_11),4UL);
       __gen_e_acsl_waitpid(pid_11,& process_status_11,0);
       signal_eval(process_status_11,0,__gen_e_acsl_literal_string_20);
       __e_acsl_delete_block((void *)(& process_status_11));
@@ -820,15 +820,15 @@ int main(int argc, char const **argv)
       int tmp_41;
       int tmp_42;
       tmp_41 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)3);
+                                        (size_t)3);
       tmp_42 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)3);
+                                        (size_t)3);
       fail_ncomp(tmp_42 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_41,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_12;
-      __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_12),4UL);
       __gen_e_acsl_waitpid(pid_12,& process_status_12,0);
       signal_eval(process_status_12,0,__gen_e_acsl_literal_string_21);
       __e_acsl_delete_block((void *)(& process_status_12));
@@ -840,15 +840,15 @@ int main(int argc, char const **argv)
       int tmp_44;
       int tmp_45;
       tmp_44 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)6);
+                                        (char const *)(nar),(size_t)6);
       tmp_45 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)6);
+                                        (char const *)(nar),(size_t)6);
       fail_ncomp(tmp_45 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_44,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_13;
-      __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_13),4UL);
       __gen_e_acsl_waitpid(pid_13,& process_status_13,0);
       signal_eval(process_status_13,0,__gen_e_acsl_literal_string_22);
       __e_acsl_delete_block((void *)(& process_status_13));
@@ -860,15 +860,15 @@ int main(int argc, char const **argv)
       int tmp_47;
       int tmp_48;
       tmp_47 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)6);
+                                        (size_t)6);
       tmp_48 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)6);
+                                        (size_t)6);
       fail_ncomp(tmp_48 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_47,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_14;
-      __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_14),4UL);
       __gen_e_acsl_waitpid(pid_14,& process_status_14,0);
       signal_eval(process_status_14,0,__gen_e_acsl_literal_string_23);
       __e_acsl_delete_block((void *)(& process_status_14));
@@ -881,15 +881,15 @@ int main(int argc, char const **argv)
       int tmp_50;
       int tmp_51;
       tmp_50 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)4);
+                                        (char const *)(nar),(size_t)4);
       tmp_51 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)4);
+                                        (char const *)(nar),(size_t)4);
       fail_ncomp(tmp_51 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_50,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_15;
-      __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_15),4UL);
       __gen_e_acsl_waitpid(pid_15,& process_status_15,0);
       signal_eval(process_status_15,0,__gen_e_acsl_literal_string_25);
       __e_acsl_delete_block((void *)(& process_status_15));
@@ -903,15 +903,15 @@ int main(int argc, char const **argv)
       int tmp_53;
       int tmp_54;
       tmp_53 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)4);
+                                        (char const *)(nar),(size_t)4);
       tmp_54 = __e_acsl_builtin_strncmp((char const *)(nal),
-                                        (char const *)(nar),(unsigned long)4);
+                                        (char const *)(nar),(size_t)4);
       fail_ncomp(tmp_54 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_53,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_16;
-      __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_16),4UL);
       __gen_e_acsl_waitpid(pid_16,& process_status_16,0);
       signal_eval(process_status_16,0,__gen_e_acsl_literal_string_26);
       __e_acsl_delete_block((void *)(& process_status_16));
@@ -924,15 +924,15 @@ int main(int argc, char const **argv)
       int tmp_56;
       int tmp_57;
       tmp_56 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)4);
+                                        (size_t)4);
       tmp_57 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)4);
+                                        (size_t)4);
       fail_ncomp(tmp_57 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_56,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_17;
-      __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_17),4UL);
       __gen_e_acsl_waitpid(pid_17,& process_status_17,0);
       signal_eval(process_status_17,0,__gen_e_acsl_literal_string_27);
       __e_acsl_delete_block((void *)(& process_status_17));
@@ -946,15 +946,15 @@ int main(int argc, char const **argv)
       int tmp_59;
       int tmp_60;
       tmp_59 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)4);
+                                        (size_t)4);
       tmp_60 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                        (unsigned long)4);
+                                        (size_t)4);
       fail_ncomp(tmp_60 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_59,0);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_18;
-      __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_18),4UL);
       __gen_e_acsl_waitpid(pid_18,& process_status_18,0);
       signal_eval(process_status_18,0,__gen_e_acsl_literal_string_28);
       __e_acsl_delete_block((void *)(& process_status_18));
@@ -964,12 +964,12 @@ int main(int argc, char const **argv)
     pid_t pid_19 = __gen_e_acsl_fork();
     if (! pid_19) {
       res = __e_acsl_builtin_strncmp((char const *)(nal),(char const *)(nar),
-                                     (unsigned long)5);
+                                     (size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_19;
-      __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_19),4UL);
       __gen_e_acsl_waitpid(pid_19,& process_status_19,0);
       signal_eval(process_status_19,1,__gen_e_acsl_literal_string_29);
       __e_acsl_delete_block((void *)(& process_status_19));
@@ -981,12 +981,12 @@ int main(int argc, char const **argv)
     pid_t pid_20 = __gen_e_acsl_fork();
     if (! pid_20) {
       res = __e_acsl_builtin_strncmp((char const *)(al),(char const *)(ar),
-                                     (unsigned long)5);
+                                     (size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_20;
-      __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_20),4UL);
       __gen_e_acsl_waitpid(pid_20,& process_status_20,0);
       signal_eval(process_status_20,1,__gen_e_acsl_literal_string_30);
       __e_acsl_delete_block((void *)(& process_status_20));
@@ -996,12 +996,12 @@ int main(int argc, char const **argv)
     pid_t pid_21 = __gen_e_acsl_fork();
     if (! pid_21) {
       res = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                     (unsigned long)5);
+                                     (size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_21;
-      __e_acsl_store_block((void *)(& process_status_21),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_21),4UL);
       __gen_e_acsl_waitpid(pid_21,& process_status_21,0);
       signal_eval(process_status_21,1,__gen_e_acsl_literal_string_31);
       __e_acsl_delete_block((void *)(& process_status_21));
@@ -1013,12 +1013,12 @@ int main(int argc, char const **argv)
     pid_t pid_22 = __gen_e_acsl_fork();
     if (! pid_22) {
       res = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
-                                     (unsigned long)5);
+                                     (size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_22;
-      __e_acsl_store_block((void *)(& process_status_22),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_22),4UL);
       __gen_e_acsl_waitpid(pid_22,& process_status_22,0);
       signal_eval(process_status_22,1,__gen_e_acsl_literal_string_32);
       __e_acsl_delete_block((void *)(& process_status_22));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
index e2b3df51a3a..40ab8b6fa9c 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
@@ -105,9 +105,9 @@ void test_memory_tracking(void)
 {
   {
     char dest[4];
-    __e_acsl_store_block((void *)(dest),(size_t)4);
+    __e_acsl_store_block((void *)(dest),4UL);
     char src[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src),(size_t)2);
+    __e_acsl_store_block((void *)(src),2UL);
     __e_acsl_full_init((void *)(& src));
     {
       int __gen_e_acsl_size;
@@ -262,9 +262,9 @@ void test_memory_tracking(void)
   }
   {
     char dest_0[4];
-    __e_acsl_store_block((void *)(dest_0),(size_t)4);
+    __e_acsl_store_block((void *)(dest_0),4UL);
     char src_0[4] = {(char)'a', (char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_0),(size_t)4);
+    __e_acsl_store_block((void *)(src_0),4UL);
     __e_acsl_full_init((void *)(& src_0));
     {
       int __gen_e_acsl_size_5;
@@ -342,7 +342,7 @@ void test_memory_tracking(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
     }
     /*@ assert \initialized(&src_0[0 .. 3]); */ ;
-    __e_acsl_builtin_strncpy(dest_0,(char const *)(src_0),(unsigned long)1);
+    __e_acsl_builtin_strncpy(dest_0,(char const *)(src_0),(size_t)1);
     {
       int __gen_e_acsl_initialized_7;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -410,9 +410,9 @@ void test_memory_tracking(void)
   }
   {
     char dest_1[4];
-    __e_acsl_store_block((void *)(dest_1),(size_t)4);
+    __e_acsl_store_block((void *)(dest_1),4UL);
     char src_1[4] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_1),(size_t)4);
+    __e_acsl_store_block((void *)(src_1),4UL);
     __e_acsl_full_init((void *)(& src_1));
     {
       int __gen_e_acsl_size_8;
@@ -490,7 +490,7 @@ void test_memory_tracking(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
     }
     /*@ assert \initialized(&src_1[0 .. 3]); */ ;
-    __e_acsl_builtin_strncpy(dest_1,(char const *)(src_1),(unsigned long)3);
+    __e_acsl_builtin_strncpy(dest_1,(char const *)(src_1),(size_t)3);
     {
       int __gen_e_acsl_size_10;
       int __gen_e_acsl_if_10;
@@ -589,12 +589,12 @@ char *__gen_e_acsl_strdup(char const *s)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   char *__retres;
-  __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+  __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
   __retres = strdup(s);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -680,15 +680,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -929,18 +929,18 @@ void __e_acsl_globals_init(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char empty_str[1] = {(char)'\000'};
   char *const_str = (char *)__gen_e_acsl_literal_string_6;
   char *src = __gen_e_acsl_strdup(__gen_e_acsl_literal_string_6);
-  char *dest1 = malloc((unsigned long)5);
-  char *dest2 = malloc((unsigned long)4);
+  char *dest1 = malloc((size_t)5);
+  char *dest2 = malloc((size_t)4);
   char dest3[256] =
     {(char)'a', (char)'b', (char)'c', (char)'d', (char)'\000'};
-  size_t len = (unsigned long)0;
-  char *unalloc_str = malloc((unsigned long)5);
-  char *_barrier = malloc((unsigned long)1);
+  size_t len = (size_t)0;
+  char *unalloc_str = malloc((size_t)5);
+  char *_barrier = malloc((size_t)1);
   free((void *)unalloc_str);
   {
     pid_t pid = __gen_e_acsl_fork();
@@ -950,7 +950,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status;
-      __e_acsl_store_block((void *)(& process_status),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status),4UL);
       __gen_e_acsl_waitpid(pid,& process_status,0);
       signal_eval(process_status,0,__gen_e_acsl_literal_string_7);
       __e_acsl_delete_block((void *)(& process_status));
@@ -964,7 +964,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_0;
-      __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_0),4UL);
       __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
       signal_eval(process_status_0,0,__gen_e_acsl_literal_string_9);
       __e_acsl_delete_block((void *)(& process_status_0));
@@ -978,7 +978,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_1;
-      __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_1),4UL);
       __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
       signal_eval(process_status_1,1,__gen_e_acsl_literal_string_10);
       __e_acsl_delete_block((void *)(& process_status_1));
@@ -992,7 +992,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_2;
-      __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_2),4UL);
       __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
       signal_eval(process_status_2,1,__gen_e_acsl_literal_string_11);
       __e_acsl_delete_block((void *)(& process_status_2));
@@ -1006,7 +1006,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_3;
-      __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_3),4UL);
       __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
       signal_eval(process_status_3,1,__gen_e_acsl_literal_string_12);
       __e_acsl_delete_block((void *)(& process_status_3));
@@ -1020,7 +1020,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_4;
-      __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_4),4UL);
       __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
       signal_eval(process_status_4,0,__gen_e_acsl_literal_string_13);
       __e_acsl_delete_block((void *)(& process_status_4));
@@ -1034,7 +1034,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_5;
-      __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_5),4UL);
       __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
       signal_eval(process_status_5,1,__gen_e_acsl_literal_string_14);
       __e_acsl_delete_block((void *)(& process_status_5));
@@ -1048,7 +1048,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_6;
-      __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_6),4UL);
       __gen_e_acsl_waitpid(pid_6,& process_status_6,0);
       signal_eval(process_status_6,0,__gen_e_acsl_literal_string_15);
       __e_acsl_delete_block((void *)(& process_status_6));
@@ -1062,7 +1062,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_7;
-      __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_7),4UL);
       __gen_e_acsl_waitpid(pid_7,& process_status_7,0);
       signal_eval(process_status_7,1,__gen_e_acsl_literal_string_16);
       __e_acsl_delete_block((void *)(& process_status_7));
@@ -1071,12 +1071,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_8 = __gen_e_acsl_fork();
     if (! pid_8) {
-      __e_acsl_builtin_strncpy(dest1,(char const *)src,(unsigned long)5);
+      __e_acsl_builtin_strncpy(dest1,(char const *)src,(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_8;
-      __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_8),4UL);
       __gen_e_acsl_waitpid(pid_8,& process_status_8,0);
       signal_eval(process_status_8,0,__gen_e_acsl_literal_string_17);
       __e_acsl_delete_block((void *)(& process_status_8));
@@ -1085,12 +1085,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_9 = __gen_e_acsl_fork();
     if (! pid_9) {
-      __e_acsl_builtin_strncpy(dest1,(char const *)src,(unsigned long)6);
+      __e_acsl_builtin_strncpy(dest1,(char const *)src,(size_t)6);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_9;
-      __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_9),4UL);
       __gen_e_acsl_waitpid(pid_9,& process_status_9,0);
       signal_eval(process_status_9,1,__gen_e_acsl_literal_string_18);
       __e_acsl_delete_block((void *)(& process_status_9));
@@ -1099,13 +1099,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_10 = __gen_e_acsl_fork();
     if (! pid_10) {
-      __e_acsl_builtin_strncpy(unalloc_str,(char const *)src,
-                               (unsigned long)5);
+      __e_acsl_builtin_strncpy(unalloc_str,(char const *)src,(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_10;
-      __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_10),4UL);
       __gen_e_acsl_waitpid(pid_10,& process_status_10,0);
       signal_eval(process_status_10,1,__gen_e_acsl_literal_string_19);
       __e_acsl_delete_block((void *)(& process_status_10));
@@ -1114,12 +1113,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_11 = __gen_e_acsl_fork();
     if (! pid_11) {
-      __e_acsl_builtin_strncpy(const_str,(char const *)src,(unsigned long)5);
+      __e_acsl_builtin_strncpy(const_str,(char const *)src,(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_11;
-      __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_11),4UL);
       __gen_e_acsl_waitpid(pid_11,& process_status_11,0);
       signal_eval(process_status_11,1,__gen_e_acsl_literal_string_20);
       __e_acsl_delete_block((void *)(& process_status_11));
@@ -1128,12 +1127,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_12 = __gen_e_acsl_fork();
     if (! pid_12) {
-      __e_acsl_builtin_strncpy(src,(char const *)const_str,(unsigned long)5);
+      __e_acsl_builtin_strncpy(src,(char const *)const_str,(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_12;
-      __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_12),4UL);
       __gen_e_acsl_waitpid(pid_12,& process_status_12,0);
       signal_eval(process_status_12,0,__gen_e_acsl_literal_string_21);
       __e_acsl_delete_block((void *)(& process_status_12));
@@ -1142,12 +1141,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_13 = __gen_e_acsl_fork();
     if (! pid_13) {
-      __e_acsl_builtin_strncpy(src,(char const *)src,(unsigned long)5);
+      __e_acsl_builtin_strncpy(src,(char const *)src,(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_13;
-      __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_13),4UL);
       __gen_e_acsl_waitpid(pid_13,& process_status_13,0);
       signal_eval(process_status_13,1,__gen_e_acsl_literal_string_22);
       __e_acsl_delete_block((void *)(& process_status_13));
@@ -1156,13 +1155,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_14 = __gen_e_acsl_fork();
     if (! pid_14) {
-      __e_acsl_builtin_strncpy(& dest3[5],(char const *)(dest3),
-                               (unsigned long)5);
+      __e_acsl_builtin_strncpy(& dest3[5],(char const *)(dest3),(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_14;
-      __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_14),4UL);
       __gen_e_acsl_waitpid(pid_14,& process_status_14,0);
       signal_eval(process_status_14,0,__gen_e_acsl_literal_string_23);
       __e_acsl_delete_block((void *)(& process_status_14));
@@ -1171,13 +1169,12 @@ int main(int argc, char const **argv)
   {
     pid_t pid_15 = __gen_e_acsl_fork();
     if (! pid_15) {
-      __e_acsl_builtin_strncpy(& dest3[4],(char const *)(dest3),
-                               (unsigned long)5);
+      __e_acsl_builtin_strncpy(& dest3[4],(char const *)(dest3),(size_t)5);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_15;
-      __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_15),4UL);
       __gen_e_acsl_waitpid(pid_15,& process_status_15,0);
       signal_eval(process_status_15,1,__gen_e_acsl_literal_string_24);
       __e_acsl_delete_block((void *)(& process_status_15));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
index ffcc52912c6..0c6854b4d1c 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
@@ -129,12 +129,12 @@ char *__gen_e_acsl_strdup(char const *s)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   char *__retres;
-  __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+  __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
   __retres = strdup(s);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -220,15 +220,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -447,7 +447,7 @@ int main(int argc, char const **argv)
 {
   int __retres;
   int len;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *empty_str = (char *)__gen_e_acsl_literal_string_6;
   char *heap_str = __gen_e_acsl_strdup(__gen_e_acsl_literal_string_7);
@@ -472,7 +472,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status;
-      __e_acsl_store_block((void *)(& process_status),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status),4UL);
       __gen_e_acsl_waitpid(pid,& process_status,0);
       signal_eval(process_status,0,__gen_e_acsl_literal_string_9);
       __e_acsl_delete_block((void *)(& process_status));
@@ -489,7 +489,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_0;
-      __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_0),4UL);
       __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
       signal_eval(process_status_0,0,__gen_e_acsl_literal_string_10);
       __e_acsl_delete_block((void *)(& process_status_0));
@@ -506,7 +506,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_1;
-      __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_1),4UL);
       __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
       signal_eval(process_status_1,0,__gen_e_acsl_literal_string_11);
       __e_acsl_delete_block((void *)(& process_status_1));
@@ -523,7 +523,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_2;
-      __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_2),4UL);
       __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
       signal_eval(process_status_2,0,__gen_e_acsl_literal_string_12);
       __e_acsl_delete_block((void *)(& process_status_2));
@@ -542,7 +542,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_3;
-      __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_3),4UL);
       __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
       signal_eval(process_status_3,1,__gen_e_acsl_literal_string_13);
       __e_acsl_delete_block((void *)(& process_status_3));
@@ -559,7 +559,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_4;
-      __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_4),4UL);
       __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
       signal_eval(process_status_4,1,__gen_e_acsl_literal_string_14);
       __e_acsl_delete_block((void *)(& process_status_4));
@@ -577,7 +577,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_5;
-      __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_5),4UL);
       __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
       signal_eval(process_status_5,1,__gen_e_acsl_literal_string_15);
       __e_acsl_delete_block((void *)(& process_status_5));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
index f3a95efc32f..049eb3209e4 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
@@ -160,11 +160,11 @@ void *write_value(void *arg)
   int tmp;
   int tmp_0;
   int tmp_1;
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp),(size_t)4);
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& tmp_1),4UL);
+  __e_acsl_store_block((void *)(& tmp_0),4UL);
+  __e_acsl_store_block((void *)(& tmp),4UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   __e_acsl_full_init((void *)(& tmp));
   tmp = __gen_e_acsl_pthread_mutex_lock(& write_mutex);
   if (tmp != 0) {
@@ -184,9 +184,9 @@ void *write_value(void *arg)
     __gen_e_acsl_perror(__gen_e_acsl_literal_string_3);
     __gen_e_acsl_exit(1);
   }
-  __gen_e_acsl_usleep((unsigned int)100);
+  __gen_e_acsl_usleep((useconds_t)100);
   int idx = *((int *)arg);
-  __e_acsl_store_block((void *)(& idx),(size_t)4);
+  __e_acsl_store_block((void *)(& idx),4UL);
   __e_acsl_full_init((void *)(& idx));
   __e_acsl_initialize((void *)(& values[idx]),sizeof(int *));
   values[idx] = (int *)malloc(sizeof(int));
@@ -215,11 +215,11 @@ void *read_value(void *arg)
   int tmp;
   int tmp_0;
   int tmp_1;
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp),(size_t)4);
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& tmp_1),4UL);
+  __e_acsl_store_block((void *)(& tmp_0),4UL);
+  __e_acsl_store_block((void *)(& tmp),4UL);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   __e_acsl_full_init((void *)(& tmp));
   tmp = __gen_e_acsl_pthread_mutex_lock(& read_mutex);
   if (tmp != 0) {
@@ -239,7 +239,7 @@ void *read_value(void *arg)
     __gen_e_acsl_perror(__gen_e_acsl_literal_string_6);
     __gen_e_acsl_exit(1);
   }
-  __gen_e_acsl_usleep((unsigned int)100);
+  __gen_e_acsl_usleep((useconds_t)100);
   {
     int __gen_e_acsl_idx;
     int __gen_e_acsl_initialized;
@@ -355,7 +355,7 @@ void *read_value(void *arg)
   */
   {
     int idx = *((int *)arg);
-    __e_acsl_store_block((void *)(& idx),(size_t)4);
+    __e_acsl_store_block((void *)(& idx),4UL);
     __e_acsl_full_init((void *)(& idx));
     {
       int __gen_e_acsl_initialized_3;
@@ -478,13 +478,13 @@ void *read_value(void *arg)
 void *__gen_e_acsl_read_value(void *arg)
 {
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_idx;
     int __gen_e_acsl_initialized;
     int __gen_e_acsl_and;
     int __gen_e_acsl_and_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*((int *)arg)",
                                  0,*((int *)arg));
@@ -603,8 +603,8 @@ void *__gen_e_acsl_write_value(void *arg)
 {
   void *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   __gen_e_acsl_at = arg;
   __retres = write_value(arg);
   {
@@ -731,8 +731,8 @@ void *__gen_e_acsl_write_value(void *arg)
 int __gen_e_acsl_usleep(useconds_t usec)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
-  __e_acsl_store_block((void *)(& usec),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
+  __e_acsl_store_block((void *)(& usec),4UL);
   __retres = usleep(usec);
   {
     int __gen_e_acsl_or;
@@ -767,7 +767,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
  */
 void __gen_e_acsl_exit(int status)
 {
-  __e_acsl_store_block((void *)(& status),(size_t)4);
+  __e_acsl_store_block((void *)(& status),4UL);
   exit(status);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -790,7 +790,7 @@ void __gen_e_acsl_exit(int status)
  */
 void __gen_e_acsl_perror(char const *s)
 {
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   perror(s);
   __e_acsl_delete_block((void *)(& s));
   return;
@@ -805,10 +805,10 @@ void __gen_e_acsl_perror(char const *s)
 int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
                                  (void *)mutex);
@@ -869,10 +869,10 @@ int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
 int __gen_e_acsl_pthread_mutex_lock(pthread_mutex_t *mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
                                  (void *)mutex);
@@ -951,12 +951,12 @@ int __gen_e_acsl_pthread_mutex_init(pthread_mutex_t * restrict mutex,
 {
   pthread_mutex_t *__gen_e_acsl_at;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
-    __e_acsl_store_block((void *)(& attrs),(size_t)8);
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& attrs),8UL);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __gen_e_acsl_at = mutex;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
@@ -1098,13 +1098,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_or;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& retval),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)4);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& retval),8UL);
+    __e_acsl_store_block((void *)(& thread),4UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
                                  (void *)retval);
@@ -1130,11 +1130,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
     __gen_e_acsl_assert_data.name = "valid_or_null_retval";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            retval == (void **)0);
     __gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
                                           (void *)retval,(void *)(& retval));
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_valid_2);
   }
   __retres = pthread_join(thread,retval);
@@ -1198,15 +1198,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
                                 void * restrict arg)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
     int __gen_e_acsl_or_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
-    __e_acsl_store_block((void *)(& start_routine),(size_t)8);
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
+    __e_acsl_store_block((void *)(& start_routine),8UL);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& thread),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
                                  (void *)thread);
@@ -1336,12 +1336,12 @@ int __gen_e_acsl_pthread_cond_wait(pthread_cond_t * restrict cond,
                                    pthread_mutex_t * restrict mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
                                  (void *)cond);
@@ -1418,12 +1418,12 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
 {
   pthread_cond_t *__gen_e_acsl_at;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __gen_e_acsl_at = cond;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
@@ -1527,10 +1527,10 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
 int __gen_e_acsl_pthread_cond_broadcast(pthread_cond_t *cond)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
                                  (void *)cond);
@@ -1647,127 +1647,121 @@ void __e_acsl_globals_init(void)
                          sizeof("Unable to broadcast to read cond var"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_14);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_14);
-    __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_read_value));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_write_value));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_usleep));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_exit),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_exit),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_exit));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_perror),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_perror),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_perror));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_unlock));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_lock));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_init));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_wait));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_init));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_broadcast));
-    __e_acsl_store_block((void *)(& read_value),(size_t)1);
+    __e_acsl_store_block((void *)(& read_value),1UL);
     __e_acsl_full_init((void *)(& read_value));
-    __e_acsl_store_block((void *)(& write_value),(size_t)1);
+    __e_acsl_store_block((void *)(& write_value),1UL);
     __e_acsl_full_init((void *)(& write_value));
-    __e_acsl_store_block((void *)(& read_mutex),(size_t)4);
+    __e_acsl_store_block((void *)(& read_mutex),4UL);
     __e_acsl_full_init((void *)(& read_mutex));
-    __e_acsl_store_block((void *)(& write_mutex),(size_t)4);
+    __e_acsl_store_block((void *)(& write_mutex),4UL);
     __e_acsl_full_init((void *)(& write_mutex));
-    __e_acsl_store_block((void *)(& read_cond),(size_t)4);
+    __e_acsl_store_block((void *)(& read_cond),4UL);
     __e_acsl_full_init((void *)(& read_cond));
-    __e_acsl_store_block((void *)(& write_cond),(size_t)4);
+    __e_acsl_store_block((void *)(& write_cond),4UL);
     __e_acsl_full_init((void *)(& write_cond));
-    __e_acsl_store_block((void *)(& read_count),(size_t)4);
+    __e_acsl_store_block((void *)(& read_count),4UL);
     __e_acsl_full_init((void *)(& read_count));
-    __e_acsl_store_block((void *)(& write_count),(size_t)4);
+    __e_acsl_store_block((void *)(& write_count),4UL);
     __e_acsl_full_init((void *)(& write_count));
-    __e_acsl_store_block((void *)(values),(size_t)80);
+    __e_acsl_store_block((void *)(values),80UL);
     __e_acsl_full_init((void *)(& values));
-    __e_acsl_store_block((void *)(& usleep),(size_t)1);
+    __e_acsl_store_block((void *)(& usleep),1UL);
     __e_acsl_full_init((void *)(& usleep));
-    __e_acsl_store_block((void *)(& __fc_p_ttyname),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ttyname),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ttyname));
-    __e_acsl_store_block((void *)(ttyname),(size_t)32);
+    __e_acsl_store_block((void *)(ttyname),32UL);
     __e_acsl_full_init((void *)(& ttyname));
-    __e_acsl_store_block((void *)(& Frama_C_entropy_source),(size_t)4);
+    __e_acsl_store_block((void *)(& Frama_C_entropy_source),4UL);
     __e_acsl_full_init((void *)(& Frama_C_entropy_source));
-    __e_acsl_store_block((void *)(& exit),(size_t)1);
+    __e_acsl_store_block((void *)(& exit),1UL);
     __e_acsl_full_init((void *)(& exit));
-    __e_acsl_store_block((void *)(& free),(size_t)1);
+    __e_acsl_store_block((void *)(& free),1UL);
     __e_acsl_full_init((void *)(& free));
-    __e_acsl_store_block((void *)(& malloc),(size_t)1);
+    __e_acsl_store_block((void *)(& malloc),1UL);
     __e_acsl_full_init((void *)(& malloc));
-    __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
     __e_acsl_full_init((void *)(& __fc_p_random48_counter));
-    __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+    __e_acsl_store_block((void *)(random48_counter),6UL);
     __e_acsl_full_init((void *)(& random48_counter));
-    __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
     __e_acsl_full_init((void *)(& __fc_random48_init));
-    __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
     __e_acsl_full_init((void *)(& __fc_rand_max));
-    __e_acsl_store_block((void *)(& perror),(size_t)1);
+    __e_acsl_store_block((void *)(& perror),1UL);
     __e_acsl_full_init((void *)(& perror));
-    __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
     __e_acsl_full_init((void *)(& __fc_p_tmpnam));
-    __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+    __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
     __e_acsl_full_init((void *)(& __fc_tmpnam));
-    __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
     __e_acsl_full_init((void *)(& __fc_p_fopen));
-    __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+    __e_acsl_store_block((void *)(__fc_fopen),128UL);
     __e_acsl_full_init((void *)(& __fc_fopen));
-    __e_acsl_store_block((void *)(& stdout),(size_t)8);
+    __e_acsl_store_block((void *)(& stdout),8UL);
     __e_acsl_full_init((void *)(& stdout));
-    __e_acsl_store_block((void *)(& stdin),(size_t)8);
+    __e_acsl_store_block((void *)(& stdin),8UL);
     __e_acsl_full_init((void *)(& stdin));
-    __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
     __e_acsl_full_init((void *)(& __fc_interrupted));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
-    __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
-    __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+    __e_acsl_store_block((void *)(__fc_ctime),26UL);
     __e_acsl_full_init((void *)(& __fc_ctime));
-    __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_time),4UL);
     __e_acsl_full_init((void *)(& __fc_time));
-    __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
     __e_acsl_full_init((void *)(& __fc_p_sigaction));
-    __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+    __e_acsl_store_block((void *)(sigaction),2080UL);
     __e_acsl_full_init((void *)(& sigaction));
-    __e_acsl_store_block((void *)(& pthread_mutex_unlock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_unlock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_unlock));
-    __e_acsl_store_block((void *)(& pthread_mutex_trylock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_trylock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_trylock));
-    __e_acsl_store_block((void *)(& pthread_mutex_lock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_lock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_lock));
-    __e_acsl_store_block((void *)(& pthread_mutex_init),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_init),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_init));
-    __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_join),1UL);
     __e_acsl_full_init((void *)(& pthread_join));
-    __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_create),1UL);
     __e_acsl_full_init((void *)(& pthread_create));
-    __e_acsl_store_block((void *)(& pthread_cond_wait),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_wait),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_wait));
-    __e_acsl_store_block((void *)(& pthread_cond_init),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_init),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_init));
-    __e_acsl_store_block((void *)(& pthread_cond_broadcast),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_broadcast),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_broadcast));
-    __e_acsl_store_block((void *)(& errno),(size_t)4);
+    __e_acsl_store_block((void *)(& errno),4UL);
     __e_acsl_full_init((void *)(& errno));
   }
   return;
@@ -1848,18 +1842,18 @@ int main(void)
   int tmp_2;
   int tmp_5;
   int tmp_6;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& tmp_6),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_5),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_2),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp),(size_t)4);
-  __e_acsl_store_block((void *)(args),(size_t)40);
-  __e_acsl_store_block((void *)(readers),(size_t)40);
-  __e_acsl_store_block((void *)(writers),(size_t)40);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& tmp_6),4UL);
+  __e_acsl_store_block((void *)(& tmp_5),4UL);
+  __e_acsl_store_block((void *)(& tmp_2),4UL);
+  __e_acsl_store_block((void *)(& tmp_1),4UL);
+  __e_acsl_store_block((void *)(& tmp_0),4UL);
+  __e_acsl_store_block((void *)(& tmp),4UL);
+  __e_acsl_store_block((void *)(args),40UL);
+  __e_acsl_store_block((void *)(readers),40UL);
+  __e_acsl_store_block((void *)(writers),40UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   __e_acsl_full_init((void *)(& tmp));
   tmp = __gen_e_acsl_pthread_mutex_init(& write_mutex,
                                         (pthread_mutexattr_t const *)0);
@@ -1890,7 +1884,7 @@ int main(void)
   }
   {
     int i = 0;
-    __e_acsl_store_block((void *)(& i),(size_t)4);
+    __e_acsl_store_block((void *)(& i),4UL);
     __e_acsl_full_init((void *)(& i));
     while (i < 10) {
       __e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -1908,11 +1902,11 @@ int main(void)
   }
   while (1) {
     int res = pthread_mutex_trylock(& write_mutex);
-    __e_acsl_store_block((void *)(& res),(size_t)4);
+    __e_acsl_store_block((void *)(& res),4UL);
     __e_acsl_full_init((void *)(& res));
     if (res == 0) {
       int done = write_count == 10;
-      __e_acsl_store_block((void *)(& done),(size_t)4);
+      __e_acsl_store_block((void *)(& done),4UL);
       __e_acsl_full_init((void *)(& done));
       __gen_e_acsl_pthread_mutex_unlock(& write_mutex);
       if (done) {
@@ -1924,16 +1918,16 @@ int main(void)
     }
     else 
       if (res != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_11);
-    __gen_e_acsl_usleep((unsigned int)100);
+    __gen_e_acsl_usleep((useconds_t)100);
     __e_acsl_delete_block((void *)(& res));
   }
   while (1) {
     int res_0 = pthread_mutex_trylock(& read_mutex);
-    __e_acsl_store_block((void *)(& res_0),(size_t)4);
+    __e_acsl_store_block((void *)(& res_0),4UL);
     __e_acsl_full_init((void *)(& res_0));
     if (res_0 == 0) {
       int done_0 = read_count == 10;
-      __e_acsl_store_block((void *)(& done_0),(size_t)4);
+      __e_acsl_store_block((void *)(& done_0),4UL);
       __e_acsl_full_init((void *)(& done_0));
       __gen_e_acsl_pthread_mutex_unlock(& read_mutex);
       if (done_0) {
@@ -1945,7 +1939,7 @@ int main(void)
     }
     else 
       if (res_0 != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_12);
-    __gen_e_acsl_usleep((unsigned int)100);
+    __gen_e_acsl_usleep((useconds_t)100);
     __e_acsl_delete_block((void *)(& res_0));
   }
   __e_acsl_full_init((void *)(& tmp_5));
@@ -1956,7 +1950,7 @@ int main(void)
   }
   {
     int i_0 = 0;
-    __e_acsl_store_block((void *)(& i_0),(size_t)4);
+    __e_acsl_store_block((void *)(& i_0),4UL);
     __e_acsl_full_init((void *)(& i_0));
     while (i_0 < 10) {
       __gen_e_acsl_pthread_join(writers[i_0],(void **)0);
@@ -1973,7 +1967,7 @@ int main(void)
   }
   {
     int i_1 = 0;
-    __e_acsl_store_block((void *)(& i_1),(size_t)4);
+    __e_acsl_store_block((void *)(& i_1),4UL);
     __e_acsl_full_init((void *)(& i_1));
     while (i_1 < 10) {
       __gen_e_acsl_pthread_join(readers[i_1],(void **)0);
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
index bd02dd0355d..d6bbeca06f8 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
@@ -50,10 +50,10 @@ int *values[10];
 void *write_value(void *arg)
 {
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   int idx = *((int *)arg);
-  __e_acsl_store_block((void *)(& idx),(size_t)4);
+  __e_acsl_store_block((void *)(& idx),4UL);
   __e_acsl_full_init((void *)(& idx));
   __e_acsl_initialize((void *)(& values[idx]),sizeof(int *));
   values[idx] = (int *)malloc(sizeof(int));
@@ -70,10 +70,10 @@ void *write_value(void *arg)
 void *read_value(void *arg)
 {
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   int idx = *((int *)arg);
-  __e_acsl_store_block((void *)(& idx),(size_t)4);
+  __e_acsl_store_block((void *)(& idx),4UL);
   __e_acsl_full_init((void *)(& idx));
   {
     int __gen_e_acsl_initialized;
@@ -202,13 +202,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_or;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& retval),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)4);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& retval),8UL);
+    __e_acsl_store_block((void *)(& thread),4UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
                                  (void *)retval);
@@ -234,11 +234,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
     __gen_e_acsl_assert_data.name = "valid_or_null_retval";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            retval == (void **)0);
     __gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
                                           (void *)retval,(void *)(& retval));
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_valid_2);
   }
   __retres = pthread_join(thread,retval);
@@ -302,15 +302,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
                                 void * restrict arg)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
     int __gen_e_acsl_or_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
-    __e_acsl_store_block((void *)(& start_routine),(size_t)8);
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
+    __e_acsl_store_block((void *)(& start_routine),8UL);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& thread),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
                                  (void *)thread);
@@ -435,47 +435,47 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
-    __e_acsl_store_block((void *)(& read_value),(size_t)1);
+    __e_acsl_store_block((void *)(& read_value),1UL);
     __e_acsl_full_init((void *)(& read_value));
-    __e_acsl_store_block((void *)(& write_value),(size_t)1);
+    __e_acsl_store_block((void *)(& write_value),1UL);
     __e_acsl_full_init((void *)(& write_value));
-    __e_acsl_store_block((void *)(values),(size_t)80);
+    __e_acsl_store_block((void *)(values),80UL);
     __e_acsl_full_init((void *)(& values));
-    __e_acsl_store_block((void *)(& free),(size_t)1);
+    __e_acsl_store_block((void *)(& free),1UL);
     __e_acsl_full_init((void *)(& free));
-    __e_acsl_store_block((void *)(& malloc),(size_t)1);
+    __e_acsl_store_block((void *)(& malloc),1UL);
     __e_acsl_full_init((void *)(& malloc));
-    __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
     __e_acsl_full_init((void *)(& __fc_p_random48_counter));
-    __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+    __e_acsl_store_block((void *)(random48_counter),6UL);
     __e_acsl_full_init((void *)(& random48_counter));
-    __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
     __e_acsl_full_init((void *)(& __fc_random48_init));
-    __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
     __e_acsl_full_init((void *)(& __fc_rand_max));
-    __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
     __e_acsl_full_init((void *)(& __fc_interrupted));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
-    __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
-    __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+    __e_acsl_store_block((void *)(__fc_ctime),26UL);
     __e_acsl_full_init((void *)(& __fc_ctime));
-    __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_time),4UL);
     __e_acsl_full_init((void *)(& __fc_time));
-    __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
     __e_acsl_full_init((void *)(& __fc_p_sigaction));
-    __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+    __e_acsl_store_block((void *)(sigaction),2080UL);
     __e_acsl_full_init((void *)(& sigaction));
-    __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_join),1UL);
     __e_acsl_full_init((void *)(& pthread_join));
-    __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_create),1UL);
     __e_acsl_full_init((void *)(& pthread_create));
   }
   return;
@@ -512,14 +512,14 @@ int main(void)
   int __retres;
   pthread_t t;
   int args[10];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(args),(size_t)40);
-  __e_acsl_store_block((void *)(& t),(size_t)4);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(args),40UL);
+  __e_acsl_store_block((void *)(& t),4UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int i = 0;
-    __e_acsl_store_block((void *)(& i),(size_t)4);
+    __e_acsl_store_block((void *)(& i),4UL);
     __e_acsl_full_init((void *)(& i));
     while (i < 10) {
       __e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -534,7 +534,7 @@ int main(void)
   }
   {
     int i_0 = 0;
-    __e_acsl_store_block((void *)(& i_0),(size_t)4);
+    __e_acsl_store_block((void *)(& i_0),4UL);
     __e_acsl_full_init((void *)(& i_0));
     while (i_0 < 10) {
       __gen_e_acsl_pthread_create(& t,(pthread_attr_t const *)0,& read_value,
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
index 36848cfe9d2..2f1969b6af0 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
@@ -160,13 +160,13 @@ void *__gen_e_acsl_read_value(void *arg);
 void *__gen_e_acsl_read_value(void *arg)
 {
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_idx;
     int __gen_e_acsl_initialized;
     int __gen_e_acsl_and;
     int __gen_e_acsl_and_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*((int *)arg)",
                                  0,*((int *)arg));
@@ -285,8 +285,8 @@ void *__gen_e_acsl_write_value(void *arg)
 {
   void *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& arg),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& arg),8UL);
   __gen_e_acsl_at = arg;
   __retres = write_value(arg);
   {
@@ -413,8 +413,8 @@ void *__gen_e_acsl_write_value(void *arg)
 int __gen_e_acsl_usleep(useconds_t usec)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
-  __e_acsl_store_block((void *)(& usec),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
+  __e_acsl_store_block((void *)(& usec),4UL);
   __retres = usleep(usec);
   {
     int __gen_e_acsl_or;
@@ -449,7 +449,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
  */
 void __gen_e_acsl_exit(int status)
 {
-  __e_acsl_store_block((void *)(& status),(size_t)4);
+  __e_acsl_store_block((void *)(& status),4UL);
   exit(status);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -472,7 +472,7 @@ void __gen_e_acsl_exit(int status)
  */
 void __gen_e_acsl_perror(char const *s)
 {
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   perror(s);
   __e_acsl_delete_block((void *)(& s));
   return;
@@ -487,10 +487,10 @@ void __gen_e_acsl_perror(char const *s)
 int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
                                  (void *)mutex);
@@ -551,10 +551,10 @@ int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
 int __gen_e_acsl_pthread_mutex_lock(pthread_mutex_t *mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
                                  (void *)mutex);
@@ -633,12 +633,12 @@ int __gen_e_acsl_pthread_mutex_init(pthread_mutex_t * restrict mutex,
 {
   pthread_mutex_t *__gen_e_acsl_at;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
-    __e_acsl_store_block((void *)(& attrs),(size_t)8);
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
+    __e_acsl_store_block((void *)(& attrs),8UL);
+    __e_acsl_store_block((void *)(& mutex),8UL);
     __gen_e_acsl_at = mutex;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
@@ -780,13 +780,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_or;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& retval),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)4);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& retval),8UL);
+    __e_acsl_store_block((void *)(& thread),4UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
                                  (void *)retval);
@@ -812,11 +812,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
     __gen_e_acsl_assert_data.name = "valid_or_null_retval";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            retval == (void **)0);
     __gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
                                           (void *)retval,(void *)(& retval));
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_valid_2);
   }
   __retres = pthread_join(thread,retval);
@@ -880,15 +880,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
                                 void * restrict arg)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
     int __gen_e_acsl_or_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
-    __e_acsl_store_block((void *)(& start_routine),(size_t)8);
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
+    __e_acsl_store_block((void *)(& start_routine),8UL);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& thread),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
                                  (void *)thread);
@@ -1018,12 +1018,12 @@ int __gen_e_acsl_pthread_cond_wait(pthread_cond_t * restrict cond,
                                    pthread_mutex_t * restrict mutex)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& mutex),(size_t)8);
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& mutex),8UL);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
                                  (void *)cond);
@@ -1100,12 +1100,12 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
 {
   pthread_cond_t *__gen_e_acsl_at;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __gen_e_acsl_at = cond;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
@@ -1209,10 +1209,10 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
 int __gen_e_acsl_pthread_cond_broadcast(pthread_cond_t *cond)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& cond),(size_t)8);
+    __e_acsl_store_block((void *)(& cond),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
                                  (void *)cond);
@@ -1329,127 +1329,121 @@ void __e_acsl_globals_init(void)
                          sizeof("Unable to broadcast to read cond var"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_14);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_14);
-    __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_read_value));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_write_value));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_usleep));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_exit),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_exit),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_exit));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_perror),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_perror),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_perror));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_unlock));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_lock));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_init));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_wait));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_init));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),
-                         (size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_broadcast));
-    __e_acsl_store_block((void *)(& read_value),(size_t)1);
+    __e_acsl_store_block((void *)(& read_value),1UL);
     __e_acsl_full_init((void *)(& read_value));
-    __e_acsl_store_block((void *)(& write_value),(size_t)1);
+    __e_acsl_store_block((void *)(& write_value),1UL);
     __e_acsl_full_init((void *)(& write_value));
-    __e_acsl_store_block((void *)(& read_mutex),(size_t)4);
+    __e_acsl_store_block((void *)(& read_mutex),4UL);
     __e_acsl_full_init((void *)(& read_mutex));
-    __e_acsl_store_block((void *)(& write_mutex),(size_t)4);
+    __e_acsl_store_block((void *)(& write_mutex),4UL);
     __e_acsl_full_init((void *)(& write_mutex));
-    __e_acsl_store_block((void *)(& read_cond),(size_t)4);
+    __e_acsl_store_block((void *)(& read_cond),4UL);
     __e_acsl_full_init((void *)(& read_cond));
-    __e_acsl_store_block((void *)(& write_cond),(size_t)4);
+    __e_acsl_store_block((void *)(& write_cond),4UL);
     __e_acsl_full_init((void *)(& write_cond));
-    __e_acsl_store_block((void *)(& read_count),(size_t)4);
+    __e_acsl_store_block((void *)(& read_count),4UL);
     __e_acsl_full_init((void *)(& read_count));
-    __e_acsl_store_block((void *)(& write_count),(size_t)4);
+    __e_acsl_store_block((void *)(& write_count),4UL);
     __e_acsl_full_init((void *)(& write_count));
-    __e_acsl_store_block((void *)(values),(size_t)80);
+    __e_acsl_store_block((void *)(values),80UL);
     __e_acsl_full_init((void *)(& values));
-    __e_acsl_store_block((void *)(& usleep),(size_t)1);
+    __e_acsl_store_block((void *)(& usleep),1UL);
     __e_acsl_full_init((void *)(& usleep));
-    __e_acsl_store_block((void *)(& __fc_p_ttyname),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ttyname),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ttyname));
-    __e_acsl_store_block((void *)(ttyname),(size_t)32);
+    __e_acsl_store_block((void *)(ttyname),32UL);
     __e_acsl_full_init((void *)(& ttyname));
-    __e_acsl_store_block((void *)(& Frama_C_entropy_source),(size_t)4);
+    __e_acsl_store_block((void *)(& Frama_C_entropy_source),4UL);
     __e_acsl_full_init((void *)(& Frama_C_entropy_source));
-    __e_acsl_store_block((void *)(& exit),(size_t)1);
+    __e_acsl_store_block((void *)(& exit),1UL);
     __e_acsl_full_init((void *)(& exit));
-    __e_acsl_store_block((void *)(& free),(size_t)1);
+    __e_acsl_store_block((void *)(& free),1UL);
     __e_acsl_full_init((void *)(& free));
-    __e_acsl_store_block((void *)(& malloc),(size_t)1);
+    __e_acsl_store_block((void *)(& malloc),1UL);
     __e_acsl_full_init((void *)(& malloc));
-    __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
     __e_acsl_full_init((void *)(& __fc_p_random48_counter));
-    __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+    __e_acsl_store_block((void *)(random48_counter),6UL);
     __e_acsl_full_init((void *)(& random48_counter));
-    __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
     __e_acsl_full_init((void *)(& __fc_random48_init));
-    __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
     __e_acsl_full_init((void *)(& __fc_rand_max));
-    __e_acsl_store_block((void *)(& perror),(size_t)1);
+    __e_acsl_store_block((void *)(& perror),1UL);
     __e_acsl_full_init((void *)(& perror));
-    __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
     __e_acsl_full_init((void *)(& __fc_p_tmpnam));
-    __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+    __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
     __e_acsl_full_init((void *)(& __fc_tmpnam));
-    __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
     __e_acsl_full_init((void *)(& __fc_p_fopen));
-    __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+    __e_acsl_store_block((void *)(__fc_fopen),128UL);
     __e_acsl_full_init((void *)(& __fc_fopen));
-    __e_acsl_store_block((void *)(& stdout),(size_t)8);
+    __e_acsl_store_block((void *)(& stdout),8UL);
     __e_acsl_full_init((void *)(& stdout));
-    __e_acsl_store_block((void *)(& stdin),(size_t)8);
+    __e_acsl_store_block((void *)(& stdin),8UL);
     __e_acsl_full_init((void *)(& stdin));
-    __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
     __e_acsl_full_init((void *)(& __fc_interrupted));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
-    __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
-    __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+    __e_acsl_store_block((void *)(__fc_ctime),26UL);
     __e_acsl_full_init((void *)(& __fc_ctime));
-    __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_time),4UL);
     __e_acsl_full_init((void *)(& __fc_time));
-    __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
     __e_acsl_full_init((void *)(& __fc_p_sigaction));
-    __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+    __e_acsl_store_block((void *)(sigaction),2080UL);
     __e_acsl_full_init((void *)(& sigaction));
-    __e_acsl_store_block((void *)(& pthread_mutex_unlock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_unlock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_unlock));
-    __e_acsl_store_block((void *)(& pthread_mutex_trylock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_trylock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_trylock));
-    __e_acsl_store_block((void *)(& pthread_mutex_lock),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_lock),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_lock));
-    __e_acsl_store_block((void *)(& pthread_mutex_init),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_mutex_init),1UL);
     __e_acsl_full_init((void *)(& pthread_mutex_init));
-    __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_join),1UL);
     __e_acsl_full_init((void *)(& pthread_join));
-    __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_create),1UL);
     __e_acsl_full_init((void *)(& pthread_create));
-    __e_acsl_store_block((void *)(& pthread_cond_wait),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_wait),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_wait));
-    __e_acsl_store_block((void *)(& pthread_cond_init),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_init),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_init));
-    __e_acsl_store_block((void *)(& pthread_cond_broadcast),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_cond_broadcast),1UL);
     __e_acsl_full_init((void *)(& pthread_cond_broadcast));
-    __e_acsl_store_block((void *)(& errno),(size_t)4);
+    __e_acsl_store_block((void *)(& errno),4UL);
     __e_acsl_full_init((void *)(& errno));
   }
   return;
@@ -1530,18 +1524,18 @@ int main(void)
   int tmp_2;
   int tmp_5;
   int tmp_6;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& tmp_6),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_5),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_2),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
-  __e_acsl_store_block((void *)(& tmp),(size_t)4);
-  __e_acsl_store_block((void *)(args),(size_t)40);
-  __e_acsl_store_block((void *)(readers),(size_t)40);
-  __e_acsl_store_block((void *)(writers),(size_t)40);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& tmp_6),4UL);
+  __e_acsl_store_block((void *)(& tmp_5),4UL);
+  __e_acsl_store_block((void *)(& tmp_2),4UL);
+  __e_acsl_store_block((void *)(& tmp_1),4UL);
+  __e_acsl_store_block((void *)(& tmp_0),4UL);
+  __e_acsl_store_block((void *)(& tmp),4UL);
+  __e_acsl_store_block((void *)(args),40UL);
+  __e_acsl_store_block((void *)(readers),40UL);
+  __e_acsl_store_block((void *)(writers),40UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   __e_acsl_full_init((void *)(& tmp));
   tmp = __gen_e_acsl_pthread_mutex_init(& write_mutex,
                                         (pthread_mutexattr_t const *)0);
@@ -1572,7 +1566,7 @@ int main(void)
   }
   {
     int i = 0;
-    __e_acsl_store_block((void *)(& i),(size_t)4);
+    __e_acsl_store_block((void *)(& i),4UL);
     __e_acsl_full_init((void *)(& i));
     while (i < 10) {
       __e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -1590,11 +1584,11 @@ int main(void)
   }
   while (1) {
     int res = pthread_mutex_trylock(& write_mutex);
-    __e_acsl_store_block((void *)(& res),(size_t)4);
+    __e_acsl_store_block((void *)(& res),4UL);
     __e_acsl_full_init((void *)(& res));
     if (res == 0) {
       int done = write_count == 10;
-      __e_acsl_store_block((void *)(& done),(size_t)4);
+      __e_acsl_store_block((void *)(& done),4UL);
       __e_acsl_full_init((void *)(& done));
       __gen_e_acsl_pthread_mutex_unlock(& write_mutex);
       if (done) {
@@ -1606,16 +1600,16 @@ int main(void)
     }
     else 
       if (res != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_11);
-    __gen_e_acsl_usleep((unsigned int)100);
+    __gen_e_acsl_usleep((useconds_t)100);
     __e_acsl_delete_block((void *)(& res));
   }
   while (1) {
     int res_0 = pthread_mutex_trylock(& read_mutex);
-    __e_acsl_store_block((void *)(& res_0),(size_t)4);
+    __e_acsl_store_block((void *)(& res_0),4UL);
     __e_acsl_full_init((void *)(& res_0));
     if (res_0 == 0) {
       int done_0 = read_count == 10;
-      __e_acsl_store_block((void *)(& done_0),(size_t)4);
+      __e_acsl_store_block((void *)(& done_0),4UL);
       __e_acsl_full_init((void *)(& done_0));
       __gen_e_acsl_pthread_mutex_unlock(& read_mutex);
       if (done_0) {
@@ -1627,7 +1621,7 @@ int main(void)
     }
     else 
       if (res_0 != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_12);
-    __gen_e_acsl_usleep((unsigned int)100);
+    __gen_e_acsl_usleep((useconds_t)100);
     __e_acsl_delete_block((void *)(& res_0));
   }
   __e_acsl_full_init((void *)(& tmp_5));
@@ -1638,7 +1632,7 @@ int main(void)
   }
   {
     int i_0 = 0;
-    __e_acsl_store_block((void *)(& i_0),(size_t)4);
+    __e_acsl_store_block((void *)(& i_0),4UL);
     __e_acsl_full_init((void *)(& i_0));
     while (i_0 < 10) {
       __gen_e_acsl_pthread_join(writers[i_0],(void **)0);
@@ -1655,7 +1649,7 @@ int main(void)
   }
   {
     int i_1 = 0;
-    __e_acsl_store_block((void *)(& i_1),(size_t)4);
+    __e_acsl_store_block((void *)(& i_1),4UL);
     __e_acsl_full_init((void *)(& i_1));
     while (i_1 < 10) {
       __gen_e_acsl_pthread_join(readers[i_1],(void **)0);
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
index 025b3fb3ba9..9de07836f81 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
@@ -49,11 +49,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval);
 void *thread_start(void *arg)
 {
   void *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_and;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"__fc_stdout",
                                  (void *)stdout);
@@ -164,7 +164,7 @@ void *thread_start(void *arg)
   }
   /*@ assert \valid(__fc_stdin) && \initialized(__fc_stdin); */ ;
   int *addrof_errno = & errno;
-  __e_acsl_store_block((void *)(& addrof_errno),(size_t)8);
+  __e_acsl_store_block((void *)(& addrof_errno),8UL);
   __e_acsl_full_init((void *)(& addrof_errno));
   {
     int __gen_e_acsl_initialized_4;
@@ -251,13 +251,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_or;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& retval),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)4);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& retval),8UL);
+    __e_acsl_store_block((void *)(& thread),4UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
                                  (void *)retval);
@@ -283,11 +283,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
     __gen_e_acsl_assert_data.name = "valid_or_null_retval";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            retval == (void **)0);
     __gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
                                           (void *)retval,(void *)(& retval));
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_valid_2);
   }
   __retres = pthread_join(thread,retval);
@@ -351,15 +351,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
                                 void * restrict arg)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
     int __gen_e_acsl_or_2;
-    __e_acsl_store_block((void *)(& arg),(size_t)8);
-    __e_acsl_store_block((void *)(& start_routine),(size_t)8);
-    __e_acsl_store_block((void *)(& attr),(size_t)8);
-    __e_acsl_store_block((void *)(& thread),(size_t)8);
+    __e_acsl_store_block((void *)(& arg),8UL);
+    __e_acsl_store_block((void *)(& start_routine),8UL);
+    __e_acsl_store_block((void *)(& attr),8UL);
+    __e_acsl_store_block((void *)(& thread),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
                                  (void *)thread);
@@ -484,47 +484,47 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
-    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
-    __e_acsl_store_block((void *)(& thread_start),(size_t)1);
+    __e_acsl_store_block((void *)(& thread_start),1UL);
     __e_acsl_full_init((void *)(& thread_start));
-    __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
     __e_acsl_full_init((void *)(& __fc_p_tmpnam));
-    __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+    __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
     __e_acsl_full_init((void *)(& __fc_tmpnam));
-    __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
     __e_acsl_full_init((void *)(& __fc_p_fopen));
-    __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+    __e_acsl_store_block((void *)(__fc_fopen),128UL);
     __e_acsl_full_init((void *)(& __fc_fopen));
-    __e_acsl_store_block((void *)(& stdout),(size_t)8);
+    __e_acsl_store_block((void *)(& stdout),8UL);
     __e_acsl_full_init((void *)(& stdout));
-    __e_acsl_store_block((void *)(& stdin),(size_t)8);
+    __e_acsl_store_block((void *)(& stdin),8UL);
     __e_acsl_full_init((void *)(& stdin));
-    __e_acsl_store_block((void *)(& stderr),(size_t)8);
+    __e_acsl_store_block((void *)(& stderr),8UL);
     __e_acsl_full_init((void *)(& stderr));
-    __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
     __e_acsl_full_init((void *)(& __fc_interrupted));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
-    __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
-    __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+    __e_acsl_store_block((void *)(__fc_ctime),26UL);
     __e_acsl_full_init((void *)(& __fc_ctime));
-    __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_time),4UL);
     __e_acsl_full_init((void *)(& __fc_time));
-    __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
     __e_acsl_full_init((void *)(& __fc_p_sigaction));
-    __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+    __e_acsl_store_block((void *)(sigaction),2080UL);
     __e_acsl_full_init((void *)(& sigaction));
-    __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_join),1UL);
     __e_acsl_full_init((void *)(& pthread_join));
-    __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+    __e_acsl_store_block((void *)(& pthread_create),1UL);
     __e_acsl_full_init((void *)(& pthread_create));
-    __e_acsl_store_block((void *)(& errno),(size_t)4);
+    __e_acsl_store_block((void *)(& errno),4UL);
     __e_acsl_full_init((void *)(& errno));
   }
   return;
@@ -560,10 +560,10 @@ int main(void)
 {
   int __retres;
   pthread_t t;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& t),(size_t)4);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& t),4UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   __gen_e_acsl_pthread_create(& t,(pthread_attr_t const *)0,& thread_start,
                               (void *)0);
   __gen_e_acsl_pthread_join(t,(void **)0);
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
index 24b9305c4e7..d47109de36c 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
@@ -22,7 +22,7 @@ void g(int a, int *b)
 {
   {
     int __gen_e_acsl_valid_read;
-    __e_acsl_store_block((void *)(& b),(size_t)8);
+    __e_acsl_store_block((void *)(& b),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"a",0,a);
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*(b + 1)",0,
@@ -122,11 +122,11 @@ void __e_acsl_globals_init(void)
 
 int main(void)
 {
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   int a = 0;
   int b[3] = {1, 2, 3};
-  __e_acsl_store_block((void *)(b),(size_t)12);
+  __e_acsl_store_block((void *)(b),12UL);
   __e_acsl_full_init((void *)(& b));
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
index ea2bac72e0d..0eab76f22a0 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
@@ -192,7 +192,7 @@ size_t fact2(size_t n)
       result *= n - i;
       {
         int __gen_e_acsl_and_2;
-        i += (size_t)1;
+        i ++;
         __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
           {.values = (void *)0};
         __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_2,"i",0,i);
@@ -279,7 +279,7 @@ int odd(int n)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int f10 = f(10);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -355,7 +355,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
   }
   /*@ assert fact7 == 5040; */ ;
-  size_t fact18 = __gen_e_acsl_fact2((unsigned long)18);
+  size_t fact18 = __gen_e_acsl_fact2((size_t)18);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
       {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
index c3a7f41246d..14f3b4114b0 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   if (x) {
     {
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
index 501806c4f43..38edcc63e05 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
@@ -181,7 +181,7 @@ void o(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __gen_e_acsl_f();
   __gen_e_acsl_g();
   __gen_e_acsl_h();
@@ -234,7 +234,7 @@ void __gen_e_acsl_o(void)
     int __gen_e_acsl_assumes_value;
     int __gen_e_acsl_active_bhvrs;
     __gen_e_acsl_at = Y;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)4);
+    __gen_e_acsl_contract = __e_acsl_contract_init(4UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"X",0,X);
     __gen_e_acsl_assert_data.blocking = 1;
@@ -245,16 +245,14 @@ void __gen_e_acsl_o(void)
     __gen_e_acsl_assert_data.line = 93;
     __e_acsl_assert(X > -1000,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                           Y < 0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
-                                           Y >= 0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)2,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,Y < 0);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,Y >= 0);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,2UL,
                                            Y % 2 == 1);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)3,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,3UL,
                                            Y % 2 == 0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
         {.values = (void *)0};
@@ -270,7 +268,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
         {.values = (void *)0};
@@ -286,7 +284,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -302,7 +300,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)3);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,3UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
         {.values = (void *)0};
@@ -318,7 +316,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
     }
     __gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_behaviors
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2,1,0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL,1,0);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
       {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_6,
@@ -350,7 +348,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
     }
     __gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_behaviors
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2,2,3);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL,2,3);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
       {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_8,
@@ -420,7 +418,7 @@ void __gen_e_acsl_o(void)
     __e_acsl_assert(X == __gen_e_acsl_at,& __gen_e_acsl_assert_data_12);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_12);
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_13 =
         {.values = (void *)0};
@@ -438,7 +436,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
     }
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_14 =
         {.values = (void *)0};
@@ -456,7 +454,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_14);
     }
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_15 =
         {.values = (void *)0};
@@ -474,7 +472,7 @@ void __gen_e_acsl_o(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_15);
     }
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)3);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,3UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_16 =
         {.values = (void *)0};
@@ -511,7 +509,7 @@ void __gen_e_acsl_n(void)
 {
   __e_acsl_contract_t *__gen_e_acsl_contract;
   {
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"X",0,X);
     __gen_e_acsl_assert_data.blocking = 1;
@@ -533,16 +531,14 @@ void __gen_e_acsl_n(void)
     __gen_e_acsl_assert_data_2.line = 80;
     __e_acsl_assert(X < 10,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                           X == 7);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
-                                           X == 5);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 7);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,X == 5);
   }
   n();
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
         {.values = (void *)0};
@@ -558,7 +554,7 @@ void __gen_e_acsl_n(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -595,18 +591,17 @@ void __gen_e_acsl_m(void)
   {
     int __gen_e_acsl_and;
     __gen_e_acsl_at = (long)X;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                           X == 7);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 7);
     if (X == 5) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_and);
   }
   m();
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
         {.values = (void *)0};
@@ -622,7 +617,7 @@ void __gen_e_acsl_m(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
         {.values = (void *)0};
@@ -694,14 +689,13 @@ void __gen_e_acsl_k(void)
   {
     int __gen_e_acsl_and;
     int __gen_e_acsl_assumes_value;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                           X == 1);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 1);
     if (X == 3) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_and);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
         {.values = (void *)0};
@@ -717,7 +711,7 @@ void __gen_e_acsl_k(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
         {.values = (void *)0};
@@ -765,11 +759,11 @@ void __gen_e_acsl_j(void)
   __e_acsl_contract_t *__gen_e_acsl_contract;
   {
     int __gen_e_acsl_assumes_value;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,1);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,1);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
         {.values = (void *)0};
@@ -785,7 +779,7 @@ void __gen_e_acsl_j(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
         {.values = (void *)0};
@@ -818,7 +812,7 @@ void __gen_e_acsl_j(void)
   {
     int __gen_e_acsl_assumes_value_2;
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -834,7 +828,7 @@ void __gen_e_acsl_j(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
index 182446f1eaf..6d224fa3a4b 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
@@ -15,9 +15,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& P),(size_t)8);
+    __e_acsl_store_block((void *)(& P),8UL);
     __e_acsl_full_init((void *)(& P));
-    __e_acsl_store_block((void *)(& G),(size_t)4);
+    __e_acsl_store_block((void *)(& G),4UL);
     __e_acsl_full_init((void *)(& G));
   }
   return;
@@ -33,11 +33,11 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   P = & G;
   int *q = P;
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     int __gen_e_acsl_valid_read;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
index 651c79d9676..a4ec6fdcb85 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   {
     int i = 0;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
index ffe68532b72..0b1558a7fe8 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
@@ -75,7 +75,7 @@ int __gen_e_acsl_main(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __retres = __gen_e_acsl_main();
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
index daa81b38292..d405c61064b 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   int y = 1;
   {
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
index 3277c9121c0..05665439035 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
@@ -403,7 +403,7 @@ void unnatural_loop(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   simple_loop();
   nested_loops();
   unnatural_loop();
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
index b8f02566ff2..5df7d92a197 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   int y = 1;
   {
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
index 0f25bc6887d..d0a76ef10ec 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
@@ -87,7 +87,7 @@ void __e_acsl_globals_init(void)
                          sizeof("EVERY ASSERTION SHOULD PRINT ITS DATA IN EXECUTION LOG\n"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string);
-    __e_acsl_store_block((void *)(& lvalue),(size_t)4);
+    __e_acsl_store_block((void *)(& lvalue),4UL);
     __e_acsl_full_init((void *)(& lvalue));
   }
   return;
@@ -102,11 +102,11 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   fprintf(stderr,__gen_e_acsl_literal_string); /* fprintf_va_1 */
   _Bool int_bool = (_Bool)1;
-  __e_acsl_store_block((void *)(& int_bool),(size_t)1);
+  __e_acsl_store_block((void *)(& int_bool),1UL);
   __e_acsl_full_init((void *)(& int_bool));
   {
     int __gen_e_acsl_x;
@@ -125,7 +125,7 @@ int main(void)
   }
   /*@ assert \let x = int_bool; \true; */ ;
   char int_char = (char)127;
-  __e_acsl_store_block((void *)(& int_char),(size_t)1);
+  __e_acsl_store_block((void *)(& int_char),1UL);
   __e_acsl_full_init((void *)(& int_char));
   {
     int __gen_e_acsl_x_2;
@@ -145,7 +145,7 @@ int main(void)
   }
   /*@ assert \let x = int_char; \true; */ ;
   signed char int_schar = (signed char)127;
-  __e_acsl_store_block((void *)(& int_schar),(size_t)1);
+  __e_acsl_store_block((void *)(& int_schar),1UL);
   __e_acsl_full_init((void *)(& int_schar));
   {
     int __gen_e_acsl_x_3;
@@ -165,7 +165,7 @@ int main(void)
   }
   /*@ assert \let x = int_schar; \true; */ ;
   unsigned char int_uchar = (unsigned char)255;
-  __e_acsl_store_block((void *)(& int_uchar),(size_t)1);
+  __e_acsl_store_block((void *)(& int_uchar),1UL);
   __e_acsl_full_init((void *)(& int_uchar));
   {
     int __gen_e_acsl_x_4;
@@ -185,7 +185,7 @@ int main(void)
   }
   /*@ assert \let x = int_uchar; \true; */ ;
   int int_int = 2147483647;
-  __e_acsl_store_block((void *)(& int_int),(size_t)4);
+  __e_acsl_store_block((void *)(& int_int),4UL);
   __e_acsl_full_init((void *)(& int_int));
   {
     int __gen_e_acsl_x_5;
@@ -205,7 +205,7 @@ int main(void)
   }
   /*@ assert \let x = int_int; \true; */ ;
   unsigned int int_uint = 4294967295U;
-  __e_acsl_store_block((void *)(& int_uint),(size_t)4);
+  __e_acsl_store_block((void *)(& int_uint),4UL);
   __e_acsl_full_init((void *)(& int_uint));
   {
     unsigned int __gen_e_acsl_x_6;
@@ -225,7 +225,7 @@ int main(void)
   }
   /*@ assert \let x = int_uint; \true; */ ;
   short int_short = (short)32767;
-  __e_acsl_store_block((void *)(& int_short),(size_t)2);
+  __e_acsl_store_block((void *)(& int_short),2UL);
   __e_acsl_full_init((void *)(& int_short));
   {
     int __gen_e_acsl_x_7;
@@ -245,7 +245,7 @@ int main(void)
   }
   /*@ assert \let x = int_short; \true; */ ;
   unsigned short int_ushort = (unsigned short)65535;
-  __e_acsl_store_block((void *)(& int_ushort),(size_t)2);
+  __e_acsl_store_block((void *)(& int_ushort),2UL);
   __e_acsl_full_init((void *)(& int_ushort));
   {
     int __gen_e_acsl_x_8;
@@ -265,7 +265,7 @@ int main(void)
   }
   /*@ assert \let x = int_ushort; \true; */ ;
   long int_long = 9223372036854775807L;
-  __e_acsl_store_block((void *)(& int_long),(size_t)8);
+  __e_acsl_store_block((void *)(& int_long),8UL);
   __e_acsl_full_init((void *)(& int_long));
   {
     long __gen_e_acsl_x_9;
@@ -285,7 +285,7 @@ int main(void)
   }
   /*@ assert \let x = int_long; \true; */ ;
   unsigned long int_ulong = 18446744073709551615UL;
-  __e_acsl_store_block((void *)(& int_ulong),(size_t)8);
+  __e_acsl_store_block((void *)(& int_ulong),8UL);
   __e_acsl_full_init((void *)(& int_ulong));
   {
     unsigned long __gen_e_acsl_x_10;
@@ -305,7 +305,7 @@ int main(void)
   }
   /*@ assert \let x = int_ulong; \true; */ ;
   long long int_llong = 9223372036854775807LL;
-  __e_acsl_store_block((void *)(& int_llong),(size_t)8);
+  __e_acsl_store_block((void *)(& int_llong),8UL);
   __e_acsl_full_init((void *)(& int_llong));
   {
     long __gen_e_acsl_x_11;
@@ -325,7 +325,7 @@ int main(void)
   }
   /*@ assert \let x = int_llong; \true; */ ;
   unsigned long long int_ullong = 18446744073709551615ULL;
-  __e_acsl_store_block((void *)(& int_ullong),(size_t)8);
+  __e_acsl_store_block((void *)(& int_ullong),8UL);
   __e_acsl_full_init((void *)(& int_ullong));
   {
     unsigned long __gen_e_acsl_x_12;
@@ -383,7 +383,7 @@ int main(void)
    */
   ;
   float real_float = (float)0x1.fffffep+127;
-  __e_acsl_store_block((void *)(& real_float),(size_t)4);
+  __e_acsl_store_block((void *)(& real_float),4UL);
   __e_acsl_full_init((void *)(& real_float));
   {
     float __gen_e_acsl_x_13;
@@ -403,7 +403,7 @@ int main(void)
   }
   /*@ assert \let x = real_float; \true; */ ;
   double real_double = 0x1.fffffffffffffp+1023;
-  __e_acsl_store_block((void *)(& real_double),(size_t)8);
+  __e_acsl_store_block((void *)(& real_double),8UL);
   __e_acsl_full_init((void *)(& real_double));
   {
     double __gen_e_acsl_x_14;
@@ -427,7 +427,7 @@ int main(void)
         \is_finite((long double)0x1.fffffffffffffffep+16383L);
   */
   long double real_ldouble = 0x1.fffffffffffffffep+16383L;
-  __e_acsl_store_block((void *)(& real_ldouble),(size_t)16);
+  __e_acsl_store_block((void *)(& real_ldouble),16UL);
   __e_acsl_full_init((void *)(& real_ldouble));
   {
     long double __gen_e_acsl_x_15;
@@ -480,7 +480,7 @@ int main(void)
   }
   /*@ assert \let real_mpq = 0.1; real_mpq != 1; */ ;
   void *ptr = (void *)(& lvalue);
-  __e_acsl_store_block((void *)(& ptr),(size_t)8);
+  __e_acsl_store_block((void *)(& ptr),8UL);
   __e_acsl_full_init((void *)(& ptr));
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_18 =
@@ -545,7 +545,7 @@ int main(void)
   }
   /*@ assert &f != &g; */ ;
   struct A struct1 = {.a = 1};
-  __e_acsl_store_block((void *)(& struct1),(size_t)4);
+  __e_acsl_store_block((void *)(& struct1),4UL);
   __e_acsl_full_init((void *)(& struct1));
   {
     struct A __gen_e_acsl_x_16;
@@ -564,7 +564,7 @@ int main(void)
   }
   /*@ assert \let x = struct1; \true; */ ;
   union U union1 = {.b = (float)1.};
-  __e_acsl_store_block((void *)(& union1),(size_t)4);
+  __e_acsl_store_block((void *)(& union1),4UL);
   __e_acsl_full_init((void *)(& union1));
   {
     union U __gen_e_acsl_x_17;
@@ -583,7 +583,7 @@ int main(void)
   }
   /*@ assert \let x = union1; \true; */ ;
   enum EBool enum_bool = (enum EBool)EBOOL_MAX;
-  __e_acsl_store_block((void *)(& enum_bool),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_bool),4UL);
   __e_acsl_full_init((void *)(& enum_bool));
   {
     unsigned int __gen_e_acsl_x_18;
@@ -603,7 +603,7 @@ int main(void)
   }
   /*@ assert \let x = enum_bool; \true; */ ;
   enum EChar enum_char = (enum EChar)ECHAR_MAX;
-  __e_acsl_store_block((void *)(& enum_char),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_char),4UL);
   __e_acsl_full_init((void *)(& enum_char));
   {
     int __gen_e_acsl_x_19;
@@ -623,7 +623,7 @@ int main(void)
   }
   /*@ assert \let x = enum_char; \true; */ ;
   enum ESChar enum_schar = (enum ESChar)ESCHAR_MAX;
-  __e_acsl_store_block((void *)(& enum_schar),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_schar),4UL);
   __e_acsl_full_init((void *)(& enum_schar));
   {
     int __gen_e_acsl_x_20;
@@ -643,7 +643,7 @@ int main(void)
   }
   /*@ assert \let x = enum_schar; \true; */ ;
   enum EUChar enum_uchar = (enum EUChar)EUCHAR_MAX;
-  __e_acsl_store_block((void *)(& enum_uchar),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_uchar),4UL);
   __e_acsl_full_init((void *)(& enum_uchar));
   {
     unsigned int __gen_e_acsl_x_21;
@@ -663,7 +663,7 @@ int main(void)
   }
   /*@ assert \let x = enum_uchar; \true; */ ;
   enum EInt enum_int = EINT_MAX;
-  __e_acsl_store_block((void *)(& enum_int),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_int),4UL);
   __e_acsl_full_init((void *)(& enum_int));
   {
     int __gen_e_acsl_x_22;
@@ -683,7 +683,7 @@ int main(void)
   }
   /*@ assert \let x = enum_int; \true; */ ;
   enum EUInt enum_uint = EUINT_MAX;
-  __e_acsl_store_block((void *)(& enum_uint),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_uint),4UL);
   __e_acsl_full_init((void *)(& enum_uint));
   {
     unsigned int __gen_e_acsl_x_23;
@@ -703,7 +703,7 @@ int main(void)
   }
   /*@ assert \let x = enum_uint; \true; */ ;
   enum EShort enum_short = (enum EShort)ESHORT_MAX;
-  __e_acsl_store_block((void *)(& enum_short),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_short),4UL);
   __e_acsl_full_init((void *)(& enum_short));
   {
     int __gen_e_acsl_x_24;
@@ -723,7 +723,7 @@ int main(void)
   }
   /*@ assert \let x = enum_short; \true; */ ;
   enum EUShort enum_ushort = (enum EUShort)EUSHORT_MAX;
-  __e_acsl_store_block((void *)(& enum_ushort),(size_t)4);
+  __e_acsl_store_block((void *)(& enum_ushort),4UL);
   __e_acsl_full_init((void *)(& enum_ushort));
   {
     unsigned int __gen_e_acsl_x_25;
@@ -743,7 +743,7 @@ int main(void)
   }
   /*@ assert \let x = enum_ushort; \true; */ ;
   enum ELong enum_long = ELONG_MAX;
-  __e_acsl_store_block((void *)(& enum_long),(size_t)8);
+  __e_acsl_store_block((void *)(& enum_long),8UL);
   __e_acsl_full_init((void *)(& enum_long));
   {
     long __gen_e_acsl_x_26;
@@ -763,7 +763,7 @@ int main(void)
   }
   /*@ assert \let x = enum_long; \true; */ ;
   enum EULong enum_ulong = EULONG_MAX;
-  __e_acsl_store_block((void *)(& enum_ulong),(size_t)8);
+  __e_acsl_store_block((void *)(& enum_ulong),8UL);
   __e_acsl_full_init((void *)(& enum_ulong));
   {
     unsigned long __gen_e_acsl_x_27;
@@ -783,7 +783,7 @@ int main(void)
   }
   /*@ assert \let x = enum_ulong; \true; */ ;
   enum ELLong enum_llong = ELLONG_MAX;
-  __e_acsl_store_block((void *)(& enum_llong),(size_t)8);
+  __e_acsl_store_block((void *)(& enum_llong),8UL);
   __e_acsl_full_init((void *)(& enum_llong));
   {
     long __gen_e_acsl_x_28;
@@ -803,7 +803,7 @@ int main(void)
   }
   /*@ assert \let x = enum_llong; \true; */ ;
   enum EULLong enum_ullong = EULLONG_MAX;
-  __e_acsl_store_block((void *)(& enum_ullong),(size_t)8);
+  __e_acsl_store_block((void *)(& enum_ullong),8UL);
   __e_acsl_full_init((void *)(& enum_ullong));
   {
     unsigned long __gen_e_acsl_x_29;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
index c99db3bf2f4..0fdf520c053 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
@@ -40,7 +40,7 @@ int h(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __gen_e_acsl_f(1);
   __gen_e_acsl_g(Y);
   __gen_e_acsl_h();
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
index 20f95307643..a8875fd82f6 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
@@ -33,7 +33,7 @@ void test(int a, int b, int c, int d, int e, int f, int g, int h, int i,
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __gen_e_acsl_test(2,3,4,5,6,7,8,9,10,11,12,13);
   __retres = 0;
   __e_acsl_memory_clean();
@@ -63,7 +63,7 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_at = b;
     __gen_e_acsl_at_2 = e;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+    __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"a",0,a);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
@@ -98,10 +98,10 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
     __gen_e_acsl_assert_data_3.name = "division_by_zero";
     __e_acsl_assert(c != 0,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            1 % c == 1);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_or;
       int __gen_e_acsl_and;
@@ -355,7 +355,7 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
     __e_acsl_assert(1 % __gen_e_acsl_at == 1,& __gen_e_acsl_assert_data_18);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_18);
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_20 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
index e13f6933a71..7cf7c8c8b0b 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
@@ -15,7 +15,7 @@ int main(void)
   __e_acsl_contract_t *__gen_e_acsl_contract;
   int __retres;
   int z;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   int y = 2;
   {
@@ -123,13 +123,11 @@ int main(void)
     int __gen_e_acsl_assumes_value_2;
     {
       int __gen_e_acsl_assumes_value;
-      __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                             1);
-      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
-                                             1);
+      __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
+      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,1);
       __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-      ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+      ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
       if (__gen_e_acsl_assumes_value) {
         __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
           {.values = (void *)0};
@@ -145,7 +143,7 @@ int main(void)
         __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
       }
       __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-      ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+      ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
       if (__gen_e_acsl_assumes_value) {
         __e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
           {.values = (void *)0};
@@ -185,7 +183,7 @@ int main(void)
     */
     x = 3;
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_11 =
         {.values = (void *)0};
@@ -201,7 +199,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_11);
     }
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value_2) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_12 =
         {.values = (void *)0};
@@ -222,14 +220,14 @@ int main(void)
   {
     int __gen_e_acsl_and_2;
     int __gen_e_acsl_assumes_value_3;
-    __gen_e_acsl_contract_2 = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,(size_t)0,
+    __gen_e_acsl_contract_2 = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,0UL,
                                            x == 1);
     if (x == 3) __gen_e_acsl_and_2 = y == 2; else __gen_e_acsl_and_2 = 0;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,1UL,
                                            __gen_e_acsl_and_2);
     __gen_e_acsl_assumes_value_3 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,0UL);
     if (__gen_e_acsl_assumes_value_3) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_13 =
         {.values = (void *)0};
@@ -245,7 +243,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
     }
     __gen_e_acsl_assumes_value_3 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,1UL);
     if (__gen_e_acsl_assumes_value_3) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_14 =
         {.values = (void *)0};
@@ -321,7 +319,7 @@ int main(void)
     int __gen_e_acsl_assumes_value_4;
     {
       int __gen_e_acsl_active_bhvrs;
-      __gen_e_acsl_contract_3 = __e_acsl_contract_init((size_t)2);
+      __gen_e_acsl_contract_3 = __e_acsl_contract_init(2UL);
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_18 =
         {.values = (void *)0};
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_18,"x",0,x);
@@ -333,10 +331,10 @@ int main(void)
       __gen_e_acsl_assert_data_18.line = 49;
       __e_acsl_assert(x > -1000,& __gen_e_acsl_assert_data_18);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_18);
-      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,
-                                             (size_t)0,x >= 0);
-      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,
-                                             (size_t)1,x < 0);
+      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,0UL,
+                                             x >= 0);
+      __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,1UL,
+                                             x < 0);
       __gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
       ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3);
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_19 =
@@ -398,7 +396,7 @@ int main(void)
     __e_acsl_assert(z >= 0,& __gen_e_acsl_assert_data_21);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_21);
     __gen_e_acsl_assumes_value_4 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,0UL);
     if (__gen_e_acsl_assumes_value_4) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_22 =
         {.values = (void *)0};
@@ -415,7 +413,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_22);
     }
     __gen_e_acsl_assumes_value_4 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,1UL);
     if (__gen_e_acsl_assumes_value_4) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_23 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
index ccc710ca0a4..ee983e4268f 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   x ++;
   {
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
index 67731cb9825..4ed5c8171ef 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
@@ -12,8 +12,8 @@ typedef unsigned char uint8;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  uint8 x = (unsigned char)0;
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  uint8 x = (uint8)0;
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_uchar(& __gen_e_acsl_assert_data,"x",0,x);
diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
index 3eb7673ca11..0c529b0a24a 100644
--- a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
+++ b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
@@ -29,16 +29,16 @@ int main(void)
   struct list node1;
   struct list node2;
   struct list node3;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& node3),(size_t)16);
-  __e_acsl_store_block((void *)(& node2),(size_t)16);
-  __e_acsl_store_block((void *)(& node1),(size_t)16);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& node3),16UL);
+  __e_acsl_store_block((void *)(& node2),16UL);
+  __e_acsl_store_block((void *)(& node1),16UL);
   __e_acsl_initialize((void *)(& node1.next),sizeof(struct list *));
   node1.next = & node2;
   __e_acsl_initialize((void *)(& node2.next),sizeof(struct list *));
   node2.next = & node3;
   struct list *l = & node1;
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   /*@ assert length(l) == 3; */ ;
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
index dfad48ef0b8..b437db7b306 100644
--- a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
+++ b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
@@ -196,7 +196,7 @@ int main(void)
 {
   int __retres;
   int found;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int i = 0;
     while (i < 10) {
@@ -260,7 +260,7 @@ int __gen_e_acsl_search(int elt)
     int __gen_e_acsl_j;
     int __gen_e_acsl_forall_2;
     int __gen_e_acsl_j_2;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_forall = 1;
     __gen_e_acsl_i = 0;
@@ -381,7 +381,7 @@ int __gen_e_acsl_search(int elt)
       __gen_e_acsl_j ++;
     }
     e_acsl_end_loop4: ;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            __gen_e_acsl_exists);
     __gen_e_acsl_forall_2 = 1;
     __gen_e_acsl_j_2 = 0;
@@ -423,14 +423,14 @@ int __gen_e_acsl_search(int elt)
       __gen_e_acsl_j_2 ++;
     }
     e_acsl_end_loop5: ;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_forall_2);
   }
   __retres = search(elt);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_10 =
         {.values = (void *)0};
@@ -447,7 +447,7 @@ int __gen_e_acsl_search(int elt)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_11 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
index be3cdf29226..14d271ade3d 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
@@ -159,15 +159,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -287,7 +287,7 @@ int __gen_e_acsl_fclose(FILE *stream)
   int __retres;
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& stream),(size_t)8);
+    __e_acsl_store_block((void *)(& stream),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"stream",
                                  (void *)stream);
@@ -343,7 +343,7 @@ int __gen_e_acsl_fclose(FILE *stream)
 FILE *__gen_e_acsl_tmpfile(void)
 {
   FILE *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   __retres = tmpfile();
   __e_acsl_delete_block((void *)(& __retres));
   return __retres;
@@ -516,7 +516,7 @@ int main(int argc, char const **argv)
   int __retres;
   char template[256];
   char buf[5];
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *pstr = (char *)__gen_e_acsl_literal_string_6;
   {
@@ -527,7 +527,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status;
-      __e_acsl_store_block((void *)(& process_status),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status),4UL);
       __gen_e_acsl_waitpid(pid,& process_status,0);
       signal_eval(process_status,0,__gen_e_acsl_literal_string_8);
       __e_acsl_delete_block((void *)(& process_status));
@@ -541,14 +541,14 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_0;
-      __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_0),4UL);
       __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
       signal_eval(process_status_0,1,__gen_e_acsl_literal_string_9);
       __e_acsl_delete_block((void *)(& process_status_0));
     }
   }
   FILE *fh = __gen_e_acsl_tmpfile();
-  __e_acsl_store_block((void *)(& fh),(size_t)8);
+  __e_acsl_store_block((void *)(& fh),8UL);
   __e_acsl_full_init((void *)(& fh));
   if (fh) {
     {
@@ -560,7 +560,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_1;
-        __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_1),4UL);
         __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
         signal_eval(process_status_1,0,__gen_e_acsl_literal_string_12);
         __e_acsl_delete_block((void *)(& process_status_1));
@@ -576,7 +576,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_2;
-        __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_2),4UL);
         __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
         signal_eval(process_status_2,1,__gen_e_acsl_literal_string_13);
         __e_acsl_delete_block((void *)(& process_status_2));
@@ -592,7 +592,7 @@ int main(int argc, char const **argv)
       }
       else {
         int process_status_3;
-        __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+        __e_acsl_store_block((void *)(& process_status_3),4UL);
         __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
         signal_eval(process_status_3,1,__gen_e_acsl_literal_string_14);
         __e_acsl_delete_block((void *)(& process_status_3));
@@ -607,7 +607,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_4;
-      __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_4),4UL);
       __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
       signal_eval(process_status_4,0,__gen_e_acsl_literal_string_15);
       __e_acsl_delete_block((void *)(& process_status_4));
@@ -621,7 +621,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_5;
-      __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_5),4UL);
       __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
       signal_eval(process_status_5,1,__gen_e_acsl_literal_string_16);
       __e_acsl_delete_block((void *)(& process_status_5));
@@ -636,7 +636,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_6;
-      __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_6),4UL);
       __gen_e_acsl_waitpid(pid_6,& process_status_6,0);
       signal_eval(process_status_6,0,__gen_e_acsl_literal_string_19);
       __e_acsl_delete_block((void *)(& process_status_6));
@@ -651,7 +651,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_7;
-      __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_7),4UL);
       __gen_e_acsl_waitpid(pid_7,& process_status_7,0);
       signal_eval(process_status_7,0,__gen_e_acsl_literal_string_21);
       __e_acsl_delete_block((void *)(& process_status_7));
@@ -666,7 +666,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_8;
-      __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_8),4UL);
       __gen_e_acsl_waitpid(pid_8,& process_status_8,0);
       signal_eval(process_status_8,1,__gen_e_acsl_literal_string_23);
       __e_acsl_delete_block((void *)(& process_status_8));
@@ -681,7 +681,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_9;
-      __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_9),4UL);
       __gen_e_acsl_waitpid(pid_9,& process_status_9,0);
       signal_eval(process_status_9,1,__gen_e_acsl_literal_string_24);
       __e_acsl_delete_block((void *)(& process_status_9));
@@ -696,7 +696,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_10;
-      __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_10),4UL);
       __gen_e_acsl_waitpid(pid_10,& process_status_10,0);
       signal_eval(process_status_10,1,__gen_e_acsl_literal_string_25);
       __e_acsl_delete_block((void *)(& process_status_10));
@@ -705,14 +705,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_11 = __gen_e_acsl_fork();
     if (! pid_11) {
-      __e_acsl_builtin_snprintf("s",buf,(unsigned long)4,
+      __e_acsl_builtin_snprintf("s",buf,(size_t)4,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_11;
-      __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_11),4UL);
       __gen_e_acsl_waitpid(pid_11,& process_status_11,0);
       signal_eval(process_status_11,0,__gen_e_acsl_literal_string_26);
       __e_acsl_delete_block((void *)(& process_status_11));
@@ -721,14 +721,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_12 = __gen_e_acsl_fork();
     if (! pid_12) {
-      __e_acsl_builtin_snprintf("s",buf,(unsigned long)5,
+      __e_acsl_builtin_snprintf("s",buf,(size_t)5,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_12;
-      __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_12),4UL);
       __gen_e_acsl_waitpid(pid_12,& process_status_12,0);
       signal_eval(process_status_12,0,__gen_e_acsl_literal_string_27);
       __e_acsl_delete_block((void *)(& process_status_12));
@@ -737,14 +737,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_13 = __gen_e_acsl_fork();
     if (! pid_13) {
-      __e_acsl_builtin_snprintf("s",pstr,(unsigned long)6,
+      __e_acsl_builtin_snprintf("s",pstr,(size_t)6,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_13;
-      __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_13),4UL);
       __gen_e_acsl_waitpid(pid_13,& process_status_13,0);
       signal_eval(process_status_13,1,__gen_e_acsl_literal_string_28);
       __e_acsl_delete_block((void *)(& process_status_13));
@@ -753,14 +753,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_14 = __gen_e_acsl_fork();
     if (! pid_14) {
-      __e_acsl_builtin_snprintf("s",buf,(unsigned long)6,
+      __e_acsl_builtin_snprintf("s",buf,(size_t)6,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_14;
-      __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_14),4UL);
       __gen_e_acsl_waitpid(pid_14,& process_status_14,0);
       signal_eval(process_status_14,1,__gen_e_acsl_literal_string_29);
       __e_acsl_delete_block((void *)(& process_status_14));
@@ -769,14 +769,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_15 = __gen_e_acsl_fork();
     if (! pid_15) {
-      __e_acsl_builtin_snprintf("s",(char *)0,(unsigned long)6,
+      __e_acsl_builtin_snprintf("s",(char *)0,(size_t)6,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_15;
-      __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_15),4UL);
       __gen_e_acsl_waitpid(pid_15,& process_status_15,0);
       signal_eval(process_status_15,1,__gen_e_acsl_literal_string_30);
       __e_acsl_delete_block((void *)(& process_status_15));
@@ -785,14 +785,14 @@ int main(int argc, char const **argv)
   {
     pid_t pid_16 = __gen_e_acsl_fork();
     if (! pid_16) {
-      __e_acsl_builtin_snprintf("s",(char *)0,(unsigned long)0,
+      __e_acsl_builtin_snprintf("s",(char *)0,(size_t)0,
                                 __gen_e_acsl_literal_string_18,
                                 __gen_e_acsl_literal_string_22);
       __gen_e_acsl_exit(0);
     }
     else {
       int process_status_16;
-      __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_16),4UL);
       __gen_e_acsl_waitpid(pid_16,& process_status_16,0);
       signal_eval(process_status_16,0,__gen_e_acsl_literal_string_31);
       __e_acsl_delete_block((void *)(& process_status_16));
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
index 621b839cc08..5cc47f47128 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
@@ -566,8 +566,8 @@ void apply_specifier(char *format, int spec)
 {
   int n;
   char *tmp_1;
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
-  __e_acsl_store_block((void *)(& format),(size_t)8);
+  __e_acsl_store_block((void *)(& tmp_1),8UL);
+  __e_acsl_store_block((void *)(& format),8UL);
   void *p = (void *)0;
   __e_acsl_full_init((void *)(& tmp_1));
   tmp_1 = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_6,spec);
@@ -575,14 +575,14 @@ void apply_specifier(char *format, int spec)
                                                   1.0);
   else {
     char *tmp_0;
-    __e_acsl_store_block((void *)(& tmp_0),(size_t)8);
+    __e_acsl_store_block((void *)(& tmp_0),8UL);
     __e_acsl_full_init((void *)(& tmp_0));
     tmp_0 = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_7,spec);
     if (tmp_0 != (char *)0) __e_acsl_builtin_printf("D",(char const *)format,
                                                     1U);
     else {
       char *tmp;
-      __e_acsl_store_block((void *)(& tmp),(size_t)8);
+      __e_acsl_store_block((void *)(& tmp),8UL);
       __e_acsl_full_init((void *)(& tmp));
       tmp = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_8,spec);
       if (tmp != (char *)0) __e_acsl_builtin_printf("d",(char const *)format,
@@ -612,8 +612,8 @@ void test_specifier_application(char const *allowed, char const *fmt,
   size_t tmp;
   unsigned long __lengthof_format;
   int i;
-  __e_acsl_store_block((void *)(& fmt),(size_t)8);
-  __e_acsl_store_block((void *)(& allowed),(size_t)8);
+  __e_acsl_store_block((void *)(& fmt),8UL);
+  __e_acsl_store_block((void *)(& allowed),8UL);
   tmp = __gen_e_acsl_strlen(fmt);
   int len = (int)tmp;
   {
@@ -656,7 +656,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
   __lengthof_format = (unsigned long)(len + 1);
   char *format = __builtin_alloca(sizeof(char) * __lengthof_format);
   __e_acsl_store_block((void *)format,sizeof(char) * __lengthof_format);
-  __e_acsl_store_block((void *)(& format),(size_t)8);
+  __e_acsl_store_block((void *)(& format),8UL);
   __e_acsl_full_init((void *)(& format));
   __gen_e_acsl_strcpy(format,fmt);
   {
@@ -668,7 +668,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
       if (! ((size_t)i_0 < tmp_3)) break;
       {
         char *tmp_2;
-        __e_acsl_store_block((void *)(& tmp_2),(size_t)8);
+        __e_acsl_store_block((void *)(& tmp_2),8UL);
         int c = (int)*(valid_specifiers + i_0);
         __e_acsl_initialize((void *)(format + (len - 1)),sizeof(char));
         *(format + (len - 1)) = (char)c;
@@ -684,7 +684,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
               }
               else {
                 int process_status;
-                __e_acsl_store_block((void *)(& process_status),(size_t)4);
+                __e_acsl_store_block((void *)(& process_status),4UL);
                 __gen_e_acsl_waitpid(pid,& process_status,0);
                 signal_eval(process_status,0,(char const *)at);
                 __e_acsl_delete_block((void *)(& process_status));
@@ -701,7 +701,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
             }
             else {
               int process_status_0;
-              __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+              __e_acsl_store_block((void *)(& process_status_0),4UL);
               __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
               signal_eval(process_status_0,1,(char const *)at);
               __e_acsl_delete_block((void *)(& process_status_0));
@@ -738,8 +738,8 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
   unsigned long __gen_e_acsl_strcpy_src_size;
   char *__gen_e_acsl_at;
   char *__retres;
-  __e_acsl_store_block((void *)(& src),(size_t)8);
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& src),8UL);
+  __e_acsl_store_block((void *)(& dest),8UL);
   __gen_e_acsl_at = dest;
   __gen_e_acsl_strcpy_src_size = __e_acsl_builtin_strlen(src);
   __retres = strcpy(dest,src);
@@ -834,17 +834,17 @@ char *__gen_e_acsl_strchr(char const *s, int c)
   int __gen_e_acsl_at_2;
   char const *__gen_e_acsl_at;
   char *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& s),8UL);
   __gen_e_acsl_at = s;
   __gen_e_acsl_at_2 = c;
-  __gen_e_acsl_contract = __e_acsl_contract_init((size_t)3);
-  __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)2,1);
+  __gen_e_acsl_contract = __e_acsl_contract_init(3UL);
+  __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,2UL,1);
   __retres = strchr(s,c);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_initialized;
       int __gen_e_acsl_and;
@@ -918,7 +918,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
         {.values = (void *)0};
@@ -935,7 +935,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_or;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
@@ -981,7 +981,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
 size_t __gen_e_acsl_strlen(char const *s)
 {
   size_t __retres;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __retres = strlen(s);
   __e_acsl_delete_block((void *)(& s));
   return __retres;
@@ -1052,15 +1052,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
   pid_t __retres;
   {
     int __gen_e_acsl_assumes_value;
-    __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+    __e_acsl_store_block((void *)(& stat_loc),8UL);
     __gen_e_acsl_at = stat_loc;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            stat_loc == (int *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            stat_loc != (int *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -3470,11 +3470,11 @@ void __e_acsl_globals_init(void)
                          sizeof("% n"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_441);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_441);
-    __e_acsl_store_block((void *)(& valid_specifiers),(size_t)8);
+    __e_acsl_store_block((void *)(& valid_specifiers),8UL);
     __e_acsl_full_init((void *)(& valid_specifiers));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
   }
   return;
@@ -3492,7 +3492,7 @@ int main(int argc, char const **argv)
 {
   int __retres;
   char *s2;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *pstr = (char *)__gen_e_acsl_literal_string_10;
   char astr[13] =
@@ -3511,7 +3511,7 @@ int main(int argc, char const **argv)
      (char)'\000'};
   signed char *sastr = (signed char *)(astr);
   void *vptr = (void *)(& argc);
-  __e_acsl_store_block((void *)(& vptr),(size_t)8);
+  __e_acsl_store_block((void *)(& vptr),8UL);
   __e_acsl_full_init((void *)(& vptr));
   char chr = (char)'T';
   unsigned char uchr = (unsigned char)'U';
@@ -3519,7 +3519,7 @@ int main(int argc, char const **argv)
   unsigned short ushrt = (unsigned short)4567;
   int i = 268;
   unsigned int ui = (unsigned int)516;
-  wint_t wi = (unsigned int)123;
+  wint_t wi = (wint_t)123;
   long li = (long)3134;
   unsigned long lu = (unsigned long)7845216;
   long long lli = 123LL;
@@ -3527,10 +3527,10 @@ int main(int argc, char const **argv)
   float flt = (float)0.2;
   double dbl = 0.3;
   long double ldbl = (long double)0.3;
-  intmax_t imax = (long long)10;
-  uintmax_t uimax = (unsigned long long)10;
-  size_t szt = (unsigned long)10;
-  ptrdiff_t ptrdf = (long)147;
+  intmax_t imax = (intmax_t)10;
+  uintmax_t uimax = (uintmax_t)10;
+  size_t szt = (size_t)10;
+  ptrdiff_t ptrdf = (ptrdiff_t)147;
   {
     pid_t pid = __gen_e_acsl_fork();
     if (! pid) {
@@ -3539,7 +3539,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status;
-      __e_acsl_store_block((void *)(& process_status),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status),4UL);
       __gen_e_acsl_waitpid(pid,& process_status,0);
       signal_eval(process_status,0,__gen_e_acsl_literal_string_12);
       __e_acsl_delete_block((void *)(& process_status));
@@ -3554,7 +3554,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_0;
-      __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_0),4UL);
       __gen_e_acsl_waitpid(pid_0,& process_status_0,0);
       signal_eval(process_status_0,0,__gen_e_acsl_literal_string_14);
       __e_acsl_delete_block((void *)(& process_status_0));
@@ -3569,7 +3569,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_1;
-      __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_1),4UL);
       __gen_e_acsl_waitpid(pid_1,& process_status_1,0);
       signal_eval(process_status_1,1,__gen_e_acsl_literal_string_16);
       __e_acsl_delete_block((void *)(& process_status_1));
@@ -3584,7 +3584,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_2;
-      __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_2),4UL);
       __gen_e_acsl_waitpid(pid_2,& process_status_2,0);
       signal_eval(process_status_2,0,__gen_e_acsl_literal_string_18);
       __e_acsl_delete_block((void *)(& process_status_2));
@@ -3607,7 +3607,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_3;
-      __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_3),4UL);
       __gen_e_acsl_waitpid(pid_3,& process_status_3,0);
       signal_eval(process_status_3,1,__gen_e_acsl_literal_string_19);
       __e_acsl_delete_block((void *)(& process_status_3));
@@ -3621,7 +3621,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_4;
-      __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_4),4UL);
       __gen_e_acsl_waitpid(pid_4,& process_status_4,0);
       signal_eval(process_status_4,0,__gen_e_acsl_literal_string_21);
       __e_acsl_delete_block((void *)(& process_status_4));
@@ -3635,7 +3635,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_5;
-      __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_5),4UL);
       __gen_e_acsl_waitpid(pid_5,& process_status_5,0);
       signal_eval(process_status_5,1,__gen_e_acsl_literal_string_23);
       __e_acsl_delete_block((void *)(& process_status_5));
@@ -3649,7 +3649,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_6;
-      __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_6),4UL);
       __gen_e_acsl_waitpid(pid_6,& process_status_6,0);
       signal_eval(process_status_6,1,__gen_e_acsl_literal_string_25);
       __e_acsl_delete_block((void *)(& process_status_6));
@@ -3663,7 +3663,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_7;
-      __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_7),4UL);
       __gen_e_acsl_waitpid(pid_7,& process_status_7,0);
       signal_eval(process_status_7,1,__gen_e_acsl_literal_string_27);
       __e_acsl_delete_block((void *)(& process_status_7));
@@ -3677,7 +3677,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_8;
-      __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_8),4UL);
       __gen_e_acsl_waitpid(pid_8,& process_status_8,0);
       signal_eval(process_status_8,0,__gen_e_acsl_literal_string_29);
       __e_acsl_delete_block((void *)(& process_status_8));
@@ -3700,7 +3700,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_9;
-      __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_9),4UL);
       __gen_e_acsl_waitpid(pid_9,& process_status_9,0);
       signal_eval(process_status_9,0,__gen_e_acsl_literal_string_40);
       __e_acsl_delete_block((void *)(& process_status_9));
@@ -3714,7 +3714,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_10;
-      __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_10),4UL);
       __gen_e_acsl_waitpid(pid_10,& process_status_10,0);
       signal_eval(process_status_10,0,__gen_e_acsl_literal_string_42);
       __e_acsl_delete_block((void *)(& process_status_10));
@@ -3728,7 +3728,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_11;
-      __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_11),4UL);
       __gen_e_acsl_waitpid(pid_11,& process_status_11,0);
       signal_eval(process_status_11,1,__gen_e_acsl_literal_string_44);
       __e_acsl_delete_block((void *)(& process_status_11));
@@ -3745,7 +3745,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_12;
-      __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_12),4UL);
       __gen_e_acsl_waitpid(pid_12,& process_status_12,0);
       signal_eval(process_status_12,0,__gen_e_acsl_literal_string_49);
       __e_acsl_delete_block((void *)(& process_status_12));
@@ -3759,7 +3759,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_13;
-      __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_13),4UL);
       __gen_e_acsl_waitpid(pid_13,& process_status_13,0);
       signal_eval(process_status_13,0,__gen_e_acsl_literal_string_51);
       __e_acsl_delete_block((void *)(& process_status_13));
@@ -3773,7 +3773,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_14;
-      __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_14),4UL);
       __gen_e_acsl_waitpid(pid_14,& process_status_14,0);
       signal_eval(process_status_14,0,__gen_e_acsl_literal_string_53);
       __e_acsl_delete_block((void *)(& process_status_14));
@@ -3787,7 +3787,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_15;
-      __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_15),4UL);
       __gen_e_acsl_waitpid(pid_15,& process_status_15,0);
       signal_eval(process_status_15,0,__gen_e_acsl_literal_string_55);
       __e_acsl_delete_block((void *)(& process_status_15));
@@ -3801,7 +3801,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_16;
-      __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_16),4UL);
       __gen_e_acsl_waitpid(pid_16,& process_status_16,0);
       signal_eval(process_status_16,0,__gen_e_acsl_literal_string_57);
       __e_acsl_delete_block((void *)(& process_status_16));
@@ -3815,7 +3815,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_17;
-      __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_17),4UL);
       __gen_e_acsl_waitpid(pid_17,& process_status_17,0);
       signal_eval(process_status_17,0,__gen_e_acsl_literal_string_58);
       __e_acsl_delete_block((void *)(& process_status_17));
@@ -3829,7 +3829,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_18;
-      __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_18),4UL);
       __gen_e_acsl_waitpid(pid_18,& process_status_18,0);
       signal_eval(process_status_18,0,__gen_e_acsl_literal_string_60);
       __e_acsl_delete_block((void *)(& process_status_18));
@@ -3846,7 +3846,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_19;
-      __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_19),4UL);
       __gen_e_acsl_waitpid(pid_19,& process_status_19,0);
       signal_eval(process_status_19,0,__gen_e_acsl_literal_string_64);
       __e_acsl_delete_block((void *)(& process_status_19));
@@ -3860,7 +3860,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_20;
-      __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_20),4UL);
       __gen_e_acsl_waitpid(pid_20,& process_status_20,0);
       signal_eval(process_status_20,0,__gen_e_acsl_literal_string_66);
       __e_acsl_delete_block((void *)(& process_status_20));
@@ -3874,7 +3874,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_21;
-      __e_acsl_store_block((void *)(& process_status_21),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_21),4UL);
       __gen_e_acsl_waitpid(pid_21,& process_status_21,0);
       signal_eval(process_status_21,0,__gen_e_acsl_literal_string_68);
       __e_acsl_delete_block((void *)(& process_status_21));
@@ -3888,7 +3888,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_22;
-      __e_acsl_store_block((void *)(& process_status_22),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_22),4UL);
       __gen_e_acsl_waitpid(pid_22,& process_status_22,0);
       signal_eval(process_status_22,0,__gen_e_acsl_literal_string_70);
       __e_acsl_delete_block((void *)(& process_status_22));
@@ -3902,7 +3902,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_23;
-      __e_acsl_store_block((void *)(& process_status_23),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_23),4UL);
       __gen_e_acsl_waitpid(pid_23,& process_status_23,0);
       signal_eval(process_status_23,0,__gen_e_acsl_literal_string_72);
       __e_acsl_delete_block((void *)(& process_status_23));
@@ -3916,7 +3916,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_24;
-      __e_acsl_store_block((void *)(& process_status_24),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_24),4UL);
       __gen_e_acsl_waitpid(pid_24,& process_status_24,0);
       signal_eval(process_status_24,0,__gen_e_acsl_literal_string_73);
       __e_acsl_delete_block((void *)(& process_status_24));
@@ -3930,7 +3930,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_25;
-      __e_acsl_store_block((void *)(& process_status_25),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_25),4UL);
       __gen_e_acsl_waitpid(pid_25,& process_status_25,0);
       signal_eval(process_status_25,0,__gen_e_acsl_literal_string_75);
       __e_acsl_delete_block((void *)(& process_status_25));
@@ -3947,7 +3947,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_26;
-      __e_acsl_store_block((void *)(& process_status_26),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_26),4UL);
       __gen_e_acsl_waitpid(pid_26,& process_status_26,0);
       signal_eval(process_status_26,0,__gen_e_acsl_literal_string_80);
       __e_acsl_delete_block((void *)(& process_status_26));
@@ -3961,7 +3961,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_27;
-      __e_acsl_store_block((void *)(& process_status_27),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_27),4UL);
       __gen_e_acsl_waitpid(pid_27,& process_status_27,0);
       signal_eval(process_status_27,0,__gen_e_acsl_literal_string_82);
       __e_acsl_delete_block((void *)(& process_status_27));
@@ -3975,7 +3975,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_28;
-      __e_acsl_store_block((void *)(& process_status_28),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_28),4UL);
       __gen_e_acsl_waitpid(pid_28,& process_status_28,0);
       signal_eval(process_status_28,0,__gen_e_acsl_literal_string_84);
       __e_acsl_delete_block((void *)(& process_status_28));
@@ -3989,7 +3989,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_29;
-      __e_acsl_store_block((void *)(& process_status_29),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_29),4UL);
       __gen_e_acsl_waitpid(pid_29,& process_status_29,0);
       signal_eval(process_status_29,0,__gen_e_acsl_literal_string_86);
       __e_acsl_delete_block((void *)(& process_status_29));
@@ -4003,7 +4003,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_30;
-      __e_acsl_store_block((void *)(& process_status_30),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_30),4UL);
       __gen_e_acsl_waitpid(pid_30,& process_status_30,0);
       signal_eval(process_status_30,0,__gen_e_acsl_literal_string_88);
       __e_acsl_delete_block((void *)(& process_status_30));
@@ -4017,7 +4017,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_31;
-      __e_acsl_store_block((void *)(& process_status_31),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_31),4UL);
       __gen_e_acsl_waitpid(pid_31,& process_status_31,0);
       signal_eval(process_status_31,0,__gen_e_acsl_literal_string_89);
       __e_acsl_delete_block((void *)(& process_status_31));
@@ -4031,7 +4031,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_32;
-      __e_acsl_store_block((void *)(& process_status_32),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_32),4UL);
       __gen_e_acsl_waitpid(pid_32,& process_status_32,0);
       signal_eval(process_status_32,0,__gen_e_acsl_literal_string_91);
       __e_acsl_delete_block((void *)(& process_status_32));
@@ -4045,7 +4045,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_33;
-      __e_acsl_store_block((void *)(& process_status_33),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_33),4UL);
       __gen_e_acsl_waitpid(pid_33,& process_status_33,0);
       signal_eval(process_status_33,0,__gen_e_acsl_literal_string_93);
       __e_acsl_delete_block((void *)(& process_status_33));
@@ -4059,7 +4059,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_34;
-      __e_acsl_store_block((void *)(& process_status_34),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_34),4UL);
       __gen_e_acsl_waitpid(pid_34,& process_status_34,0);
       signal_eval(process_status_34,0,__gen_e_acsl_literal_string_95);
       __e_acsl_delete_block((void *)(& process_status_34));
@@ -4073,7 +4073,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_35;
-      __e_acsl_store_block((void *)(& process_status_35),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_35),4UL);
       __gen_e_acsl_waitpid(pid_35,& process_status_35,0);
       signal_eval(process_status_35,0,__gen_e_acsl_literal_string_97);
       __e_acsl_delete_block((void *)(& process_status_35));
@@ -4087,7 +4087,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_36;
-      __e_acsl_store_block((void *)(& process_status_36),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_36),4UL);
       __gen_e_acsl_waitpid(pid_36,& process_status_36,0);
       signal_eval(process_status_36,0,__gen_e_acsl_literal_string_99);
       __e_acsl_delete_block((void *)(& process_status_36));
@@ -4101,7 +4101,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_37;
-      __e_acsl_store_block((void *)(& process_status_37),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_37),4UL);
       __gen_e_acsl_waitpid(pid_37,& process_status_37,0);
       signal_eval(process_status_37,0,__gen_e_acsl_literal_string_101);
       __e_acsl_delete_block((void *)(& process_status_37));
@@ -4115,7 +4115,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_38;
-      __e_acsl_store_block((void *)(& process_status_38),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_38),4UL);
       __gen_e_acsl_waitpid(pid_38,& process_status_38,0);
       signal_eval(process_status_38,0,__gen_e_acsl_literal_string_103);
       __e_acsl_delete_block((void *)(& process_status_38));
@@ -4129,7 +4129,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_39;
-      __e_acsl_store_block((void *)(& process_status_39),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_39),4UL);
       __gen_e_acsl_waitpid(pid_39,& process_status_39,0);
       signal_eval(process_status_39,0,__gen_e_acsl_literal_string_105);
       __e_acsl_delete_block((void *)(& process_status_39));
@@ -4143,7 +4143,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_40;
-      __e_acsl_store_block((void *)(& process_status_40),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_40),4UL);
       __gen_e_acsl_waitpid(pid_40,& process_status_40,0);
       signal_eval(process_status_40,0,__gen_e_acsl_literal_string_107);
       __e_acsl_delete_block((void *)(& process_status_40));
@@ -4157,7 +4157,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_41;
-      __e_acsl_store_block((void *)(& process_status_41),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_41),4UL);
       __gen_e_acsl_waitpid(pid_41,& process_status_41,0);
       signal_eval(process_status_41,0,__gen_e_acsl_literal_string_109);
       __e_acsl_delete_block((void *)(& process_status_41));
@@ -4171,7 +4171,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_42;
-      __e_acsl_store_block((void *)(& process_status_42),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_42),4UL);
       __gen_e_acsl_waitpid(pid_42,& process_status_42,0);
       signal_eval(process_status_42,0,__gen_e_acsl_literal_string_111);
       __e_acsl_delete_block((void *)(& process_status_42));
@@ -4185,7 +4185,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_43;
-      __e_acsl_store_block((void *)(& process_status_43),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_43),4UL);
       __gen_e_acsl_waitpid(pid_43,& process_status_43,0);
       signal_eval(process_status_43,0,__gen_e_acsl_literal_string_113);
       __e_acsl_delete_block((void *)(& process_status_43));
@@ -4199,7 +4199,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_44;
-      __e_acsl_store_block((void *)(& process_status_44),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_44),4UL);
       __gen_e_acsl_waitpid(pid_44,& process_status_44,0);
       signal_eval(process_status_44,0,__gen_e_acsl_literal_string_115);
       __e_acsl_delete_block((void *)(& process_status_44));
@@ -4213,7 +4213,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_45;
-      __e_acsl_store_block((void *)(& process_status_45),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_45),4UL);
       __gen_e_acsl_waitpid(pid_45,& process_status_45,0);
       signal_eval(process_status_45,0,__gen_e_acsl_literal_string_117);
       __e_acsl_delete_block((void *)(& process_status_45));
@@ -4227,7 +4227,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_46;
-      __e_acsl_store_block((void *)(& process_status_46),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_46),4UL);
       __gen_e_acsl_waitpid(pid_46,& process_status_46,0);
       signal_eval(process_status_46,0,__gen_e_acsl_literal_string_119);
       __e_acsl_delete_block((void *)(& process_status_46));
@@ -4241,7 +4241,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_47;
-      __e_acsl_store_block((void *)(& process_status_47),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_47),4UL);
       __gen_e_acsl_waitpid(pid_47,& process_status_47,0);
       signal_eval(process_status_47,0,__gen_e_acsl_literal_string_121);
       __e_acsl_delete_block((void *)(& process_status_47));
@@ -4255,7 +4255,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_48;
-      __e_acsl_store_block((void *)(& process_status_48),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_48),4UL);
       __gen_e_acsl_waitpid(pid_48,& process_status_48,0);
       signal_eval(process_status_48,0,__gen_e_acsl_literal_string_123);
       __e_acsl_delete_block((void *)(& process_status_48));
@@ -4272,7 +4272,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_49;
-      __e_acsl_store_block((void *)(& process_status_49),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_49),4UL);
       __gen_e_acsl_waitpid(pid_49,& process_status_49,0);
       signal_eval(process_status_49,0,__gen_e_acsl_literal_string_127);
       __e_acsl_delete_block((void *)(& process_status_49));
@@ -4286,7 +4286,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_50;
-      __e_acsl_store_block((void *)(& process_status_50),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_50),4UL);
       __gen_e_acsl_waitpid(pid_50,& process_status_50,0);
       signal_eval(process_status_50,0,__gen_e_acsl_literal_string_129);
       __e_acsl_delete_block((void *)(& process_status_50));
@@ -4300,7 +4300,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_51;
-      __e_acsl_store_block((void *)(& process_status_51),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_51),4UL);
       __gen_e_acsl_waitpid(pid_51,& process_status_51,0);
       signal_eval(process_status_51,0,__gen_e_acsl_literal_string_131);
       __e_acsl_delete_block((void *)(& process_status_51));
@@ -4314,7 +4314,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_52;
-      __e_acsl_store_block((void *)(& process_status_52),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_52),4UL);
       __gen_e_acsl_waitpid(pid_52,& process_status_52,0);
       signal_eval(process_status_52,0,__gen_e_acsl_literal_string_133);
       __e_acsl_delete_block((void *)(& process_status_52));
@@ -4328,7 +4328,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_53;
-      __e_acsl_store_block((void *)(& process_status_53),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_53),4UL);
       __gen_e_acsl_waitpid(pid_53,& process_status_53,0);
       signal_eval(process_status_53,0,__gen_e_acsl_literal_string_135);
       __e_acsl_delete_block((void *)(& process_status_53));
@@ -4342,7 +4342,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_54;
-      __e_acsl_store_block((void *)(& process_status_54),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_54),4UL);
       __gen_e_acsl_waitpid(pid_54,& process_status_54,0);
       signal_eval(process_status_54,0,__gen_e_acsl_literal_string_136);
       __e_acsl_delete_block((void *)(& process_status_54));
@@ -4356,7 +4356,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_55;
-      __e_acsl_store_block((void *)(& process_status_55),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_55),4UL);
       __gen_e_acsl_waitpid(pid_55,& process_status_55,0);
       signal_eval(process_status_55,0,__gen_e_acsl_literal_string_138);
       __e_acsl_delete_block((void *)(& process_status_55));
@@ -4373,7 +4373,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_56;
-      __e_acsl_store_block((void *)(& process_status_56),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_56),4UL);
       __gen_e_acsl_waitpid(pid_56,& process_status_56,0);
       signal_eval(process_status_56,0,__gen_e_acsl_literal_string_142);
       __e_acsl_delete_block((void *)(& process_status_56));
@@ -4387,7 +4387,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_57;
-      __e_acsl_store_block((void *)(& process_status_57),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_57),4UL);
       __gen_e_acsl_waitpid(pid_57,& process_status_57,0);
       signal_eval(process_status_57,0,__gen_e_acsl_literal_string_144);
       __e_acsl_delete_block((void *)(& process_status_57));
@@ -4401,7 +4401,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_58;
-      __e_acsl_store_block((void *)(& process_status_58),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_58),4UL);
       __gen_e_acsl_waitpid(pid_58,& process_status_58,0);
       signal_eval(process_status_58,0,__gen_e_acsl_literal_string_146);
       __e_acsl_delete_block((void *)(& process_status_58));
@@ -4415,7 +4415,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_59;
-      __e_acsl_store_block((void *)(& process_status_59),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_59),4UL);
       __gen_e_acsl_waitpid(pid_59,& process_status_59,0);
       signal_eval(process_status_59,0,__gen_e_acsl_literal_string_148);
       __e_acsl_delete_block((void *)(& process_status_59));
@@ -4429,7 +4429,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_60;
-      __e_acsl_store_block((void *)(& process_status_60),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_60),4UL);
       __gen_e_acsl_waitpid(pid_60,& process_status_60,0);
       signal_eval(process_status_60,0,__gen_e_acsl_literal_string_150);
       __e_acsl_delete_block((void *)(& process_status_60));
@@ -4443,7 +4443,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_61;
-      __e_acsl_store_block((void *)(& process_status_61),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_61),4UL);
       __gen_e_acsl_waitpid(pid_61,& process_status_61,0);
       signal_eval(process_status_61,0,__gen_e_acsl_literal_string_151);
       __e_acsl_delete_block((void *)(& process_status_61));
@@ -4457,7 +4457,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_62;
-      __e_acsl_store_block((void *)(& process_status_62),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_62),4UL);
       __gen_e_acsl_waitpid(pid_62,& process_status_62,0);
       signal_eval(process_status_62,0,__gen_e_acsl_literal_string_153);
       __e_acsl_delete_block((void *)(& process_status_62));
@@ -4474,7 +4474,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_63;
-      __e_acsl_store_block((void *)(& process_status_63),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_63),4UL);
       __gen_e_acsl_waitpid(pid_63,& process_status_63,0);
       signal_eval(process_status_63,0,__gen_e_acsl_literal_string_157);
       __e_acsl_delete_block((void *)(& process_status_63));
@@ -4488,7 +4488,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_64;
-      __e_acsl_store_block((void *)(& process_status_64),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_64),4UL);
       __gen_e_acsl_waitpid(pid_64,& process_status_64,0);
       signal_eval(process_status_64,0,__gen_e_acsl_literal_string_159);
       __e_acsl_delete_block((void *)(& process_status_64));
@@ -4502,7 +4502,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_65;
-      __e_acsl_store_block((void *)(& process_status_65),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_65),4UL);
       __gen_e_acsl_waitpid(pid_65,& process_status_65,0);
       signal_eval(process_status_65,0,__gen_e_acsl_literal_string_161);
       __e_acsl_delete_block((void *)(& process_status_65));
@@ -4516,7 +4516,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_66;
-      __e_acsl_store_block((void *)(& process_status_66),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_66),4UL);
       __gen_e_acsl_waitpid(pid_66,& process_status_66,0);
       signal_eval(process_status_66,0,__gen_e_acsl_literal_string_162);
       __e_acsl_delete_block((void *)(& process_status_66));
@@ -4530,7 +4530,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_67;
-      __e_acsl_store_block((void *)(& process_status_67),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_67),4UL);
       __gen_e_acsl_waitpid(pid_67,& process_status_67,0);
       signal_eval(process_status_67,0,__gen_e_acsl_literal_string_164);
       __e_acsl_delete_block((void *)(& process_status_67));
@@ -4544,7 +4544,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_68;
-      __e_acsl_store_block((void *)(& process_status_68),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_68),4UL);
       __gen_e_acsl_waitpid(pid_68,& process_status_68,0);
       signal_eval(process_status_68,0,__gen_e_acsl_literal_string_166);
       __e_acsl_delete_block((void *)(& process_status_68));
@@ -4558,7 +4558,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_69;
-      __e_acsl_store_block((void *)(& process_status_69),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_69),4UL);
       __gen_e_acsl_waitpid(pid_69,& process_status_69,0);
       signal_eval(process_status_69,0,__gen_e_acsl_literal_string_168);
       __e_acsl_delete_block((void *)(& process_status_69));
@@ -4575,7 +4575,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_70;
-      __e_acsl_store_block((void *)(& process_status_70),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_70),4UL);
       __gen_e_acsl_waitpid(pid_70,& process_status_70,0);
       signal_eval(process_status_70,0,__gen_e_acsl_literal_string_173);
       __e_acsl_delete_block((void *)(& process_status_70));
@@ -4589,7 +4589,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_71;
-      __e_acsl_store_block((void *)(& process_status_71),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_71),4UL);
       __gen_e_acsl_waitpid(pid_71,& process_status_71,0);
       signal_eval(process_status_71,0,__gen_e_acsl_literal_string_175);
       __e_acsl_delete_block((void *)(& process_status_71));
@@ -4603,7 +4603,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_72;
-      __e_acsl_store_block((void *)(& process_status_72),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_72),4UL);
       __gen_e_acsl_waitpid(pid_72,& process_status_72,0);
       signal_eval(process_status_72,0,__gen_e_acsl_literal_string_177);
       __e_acsl_delete_block((void *)(& process_status_72));
@@ -4617,7 +4617,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_73;
-      __e_acsl_store_block((void *)(& process_status_73),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_73),4UL);
       __gen_e_acsl_waitpid(pid_73,& process_status_73,0);
       signal_eval(process_status_73,0,__gen_e_acsl_literal_string_179);
       __e_acsl_delete_block((void *)(& process_status_73));
@@ -4631,7 +4631,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_74;
-      __e_acsl_store_block((void *)(& process_status_74),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_74),4UL);
       __gen_e_acsl_waitpid(pid_74,& process_status_74,0);
       signal_eval(process_status_74,0,__gen_e_acsl_literal_string_181);
       __e_acsl_delete_block((void *)(& process_status_74));
@@ -4645,7 +4645,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_75;
-      __e_acsl_store_block((void *)(& process_status_75),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_75),4UL);
       __gen_e_acsl_waitpid(pid_75,& process_status_75,0);
       signal_eval(process_status_75,0,__gen_e_acsl_literal_string_183);
       __e_acsl_delete_block((void *)(& process_status_75));
@@ -4659,7 +4659,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_76;
-      __e_acsl_store_block((void *)(& process_status_76),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_76),4UL);
       __gen_e_acsl_waitpid(pid_76,& process_status_76,0);
       signal_eval(process_status_76,0,__gen_e_acsl_literal_string_185);
       __e_acsl_delete_block((void *)(& process_status_76));
@@ -4673,7 +4673,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_77;
-      __e_acsl_store_block((void *)(& process_status_77),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_77),4UL);
       __gen_e_acsl_waitpid(pid_77,& process_status_77,0);
       signal_eval(process_status_77,0,__gen_e_acsl_literal_string_187);
       __e_acsl_delete_block((void *)(& process_status_77));
@@ -4687,7 +4687,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_78;
-      __e_acsl_store_block((void *)(& process_status_78),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_78),4UL);
       __gen_e_acsl_waitpid(pid_78,& process_status_78,0);
       signal_eval(process_status_78,1,__gen_e_acsl_literal_string_189);
       __e_acsl_delete_block((void *)(& process_status_78));
@@ -4701,7 +4701,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_79;
-      __e_acsl_store_block((void *)(& process_status_79),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_79),4UL);
       __gen_e_acsl_waitpid(pid_79,& process_status_79,0);
       signal_eval(process_status_79,1,__gen_e_acsl_literal_string_191);
       __e_acsl_delete_block((void *)(& process_status_79));
@@ -4715,7 +4715,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_80;
-      __e_acsl_store_block((void *)(& process_status_80),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_80),4UL);
       __gen_e_acsl_waitpid(pid_80,& process_status_80,0);
       signal_eval(process_status_80,1,__gen_e_acsl_literal_string_193);
       __e_acsl_delete_block((void *)(& process_status_80));
@@ -4729,7 +4729,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_81;
-      __e_acsl_store_block((void *)(& process_status_81),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_81),4UL);
       __gen_e_acsl_waitpid(pid_81,& process_status_81,0);
       signal_eval(process_status_81,0,__gen_e_acsl_literal_string_195);
       __e_acsl_delete_block((void *)(& process_status_81));
@@ -4743,7 +4743,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_82;
-      __e_acsl_store_block((void *)(& process_status_82),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_82),4UL);
       __gen_e_acsl_waitpid(pid_82,& process_status_82,0);
       signal_eval(process_status_82,0,__gen_e_acsl_literal_string_197);
       __e_acsl_delete_block((void *)(& process_status_82));
@@ -4757,7 +4757,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_83;
-      __e_acsl_store_block((void *)(& process_status_83),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_83),4UL);
       __gen_e_acsl_waitpid(pid_83,& process_status_83,0);
       signal_eval(process_status_83,0,__gen_e_acsl_literal_string_198);
       __e_acsl_delete_block((void *)(& process_status_83));
@@ -4771,7 +4771,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_84;
-      __e_acsl_store_block((void *)(& process_status_84),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_84),4UL);
       __gen_e_acsl_waitpid(pid_84,& process_status_84,0);
       signal_eval(process_status_84,0,__gen_e_acsl_literal_string_199);
       __e_acsl_delete_block((void *)(& process_status_84));
@@ -4785,7 +4785,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_85;
-      __e_acsl_store_block((void *)(& process_status_85),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_85),4UL);
       __gen_e_acsl_waitpid(pid_85,& process_status_85,0);
       signal_eval(process_status_85,0,__gen_e_acsl_literal_string_200);
       __e_acsl_delete_block((void *)(& process_status_85));
@@ -4799,7 +4799,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_86;
-      __e_acsl_store_block((void *)(& process_status_86),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_86),4UL);
       __gen_e_acsl_waitpid(pid_86,& process_status_86,0);
       signal_eval(process_status_86,0,__gen_e_acsl_literal_string_201);
       __e_acsl_delete_block((void *)(& process_status_86));
@@ -4813,7 +4813,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_87;
-      __e_acsl_store_block((void *)(& process_status_87),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_87),4UL);
       __gen_e_acsl_waitpid(pid_87,& process_status_87,0);
       signal_eval(process_status_87,1,__gen_e_acsl_literal_string_202);
       __e_acsl_delete_block((void *)(& process_status_87));
@@ -4827,7 +4827,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_88;
-      __e_acsl_store_block((void *)(& process_status_88),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_88),4UL);
       __gen_e_acsl_waitpid(pid_88,& process_status_88,0);
       signal_eval(process_status_88,1,__gen_e_acsl_literal_string_203);
       __e_acsl_delete_block((void *)(& process_status_88));
@@ -4841,7 +4841,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_89;
-      __e_acsl_store_block((void *)(& process_status_89),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_89),4UL);
       __gen_e_acsl_waitpid(pid_89,& process_status_89,0);
       signal_eval(process_status_89,1,__gen_e_acsl_literal_string_204);
       __e_acsl_delete_block((void *)(& process_status_89));
@@ -4855,7 +4855,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_90;
-      __e_acsl_store_block((void *)(& process_status_90),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_90),4UL);
       __gen_e_acsl_waitpid(pid_90,& process_status_90,0);
       signal_eval(process_status_90,1,__gen_e_acsl_literal_string_205);
       __e_acsl_delete_block((void *)(& process_status_90));
@@ -4869,7 +4869,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_91;
-      __e_acsl_store_block((void *)(& process_status_91),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_91),4UL);
       __gen_e_acsl_waitpid(pid_91,& process_status_91,0);
       signal_eval(process_status_91,1,__gen_e_acsl_literal_string_206);
       __e_acsl_delete_block((void *)(& process_status_91));
@@ -4883,7 +4883,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_92;
-      __e_acsl_store_block((void *)(& process_status_92),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_92),4UL);
       __gen_e_acsl_waitpid(pid_92,& process_status_92,0);
       signal_eval(process_status_92,1,__gen_e_acsl_literal_string_207);
       __e_acsl_delete_block((void *)(& process_status_92));
@@ -4898,7 +4898,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_93;
-      __e_acsl_store_block((void *)(& process_status_93),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_93),4UL);
       __gen_e_acsl_waitpid(pid_93,& process_status_93,0);
       signal_eval(process_status_93,1,__gen_e_acsl_literal_string_208);
       __e_acsl_delete_block((void *)(& process_status_93));
@@ -4913,7 +4913,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_94;
-      __e_acsl_store_block((void *)(& process_status_94),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_94),4UL);
       __gen_e_acsl_waitpid(pid_94,& process_status_94,0);
       signal_eval(process_status_94,1,__gen_e_acsl_literal_string_209);
       __e_acsl_delete_block((void *)(& process_status_94));
@@ -4927,7 +4927,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_95;
-      __e_acsl_store_block((void *)(& process_status_95),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_95),4UL);
       __gen_e_acsl_waitpid(pid_95,& process_status_95,0);
       signal_eval(process_status_95,0,__gen_e_acsl_literal_string_211);
       __e_acsl_delete_block((void *)(& process_status_95));
@@ -4941,7 +4941,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_96;
-      __e_acsl_store_block((void *)(& process_status_96),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_96),4UL);
       __gen_e_acsl_waitpid(pid_96,& process_status_96,0);
       signal_eval(process_status_96,0,__gen_e_acsl_literal_string_212);
       __e_acsl_delete_block((void *)(& process_status_96));
@@ -4955,7 +4955,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_97;
-      __e_acsl_store_block((void *)(& process_status_97),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_97),4UL);
       __gen_e_acsl_waitpid(pid_97,& process_status_97,0);
       signal_eval(process_status_97,0,__gen_e_acsl_literal_string_214);
       __e_acsl_delete_block((void *)(& process_status_97));
@@ -4969,7 +4969,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_98;
-      __e_acsl_store_block((void *)(& process_status_98),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_98),4UL);
       __gen_e_acsl_waitpid(pid_98,& process_status_98,0);
       signal_eval(process_status_98,0,__gen_e_acsl_literal_string_215);
       __e_acsl_delete_block((void *)(& process_status_98));
@@ -4983,7 +4983,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_99;
-      __e_acsl_store_block((void *)(& process_status_99),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_99),4UL);
       __gen_e_acsl_waitpid(pid_99,& process_status_99,0);
       signal_eval(process_status_99,0,__gen_e_acsl_literal_string_217);
       __e_acsl_delete_block((void *)(& process_status_99));
@@ -4997,7 +4997,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_100;
-      __e_acsl_store_block((void *)(& process_status_100),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_100),4UL);
       __gen_e_acsl_waitpid(pid_100,& process_status_100,0);
       signal_eval(process_status_100,0,__gen_e_acsl_literal_string_219);
       __e_acsl_delete_block((void *)(& process_status_100));
@@ -5011,7 +5011,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_101;
-      __e_acsl_store_block((void *)(& process_status_101),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_101),4UL);
       __gen_e_acsl_waitpid(pid_101,& process_status_101,0);
       signal_eval(process_status_101,0,__gen_e_acsl_literal_string_221);
       __e_acsl_delete_block((void *)(& process_status_101));
@@ -5025,7 +5025,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_102;
-      __e_acsl_store_block((void *)(& process_status_102),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_102),4UL);
       __gen_e_acsl_waitpid(pid_102,& process_status_102,0);
       signal_eval(process_status_102,0,__gen_e_acsl_literal_string_223);
       __e_acsl_delete_block((void *)(& process_status_102));
@@ -5039,7 +5039,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_103;
-      __e_acsl_store_block((void *)(& process_status_103),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_103),4UL);
       __gen_e_acsl_waitpid(pid_103,& process_status_103,0);
       signal_eval(process_status_103,0,__gen_e_acsl_literal_string_225);
       __e_acsl_delete_block((void *)(& process_status_103));
@@ -5053,7 +5053,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_104;
-      __e_acsl_store_block((void *)(& process_status_104),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_104),4UL);
       __gen_e_acsl_waitpid(pid_104,& process_status_104,0);
       signal_eval(process_status_104,0,__gen_e_acsl_literal_string_227);
       __e_acsl_delete_block((void *)(& process_status_104));
@@ -5067,7 +5067,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_105;
-      __e_acsl_store_block((void *)(& process_status_105),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_105),4UL);
       __gen_e_acsl_waitpid(pid_105,& process_status_105,0);
       signal_eval(process_status_105,0,__gen_e_acsl_literal_string_229);
       __e_acsl_delete_block((void *)(& process_status_105));
@@ -5081,7 +5081,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_106;
-      __e_acsl_store_block((void *)(& process_status_106),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_106),4UL);
       __gen_e_acsl_waitpid(pid_106,& process_status_106,0);
       signal_eval(process_status_106,0,__gen_e_acsl_literal_string_231);
       __e_acsl_delete_block((void *)(& process_status_106));
@@ -5095,7 +5095,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_107;
-      __e_acsl_store_block((void *)(& process_status_107),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_107),4UL);
       __gen_e_acsl_waitpid(pid_107,& process_status_107,0);
       signal_eval(process_status_107,0,__gen_e_acsl_literal_string_233);
       __e_acsl_delete_block((void *)(& process_status_107));
@@ -5109,7 +5109,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_108;
-      __e_acsl_store_block((void *)(& process_status_108),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_108),4UL);
       __gen_e_acsl_waitpid(pid_108,& process_status_108,0);
       signal_eval(process_status_108,0,__gen_e_acsl_literal_string_235);
       __e_acsl_delete_block((void *)(& process_status_108));
@@ -5123,7 +5123,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_109;
-      __e_acsl_store_block((void *)(& process_status_109),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_109),4UL);
       __gen_e_acsl_waitpid(pid_109,& process_status_109,0);
       signal_eval(process_status_109,0,__gen_e_acsl_literal_string_237);
       __e_acsl_delete_block((void *)(& process_status_109));
@@ -5137,7 +5137,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_110;
-      __e_acsl_store_block((void *)(& process_status_110),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_110),4UL);
       __gen_e_acsl_waitpid(pid_110,& process_status_110,0);
       signal_eval(process_status_110,0,__gen_e_acsl_literal_string_239);
       __e_acsl_delete_block((void *)(& process_status_110));
@@ -5151,7 +5151,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_111;
-      __e_acsl_store_block((void *)(& process_status_111),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_111),4UL);
       __gen_e_acsl_waitpid(pid_111,& process_status_111,0);
       signal_eval(process_status_111,1,__gen_e_acsl_literal_string_240);
       __e_acsl_delete_block((void *)(& process_status_111));
@@ -5165,7 +5165,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_112;
-      __e_acsl_store_block((void *)(& process_status_112),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_112),4UL);
       __gen_e_acsl_waitpid(pid_112,& process_status_112,0);
       signal_eval(process_status_112,1,__gen_e_acsl_literal_string_241);
       __e_acsl_delete_block((void *)(& process_status_112));
@@ -5179,7 +5179,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_113;
-      __e_acsl_store_block((void *)(& process_status_113),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_113),4UL);
       __gen_e_acsl_waitpid(pid_113,& process_status_113,0);
       signal_eval(process_status_113,1,__gen_e_acsl_literal_string_242);
       __e_acsl_delete_block((void *)(& process_status_113));
@@ -5193,7 +5193,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_114;
-      __e_acsl_store_block((void *)(& process_status_114),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_114),4UL);
       __gen_e_acsl_waitpid(pid_114,& process_status_114,0);
       signal_eval(process_status_114,1,__gen_e_acsl_literal_string_243);
       __e_acsl_delete_block((void *)(& process_status_114));
@@ -5207,7 +5207,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_115;
-      __e_acsl_store_block((void *)(& process_status_115),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_115),4UL);
       __gen_e_acsl_waitpid(pid_115,& process_status_115,0);
       signal_eval(process_status_115,1,__gen_e_acsl_literal_string_244);
       __e_acsl_delete_block((void *)(& process_status_115));
@@ -5221,7 +5221,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_116;
-      __e_acsl_store_block((void *)(& process_status_116),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_116),4UL);
       __gen_e_acsl_waitpid(pid_116,& process_status_116,0);
       signal_eval(process_status_116,1,__gen_e_acsl_literal_string_245);
       __e_acsl_delete_block((void *)(& process_status_116));
@@ -5235,7 +5235,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_117;
-      __e_acsl_store_block((void *)(& process_status_117),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_117),4UL);
       __gen_e_acsl_waitpid(pid_117,& process_status_117,0);
       signal_eval(process_status_117,1,__gen_e_acsl_literal_string_246);
       __e_acsl_delete_block((void *)(& process_status_117));
@@ -5249,7 +5249,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_118;
-      __e_acsl_store_block((void *)(& process_status_118),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_118),4UL);
       __gen_e_acsl_waitpid(pid_118,& process_status_118,0);
       signal_eval(process_status_118,1,__gen_e_acsl_literal_string_247);
       __e_acsl_delete_block((void *)(& process_status_118));
@@ -5264,7 +5264,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_119;
-      __e_acsl_store_block((void *)(& process_status_119),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_119),4UL);
       __gen_e_acsl_waitpid(pid_119,& process_status_119,0);
       signal_eval(process_status_119,1,__gen_e_acsl_literal_string_248);
       __e_acsl_delete_block((void *)(& process_status_119));
@@ -5279,7 +5279,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_120;
-      __e_acsl_store_block((void *)(& process_status_120),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_120),4UL);
       __gen_e_acsl_waitpid(pid_120,& process_status_120,0);
       signal_eval(process_status_120,1,__gen_e_acsl_literal_string_249);
       __e_acsl_delete_block((void *)(& process_status_120));
@@ -5294,7 +5294,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_121;
-      __e_acsl_store_block((void *)(& process_status_121),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_121),4UL);
       __gen_e_acsl_waitpid(pid_121,& process_status_121,0);
       signal_eval(process_status_121,1,__gen_e_acsl_literal_string_250);
       __e_acsl_delete_block((void *)(& process_status_121));
@@ -5309,7 +5309,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_122;
-      __e_acsl_store_block((void *)(& process_status_122),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_122),4UL);
       __gen_e_acsl_waitpid(pid_122,& process_status_122,0);
       signal_eval(process_status_122,1,__gen_e_acsl_literal_string_251);
       __e_acsl_delete_block((void *)(& process_status_122));
@@ -5323,7 +5323,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_123;
-      __e_acsl_store_block((void *)(& process_status_123),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_123),4UL);
       __gen_e_acsl_waitpid(pid_123,& process_status_123,0);
       signal_eval(process_status_123,1,__gen_e_acsl_literal_string_252);
       __e_acsl_delete_block((void *)(& process_status_123));
@@ -5337,7 +5337,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_124;
-      __e_acsl_store_block((void *)(& process_status_124),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_124),4UL);
       __gen_e_acsl_waitpid(pid_124,& process_status_124,0);
       signal_eval(process_status_124,1,__gen_e_acsl_literal_string_253);
       __e_acsl_delete_block((void *)(& process_status_124));
@@ -5351,7 +5351,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_125;
-      __e_acsl_store_block((void *)(& process_status_125),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_125),4UL);
       __gen_e_acsl_waitpid(pid_125,& process_status_125,0);
       signal_eval(process_status_125,1,__gen_e_acsl_literal_string_254);
       __e_acsl_delete_block((void *)(& process_status_125));
@@ -5365,7 +5365,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_126;
-      __e_acsl_store_block((void *)(& process_status_126),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_126),4UL);
       __gen_e_acsl_waitpid(pid_126,& process_status_126,0);
       signal_eval(process_status_126,1,__gen_e_acsl_literal_string_255);
       __e_acsl_delete_block((void *)(& process_status_126));
@@ -5379,7 +5379,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_127;
-      __e_acsl_store_block((void *)(& process_status_127),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_127),4UL);
       __gen_e_acsl_waitpid(pid_127,& process_status_127,0);
       signal_eval(process_status_127,1,__gen_e_acsl_literal_string_256);
       __e_acsl_delete_block((void *)(& process_status_127));
@@ -5393,7 +5393,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_128;
-      __e_acsl_store_block((void *)(& process_status_128),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_128),4UL);
       __gen_e_acsl_waitpid(pid_128,& process_status_128,0);
       signal_eval(process_status_128,1,__gen_e_acsl_literal_string_257);
       __e_acsl_delete_block((void *)(& process_status_128));
@@ -5407,7 +5407,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_129;
-      __e_acsl_store_block((void *)(& process_status_129),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_129),4UL);
       __gen_e_acsl_waitpid(pid_129,& process_status_129,0);
       signal_eval(process_status_129,1,__gen_e_acsl_literal_string_258);
       __e_acsl_delete_block((void *)(& process_status_129));
@@ -5421,7 +5421,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_130;
-      __e_acsl_store_block((void *)(& process_status_130),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_130),4UL);
       __gen_e_acsl_waitpid(pid_130,& process_status_130,0);
       signal_eval(process_status_130,1,__gen_e_acsl_literal_string_259);
       __e_acsl_delete_block((void *)(& process_status_130));
@@ -5435,7 +5435,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_131;
-      __e_acsl_store_block((void *)(& process_status_131),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_131),4UL);
       __gen_e_acsl_waitpid(pid_131,& process_status_131,0);
       signal_eval(process_status_131,0,__gen_e_acsl_literal_string_261);
       __e_acsl_delete_block((void *)(& process_status_131));
@@ -5449,7 +5449,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_132;
-      __e_acsl_store_block((void *)(& process_status_132),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_132),4UL);
       __gen_e_acsl_waitpid(pid_132,& process_status_132,0);
       signal_eval(process_status_132,0,__gen_e_acsl_literal_string_263);
       __e_acsl_delete_block((void *)(& process_status_132));
@@ -5463,7 +5463,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_133;
-      __e_acsl_store_block((void *)(& process_status_133),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_133),4UL);
       __gen_e_acsl_waitpid(pid_133,& process_status_133,0);
       signal_eval(process_status_133,0,__gen_e_acsl_literal_string_265);
       __e_acsl_delete_block((void *)(& process_status_133));
@@ -5477,7 +5477,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_134;
-      __e_acsl_store_block((void *)(& process_status_134),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_134),4UL);
       __gen_e_acsl_waitpid(pid_134,& process_status_134,0);
       signal_eval(process_status_134,0,__gen_e_acsl_literal_string_267);
       __e_acsl_delete_block((void *)(& process_status_134));
@@ -5491,7 +5491,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_135;
-      __e_acsl_store_block((void *)(& process_status_135),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_135),4UL);
       __gen_e_acsl_waitpid(pid_135,& process_status_135,0);
       signal_eval(process_status_135,0,__gen_e_acsl_literal_string_269);
       __e_acsl_delete_block((void *)(& process_status_135));
@@ -5505,7 +5505,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_136;
-      __e_acsl_store_block((void *)(& process_status_136),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_136),4UL);
       __gen_e_acsl_waitpid(pid_136,& process_status_136,0);
       signal_eval(process_status_136,0,__gen_e_acsl_literal_string_271);
       __e_acsl_delete_block((void *)(& process_status_136));
@@ -5519,7 +5519,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_137;
-      __e_acsl_store_block((void *)(& process_status_137),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_137),4UL);
       __gen_e_acsl_waitpid(pid_137,& process_status_137,0);
       signal_eval(process_status_137,0,__gen_e_acsl_literal_string_273);
       __e_acsl_delete_block((void *)(& process_status_137));
@@ -5533,7 +5533,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_138;
-      __e_acsl_store_block((void *)(& process_status_138),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_138),4UL);
       __gen_e_acsl_waitpid(pid_138,& process_status_138,0);
       signal_eval(process_status_138,0,__gen_e_acsl_literal_string_275);
       __e_acsl_delete_block((void *)(& process_status_138));
@@ -5547,7 +5547,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_139;
-      __e_acsl_store_block((void *)(& process_status_139),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_139),4UL);
       __gen_e_acsl_waitpid(pid_139,& process_status_139,0);
       signal_eval(process_status_139,0,__gen_e_acsl_literal_string_277);
       __e_acsl_delete_block((void *)(& process_status_139));
@@ -5561,7 +5561,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_140;
-      __e_acsl_store_block((void *)(& process_status_140),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_140),4UL);
       __gen_e_acsl_waitpid(pid_140,& process_status_140,0);
       signal_eval(process_status_140,0,__gen_e_acsl_literal_string_279);
       __e_acsl_delete_block((void *)(& process_status_140));
@@ -5575,7 +5575,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_141;
-      __e_acsl_store_block((void *)(& process_status_141),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_141),4UL);
       __gen_e_acsl_waitpid(pid_141,& process_status_141,0);
       signal_eval(process_status_141,0,__gen_e_acsl_literal_string_281);
       __e_acsl_delete_block((void *)(& process_status_141));
@@ -5589,7 +5589,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_142;
-      __e_acsl_store_block((void *)(& process_status_142),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_142),4UL);
       __gen_e_acsl_waitpid(pid_142,& process_status_142,0);
       signal_eval(process_status_142,0,__gen_e_acsl_literal_string_283);
       __e_acsl_delete_block((void *)(& process_status_142));
@@ -5603,7 +5603,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_143;
-      __e_acsl_store_block((void *)(& process_status_143),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_143),4UL);
       __gen_e_acsl_waitpid(pid_143,& process_status_143,0);
       signal_eval(process_status_143,0,__gen_e_acsl_literal_string_285);
       __e_acsl_delete_block((void *)(& process_status_143));
@@ -5617,7 +5617,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_144;
-      __e_acsl_store_block((void *)(& process_status_144),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_144),4UL);
       __gen_e_acsl_waitpid(pid_144,& process_status_144,0);
       signal_eval(process_status_144,0,__gen_e_acsl_literal_string_287);
       __e_acsl_delete_block((void *)(& process_status_144));
@@ -5631,7 +5631,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_145;
-      __e_acsl_store_block((void *)(& process_status_145),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_145),4UL);
       __gen_e_acsl_waitpid(pid_145,& process_status_145,0);
       signal_eval(process_status_145,0,__gen_e_acsl_literal_string_289);
       __e_acsl_delete_block((void *)(& process_status_145));
@@ -5645,7 +5645,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_146;
-      __e_acsl_store_block((void *)(& process_status_146),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_146),4UL);
       __gen_e_acsl_waitpid(pid_146,& process_status_146,0);
       signal_eval(process_status_146,0,__gen_e_acsl_literal_string_291);
       __e_acsl_delete_block((void *)(& process_status_146));
@@ -5659,7 +5659,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_147;
-      __e_acsl_store_block((void *)(& process_status_147),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_147),4UL);
       __gen_e_acsl_waitpid(pid_147,& process_status_147,0);
       signal_eval(process_status_147,0,__gen_e_acsl_literal_string_293);
       __e_acsl_delete_block((void *)(& process_status_147));
@@ -5673,7 +5673,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_148;
-      __e_acsl_store_block((void *)(& process_status_148),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_148),4UL);
       __gen_e_acsl_waitpid(pid_148,& process_status_148,0);
       signal_eval(process_status_148,0,__gen_e_acsl_literal_string_295);
       __e_acsl_delete_block((void *)(& process_status_148));
@@ -5687,7 +5687,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_149;
-      __e_acsl_store_block((void *)(& process_status_149),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_149),4UL);
       __gen_e_acsl_waitpid(pid_149,& process_status_149,0);
       signal_eval(process_status_149,0,__gen_e_acsl_literal_string_297);
       __e_acsl_delete_block((void *)(& process_status_149));
@@ -5701,7 +5701,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_150;
-      __e_acsl_store_block((void *)(& process_status_150),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_150),4UL);
       __gen_e_acsl_waitpid(pid_150,& process_status_150,0);
       signal_eval(process_status_150,0,__gen_e_acsl_literal_string_299);
       __e_acsl_delete_block((void *)(& process_status_150));
@@ -5715,7 +5715,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_151;
-      __e_acsl_store_block((void *)(& process_status_151),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_151),4UL);
       __gen_e_acsl_waitpid(pid_151,& process_status_151,0);
       signal_eval(process_status_151,0,__gen_e_acsl_literal_string_301);
       __e_acsl_delete_block((void *)(& process_status_151));
@@ -5729,7 +5729,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_152;
-      __e_acsl_store_block((void *)(& process_status_152),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_152),4UL);
       __gen_e_acsl_waitpid(pid_152,& process_status_152,0);
       signal_eval(process_status_152,0,__gen_e_acsl_literal_string_303);
       __e_acsl_delete_block((void *)(& process_status_152));
@@ -5743,7 +5743,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_153;
-      __e_acsl_store_block((void *)(& process_status_153),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_153),4UL);
       __gen_e_acsl_waitpid(pid_153,& process_status_153,0);
       signal_eval(process_status_153,0,__gen_e_acsl_literal_string_305);
       __e_acsl_delete_block((void *)(& process_status_153));
@@ -5757,7 +5757,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_154;
-      __e_acsl_store_block((void *)(& process_status_154),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_154),4UL);
       __gen_e_acsl_waitpid(pid_154,& process_status_154,0);
       signal_eval(process_status_154,0,__gen_e_acsl_literal_string_307);
       __e_acsl_delete_block((void *)(& process_status_154));
@@ -5771,7 +5771,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_155;
-      __e_acsl_store_block((void *)(& process_status_155),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_155),4UL);
       __gen_e_acsl_waitpid(pid_155,& process_status_155,0);
       signal_eval(process_status_155,0,__gen_e_acsl_literal_string_309);
       __e_acsl_delete_block((void *)(& process_status_155));
@@ -5785,7 +5785,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_156;
-      __e_acsl_store_block((void *)(& process_status_156),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_156),4UL);
       __gen_e_acsl_waitpid(pid_156,& process_status_156,0);
       signal_eval(process_status_156,0,__gen_e_acsl_literal_string_311);
       __e_acsl_delete_block((void *)(& process_status_156));
@@ -5799,7 +5799,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_157;
-      __e_acsl_store_block((void *)(& process_status_157),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_157),4UL);
       __gen_e_acsl_waitpid(pid_157,& process_status_157,0);
       signal_eval(process_status_157,0,__gen_e_acsl_literal_string_313);
       __e_acsl_delete_block((void *)(& process_status_157));
@@ -5813,7 +5813,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_158;
-      __e_acsl_store_block((void *)(& process_status_158),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_158),4UL);
       __gen_e_acsl_waitpid(pid_158,& process_status_158,0);
       signal_eval(process_status_158,0,__gen_e_acsl_literal_string_315);
       __e_acsl_delete_block((void *)(& process_status_158));
@@ -5827,7 +5827,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_159;
-      __e_acsl_store_block((void *)(& process_status_159),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_159),4UL);
       __gen_e_acsl_waitpid(pid_159,& process_status_159,0);
       signal_eval(process_status_159,0,__gen_e_acsl_literal_string_317);
       __e_acsl_delete_block((void *)(& process_status_159));
@@ -5841,7 +5841,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_160;
-      __e_acsl_store_block((void *)(& process_status_160),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_160),4UL);
       __gen_e_acsl_waitpid(pid_160,& process_status_160,0);
       signal_eval(process_status_160,0,__gen_e_acsl_literal_string_319);
       __e_acsl_delete_block((void *)(& process_status_160));
@@ -5855,7 +5855,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_161;
-      __e_acsl_store_block((void *)(& process_status_161),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_161),4UL);
       __gen_e_acsl_waitpid(pid_161,& process_status_161,0);
       signal_eval(process_status_161,1,__gen_e_acsl_literal_string_320);
       __e_acsl_delete_block((void *)(& process_status_161));
@@ -5869,7 +5869,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_162;
-      __e_acsl_store_block((void *)(& process_status_162),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_162),4UL);
       __gen_e_acsl_waitpid(pid_162,& process_status_162,0);
       signal_eval(process_status_162,1,__gen_e_acsl_literal_string_321);
       __e_acsl_delete_block((void *)(& process_status_162));
@@ -5883,7 +5883,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_163;
-      __e_acsl_store_block((void *)(& process_status_163),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_163),4UL);
       __gen_e_acsl_waitpid(pid_163,& process_status_163,0);
       signal_eval(process_status_163,1,__gen_e_acsl_literal_string_322);
       __e_acsl_delete_block((void *)(& process_status_163));
@@ -5897,7 +5897,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_164;
-      __e_acsl_store_block((void *)(& process_status_164),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_164),4UL);
       __gen_e_acsl_waitpid(pid_164,& process_status_164,0);
       signal_eval(process_status_164,1,__gen_e_acsl_literal_string_323);
       __e_acsl_delete_block((void *)(& process_status_164));
@@ -5911,7 +5911,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_165;
-      __e_acsl_store_block((void *)(& process_status_165),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_165),4UL);
       __gen_e_acsl_waitpid(pid_165,& process_status_165,0);
       signal_eval(process_status_165,1,__gen_e_acsl_literal_string_324);
       __e_acsl_delete_block((void *)(& process_status_165));
@@ -5925,7 +5925,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_166;
-      __e_acsl_store_block((void *)(& process_status_166),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_166),4UL);
       __gen_e_acsl_waitpid(pid_166,& process_status_166,0);
       signal_eval(process_status_166,1,__gen_e_acsl_literal_string_325);
       __e_acsl_delete_block((void *)(& process_status_166));
@@ -5939,7 +5939,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_167;
-      __e_acsl_store_block((void *)(& process_status_167),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_167),4UL);
       __gen_e_acsl_waitpid(pid_167,& process_status_167,0);
       signal_eval(process_status_167,0,__gen_e_acsl_literal_string_327);
       __e_acsl_delete_block((void *)(& process_status_167));
@@ -5953,7 +5953,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_168;
-      __e_acsl_store_block((void *)(& process_status_168),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_168),4UL);
       __gen_e_acsl_waitpid(pid_168,& process_status_168,0);
       signal_eval(process_status_168,0,__gen_e_acsl_literal_string_329);
       __e_acsl_delete_block((void *)(& process_status_168));
@@ -5967,7 +5967,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_169;
-      __e_acsl_store_block((void *)(& process_status_169),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_169),4UL);
       __gen_e_acsl_waitpid(pid_169,& process_status_169,0);
       signal_eval(process_status_169,1,__gen_e_acsl_literal_string_330);
       __e_acsl_delete_block((void *)(& process_status_169));
@@ -5981,7 +5981,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_170;
-      __e_acsl_store_block((void *)(& process_status_170),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_170),4UL);
       __gen_e_acsl_waitpid(pid_170,& process_status_170,0);
       signal_eval(process_status_170,1,__gen_e_acsl_literal_string_331);
       __e_acsl_delete_block((void *)(& process_status_170));
@@ -5995,7 +5995,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_171;
-      __e_acsl_store_block((void *)(& process_status_171),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_171),4UL);
       __gen_e_acsl_waitpid(pid_171,& process_status_171,0);
       signal_eval(process_status_171,1,__gen_e_acsl_literal_string_332);
       __e_acsl_delete_block((void *)(& process_status_171));
@@ -6009,7 +6009,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_172;
-      __e_acsl_store_block((void *)(& process_status_172),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_172),4UL);
       __gen_e_acsl_waitpid(pid_172,& process_status_172,0);
       signal_eval(process_status_172,1,__gen_e_acsl_literal_string_333);
       __e_acsl_delete_block((void *)(& process_status_172));
@@ -6023,7 +6023,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_173;
-      __e_acsl_store_block((void *)(& process_status_173),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_173),4UL);
       __gen_e_acsl_waitpid(pid_173,& process_status_173,0);
       signal_eval(process_status_173,1,__gen_e_acsl_literal_string_334);
       __e_acsl_delete_block((void *)(& process_status_173));
@@ -6037,7 +6037,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_174;
-      __e_acsl_store_block((void *)(& process_status_174),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_174),4UL);
       __gen_e_acsl_waitpid(pid_174,& process_status_174,0);
       signal_eval(process_status_174,1,__gen_e_acsl_literal_string_335);
       __e_acsl_delete_block((void *)(& process_status_174));
@@ -6051,7 +6051,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_175;
-      __e_acsl_store_block((void *)(& process_status_175),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_175),4UL);
       __gen_e_acsl_waitpid(pid_175,& process_status_175,0);
       signal_eval(process_status_175,0,__gen_e_acsl_literal_string_337);
       __e_acsl_delete_block((void *)(& process_status_175));
@@ -6065,7 +6065,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_176;
-      __e_acsl_store_block((void *)(& process_status_176),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_176),4UL);
       __gen_e_acsl_waitpid(pid_176,& process_status_176,0);
       signal_eval(process_status_176,0,__gen_e_acsl_literal_string_339);
       __e_acsl_delete_block((void *)(& process_status_176));
@@ -6079,7 +6079,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_177;
-      __e_acsl_store_block((void *)(& process_status_177),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_177),4UL);
       __gen_e_acsl_waitpid(pid_177,& process_status_177,0);
       signal_eval(process_status_177,1,__gen_e_acsl_literal_string_340);
       __e_acsl_delete_block((void *)(& process_status_177));
@@ -6093,7 +6093,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_178;
-      __e_acsl_store_block((void *)(& process_status_178),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_178),4UL);
       __gen_e_acsl_waitpid(pid_178,& process_status_178,0);
       signal_eval(process_status_178,1,__gen_e_acsl_literal_string_341);
       __e_acsl_delete_block((void *)(& process_status_178));
@@ -6107,7 +6107,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_179;
-      __e_acsl_store_block((void *)(& process_status_179),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_179),4UL);
       __gen_e_acsl_waitpid(pid_179,& process_status_179,0);
       signal_eval(process_status_179,1,__gen_e_acsl_literal_string_342);
       __e_acsl_delete_block((void *)(& process_status_179));
@@ -6121,7 +6121,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_180;
-      __e_acsl_store_block((void *)(& process_status_180),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_180),4UL);
       __gen_e_acsl_waitpid(pid_180,& process_status_180,0);
       signal_eval(process_status_180,1,__gen_e_acsl_literal_string_343);
       __e_acsl_delete_block((void *)(& process_status_180));
@@ -6135,7 +6135,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_181;
-      __e_acsl_store_block((void *)(& process_status_181),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_181),4UL);
       __gen_e_acsl_waitpid(pid_181,& process_status_181,0);
       signal_eval(process_status_181,1,__gen_e_acsl_literal_string_344);
       __e_acsl_delete_block((void *)(& process_status_181));
@@ -6149,7 +6149,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_182;
-      __e_acsl_store_block((void *)(& process_status_182),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_182),4UL);
       __gen_e_acsl_waitpid(pid_182,& process_status_182,0);
       signal_eval(process_status_182,1,__gen_e_acsl_literal_string_345);
       __e_acsl_delete_block((void *)(& process_status_182));
@@ -6163,7 +6163,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_183;
-      __e_acsl_store_block((void *)(& process_status_183),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_183),4UL);
       __gen_e_acsl_waitpid(pid_183,& process_status_183,0);
       signal_eval(process_status_183,0,__gen_e_acsl_literal_string_347);
       __e_acsl_delete_block((void *)(& process_status_183));
@@ -6177,7 +6177,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_184;
-      __e_acsl_store_block((void *)(& process_status_184),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_184),4UL);
       __gen_e_acsl_waitpid(pid_184,& process_status_184,0);
       signal_eval(process_status_184,0,__gen_e_acsl_literal_string_349);
       __e_acsl_delete_block((void *)(& process_status_184));
@@ -6191,7 +6191,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_185;
-      __e_acsl_store_block((void *)(& process_status_185),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_185),4UL);
       __gen_e_acsl_waitpid(pid_185,& process_status_185,0);
       signal_eval(process_status_185,1,__gen_e_acsl_literal_string_350);
       __e_acsl_delete_block((void *)(& process_status_185));
@@ -6205,7 +6205,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_186;
-      __e_acsl_store_block((void *)(& process_status_186),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_186),4UL);
       __gen_e_acsl_waitpid(pid_186,& process_status_186,0);
       signal_eval(process_status_186,1,__gen_e_acsl_literal_string_351);
       __e_acsl_delete_block((void *)(& process_status_186));
@@ -6219,7 +6219,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_187;
-      __e_acsl_store_block((void *)(& process_status_187),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_187),4UL);
       __gen_e_acsl_waitpid(pid_187,& process_status_187,0);
       signal_eval(process_status_187,1,__gen_e_acsl_literal_string_352);
       __e_acsl_delete_block((void *)(& process_status_187));
@@ -6233,7 +6233,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_188;
-      __e_acsl_store_block((void *)(& process_status_188),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_188),4UL);
       __gen_e_acsl_waitpid(pid_188,& process_status_188,0);
       signal_eval(process_status_188,1,__gen_e_acsl_literal_string_353);
       __e_acsl_delete_block((void *)(& process_status_188));
@@ -6247,7 +6247,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_189;
-      __e_acsl_store_block((void *)(& process_status_189),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_189),4UL);
       __gen_e_acsl_waitpid(pid_189,& process_status_189,0);
       signal_eval(process_status_189,1,__gen_e_acsl_literal_string_354);
       __e_acsl_delete_block((void *)(& process_status_189));
@@ -6261,7 +6261,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_190;
-      __e_acsl_store_block((void *)(& process_status_190),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_190),4UL);
       __gen_e_acsl_waitpid(pid_190,& process_status_190,0);
       signal_eval(process_status_190,1,__gen_e_acsl_literal_string_355);
       __e_acsl_delete_block((void *)(& process_status_190));
@@ -6275,7 +6275,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_191;
-      __e_acsl_store_block((void *)(& process_status_191),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_191),4UL);
       __gen_e_acsl_waitpid(pid_191,& process_status_191,0);
       signal_eval(process_status_191,1,__gen_e_acsl_literal_string_357);
       __e_acsl_delete_block((void *)(& process_status_191));
@@ -6289,7 +6289,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_192;
-      __e_acsl_store_block((void *)(& process_status_192),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_192),4UL);
       __gen_e_acsl_waitpid(pid_192,& process_status_192,0);
       signal_eval(process_status_192,1,__gen_e_acsl_literal_string_359);
       __e_acsl_delete_block((void *)(& process_status_192));
@@ -6303,7 +6303,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_193;
-      __e_acsl_store_block((void *)(& process_status_193),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_193),4UL);
       __gen_e_acsl_waitpid(pid_193,& process_status_193,0);
       signal_eval(process_status_193,0,__gen_e_acsl_literal_string_360);
       __e_acsl_delete_block((void *)(& process_status_193));
@@ -6317,7 +6317,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_194;
-      __e_acsl_store_block((void *)(& process_status_194),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_194),4UL);
       __gen_e_acsl_waitpid(pid_194,& process_status_194,0);
       signal_eval(process_status_194,0,__gen_e_acsl_literal_string_361);
       __e_acsl_delete_block((void *)(& process_status_194));
@@ -6331,7 +6331,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_195;
-      __e_acsl_store_block((void *)(& process_status_195),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_195),4UL);
       __gen_e_acsl_waitpid(pid_195,& process_status_195,0);
       signal_eval(process_status_195,1,__gen_e_acsl_literal_string_362);
       __e_acsl_delete_block((void *)(& process_status_195));
@@ -6345,7 +6345,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_196;
-      __e_acsl_store_block((void *)(& process_status_196),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_196),4UL);
       __gen_e_acsl_waitpid(pid_196,& process_status_196,0);
       signal_eval(process_status_196,1,__gen_e_acsl_literal_string_363);
       __e_acsl_delete_block((void *)(& process_status_196));
@@ -6359,7 +6359,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_197;
-      __e_acsl_store_block((void *)(& process_status_197),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_197),4UL);
       __gen_e_acsl_waitpid(pid_197,& process_status_197,0);
       signal_eval(process_status_197,1,__gen_e_acsl_literal_string_364);
       __e_acsl_delete_block((void *)(& process_status_197));
@@ -6373,7 +6373,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_198;
-      __e_acsl_store_block((void *)(& process_status_198),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_198),4UL);
       __gen_e_acsl_waitpid(pid_198,& process_status_198,0);
       signal_eval(process_status_198,1,__gen_e_acsl_literal_string_365);
       __e_acsl_delete_block((void *)(& process_status_198));
@@ -6387,7 +6387,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_199;
-      __e_acsl_store_block((void *)(& process_status_199),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_199),4UL);
       __gen_e_acsl_waitpid(pid_199,& process_status_199,0);
       signal_eval(process_status_199,1,__gen_e_acsl_literal_string_367);
       __e_acsl_delete_block((void *)(& process_status_199));
@@ -6401,7 +6401,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_200;
-      __e_acsl_store_block((void *)(& process_status_200),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_200),4UL);
       __gen_e_acsl_waitpid(pid_200,& process_status_200,0);
       signal_eval(process_status_200,1,__gen_e_acsl_literal_string_369);
       __e_acsl_delete_block((void *)(& process_status_200));
@@ -6415,7 +6415,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_201;
-      __e_acsl_store_block((void *)(& process_status_201),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_201),4UL);
       __gen_e_acsl_waitpid(pid_201,& process_status_201,0);
       signal_eval(process_status_201,0,__gen_e_acsl_literal_string_370);
       __e_acsl_delete_block((void *)(& process_status_201));
@@ -6429,7 +6429,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_202;
-      __e_acsl_store_block((void *)(& process_status_202),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_202),4UL);
       __gen_e_acsl_waitpid(pid_202,& process_status_202,0);
       signal_eval(process_status_202,0,__gen_e_acsl_literal_string_371);
       __e_acsl_delete_block((void *)(& process_status_202));
@@ -6443,7 +6443,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_203;
-      __e_acsl_store_block((void *)(& process_status_203),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_203),4UL);
       __gen_e_acsl_waitpid(pid_203,& process_status_203,0);
       signal_eval(process_status_203,1,__gen_e_acsl_literal_string_372);
       __e_acsl_delete_block((void *)(& process_status_203));
@@ -6457,7 +6457,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_204;
-      __e_acsl_store_block((void *)(& process_status_204),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_204),4UL);
       __gen_e_acsl_waitpid(pid_204,& process_status_204,0);
       signal_eval(process_status_204,1,__gen_e_acsl_literal_string_373);
       __e_acsl_delete_block((void *)(& process_status_204));
@@ -6471,7 +6471,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_205;
-      __e_acsl_store_block((void *)(& process_status_205),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_205),4UL);
       __gen_e_acsl_waitpid(pid_205,& process_status_205,0);
       signal_eval(process_status_205,1,__gen_e_acsl_literal_string_374);
       __e_acsl_delete_block((void *)(& process_status_205));
@@ -6485,7 +6485,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_206;
-      __e_acsl_store_block((void *)(& process_status_206),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_206),4UL);
       __gen_e_acsl_waitpid(pid_206,& process_status_206,0);
       signal_eval(process_status_206,1,__gen_e_acsl_literal_string_375);
       __e_acsl_delete_block((void *)(& process_status_206));
@@ -6499,7 +6499,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_207;
-      __e_acsl_store_block((void *)(& process_status_207),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_207),4UL);
       __gen_e_acsl_waitpid(pid_207,& process_status_207,0);
       signal_eval(process_status_207,1,__gen_e_acsl_literal_string_377);
       __e_acsl_delete_block((void *)(& process_status_207));
@@ -6513,7 +6513,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_208;
-      __e_acsl_store_block((void *)(& process_status_208),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_208),4UL);
       __gen_e_acsl_waitpid(pid_208,& process_status_208,0);
       signal_eval(process_status_208,1,__gen_e_acsl_literal_string_379);
       __e_acsl_delete_block((void *)(& process_status_208));
@@ -6527,7 +6527,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_209;
-      __e_acsl_store_block((void *)(& process_status_209),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_209),4UL);
       __gen_e_acsl_waitpid(pid_209,& process_status_209,0);
       signal_eval(process_status_209,0,__gen_e_acsl_literal_string_380);
       __e_acsl_delete_block((void *)(& process_status_209));
@@ -6541,7 +6541,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_210;
-      __e_acsl_store_block((void *)(& process_status_210),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_210),4UL);
       __gen_e_acsl_waitpid(pid_210,& process_status_210,0);
       signal_eval(process_status_210,0,__gen_e_acsl_literal_string_381);
       __e_acsl_delete_block((void *)(& process_status_210));
@@ -6555,7 +6555,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_211;
-      __e_acsl_store_block((void *)(& process_status_211),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_211),4UL);
       __gen_e_acsl_waitpid(pid_211,& process_status_211,0);
       signal_eval(process_status_211,1,__gen_e_acsl_literal_string_382);
       __e_acsl_delete_block((void *)(& process_status_211));
@@ -6569,7 +6569,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_212;
-      __e_acsl_store_block((void *)(& process_status_212),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_212),4UL);
       __gen_e_acsl_waitpid(pid_212,& process_status_212,0);
       signal_eval(process_status_212,1,__gen_e_acsl_literal_string_383);
       __e_acsl_delete_block((void *)(& process_status_212));
@@ -6583,7 +6583,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_213;
-      __e_acsl_store_block((void *)(& process_status_213),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_213),4UL);
       __gen_e_acsl_waitpid(pid_213,& process_status_213,0);
       signal_eval(process_status_213,1,__gen_e_acsl_literal_string_384);
       __e_acsl_delete_block((void *)(& process_status_213));
@@ -6597,7 +6597,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_214;
-      __e_acsl_store_block((void *)(& process_status_214),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_214),4UL);
       __gen_e_acsl_waitpid(pid_214,& process_status_214,0);
       signal_eval(process_status_214,1,__gen_e_acsl_literal_string_385);
       __e_acsl_delete_block((void *)(& process_status_214));
@@ -6611,7 +6611,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_215;
-      __e_acsl_store_block((void *)(& process_status_215),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_215),4UL);
       __gen_e_acsl_waitpid(pid_215,& process_status_215,0);
       signal_eval(process_status_215,1,__gen_e_acsl_literal_string_387);
       __e_acsl_delete_block((void *)(& process_status_215));
@@ -6625,7 +6625,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_216;
-      __e_acsl_store_block((void *)(& process_status_216),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_216),4UL);
       __gen_e_acsl_waitpid(pid_216,& process_status_216,0);
       signal_eval(process_status_216,1,__gen_e_acsl_literal_string_389);
       __e_acsl_delete_block((void *)(& process_status_216));
@@ -6639,7 +6639,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_217;
-      __e_acsl_store_block((void *)(& process_status_217),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_217),4UL);
       __gen_e_acsl_waitpid(pid_217,& process_status_217,0);
       signal_eval(process_status_217,0,__gen_e_acsl_literal_string_390);
       __e_acsl_delete_block((void *)(& process_status_217));
@@ -6653,7 +6653,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_218;
-      __e_acsl_store_block((void *)(& process_status_218),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_218),4UL);
       __gen_e_acsl_waitpid(pid_218,& process_status_218,0);
       signal_eval(process_status_218,0,__gen_e_acsl_literal_string_391);
       __e_acsl_delete_block((void *)(& process_status_218));
@@ -6667,7 +6667,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_219;
-      __e_acsl_store_block((void *)(& process_status_219),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_219),4UL);
       __gen_e_acsl_waitpid(pid_219,& process_status_219,0);
       signal_eval(process_status_219,1,__gen_e_acsl_literal_string_392);
       __e_acsl_delete_block((void *)(& process_status_219));
@@ -6681,7 +6681,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_220;
-      __e_acsl_store_block((void *)(& process_status_220),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_220),4UL);
       __gen_e_acsl_waitpid(pid_220,& process_status_220,0);
       signal_eval(process_status_220,1,__gen_e_acsl_literal_string_393);
       __e_acsl_delete_block((void *)(& process_status_220));
@@ -6695,7 +6695,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_221;
-      __e_acsl_store_block((void *)(& process_status_221),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_221),4UL);
       __gen_e_acsl_waitpid(pid_221,& process_status_221,0);
       signal_eval(process_status_221,1,__gen_e_acsl_literal_string_394);
       __e_acsl_delete_block((void *)(& process_status_221));
@@ -6709,7 +6709,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_222;
-      __e_acsl_store_block((void *)(& process_status_222),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_222),4UL);
       __gen_e_acsl_waitpid(pid_222,& process_status_222,0);
       signal_eval(process_status_222,1,__gen_e_acsl_literal_string_395);
       __e_acsl_delete_block((void *)(& process_status_222));
@@ -6723,7 +6723,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_223;
-      __e_acsl_store_block((void *)(& process_status_223),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_223),4UL);
       __gen_e_acsl_waitpid(pid_223,& process_status_223,0);
       signal_eval(process_status_223,0,__gen_e_acsl_literal_string_397);
       __e_acsl_delete_block((void *)(& process_status_223));
@@ -6737,7 +6737,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_224;
-      __e_acsl_store_block((void *)(& process_status_224),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_224),4UL);
       __gen_e_acsl_waitpid(pid_224,& process_status_224,0);
       signal_eval(process_status_224,0,__gen_e_acsl_literal_string_398);
       __e_acsl_delete_block((void *)(& process_status_224));
@@ -6751,7 +6751,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_225;
-      __e_acsl_store_block((void *)(& process_status_225),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_225),4UL);
       __gen_e_acsl_waitpid(pid_225,& process_status_225,0);
       signal_eval(process_status_225,0,__gen_e_acsl_literal_string_399);
       __e_acsl_delete_block((void *)(& process_status_225));
@@ -6765,7 +6765,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_226;
-      __e_acsl_store_block((void *)(& process_status_226),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_226),4UL);
       __gen_e_acsl_waitpid(pid_226,& process_status_226,0);
       signal_eval(process_status_226,1,__gen_e_acsl_literal_string_400);
       __e_acsl_delete_block((void *)(& process_status_226));
@@ -6779,7 +6779,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_227;
-      __e_acsl_store_block((void *)(& process_status_227),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_227),4UL);
       __gen_e_acsl_waitpid(pid_227,& process_status_227,0);
       signal_eval(process_status_227,1,__gen_e_acsl_literal_string_401);
       __e_acsl_delete_block((void *)(& process_status_227));
@@ -6794,7 +6794,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_228;
-      __e_acsl_store_block((void *)(& process_status_228),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_228),4UL);
       __gen_e_acsl_waitpid(pid_228,& process_status_228,0);
       signal_eval(process_status_228,1,__gen_e_acsl_literal_string_402);
       __e_acsl_delete_block((void *)(& process_status_228));
@@ -6808,7 +6808,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_229;
-      __e_acsl_store_block((void *)(& process_status_229),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_229),4UL);
       __gen_e_acsl_waitpid(pid_229,& process_status_229,0);
       signal_eval(process_status_229,1,__gen_e_acsl_literal_string_403);
       __e_acsl_delete_block((void *)(& process_status_229));
@@ -6822,7 +6822,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_230;
-      __e_acsl_store_block((void *)(& process_status_230),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_230),4UL);
       __gen_e_acsl_waitpid(pid_230,& process_status_230,0);
       signal_eval(process_status_230,0,__gen_e_acsl_literal_string_405);
       __e_acsl_delete_block((void *)(& process_status_230));
@@ -6836,7 +6836,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_231;
-      __e_acsl_store_block((void *)(& process_status_231),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_231),4UL);
       __gen_e_acsl_waitpid(pid_231,& process_status_231,0);
       signal_eval(process_status_231,1,__gen_e_acsl_literal_string_406);
       __e_acsl_delete_block((void *)(& process_status_231));
@@ -6850,7 +6850,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_232;
-      __e_acsl_store_block((void *)(& process_status_232),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_232),4UL);
       __gen_e_acsl_waitpid(pid_232,& process_status_232,0);
       signal_eval(process_status_232,0,__gen_e_acsl_literal_string_408);
       __e_acsl_delete_block((void *)(& process_status_232));
@@ -6864,7 +6864,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_233;
-      __e_acsl_store_block((void *)(& process_status_233),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_233),4UL);
       __gen_e_acsl_waitpid(pid_233,& process_status_233,0);
       signal_eval(process_status_233,0,__gen_e_acsl_literal_string_409);
       __e_acsl_delete_block((void *)(& process_status_233));
@@ -6878,7 +6878,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_234;
-      __e_acsl_store_block((void *)(& process_status_234),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_234),4UL);
       __gen_e_acsl_waitpid(pid_234,& process_status_234,0);
       signal_eval(process_status_234,1,__gen_e_acsl_literal_string_410);
       __e_acsl_delete_block((void *)(& process_status_234));
@@ -6892,7 +6892,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_235;
-      __e_acsl_store_block((void *)(& process_status_235),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_235),4UL);
       __gen_e_acsl_waitpid(pid_235,& process_status_235,0);
       signal_eval(process_status_235,1,__gen_e_acsl_literal_string_411);
       __e_acsl_delete_block((void *)(& process_status_235));
@@ -6907,7 +6907,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_236;
-      __e_acsl_store_block((void *)(& process_status_236),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_236),4UL);
       __gen_e_acsl_waitpid(pid_236,& process_status_236,0);
       signal_eval(process_status_236,1,__gen_e_acsl_literal_string_412);
       __e_acsl_delete_block((void *)(& process_status_236));
@@ -6921,7 +6921,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_237;
-      __e_acsl_store_block((void *)(& process_status_237),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_237),4UL);
       __gen_e_acsl_waitpid(pid_237,& process_status_237,0);
       signal_eval(process_status_237,1,__gen_e_acsl_literal_string_413);
       __e_acsl_delete_block((void *)(& process_status_237));
@@ -6936,7 +6936,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_238;
-      __e_acsl_store_block((void *)(& process_status_238),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_238),4UL);
       __gen_e_acsl_waitpid(pid_238,& process_status_238,0);
       signal_eval(process_status_238,0,__gen_e_acsl_literal_string_414);
       __e_acsl_delete_block((void *)(& process_status_238));
@@ -6951,7 +6951,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_239;
-      __e_acsl_store_block((void *)(& process_status_239),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_239),4UL);
       __gen_e_acsl_waitpid(pid_239,& process_status_239,0);
       signal_eval(process_status_239,1,__gen_e_acsl_literal_string_415);
       __e_acsl_delete_block((void *)(& process_status_239));
@@ -6965,7 +6965,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_240;
-      __e_acsl_store_block((void *)(& process_status_240),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_240),4UL);
       __gen_e_acsl_waitpid(pid_240,& process_status_240,0);
       signal_eval(process_status_240,0,__gen_e_acsl_literal_string_417);
       __e_acsl_delete_block((void *)(& process_status_240));
@@ -6979,7 +6979,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_241;
-      __e_acsl_store_block((void *)(& process_status_241),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_241),4UL);
       __gen_e_acsl_waitpid(pid_241,& process_status_241,0);
       signal_eval(process_status_241,0,__gen_e_acsl_literal_string_419);
       __e_acsl_delete_block((void *)(& process_status_241));
@@ -6993,7 +6993,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_242;
-      __e_acsl_store_block((void *)(& process_status_242),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_242),4UL);
       __gen_e_acsl_waitpid(pid_242,& process_status_242,0);
       signal_eval(process_status_242,0,__gen_e_acsl_literal_string_421);
       __e_acsl_delete_block((void *)(& process_status_242));
@@ -7007,7 +7007,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_243;
-      __e_acsl_store_block((void *)(& process_status_243),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_243),4UL);
       __gen_e_acsl_waitpid(pid_243,& process_status_243,0);
       signal_eval(process_status_243,0,__gen_e_acsl_literal_string_423);
       __e_acsl_delete_block((void *)(& process_status_243));
@@ -7021,7 +7021,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_244;
-      __e_acsl_store_block((void *)(& process_status_244),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_244),4UL);
       __gen_e_acsl_waitpid(pid_244,& process_status_244,0);
       signal_eval(process_status_244,1,__gen_e_acsl_literal_string_425);
       __e_acsl_delete_block((void *)(& process_status_244));
@@ -7035,7 +7035,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_245;
-      __e_acsl_store_block((void *)(& process_status_245),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_245),4UL);
       __gen_e_acsl_waitpid(pid_245,& process_status_245,0);
       signal_eval(process_status_245,0,__gen_e_acsl_literal_string_427);
       __e_acsl_delete_block((void *)(& process_status_245));
@@ -7049,7 +7049,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_246;
-      __e_acsl_store_block((void *)(& process_status_246),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_246),4UL);
       __gen_e_acsl_waitpid(pid_246,& process_status_246,0);
       signal_eval(process_status_246,1,__gen_e_acsl_literal_string_428);
       __e_acsl_delete_block((void *)(& process_status_246));
@@ -7063,7 +7063,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_247;
-      __e_acsl_store_block((void *)(& process_status_247),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_247),4UL);
       __gen_e_acsl_waitpid(pid_247,& process_status_247,0);
       signal_eval(process_status_247,1,__gen_e_acsl_literal_string_429);
       __e_acsl_delete_block((void *)(& process_status_247));
@@ -7077,7 +7077,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_248;
-      __e_acsl_store_block((void *)(& process_status_248),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_248),4UL);
       __gen_e_acsl_waitpid(pid_248,& process_status_248,0);
       signal_eval(process_status_248,0,__gen_e_acsl_literal_string_431);
       __e_acsl_delete_block((void *)(& process_status_248));
@@ -7091,7 +7091,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_249;
-      __e_acsl_store_block((void *)(& process_status_249),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_249),4UL);
       __gen_e_acsl_waitpid(pid_249,& process_status_249,0);
       signal_eval(process_status_249,1,__gen_e_acsl_literal_string_432);
       __e_acsl_delete_block((void *)(& process_status_249));
@@ -7105,7 +7105,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_250;
-      __e_acsl_store_block((void *)(& process_status_250),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_250),4UL);
       __gen_e_acsl_waitpid(pid_250,& process_status_250,0);
       signal_eval(process_status_250,1,__gen_e_acsl_literal_string_433);
       __e_acsl_delete_block((void *)(& process_status_250));
@@ -7120,7 +7120,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_251;
-      __e_acsl_store_block((void *)(& process_status_251),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_251),4UL);
       __gen_e_acsl_waitpid(pid_251,& process_status_251,0);
       signal_eval(process_status_251,1,__gen_e_acsl_literal_string_434);
       __e_acsl_delete_block((void *)(& process_status_251));
@@ -7134,7 +7134,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_252;
-      __e_acsl_store_block((void *)(& process_status_252),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_252),4UL);
       __gen_e_acsl_waitpid(pid_252,& process_status_252,0);
       signal_eval(process_status_252,1,__gen_e_acsl_literal_string_436);
       __e_acsl_delete_block((void *)(& process_status_252));
@@ -7148,7 +7148,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_253;
-      __e_acsl_store_block((void *)(& process_status_253),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_253),4UL);
       __gen_e_acsl_waitpid(pid_253,& process_status_253,0);
       signal_eval(process_status_253,1,__gen_e_acsl_literal_string_438);
       __e_acsl_delete_block((void *)(& process_status_253));
@@ -7162,7 +7162,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_254;
-      __e_acsl_store_block((void *)(& process_status_254),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_254),4UL);
       __gen_e_acsl_waitpid(pid_254,& process_status_254,0);
       signal_eval(process_status_254,1,__gen_e_acsl_literal_string_440);
       __e_acsl_delete_block((void *)(& process_status_254));
@@ -7176,7 +7176,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_255;
-      __e_acsl_store_block((void *)(& process_status_255),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_255),4UL);
       __gen_e_acsl_waitpid(pid_255,& process_status_255,0);
       signal_eval(process_status_255,1,__gen_e_acsl_literal_string_442);
       __e_acsl_delete_block((void *)(& process_status_255));
@@ -7190,7 +7190,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_256;
-      __e_acsl_store_block((void *)(& process_status_256),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_256),4UL);
       __gen_e_acsl_waitpid(pid_256,& process_status_256,0);
       signal_eval(process_status_256,1,__gen_e_acsl_literal_string_444);
       __e_acsl_delete_block((void *)(& process_status_256));
@@ -7204,7 +7204,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_257;
-      __e_acsl_store_block((void *)(& process_status_257),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_257),4UL);
       __gen_e_acsl_waitpid(pid_257,& process_status_257,0);
       signal_eval(process_status_257,1,__gen_e_acsl_literal_string_446);
       __e_acsl_delete_block((void *)(& process_status_257));
@@ -7218,7 +7218,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_258;
-      __e_acsl_store_block((void *)(& process_status_258),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_258),4UL);
       __gen_e_acsl_waitpid(pid_258,& process_status_258,0);
       signal_eval(process_status_258,1,__gen_e_acsl_literal_string_448);
       __e_acsl_delete_block((void *)(& process_status_258));
@@ -7232,7 +7232,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_259;
-      __e_acsl_store_block((void *)(& process_status_259),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_259),4UL);
       __gen_e_acsl_waitpid(pid_259,& process_status_259,0);
       signal_eval(process_status_259,1,__gen_e_acsl_literal_string_450);
       __e_acsl_delete_block((void *)(& process_status_259));
@@ -7246,7 +7246,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_260;
-      __e_acsl_store_block((void *)(& process_status_260),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_260),4UL);
       __gen_e_acsl_waitpid(pid_260,& process_status_260,0);
       signal_eval(process_status_260,1,__gen_e_acsl_literal_string_451);
       __e_acsl_delete_block((void *)(& process_status_260));
@@ -7260,7 +7260,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_261;
-      __e_acsl_store_block((void *)(& process_status_261),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_261),4UL);
       __gen_e_acsl_waitpid(pid_261,& process_status_261,0);
       signal_eval(process_status_261,1,__gen_e_acsl_literal_string_453);
       __e_acsl_delete_block((void *)(& process_status_261));
@@ -7274,7 +7274,7 @@ int main(int argc, char const **argv)
     }
     else {
       int process_status_262;
-      __e_acsl_store_block((void *)(& process_status_262),(size_t)4);
+      __e_acsl_store_block((void *)(& process_status_262),4UL);
       __gen_e_acsl_waitpid(pid_262,& process_status_262,0);
       signal_eval(process_status_262,1,__gen_e_acsl_literal_string_455);
       __e_acsl_delete_block((void *)(& process_status_262));
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
index d8e75e298d3..755f61a5d9d 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
@@ -25,11 +25,11 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   {
     char buf[4];
-    __e_acsl_store_block((void *)(buf),(size_t)4);
+    __e_acsl_store_block((void *)(buf),4UL);
     {
       int __gen_e_acsl_size;
       int __gen_e_acsl_if;
@@ -132,7 +132,7 @@ int main(void)
   }
   {
     char buf_0[4];
-    __e_acsl_store_block((void *)(buf_0),(size_t)4);
+    __e_acsl_store_block((void *)(buf_0),4UL);
     {
       int __gen_e_acsl_size_3;
       int __gen_e_acsl_if_3;
@@ -171,7 +171,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     /*@ assert !\initialized(&buf_0[0 .. 3]); */ ;
-    __e_acsl_builtin_snprintf("d",buf_0,(unsigned long)2,
+    __e_acsl_builtin_snprintf("d",buf_0,(size_t)2,
                               __gen_e_acsl_literal_string,10);
     {
       int __gen_e_acsl_size_4;
@@ -263,7 +263,7 @@ int main(void)
   }
   {
     char buf_1[4];
-    __e_acsl_store_block((void *)(buf_1),(size_t)4);
+    __e_acsl_store_block((void *)(buf_1),4UL);
     {
       int __gen_e_acsl_size_5;
       int __gen_e_acsl_if_5;
@@ -302,7 +302,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
     }
     /*@ assert !\initialized(&buf_1[0 .. 3]); */ ;
-    __e_acsl_builtin_snprintf("d",buf_1,(unsigned long)4,
+    __e_acsl_builtin_snprintf("d",buf_1,(size_t)4,
                               __gen_e_acsl_literal_string,10);
     {
       int __gen_e_acsl_size_6;
diff --git a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
index 2bfaddf7fd9..f1d2267d916 100644
--- a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
@@ -13,9 +13,9 @@ void f(void)
   int m;
   int *u;
   int *p;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
-  __e_acsl_store_block((void *)(& u),(size_t)8);
-  __e_acsl_store_block((void *)(& m),(size_t)4);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& u),8UL);
+  __e_acsl_store_block((void *)(& m),4UL);
   __e_acsl_full_init((void *)(& u));
   u = & m;
   __e_acsl_full_init((void *)(& p));
@@ -53,7 +53,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& f),(size_t)1);
+    __e_acsl_store_block((void *)(& f),1UL);
     __e_acsl_full_init((void *)(& f));
   }
   return;
@@ -68,11 +68,11 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   int x = 0;
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   f();
   {
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
index 49d42dfc6c9..6bc0e28ab20 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = -3;
   int y = 2;
   long z = 2L;
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
index e85555c3198..ec76834879d 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_mpz_t __gen_e_acsl_;
     __e_acsl_mpz_t __gen_e_acsl__2;
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
index 9a6b723e622..b646036d142 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
@@ -88,7 +88,7 @@ int main(void)
 {
   int __retres;
   mystruct m;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 1;
   int y = 2;
   {
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
index f4e8c5310d9..8cbed47e6d6 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
@@ -79,8 +79,8 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     unsigned long __gen_e_acsl_size_4;
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
-    __e_acsl_store_block((void *)(& stream),(size_t)8);
-    __e_acsl_store_block((void *)(& ptr),(size_t)8);
+    __e_acsl_store_block((void *)(& stream),8UL);
+    __e_acsl_store_block((void *)(& ptr),8UL);
     __gen_e_acsl_at = ptr;
     __gmpz_init_set_ui(__gen_e_acsl_size,size);
     __gmpz_init_set(__gen_e_acsl_at_2,
@@ -406,7 +406,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename,
                          char const * restrict mode)
 {
   FILE *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   __retres = fopen(filename,mode);
   __e_acsl_delete_block((void *)(& __retres));
   return __retres;
@@ -436,17 +436,16 @@ int main(void)
   int buf[6];
   size_t tmp_0;
   int buf2[6];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(buf2),(size_t)24);
-  __e_acsl_store_block((void *)(buf),(size_t)24);
+  __e_acsl_store_block((void *)(buf2),24UL);
+  __e_acsl_store_block((void *)(buf),24UL);
   FILE *f =
     __gen_e_acsl_fopen(__gen_e_acsl_literal_string_2,
                        __gen_e_acsl_literal_string);
-  __e_acsl_store_block((void *)(& f),(size_t)8);
+  __e_acsl_store_block((void *)(& f),8UL);
   __e_acsl_full_init((void *)(& f));
-  tmp_0 = __gen_e_acsl_fread((void *)(& buf[1]),sizeof(int),(unsigned long)4,
-                             f);
+  tmp_0 = __gen_e_acsl_fread((void *)(& buf[1]),sizeof(int),(size_t)4,f);
   int res = (int)tmp_0;
   {
     int __gen_e_acsl_initialized;
@@ -624,7 +623,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
   }
   /*@ assert !\initialized(&buf[5]); */ ;
-  __gen_e_acsl_fread((void *)(& buf2[1]),sizeof(int),(unsigned long)4,f);
+  __gen_e_acsl_fread((void *)(& buf2[1]),sizeof(int),(size_t)4,f);
   {
     int __gen_e_acsl_initialized_8;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
index 5d9daf5e2e7..f78bba29465 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
@@ -56,11 +56,11 @@ int main(void)
   char a[2];
   int b[5];
   char c[4];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(c),(size_t)4);
-  __e_acsl_store_block((void *)(b),(size_t)20);
-  __e_acsl_store_block((void *)(a),(size_t)2);
-  __gen_e_acsl_memset((void *)(a),1,(unsigned long)1);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(c),4UL);
+  __e_acsl_store_block((void *)(b),20UL);
+  __e_acsl_store_block((void *)(a),2UL);
+  __gen_e_acsl_memset((void *)(a),1,(size_t)1);
   {
     int __gen_e_acsl_initialized;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -106,7 +106,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
   }
   /*@ assert !\initialized(&a[1]); */ ;
-  __gen_e_acsl_memset((void *)(& a[1]),1,(unsigned long)1);
+  __gen_e_acsl_memset((void *)(& a[1]),1,(size_t)1);
   {
     int __gen_e_acsl_initialized_3;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
@@ -240,7 +240,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
   }
   /*@ assert !\initialized(&b[4]); */ ;
-  __gen_e_acsl_memcpy((void *)(& c[1]),(void const *)(a),(unsigned long)2);
+  __gen_e_acsl_memcpy((void *)(& c[1]),(void const *)(a),(size_t)2);
   {
     int __gen_e_acsl_initialized_8;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
@@ -325,7 +325,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
   }
   /*@ assert !\initialized(&c[3]); */ ;
-  __gen_e_acsl_memmove((void *)(c),(void const *)(& c[1]),(unsigned long)2);
+  __gen_e_acsl_memmove((void *)(c),(void const *)(& c[1]),(size_t)2);
   {
     int __gen_e_acsl_size_3;
     int __gen_e_acsl_if_3;
@@ -406,7 +406,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
 {
   void *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __gen_e_acsl_at = s;
   __retres = memset(s,c,n);
   __e_acsl_initialize(s,n);
@@ -447,8 +447,8 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n)
 {
   void *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& src),(size_t)8);
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& src),8UL);
+  __e_acsl_store_block((void *)(& dest),8UL);
   __gen_e_acsl_at = dest;
   __retres = memmove(dest,src,n);
   __e_acsl_initialize(dest,n);
@@ -516,8 +516,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     unsigned long __gen_e_acsl__6;
     unsigned long __gen_e_acsl_if_4;
     int __gen_e_acsl_separated;
-    __e_acsl_store_block((void *)(& src),(size_t)8);
-    __e_acsl_store_block((void *)(& dest),(size_t)8);
+    __e_acsl_store_block((void *)(& src),8UL);
+    __e_acsl_store_block((void *)(& dest),8UL);
     __gen_e_acsl_at = dest;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
       {.values = (void *)0};
@@ -633,8 +633,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
                                      __gen_e_acsl_size_4);
       __gen_e_acsl_if_4 = __gen_e_acsl_size_4;
     }
-    __gen_e_acsl_separated = __e_acsl_separated((size_t)2,
-                                                (char *)dest + 1 * 0,
+    __gen_e_acsl_separated = __e_acsl_separated(2UL,(char *)dest + 1 * 0,
                                                 __gen_e_acsl_if_3,
                                                 (char *)src + 1 * 0,
                                                 __gen_e_acsl_if_4);
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
index 16a88485d71..90bc6d701d2 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
@@ -28,11 +28,11 @@ int main(void)
   int __gen_e_acsl_snprintf_res;
   int __gen_e_acsl_sprintf_res;
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   {
     char buf[4];
-    __e_acsl_store_block((void *)(buf),(size_t)4);
+    __e_acsl_store_block((void *)(buf),4UL);
     {
       int __gen_e_acsl_size;
       int __gen_e_acsl_if;
@@ -137,7 +137,7 @@ int main(void)
   }
   {
     char buf_0[4];
-    __e_acsl_store_block((void *)(buf_0),(size_t)4);
+    __e_acsl_store_block((void *)(buf_0),4UL);
     {
       int __gen_e_acsl_size_3;
       int __gen_e_acsl_if_3;
@@ -176,11 +176,11 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     /*@ assert !\initialized(&buf_0[0 .. 3]); */ ;
-    __gen_e_acsl_snprintf_res = snprintf(buf_0,(unsigned long)2,
+    __gen_e_acsl_snprintf_res = snprintf(buf_0,(size_t)2,
                                          __gen_e_acsl_literal_string,10); /* snprintf_va_1 */
     if (__gen_e_acsl_snprintf_res >= 0) {
       unsigned long __gen_e_acsl_n;
-      if (2UL <= (unsigned long)__gen_e_acsl_snprintf_res) __gen_e_acsl_n = (unsigned long)2;
+      if (2UL <= (size_t)__gen_e_acsl_snprintf_res) __gen_e_acsl_n = (size_t)2;
       else __gen_e_acsl_n = __gen_e_acsl_snprintf_res + 1L;
       __e_acsl_initialize((void *)(buf_0),__gen_e_acsl_n);
     }
@@ -264,7 +264,7 @@ int main(void)
   }
   {
     char buf_1[4];
-    __e_acsl_store_block((void *)(buf_1),(size_t)4);
+    __e_acsl_store_block((void *)(buf_1),4UL);
     {
       int __gen_e_acsl_size_6;
       int __gen_e_acsl_if_6;
@@ -303,11 +303,11 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
     }
     /*@ assert !\initialized(&buf_1[0 .. 3]); */ ;
-    __gen_e_acsl_snprintf_res_2 = snprintf(buf_1,(unsigned long)4,
+    __gen_e_acsl_snprintf_res_2 = snprintf(buf_1,(size_t)4,
                                            __gen_e_acsl_literal_string,10); /* snprintf_va_2 */
     if (__gen_e_acsl_snprintf_res_2 >= 0) {
       unsigned long __gen_e_acsl_n_2;
-      if (4UL <= (unsigned long)__gen_e_acsl_snprintf_res_2) __gen_e_acsl_n_2 = (unsigned long)4;
+      if (4UL <= (size_t)__gen_e_acsl_snprintf_res_2) __gen_e_acsl_n_2 = (size_t)4;
       else __gen_e_acsl_n_2 = __gen_e_acsl_snprintf_res_2 + 1L;
       __e_acsl_initialize((void *)(buf_1),__gen_e_acsl_n_2);
     }
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
index a920841927e..4099d755710 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
@@ -154,9 +154,9 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src,
   __e_acsl_contract_t *__gen_e_acsl_contract;
   char *__gen_e_acsl_at;
   char *__retres;
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& dest),8UL);
   __gen_e_acsl_at = dest;
-  __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+  __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
   __gen_e_acsl_strcat_src_size = __e_acsl_builtin_strlen(src);
   if (n < __gen_e_acsl_strcat_src_size) __gen_e_acsl_strcat_src_size = n;
   __gen_e_acsl_strcat_dest_size = __e_acsl_builtin_strlen((char const *)dest);
@@ -260,7 +260,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src)
   unsigned long __gen_e_acsl_strcat_src_size;
   char *__gen_e_acsl_at;
   char *__retres;
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& dest),8UL);
   __gen_e_acsl_at = dest;
   __gen_e_acsl_strcat_src_size = __e_acsl_builtin_strlen(src);
   __gen_e_acsl_strcat_dest_size = __e_acsl_builtin_strlen((char const *)dest);
@@ -389,13 +389,13 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     unsigned long __gen_e_acsl__7;
     unsigned long __gen_e_acsl_if_5;
     int __gen_e_acsl_separated;
-    __e_acsl_store_block((void *)(& src),(size_t)8);
-    __e_acsl_store_block((void *)(& dest),(size_t)8);
+    __e_acsl_store_block((void *)(& src),8UL);
+    __e_acsl_store_block((void *)(& dest),8UL);
     __gen_e_acsl_at = dest;
     __gmpz_init_set_ui(__gen_e_acsl_n,n);
     __gmpz_init_set(__gen_e_acsl_at_2,
                     (__e_acsl_mpz_struct const *)(__gen_e_acsl_n));
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
       {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_2,"dest",
@@ -545,7 +545,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
                                      __gen_e_acsl_size_5);
       __gen_e_acsl_if_5 = __gen_e_acsl_size_5;
     }
-    __gen_e_acsl_separated = __e_acsl_separated((size_t)2,dest + 1 * 0,
+    __gen_e_acsl_separated = __e_acsl_separated(2UL,dest + 1 * 0,
                                                 __gen_e_acsl_if_4,
                                                 src + 1 * 0,
                                                 __gen_e_acsl_if_5);
@@ -675,8 +675,8 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
   unsigned long __gen_e_acsl_strcpy_src_size;
   char *__gen_e_acsl_at;
   char *__retres;
-  __e_acsl_store_block((void *)(& src),(size_t)8);
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& src),8UL);
+  __e_acsl_store_block((void *)(& dest),8UL);
   __gen_e_acsl_at = dest;
   __gen_e_acsl_strcpy_src_size = __e_acsl_builtin_strlen(src);
   __retres = strcpy(dest,src);
@@ -756,13 +756,13 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   {
     char dest[4];
-    __e_acsl_store_block((void *)(dest),(size_t)4);
+    __e_acsl_store_block((void *)(dest),4UL);
     char src[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src),(size_t)2);
+    __e_acsl_store_block((void *)(src),2UL);
     __e_acsl_full_init((void *)(& src));
     {
       int __gen_e_acsl_size;
@@ -917,9 +917,9 @@ int main(void)
   }
   {
     char dest_0[4];
-    __e_acsl_store_block((void *)(dest_0),(size_t)4);
+    __e_acsl_store_block((void *)(dest_0),4UL);
     char src_0[4] = {(char)'a', (char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_0),(size_t)4);
+    __e_acsl_store_block((void *)(src_0),4UL);
     __e_acsl_full_init((void *)(& src_0));
     {
       int __gen_e_acsl_size_5;
@@ -997,7 +997,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
     }
     /*@ assert \initialized(&src_0[0 .. 3]); */ ;
-    __gen_e_acsl_strncpy(dest_0,(char const *)(src_0),(unsigned long)1);
+    __gen_e_acsl_strncpy(dest_0,(char const *)(src_0),(size_t)1);
     {
       int __gen_e_acsl_initialized_7;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -1065,9 +1065,9 @@ int main(void)
   }
   {
     char dest_1[4];
-    __e_acsl_store_block((void *)(dest_1),(size_t)4);
+    __e_acsl_store_block((void *)(dest_1),4UL);
     char src_1[4] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_1),(size_t)4);
+    __e_acsl_store_block((void *)(src_1),4UL);
     __e_acsl_full_init((void *)(& src_1));
     {
       int __gen_e_acsl_size_8;
@@ -1145,7 +1145,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
     }
     /*@ assert \initialized(&src_1[0 .. 3]); */ ;
-    __gen_e_acsl_strncpy(dest_1,(char const *)(src_1),(unsigned long)3);
+    __gen_e_acsl_strncpy(dest_1,(char const *)(src_1),(size_t)3);
     {
       int __gen_e_acsl_size_10;
       int __gen_e_acsl_if_10;
@@ -1213,10 +1213,10 @@ int main(void)
   }
   {
     char dest_2[4];
-    __e_acsl_store_block((void *)(dest_2),(size_t)4);
+    __e_acsl_store_block((void *)(dest_2),4UL);
     __gen_e_acsl_strcpy(dest_2,__gen_e_acsl_literal_string);
     char src_2[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_2),(size_t)2);
+    __e_acsl_store_block((void *)(src_2),2UL);
     __e_acsl_full_init((void *)(& src_2));
     {
       int __gen_e_acsl_size_11;
@@ -1400,10 +1400,10 @@ int main(void)
   }
   {
     char dest_3[4];
-    __e_acsl_store_block((void *)(dest_3),(size_t)4);
+    __e_acsl_store_block((void *)(dest_3),4UL);
     __gen_e_acsl_strcpy(dest_3,__gen_e_acsl_literal_string);
     char src_3[3] = {(char)'b', (char)'c', (char)'\000'};
-    __e_acsl_store_block((void *)(src_3),(size_t)3);
+    __e_acsl_store_block((void *)(src_3),3UL);
     __e_acsl_full_init((void *)(& src_3));
     {
       int __gen_e_acsl_size_15;
@@ -1519,7 +1519,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_20);
     }
     /*@ assert \initialized(&src_3[0 .. 2]); */ ;
-    __gen_e_acsl_strncat(dest_3,(char const *)(src_3),(unsigned long)1);
+    __gen_e_acsl_strncat(dest_3,(char const *)(src_3),(size_t)1);
     {
       int __gen_e_acsl_size_18;
       int __gen_e_acsl_if_18;
@@ -1587,10 +1587,10 @@ int main(void)
   }
   {
     char dest_4[4];
-    __e_acsl_store_block((void *)(dest_4),(size_t)4);
+    __e_acsl_store_block((void *)(dest_4),4UL);
     __gen_e_acsl_strcpy(dest_4,__gen_e_acsl_literal_string);
     char src_4[2] = {(char)'b', (char)'\000'};
-    __e_acsl_store_block((void *)(src_4),(size_t)2);
+    __e_acsl_store_block((void *)(src_4),2UL);
     __e_acsl_full_init((void *)(& src_4));
     {
       int __gen_e_acsl_size_19;
@@ -1706,7 +1706,7 @@ int main(void)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_25);
     }
     /*@ assert \initialized(&src_4[0 .. 1]); */ ;
-    __gen_e_acsl_strncat(dest_4,(char const *)(src_4),(unsigned long)2);
+    __gen_e_acsl_strncat(dest_4,(char const *)(src_4),(size_t)2);
     {
       int __gen_e_acsl_size_22;
       int __gen_e_acsl_if_22;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
index 5bd22c0c309..355e8753d49 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
@@ -13,9 +13,9 @@ void f(void)
   int m;
   int *u;
   int *p;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
-  __e_acsl_store_block((void *)(& u),(size_t)8);
-  __e_acsl_store_block((void *)(& m),(size_t)4);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& u),8UL);
+  __e_acsl_store_block((void *)(& m),4UL);
   __e_acsl_full_init((void *)(& u));
   u = & m;
   __e_acsl_full_init((void *)(& p));
@@ -51,7 +51,7 @@ void f(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   f();
   {
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c b/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
index 22db7776b56..2581ae7200f 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
@@ -10,9 +10,9 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 void f(int *dest, int val)
 {
-  __e_acsl_store_block((void *)(& dest),(size_t)8);
+  __e_acsl_store_block((void *)(& dest),8UL);
   int *ptr = dest;
-  __e_acsl_store_block((void *)(& ptr),(size_t)8);
+  __e_acsl_store_block((void *)(& ptr),8UL);
   __e_acsl_full_init((void *)(& ptr));
   __e_acsl_initialize((void *)ptr,sizeof(int));
   *ptr = val;
@@ -25,8 +25,8 @@ int main(void)
 {
   int __retres;
   int i;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& i),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& i),4UL);
   f(& i,255);
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
index 00caeae3b6f..75cb5f6b325 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
@@ -28,9 +28,9 @@ void init4(int *arr, int start)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int a[4] = {1, 2, 3, 4};
-  __e_acsl_store_block((void *)(a),(size_t)16);
+  __e_acsl_store_block((void *)(a),16UL);
   __e_acsl_full_init((void *)(& a));
   int b[4] = {5, 6, 7, 8};
   {
@@ -55,7 +55,7 @@ int main(void)
   }
   /*@ assert !\valid(&a[4]); */ ;
   int *ap = a;
-  __e_acsl_store_block((void *)(& ap),(size_t)8);
+  __e_acsl_store_block((void *)(& ap),8UL);
   __e_acsl_full_init((void *)(& ap));
   int *bp = b;
   {
@@ -85,13 +85,13 @@ int main(void)
   }
   /*@ assert !\valid(&(*((int (*)[])ap))[4]); */ ;
   struct dat d = {.arr = {4, 5, 6, 7}};
-  __e_acsl_store_block((void *)(& d),(size_t)16);
+  __e_acsl_store_block((void *)(& d),16UL);
   __e_acsl_full_init((void *)(& d));
   struct dat dd = {.arr = {1, 2, 3, 9}};
-  __e_acsl_store_block((void *)(& dd),(size_t)16);
+  __e_acsl_store_block((void *)(& dd),16UL);
   __e_acsl_full_init((void *)(& dd));
   struct dat2 d2 = {.p = {& d, & dd}};
-  __e_acsl_store_block((void *)(& d2),(size_t)16);
+  __e_acsl_store_block((void *)(& d2),16UL);
   __e_acsl_full_init((void *)(& d2));
   {
     int __gen_e_acsl_valid_3;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
index ffe642164ba..c5fc859be53 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& PA),(size_t)8);
+    __e_acsl_store_block((void *)(& PA),8UL);
     __e_acsl_full_init((void *)(& PA));
-    __e_acsl_store_block((void *)(A),(size_t)16);
+    __e_acsl_store_block((void *)(A),16UL);
     __e_acsl_full_init((void *)(& A));
   }
   return;
@@ -35,9 +35,9 @@ int main(void)
 {
   int __retres;
   int *pa;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& pa),(size_t)8);
+  __e_acsl_store_block((void *)(& pa),8UL);
   PA = (int *)(& A);
   {
     void *__gen_e_acsl_base_addr;
@@ -156,7 +156,7 @@ int main(void)
   }
   /*@ assert \base_addr(PA + 2) == \base_addr(&A[3]); */ ;
   int a[4] = {1, 2, 3, 4};
-  __e_acsl_store_block((void *)(a),(size_t)16);
+  __e_acsl_store_block((void *)(a),16UL);
   __e_acsl_full_init((void *)(& a));
   __e_acsl_full_init((void *)(& pa));
   pa = (int *)(& a);
@@ -279,10 +279,10 @@ int main(void)
   }
   /*@ assert \base_addr(pa + 2) == \base_addr((int *)a); */ ;
   long l = (long)4;
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   char *pl = (char *)(& l);
-  __e_acsl_store_block((void *)(& pl),(size_t)8);
+  __e_acsl_store_block((void *)(& pl),8UL);
   __e_acsl_full_init((void *)(& pl));
   {
     void *__gen_e_acsl_base_addr_21;
@@ -330,7 +330,7 @@ int main(void)
   }
   /*@ assert \base_addr(pl + 2) == \base_addr(&l); */ ;
   short *pi = (short *)(& l);
-  __e_acsl_store_block((void *)(& pi),(size_t)8);
+  __e_acsl_store_block((void *)(& pi),8UL);
   __e_acsl_full_init((void *)(& pi));
   __e_acsl_full_init((void *)(& pi));
   pi ++;
@@ -380,11 +380,11 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_14);
   }
   /*@ assert \base_addr(pl) == \base_addr(&l); */ ;
-  char *p = malloc((unsigned long)12);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  char *p = malloc((size_t)12);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   char *pd = p;
-  __e_acsl_store_block((void *)(& pd),(size_t)8);
+  __e_acsl_store_block((void *)(& pd),8UL);
   __e_acsl_full_init((void *)(& pd));
   {
     void *__gen_e_acsl_base_addr_29;
@@ -505,10 +505,10 @@ int main(void)
   }
   /*@ assert \base_addr(p - 5) == \base_addr(pd); */ ;
   long *q = malloc((unsigned long)30 * sizeof(long));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   long *qd = q;
-  __e_acsl_store_block((void *)(& qd),(size_t)8);
+  __e_acsl_store_block((void *)(& qd),8UL);
   __e_acsl_full_init((void *)(& qd));
   {
     void *__gen_e_acsl_base_addr_39;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
index 24938d7d322..b688dcae726 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& PA),(size_t)8);
+    __e_acsl_store_block((void *)(& PA),8UL);
     __e_acsl_full_init((void *)(& PA));
-    __e_acsl_store_block((void *)(A),(size_t)16);
+    __e_acsl_store_block((void *)(A),16UL);
     __e_acsl_full_init((void *)(& A));
   }
   return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   PA = (int *)(& A);
   {
@@ -134,10 +134,10 @@ int main(void)
   }
   /*@ assert \block_length(PA + 1) == \block_length(&A[1]); */ ;
   int a[4] = {1, 2, 3, 4};
-  __e_acsl_store_block((void *)(a),(size_t)16);
+  __e_acsl_store_block((void *)(a),16UL);
   __e_acsl_full_init((void *)(& a));
   int *pa = (int *)(& a);
-  __e_acsl_store_block((void *)(& pa),(size_t)8);
+  __e_acsl_store_block((void *)(& pa),8UL);
   __e_acsl_full_init((void *)(& pa));
   {
     unsigned long __gen_e_acsl_block_length_6;
@@ -239,10 +239,10 @@ int main(void)
   }
   /*@ assert \block_length(pa + 1) == \block_length(&a[1]); */ ;
   long l = (long)4;
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   char *pl = (char *)(& l);
-  __e_acsl_store_block((void *)(& pl),(size_t)8);
+  __e_acsl_store_block((void *)(& pl),8UL);
   __e_acsl_full_init((void *)(& pl));
   {
     unsigned long __gen_e_acsl_block_length_11;
@@ -314,7 +314,7 @@ int main(void)
   }
   /*@ assert \block_length(pl + 7) == sizeof(long); */ ;
   int *pi = (int *)(& l);
-  __e_acsl_store_block((void *)(& pi),(size_t)8);
+  __e_acsl_store_block((void *)(& pi),8UL);
   __e_acsl_full_init((void *)(& pi));
   {
     unsigned long __gen_e_acsl_block_length_14;
@@ -374,9 +374,9 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
   }
   /*@ assert \block_length(pi) == \block_length(&l); */ ;
-  size_t size = (unsigned long)12;
+  size_t size = (size_t)12;
   char *p = malloc(size);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     unsigned long __gen_e_acsl_block_length_18;
@@ -452,7 +452,7 @@ int main(void)
   /*@ assert \block_length(p + 5) == \block_length(p - 5); */ ;
   size = (unsigned long)30 * sizeof(long);
   long *q = malloc(size);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     unsigned long __gen_e_acsl_block_length_22;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
index 3007ee2ca7e..2b48b0a102f 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
@@ -17,7 +17,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& B),(size_t)4);
+    __e_acsl_store_block((void *)(& B),4UL);
     __e_acsl_full_init((void *)(& B));
   }
   return;
@@ -32,15 +32,15 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   __e_acsl_globals_init();
   int *p = (int *)0;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *q = (int *)0;
   int a = 1;
   int b = 2;
-  __e_acsl_store_block((void *)(& b),(size_t)4);
+  __e_acsl_store_block((void *)(& b),4UL);
   __e_acsl_full_init((void *)(& b));
   int c = 3;
   __e_acsl_full_init((void *)(& p));
@@ -162,14 +162,14 @@ int main(int argc, char **argv)
   }
   /*@ assert !\valid(p + 1); */ ;
   char *pmin = malloc(sizeof(int));
-  __e_acsl_store_block((void *)(& pmin),(size_t)8);
+  __e_acsl_store_block((void *)(& pmin),8UL);
   __e_acsl_full_init((void *)(& pmin));
   char *pmax = malloc(sizeof(int));
-  __e_acsl_store_block((void *)(& pmax),(size_t)8);
+  __e_acsl_store_block((void *)(& pmax),8UL);
   __e_acsl_full_init((void *)(& pmax));
-  if ((unsigned long)pmin > (unsigned long)pmax) {
+  if ((uintptr_t)pmin > (uintptr_t)pmax) {
     char *t = pmin;
-    __e_acsl_store_block((void *)(& t),(size_t)8);
+    __e_acsl_store_block((void *)(& t),8UL);
     __e_acsl_full_init((void *)(& t));
     __e_acsl_full_init((void *)(& pmin));
     pmin = pmax;
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
   *pmin = (char)'P';
   __e_acsl_initialize((void *)pmax,sizeof(char));
   *pmax = (char)'L';
-  int diff = (int)((unsigned long)pmax - (unsigned long)pmin);
+  int diff = (int)((uintptr_t)pmax - (uintptr_t)pmin);
   {
     int __gen_e_acsl_initialized_3;
     int __gen_e_acsl_and_3;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c b/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
index 9db991fcd5f..44313cb895b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
@@ -11,13 +11,13 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   goto L;
   {
     int *p;
-    __e_acsl_store_block((void *)(& p),(size_t)8);
+    __e_acsl_store_block((void *)(& p),8UL);
     L:
-    __e_acsl_store_block_duplicate((void *)(& p),(size_t)8);
+    __e_acsl_store_block_duplicate((void *)(& p),8UL);
     __e_acsl_full_init((void *)(& p));
     p = & argc;
     {
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_call.c b/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
index a8d4fb41451..a7c2ef1d63b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
@@ -14,8 +14,8 @@ int *__gen_e_acsl_f(int *x, int *y);
 
 int *f(int *x, int *y)
 {
-  __e_acsl_store_block((void *)(& y),(size_t)8);
-  __e_acsl_store_block((void *)(& x),(size_t)8);
+  __e_acsl_store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& x),8UL);
   __e_acsl_initialize((void *)y,sizeof(int));
   *y = 1;
   __e_acsl_delete_block((void *)(& y));
@@ -27,13 +27,13 @@ int main(void)
 {
   int __retres;
   int *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int x = 0;
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   int *q = malloc(sizeof(int));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   int *r = malloc(sizeof(int));
   __e_acsl_full_init((void *)(& p));
@@ -52,9 +52,9 @@ int main(void)
 int *__gen_e_acsl_f(int *x, int *y)
 {
   int *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& y),(size_t)8);
-  __e_acsl_store_block((void *)(& x),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& x),8UL);
   __retres = f(x,y);
   {
     int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
index b2275a5f2b2..0514c398308 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
@@ -54,19 +54,19 @@ void __e_acsl_globals_init(void)
                          sizeof("First"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_5);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_5);
-    __e_acsl_store_block((void *)(_G),(size_t)32);
+    __e_acsl_store_block((void *)(_G),32UL);
     __e_acsl_full_init((void *)(& _G));
-    __e_acsl_store_block((void *)(& _E),(size_t)4);
+    __e_acsl_store_block((void *)(& _E),4UL);
     __e_acsl_full_init((void *)(& _E));
-    __e_acsl_store_block((void *)(_D),(size_t)8);
+    __e_acsl_store_block((void *)(_D),8UL);
     __e_acsl_full_init((void *)(& _D));
-    __e_acsl_store_block((void *)(& _C),(size_t)8);
+    __e_acsl_store_block((void *)(& _C),8UL);
     __e_acsl_full_init((void *)(& _C));
-    __e_acsl_store_block((void *)(& _B),(size_t)8);
+    __e_acsl_store_block((void *)(& _B),8UL);
     __e_acsl_full_init((void *)(& _B));
-    __e_acsl_store_block((void *)(_A),(size_t)16);
+    __e_acsl_store_block((void *)(_A),16UL);
     __e_acsl_full_init((void *)(& _A));
-    __e_acsl_store_block((void *)(& _F),(size_t)4);
+    __e_acsl_store_block((void *)(& _F),4UL);
     __e_acsl_full_init((void *)(& _F));
   }
   return;
@@ -87,7 +87,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   __e_acsl_globals_init();
   {
     int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c b/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
index 0583c398c29..b4d85f2b9a5 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
@@ -41,7 +41,7 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   printf(__gen_e_acsl_literal_string_2); /* printf_va_2 */
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
index 6831a80ad79..c1242436a5b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
@@ -29,13 +29,13 @@ int main(int argc, char const **argv)
 {
   int __retres;
   int tmp;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   tmp = __gen_e_acsl_isupper(argc);
   char c = (char)tmp;
-  __e_acsl_store_block((void *)(& c),(size_t)1);
+  __e_acsl_store_block((void *)(& c),1UL);
   __e_acsl_full_init((void *)(& c));
   char *d = & c;
-  __e_acsl_store_block((void *)(& d),(size_t)8);
+  __e_acsl_store_block((void *)(& d),8UL);
   __e_acsl_full_init((void *)(& d));
   {
     int __gen_e_acsl_initialized;
@@ -104,7 +104,7 @@ int __gen_e_acsl_isupper(int c)
     int __gen_e_acsl_or_2;
     int __gen_e_acsl_or_3;
     int __gen_e_acsl_active_bhvrs;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"c",0,c);
     if (0 <= c) {
@@ -127,7 +127,7 @@ int __gen_e_acsl_isupper(int c)
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
     if (65 <= c) __gen_e_acsl_and_2 = c <= 90; else __gen_e_acsl_and_2 = 0;
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            __gen_e_acsl_and_2);
     if (c == -1) __gen_e_acsl_or_2 = 1;
     else {
@@ -141,7 +141,7 @@ int __gen_e_acsl_isupper(int c)
       if (90 < c) __gen_e_acsl_and_4 = c <= 127; else __gen_e_acsl_and_4 = 0;
       __gen_e_acsl_or_3 = __gen_e_acsl_and_4;
     }
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_or_3);
     __gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
     ((__e_acsl_contract_t const *)__gen_e_acsl_contract);
@@ -169,7 +169,7 @@ int __gen_e_acsl_isupper(int c)
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_or_4;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
@@ -193,7 +193,7 @@ int __gen_e_acsl_isupper(int c)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c b/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
index 0d716b69a95..1674016043d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
@@ -10,12 +10,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 void decl_in_switch(int value)
 {
-  __e_acsl_store_block((void *)(& value),(size_t)4);
+  __e_acsl_store_block((void *)(& value),4UL);
   switch (value) {
     int *p;
-    __e_acsl_store_block((void *)(& p),(size_t)8);
+    __e_acsl_store_block((void *)(& p),8UL);
     default:
-    __e_acsl_store_block_duplicate((void *)(& p),(size_t)8);
+    __e_acsl_store_block_duplicate((void *)(& p),8UL);
     __e_acsl_full_init((void *)(& p));
     p = & value;
     __e_acsl_delete_block((void *)(& p));
@@ -29,7 +29,7 @@ void decl_in_switch(int value)
 void compound_decl_and_init(int value)
 {
   int a = 0;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   {
     int __gen_e_acsl_valid;
@@ -78,7 +78,7 @@ void compound_decl_and_init(int value)
     /*@ assert \valid(&b); */ ;
     case 0: ;
     int c = 3;
-    __e_acsl_store_block((void *)(& c),(size_t)4);
+    __e_acsl_store_block((void *)(& c),4UL);
     __e_acsl_full_init((void *)(& c));
     {
       int __gen_e_acsl_valid_3;
@@ -104,10 +104,10 @@ void compound_decl_and_init(int value)
     /*@ assert \valid(&c); */ ;
     __e_acsl_delete_block((void *)(& c));
     break;
-    case 1: __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
+    case 1: __e_acsl_store_block_duplicate((void *)(& c),4UL);
             ;
     int d = 4;
-    __e_acsl_store_block((void *)(& d),(size_t)4);
+    __e_acsl_store_block((void *)(& d),4UL);
     __e_acsl_full_init((void *)(& d));
     {
       int __gen_e_acsl_valid_4;
@@ -144,7 +144,7 @@ void compound_decl_and_init(int value)
 void separate_decl_and_init(int value)
 {
   int a;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   a = 1;
   {
@@ -172,8 +172,8 @@ void separate_decl_and_init(int value)
     int b;
     int c;
     int d;
-    __e_acsl_store_block((void *)(& d),(size_t)4);
-    __e_acsl_store_block((void *)(& c),(size_t)4);
+    __e_acsl_store_block((void *)(& d),4UL);
+    __e_acsl_store_block((void *)(& c),4UL);
     b = 2;
     {
       int __gen_e_acsl_valid_2;
@@ -198,8 +198,8 @@ void separate_decl_and_init(int value)
     }
     /*@ assert \valid(&b); */ ;
     case 0:
-    __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
-    __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+    __e_acsl_store_block_duplicate((void *)(& c),4UL);
+    __e_acsl_store_block_duplicate((void *)(& d),4UL);
     ;
     __e_acsl_full_init((void *)(& c));
     c = 3;
@@ -229,8 +229,8 @@ void separate_decl_and_init(int value)
     __e_acsl_delete_block((void *)(& d));
     break;
     case 1:
-    __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
-    __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+    __e_acsl_store_block_duplicate((void *)(& c),4UL);
+    __e_acsl_store_block_duplicate((void *)(& d),4UL);
     ;
     __e_acsl_full_init((void *)(& d));
     d = 4;
@@ -272,7 +272,7 @@ void label_in_switch(int value)
   switch (value) {
     K: ;
     int d = 0;
-    __e_acsl_store_block((void *)(& d),(size_t)4);
+    __e_acsl_store_block((void *)(& d),4UL);
     __e_acsl_full_init((void *)(& d));
     {
       int __gen_e_acsl_valid;
@@ -296,10 +296,10 @@ void label_in_switch(int value)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
     }
     /*@ assert \valid(&d); */ ;
-    L: case 0: __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+    L: case 0: __e_acsl_store_block_duplicate((void *)(& d),4UL);
                ;
     int e = 1;
-    __e_acsl_store_block((void *)(& e),(size_t)4);
+    __e_acsl_store_block((void *)(& e),4UL);
     __e_acsl_full_init((void *)(& e));
     {
       int __gen_e_acsl_valid_2;
@@ -327,11 +327,11 @@ void label_in_switch(int value)
     __e_acsl_delete_block((void *)(& e));
     break;
     case 1:
-    __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
-    __e_acsl_store_block_duplicate((void *)(& e),(size_t)4);
+    __e_acsl_store_block_duplicate((void *)(& d),4UL);
+    __e_acsl_store_block_duplicate((void *)(& e),4UL);
     ;
     int ff = 2;
-    __e_acsl_store_block((void *)(& ff),(size_t)4);
+    __e_acsl_store_block((void *)(& ff),4UL);
     __e_acsl_full_init((void *)(& ff));
     {
       int __gen_e_acsl_valid_3;
@@ -373,7 +373,7 @@ void label_in_switch(int value)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   decl_in_switch(argc);
   compound_decl_and_init(argc);
   separate_decl_and_init(argc);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
index f7356a6d34e..c059f62f435 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
@@ -12,10 +12,10 @@ int goto_bts(void)
 {
   int __retres;
   int *p;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int a = 0;
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& a),4UL);
     __e_acsl_full_init((void *)(& a));
     __e_acsl_full_init((void *)(& p));
     p = & a;
@@ -110,25 +110,25 @@ int goto_valid(void)
   int *p;
   int *q;
   int *r;
-  __e_acsl_store_block((void *)(& r),(size_t)8);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& r),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int a = 9;
   {
     int a1 = 0;
-    __e_acsl_store_block((void *)(& a1),(size_t)4);
+    __e_acsl_store_block((void *)(& a1),4UL);
     __e_acsl_full_init((void *)(& a1));
     __e_acsl_full_init((void *)(& p));
     p = & a1;
     {
       int a2 = 0;
-      __e_acsl_store_block((void *)(& a2),(size_t)4);
+      __e_acsl_store_block((void *)(& a2),4UL);
       __e_acsl_full_init((void *)(& a2));
       __e_acsl_full_init((void *)(& q));
       q = & a2;
       {
         int a3 = 0;
-        __e_acsl_store_block((void *)(& a3),(size_t)4);
+        __e_acsl_store_block((void *)(& a3),4UL);
         __e_acsl_full_init((void *)(& a3));
         __e_acsl_full_init((void *)(& r));
         r = & a3;
@@ -392,11 +392,11 @@ int switch_valid(void)
   int *p;
   int *q;
   int *s;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int i = 1;
-  __e_acsl_store_block((void *)(& i),(size_t)4);
+  __e_acsl_store_block((void *)(& i),4UL);
   __e_acsl_full_init((void *)(& i));
   __e_acsl_full_init((void *)(& s));
   s = & i;
@@ -404,13 +404,13 @@ int switch_valid(void)
     default:
     {
       int a1 = 0;
-      __e_acsl_store_block((void *)(& a1),(size_t)4);
+      __e_acsl_store_block((void *)(& a1),4UL);
       __e_acsl_full_init((void *)(& a1));
       __e_acsl_full_init((void *)(& p));
       p = & a1;
       {
         int a2 = 0;
-        __e_acsl_store_block((void *)(& a2),(size_t)4);
+        __e_acsl_store_block((void *)(& a2),4UL);
         __e_acsl_full_init((void *)(& a2));
         __e_acsl_full_init((void *)(& q));
         q = & a2;
@@ -664,13 +664,13 @@ int while_valid(void)
   int *p;
   int *q;
   int *r;
-  __e_acsl_store_block((void *)(& r),(size_t)8);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& r),8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int i = 5;
   {
     int a0 = 0;
-    __e_acsl_store_block((void *)(& a0),(size_t)4);
+    __e_acsl_store_block((void *)(& a0),4UL);
     __e_acsl_full_init((void *)(& a0));
     __e_acsl_full_init((void *)(& r));
     r = & a0;
@@ -679,13 +679,13 @@ int while_valid(void)
       if (! i) break;
       {
         int a1 = 0;
-        __e_acsl_store_block((void *)(& a1),(size_t)4);
+        __e_acsl_store_block((void *)(& a1),4UL);
         __e_acsl_full_init((void *)(& a1));
         __e_acsl_full_init((void *)(& p));
         p = & a1;
         {
           int a2 = 0;
-          __e_acsl_store_block((void *)(& a2),(size_t)4);
+          __e_acsl_store_block((void *)(& a2),4UL);
           __e_acsl_full_init((void *)(& a2));
           __e_acsl_full_init((void *)(& q));
           q = & a2;
@@ -936,8 +936,8 @@ void continue_valid(void)
 {
   int *p;
   int *q;
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int i = 0;
   while (1) {
     int tmp;
@@ -1021,7 +1021,7 @@ void continue_valid(void)
       }
       /*@ assert !\valid(q); */ ;
       int a1 = 1;
-      __e_acsl_store_block((void *)(& a1),(size_t)4);
+      __e_acsl_store_block((void *)(& a1),4UL);
       __e_acsl_full_init((void *)(& a1));
       __e_acsl_full_init((void *)(& p));
       p = & a1;
@@ -1101,7 +1101,7 @@ void continue_valid(void)
       /*@ assert !\valid(q); */ ;
       {
         int a2 = 1;
-        __e_acsl_store_block((void *)(& a2),(size_t)4);
+        __e_acsl_store_block((void *)(& a2),4UL);
         __e_acsl_full_init((void *)(& a2));
         __e_acsl_full_init((void *)(& q));
         q = & a2;
@@ -1273,7 +1273,7 @@ void continue_valid(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   goto_bts();
   goto_valid();
   switch_valid();
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c b/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
index 231296afc7f..0e4e83cd028 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& errno),(size_t)4);
+    __e_acsl_store_block((void *)(& errno),4UL);
     __e_acsl_full_init((void *)(& errno));
   }
   return;
@@ -30,10 +30,10 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   int *p = & errno;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
index f02b64b4c9f..589a213ac03 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(array),(size_t)1024);
+    __e_acsl_store_block((void *)(array),1024UL);
     __e_acsl_full_init((void *)(& array));
   }
   return;
@@ -31,9 +31,9 @@ int main(void)
 {
   int __retres;
   int *p;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int __gen_e_acsl_freeable;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
index 7362996cf7c..6c4a2cd4abb 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
@@ -16,7 +16,7 @@ void function(int a, int b, int c, int d)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int w = 0;
   int x = 1;
   int y = 2;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c b/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
index 43911e961b2..1d3d5fc7491 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
@@ -14,7 +14,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& a),(size_t)1);
+    __e_acsl_store_block((void *)(& a),1UL);
     __e_acsl_full_init((void *)(& a));
   }
   return;
@@ -30,9 +30,9 @@ int main(void)
 {
   int __retres;
   char *b;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& b),(size_t)8);
+  __e_acsl_store_block((void *)(& b),8UL);
   goto _LOR;
   _LOR: __e_acsl_full_init((void *)(& b));
         b = & a;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
index 35dffbd0489..f264c45b599 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
@@ -26,7 +26,7 @@ void __e_acsl_globals_init(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *cwd = realpath(__gen_e_acsl_literal_string,(char *)0);
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
index 6308414506a..9423eedcc88 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
@@ -15,9 +15,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& b),(size_t)4);
+    __e_acsl_store_block((void *)(& b),4UL);
     __e_acsl_full_init((void *)(& b));
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& a),4UL);
     __e_acsl_full_init((void *)(& a));
   }
   return;
@@ -33,13 +33,13 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   int *p = & a;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *q = & b;
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
index 591da5b061c..b33191d7901 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
@@ -14,7 +14,7 @@ extern size_t __e_acsl_heap_allocation_size;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
@@ -31,7 +31,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
   }
   /*@ assert __e_acsl_heap_allocation_size == 0; */ ;
-  char *a = malloc((unsigned long)7);
+  char *a = malloc((size_t)7);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
       {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
index b05d785e731..a370575bf58 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& B),(size_t)4);
+    __e_acsl_store_block((void *)(& B),4UL);
     __e_acsl_full_init((void *)(& B));
-    __e_acsl_store_block((void *)(& A),(size_t)4);
+    __e_acsl_store_block((void *)(& A),4UL);
     __e_acsl_full_init((void *)(& A));
   }
   return;
@@ -38,16 +38,16 @@ int main(void)
   long *r;
   long d[2];
   int dup[2];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(d),(size_t)16);
-  __e_acsl_store_block((void *)(& r),(size_t)8);
-  __e_acsl_store_block((void *)(& b),(size_t)4);
+  __e_acsl_store_block((void *)(d),16UL);
+  __e_acsl_store_block((void *)(& r),8UL);
+  __e_acsl_store_block((void *)(& b),4UL);
   int *p = & A;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *q = & B;
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -115,10 +115,10 @@ int main(void)
   }
   /*@ assert \initialized(q); */ ;
   int a = 0;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   long c[2] = {(long)1, (long)1};
-  __e_acsl_store_block((void *)(c),(size_t)16);
+  __e_acsl_store_block((void *)(c),16UL);
   __e_acsl_full_init((void *)(& c));
   __e_acsl_full_init((void *)(& p));
   p = & a;
@@ -693,7 +693,7 @@ int main(void)
   }
   /*@ assert !\initialized(p); */ ;
   __e_acsl_full_init((void *)(& q));
-  q = (int *)calloc((unsigned long)1,sizeof(int));
+  q = (int *)calloc((size_t)1,sizeof(int));
   {
     int __gen_e_acsl_initialized_27;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_29 =
@@ -814,7 +814,7 @@ int main(void)
   }
   /*@ assert !\initialized(q); */ ;
   __e_acsl_full_init((void *)(& q));
-  q = (int *)calloc((unsigned long)3,sizeof(int));
+  q = (int *)calloc((size_t)3,sizeof(int));
   {
     int __gen_e_acsl_size;
     int __gen_e_acsl_if;
@@ -962,7 +962,7 @@ int main(void)
   /*@ assert !\initialized(q + 5); */ ;
   free((void *)q);
   __e_acsl_full_init((void *)(& q));
-  q = (int *)calloc((unsigned long)7,sizeof(int));
+  q = (int *)calloc((size_t)7,sizeof(int));
   {
     int __gen_e_acsl_size_3;
     int __gen_e_acsl_if_3;
@@ -1172,7 +1172,7 @@ int main(void)
   /*@ assert !\initialized(q + 9); */ ;
   free((void *)q);
   __e_acsl_full_init((void *)(& q));
-  q = (int *)calloc((unsigned long)2,sizeof(int));
+  q = (int *)calloc((size_t)2,sizeof(int));
   {
     int __gen_e_acsl_size_6;
     int __gen_e_acsl_if_6;
@@ -1297,7 +1297,7 @@ int main(void)
   /*@ assert !\initialized(q + 3); */ ;
   free((void *)q);
   __e_acsl_full_init((void *)(& q));
-  q = (int *)calloc((unsigned long)6,sizeof(int));
+  q = (int *)calloc((size_t)6,sizeof(int));
   {
     int __gen_e_acsl_size_8;
     int __gen_e_acsl_if_8;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
index f2c14f3d7a8..b96f4d88152 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
@@ -96,15 +96,15 @@ void __e_acsl_globals_init(void)
     __e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
-    __e_acsl_store_block((void *)(& l_str),(size_t)8);
+    __e_acsl_store_block((void *)(& l_str),8UL);
     __e_acsl_full_init((void *)(& l_str));
-    __e_acsl_store_block((void *)(& s_str),(size_t)8);
+    __e_acsl_store_block((void *)(& s_str),8UL);
     __e_acsl_full_init((void *)(& s_str));
-    __e_acsl_store_block((void *)(& S2),(size_t)8);
+    __e_acsl_store_block((void *)(& S2),8UL);
     __e_acsl_full_init((void *)(& S2));
-    __e_acsl_store_block((void *)(& S),(size_t)8);
+    __e_acsl_store_block((void *)(& S),8UL);
     __e_acsl_full_init((void *)(& S));
-    __e_acsl_store_block((void *)(& T),(size_t)8);
+    __e_acsl_store_block((void *)(& T),8UL);
     __e_acsl_full_init((void *)(& T));
   }
   return;
@@ -123,10 +123,10 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   char *SS = (char *)__gen_e_acsl_literal_string;
-  __e_acsl_store_block((void *)(& SS),(size_t)8);
+  __e_acsl_store_block((void *)(& SS),8UL);
   __e_acsl_full_init((void *)(& SS));
   {
     int __gen_e_acsl_valid_read;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
index a47a436f538..e4d49d91da5 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
@@ -42,7 +42,7 @@ void __e_acsl_globals_init(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   int t = 0;
   UP: ;
@@ -54,7 +54,7 @@ int main(int argc, char const **argv)
   AGAIN:
   {
     int a;
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& a),4UL);
     __e_acsl_full_init((void *)(& a));
     a = 1;
     {
@@ -87,7 +87,7 @@ int main(int argc, char const **argv)
     }
     else t ++;
     int b = 15;
-    __e_acsl_store_block((void *)(& b),(size_t)4);
+    __e_acsl_store_block((void *)(& b),4UL);
     __e_acsl_full_init((void *)(& b));
     {
       int __gen_e_acsl_valid_2;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
index e43ee1e3373..5857c85776c 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
@@ -21,9 +21,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& p),(size_t)8);
+    __e_acsl_store_block((void *)(& p),8UL);
     __e_acsl_full_init((void *)(& p));
-    __e_acsl_store_block((void *)(& X),(size_t)4);
+    __e_acsl_store_block((void *)(& X),4UL);
     __e_acsl_full_init((void *)(& X));
   }
   return;
@@ -39,7 +39,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   f();
   __retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
index d97bdb41c92..3af7fbac0b8 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
@@ -16,8 +16,8 @@ struct list {
 struct list *add(struct list *l, int i)
 {
   struct list *new;
-  __e_acsl_store_block((void *)(& new),(size_t)8);
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& new),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& new));
   new = (struct list *)malloc(sizeof(struct list));
   {
@@ -70,9 +70,9 @@ struct list *add(struct list *l, int i)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   struct list *l = (struct list *)0;
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   __e_acsl_full_init((void *)(& l));
   l = add(l,4);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
index 8f9f0b16081..001a897e269 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
@@ -27,7 +27,7 @@ int __gen_e_acsl_main(int argc, char **argv)
   {
     int __gen_e_acsl_forall;
     long __gen_e_acsl_k;
-    __e_acsl_store_block((void *)(& argv),(size_t)8);
+    __e_acsl_store_block((void *)(& argv),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_forall = 1;
     __gen_e_acsl_k = 0;
@@ -339,7 +339,7 @@ int __gen_e_acsl_main(int argc, char **argv)
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_valid_2;
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
 size_t __gen_e_acsl_strlen(char const *s)
 {
   size_t __retres;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __retres = strlen(s);
   __e_acsl_delete_block((void *)(& s));
   return __retres;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
index bb292590eff..fadac7c1f5d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
@@ -57,16 +57,15 @@ int main(int argc, char const **argv)
 {
   int __retres;
   char *a;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
-  __e_acsl_store_block((void *)(& a),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   char **memptr = malloc(sizeof(void *));
-  __e_acsl_store_block((void *)(& memptr),(size_t)8);
+  __e_acsl_store_block((void *)(& memptr),8UL);
   __e_acsl_full_init((void *)(& memptr));
   int res2 =
-    __gen_e_acsl_posix_memalign((void **)memptr,(unsigned long)256,
-                                (unsigned long)15);
+    __gen_e_acsl_posix_memalign((void **)memptr,(size_t)256,(size_t)15);
   char *p = *memptr;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized;
@@ -180,7 +179,7 @@ int main(int argc, char const **argv)
   }
   /*@ assert !\valid(p); */ ;
   __e_acsl_full_init((void *)(& a));
-  a = (char *)aligned_alloc((unsigned long)256,(unsigned long)12);
+  a = (char *)aligned_alloc((size_t)256,(size_t)12);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
       {.values = (void *)0};
@@ -196,7 +195,7 @@ int main(int argc, char const **argv)
   }
   /*@ assert a == \null; */ ;
   __e_acsl_full_init((void *)(& a));
-  a = (char *)aligned_alloc((unsigned long)255,(unsigned long)512);
+  a = (char *)aligned_alloc((size_t)255,(size_t)512);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
       {.values = (void *)0};
@@ -212,7 +211,7 @@ int main(int argc, char const **argv)
   }
   /*@ assert a == \null; */ ;
   __e_acsl_full_init((void *)(& a));
-  a = (char *)aligned_alloc((unsigned long)0,(unsigned long)512);
+  a = (char *)aligned_alloc((size_t)0,(size_t)512);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
       {.values = (void *)0};
@@ -228,7 +227,7 @@ int main(int argc, char const **argv)
   }
   /*@ assert a == \null; */ ;
   __e_acsl_full_init((void *)(& a));
-  a = (char *)aligned_alloc((unsigned long)256,(unsigned long)512);
+  a = (char *)aligned_alloc((size_t)256,(size_t)512);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
       {.values = (void *)0};
@@ -405,8 +404,8 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_and;
-    __e_acsl_store_block((void *)(& memptr),(size_t)8);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& memptr),8UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"memptr",
                                  (void *)memptr);
@@ -473,7 +472,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
         {.values = (void *)0};
@@ -490,7 +489,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_or;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
index 2606de54e2f..e4806a7d05f 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
@@ -14,8 +14,8 @@ extern size_t __e_acsl_heap_allocation_size;
 int main(int argc, char **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
-  char *a = malloc((unsigned long)7);
+  __e_acsl_memory_init(& argc,& argv,8UL);
+  char *a = malloc((size_t)7);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
   }
   /*@ assert __e_acsl_heap_allocation_size == 7; */ ;
-  char *b = malloc((unsigned long)14);
+  char *b = malloc((size_t)14);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
       {.values = (void *)0};
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
   }
   /*@ assert __e_acsl_heap_allocation_size == 14; */ ;
-  b = (char *)realloc((void *)b,(unsigned long)9);
+  b = (char *)realloc((void *)b,(size_t)9);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
       {.values = (void *)0};
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
   }
   /*@ assert __e_acsl_heap_allocation_size == 9; */ ;
-  b = (char *)realloc((void *)b,(unsigned long)18);
+  b = (char *)realloc((void *)b,(size_t)18);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
       {.values = (void *)0};
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
   }
   /*@ assert __e_acsl_heap_allocation_size == 18; */ ;
-  b = (char *)realloc((void *)b,(unsigned long)0);
+  b = (char *)realloc((void *)b,(size_t)0);
   b = (char *)0;
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
   }
   /*@ assert __e_acsl_heap_allocation_size == 0; */ ;
-  b = (char *)realloc((void *)b,(unsigned long)8);
+  b = (char *)realloc((void *)b,(size_t)8);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
       {.values = (void *)0};
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
   }
   /*@ assert __e_acsl_heap_allocation_size == 8; */ ;
-  b = (char *)realloc((void *)0,(unsigned long)8);
+  b = (char *)realloc((void *)0,(size_t)8);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
       {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
index 82e8b5fdfd1..422719d5b1a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
index e9beecbd3c9..12164ac136e 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& PA),(size_t)8);
+    __e_acsl_store_block((void *)(& PA),8UL);
     __e_acsl_full_init((void *)(& PA));
-    __e_acsl_store_block((void *)(A),(size_t)16);
+    __e_acsl_store_block((void *)(A),16UL);
     __e_acsl_full_init((void *)(& A));
   }
   return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   PA = (int *)(& A);
   {
@@ -119,7 +119,7 @@ int main(void)
   }
   /*@ assert \offset(PA + 1) == 8; */ ;
   int a[4] = {1, 2, 3, 4};
-  __e_acsl_store_block((void *)(a),(size_t)16);
+  __e_acsl_store_block((void *)(a),16UL);
   __e_acsl_full_init((void *)(& a));
   {
     unsigned long __gen_e_acsl_offset_5;
@@ -183,10 +183,10 @@ int main(void)
   }
   /*@ assert \offset(&a[3]) == 12; */ ;
   long l = (long)4;
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& l),8UL);
   __e_acsl_full_init((void *)(& l));
   char *pl = (char *)(& l);
-  __e_acsl_store_block((void *)(& pl),(size_t)8);
+  __e_acsl_store_block((void *)(& pl),8UL);
   __e_acsl_full_init((void *)(& pl));
   {
     unsigned long __gen_e_acsl_offset_8;
@@ -271,7 +271,7 @@ int main(void)
   }
   /*@ assert \offset(pl + 7) == 7; */ ;
   int *pi = (int *)(& l);
-  __e_acsl_store_block((void *)(& pi),(size_t)8);
+  __e_acsl_store_block((void *)(& pi),8UL);
   __e_acsl_full_init((void *)(& pi));
   {
     unsigned long __gen_e_acsl_offset_12;
@@ -315,8 +315,8 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
   }
   /*@ assert \offset(pi) == 4; */ ;
-  char *p = malloc((unsigned long)12);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  char *p = malloc((size_t)12);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     unsigned long __gen_e_acsl_offset_14;
@@ -420,7 +420,7 @@ int main(void)
   }
   /*@ assert \offset(p - 5) == 0; */ ;
   long *q = malloc((unsigned long)30 * sizeof(long));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     unsigned long __gen_e_acsl_offset_19;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
index c5904316438..3fa7646a8d5 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
@@ -15,7 +15,7 @@ enum bool {
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
index ff00f4a06ec..68e0b7f7580 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
@@ -11,15 +11,15 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 1;
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   int t[3] = {2, 3, 4};
-  __e_acsl_store_block((void *)(t),(size_t)12);
+  __e_acsl_store_block((void *)(t),12UL);
   __e_acsl_full_init((void *)(& t));
   int *p = & x;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
index 1c2481f7de8..a30ed671ba7 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
@@ -20,7 +20,7 @@ void f(void)
 void g(int *C, int *D)
 {
   {
-    __e_acsl_store_block((void *)(& C),(size_t)8);
+    __e_acsl_store_block((void *)(& C),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __gen_e_acsl_assert_data.blocking = 1;
     __gen_e_acsl_assert_data.kind = "Assertion";
@@ -40,9 +40,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& B),(size_t)8);
+    __e_acsl_store_block((void *)(& B),8UL);
     __e_acsl_full_init((void *)(& B));
-    __e_acsl_store_block((void *)(& A),(size_t)8);
+    __e_acsl_store_block((void *)(& A),8UL);
     __e_acsl_full_init((void *)(& A));
   }
   return;
@@ -60,10 +60,10 @@ int main(void)
   int __retres;
   int *x;
   int *y;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& y),(size_t)8);
-  __e_acsl_store_block((void *)(& x),(size_t)8);
+  __e_acsl_store_block((void *)(& y),8UL);
+  __e_acsl_store_block((void *)(& x),8UL);
   B = (int *)malloc(sizeof(int));
   __e_acsl_full_init((void *)(& y));
   y = (int *)malloc(sizeof(int));
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
index 51a87c4aa3b..b9c6e8b0ed6 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
@@ -29,7 +29,7 @@ void __gen_e_acsl_g(long *ptr, size_t size);
 
 void g(long *ptr, size_t size)
 {
-  __e_acsl_store_block((void *)(& ptr),(size_t)8);
+  __e_acsl_store_block((void *)(& ptr),8UL);
   __e_acsl_delete_block((void *)(& ptr));
   return;
 }
@@ -45,14 +45,14 @@ int main(void)
   struct S s;
   int **multi_dynamic;
   int i;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& multi_dynamic),(size_t)8);
-  __e_acsl_store_block((void *)(& s),(size_t)24);
-  __e_acsl_store_block((void *)(t4),(size_t)4000);
-  __e_acsl_store_block((void *)(t3),(size_t)224);
-  __e_acsl_store_block((void *)(t2),(size_t)32);
-  __e_acsl_store_block((void *)(& b),(size_t)8);
-  __e_acsl_store_block((void *)(& a),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& multi_dynamic),8UL);
+  __e_acsl_store_block((void *)(& s),24UL);
+  __e_acsl_store_block((void *)(t4),4000UL);
+  __e_acsl_store_block((void *)(t3),224UL);
+  __e_acsl_store_block((void *)(t2),32UL);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   __e_acsl_full_init((void *)(& a));
   a = (int *)malloc((unsigned long)10 * sizeof(int));
   {
@@ -240,7 +240,7 @@ int main(void)
   }
   /*@ assert !\valid(b + (10 .. 15)); */ ;
   long t[3] = {7l, 8l, 9l};
-  __e_acsl_store_block((void *)(t),(size_t)24);
+  __e_acsl_store_block((void *)(t),24UL);
   __e_acsl_full_init((void *)(& t));
   {
     int __gen_e_acsl_size_6;
@@ -316,7 +316,7 @@ int main(void)
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
   }
   /*@ assert !\valid(&t[3 .. 5]); */ ;
-  __gen_e_acsl_g(t,(unsigned long)3);
+  __gen_e_acsl_g(t,(size_t)3);
   __e_acsl_initialize((void *)(t2),sizeof(double));
   t2[0] = 0.5;
   __e_acsl_initialize((void *)(& t2[1]),sizeof(double));
@@ -768,11 +768,11 @@ int main(void)
   }
   free((void *)multi_dynamic);
   char c = (char)'w';
-  __e_acsl_store_block((void *)(& c),(size_t)1);
+  __e_acsl_store_block((void *)(& c),1UL);
   __e_acsl_full_init((void *)(& c));
   __gen_e_acsl_f(& c,(long)5);
   char t5[4] = {(char)'a', (char)'b', (char)'c', (char)'d'};
-  __e_acsl_store_block((void *)(t5),(size_t)4);
+  __e_acsl_store_block((void *)(t5),4UL);
   __e_acsl_full_init((void *)(& t5));
   {
     int __gen_e_acsl_size_15;
@@ -850,7 +850,7 @@ void __gen_e_acsl_g(long *ptr, size_t size)
     int __gen_e_acsl_le_2;
     unsigned long __gen_e_acsl_size_4;
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& ptr),(size_t)8);
+    __e_acsl_store_block((void *)(& ptr),8UL);
     __gen_e_acsl_at = ptr;
     __gmpz_init_set_ui(__gen_e_acsl_size,size);
     __gmpz_init_set(__gen_e_acsl_at_2,
@@ -1089,7 +1089,7 @@ void __gen_e_acsl_f(char *s, long n)
     int __gen_e_acsl_le_2;
     unsigned long __gen_e_acsl_size_2;
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& s),(size_t)8);
+    __e_acsl_store_block((void *)(& s),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"s",(void *)s);
     __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"sizeof(char)",0,
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
index 4cd79cd0a40..937c0045936 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
@@ -12,14 +12,14 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int a;
     int b;
     int c;
-    __e_acsl_store_block((void *)(& c),(size_t)4);
-    __e_acsl_store_block((void *)(& b),(size_t)4);
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& c),4UL);
+    __e_acsl_store_block((void *)(& b),4UL);
+    __e_acsl_store_block((void *)(& a),4UL);
     __e_acsl_full_init((void *)(& c));
     c = 0;
     __e_acsl_full_init((void *)(& b));
@@ -27,7 +27,7 @@ int main(void)
     __e_acsl_full_init((void *)(& a));
     a = b;
     int *d = & a;
-    __e_acsl_store_block((void *)(& d),(size_t)8);
+    __e_acsl_store_block((void *)(& d),8UL);
     __e_acsl_full_init((void *)(& d));
     {
       int __gen_e_acsl_valid_read;
@@ -104,8 +104,8 @@ int main(void)
                                    (void *)(& c));
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
                                      "sizeof(int)",0,sizeof(int));
-      __gen_e_acsl_separated = __e_acsl_separated((size_t)3,& a,sizeof(int),
-                                                  & b,sizeof(int),& c,
+      __gen_e_acsl_separated = __e_acsl_separated(3UL,& a,sizeof(int),& b,
+                                                  sizeof(int),& c,
                                                   sizeof(int));
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,
                                    "\\separated(&a, &b, &c)",0,
@@ -232,8 +232,7 @@ int main(void)
                                    (void *)d);
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_5,
                                      "sizeof(int)",0,sizeof(int));
-      __gen_e_acsl_separated_2 = __e_acsl_separated((size_t)4,& a,
-                                                    sizeof(int),& b,
+      __gen_e_acsl_separated_2 = __e_acsl_separated(4UL,& a,sizeof(int),& b,
                                                     sizeof(int),& c,
                                                     sizeof(int),d,
                                                     sizeof(int));
@@ -258,7 +257,7 @@ int main(void)
   }
   {
     double array[20] = {(double)0};
-    __e_acsl_store_block((void *)(array),(size_t)160);
+    __e_acsl_store_block((void *)(array),160UL);
     __e_acsl_full_init((void *)(& array));
     {
       int __gen_e_acsl_size;
@@ -368,7 +367,7 @@ int main(void)
                                      __gen_e_acsl_size_4);
         __gen_e_acsl_if_4 = __gen_e_acsl_size_4;
       }
-      __gen_e_acsl_separated_3 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_3 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 0,
                                                     __gen_e_acsl_if_3,
                                                     (char *)(array) + 8 * 10,
@@ -494,7 +493,7 @@ int main(void)
                                      __gen_e_acsl_size_8);
         __gen_e_acsl_if_8 = __gen_e_acsl_size_8;
       }
-      __gen_e_acsl_separated_4 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_4 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 0,
                                                     __gen_e_acsl_if_7,
                                                     (char *)(array) + 8 * 5,
@@ -621,7 +620,7 @@ int main(void)
                                      __gen_e_acsl_size_12);
         __gen_e_acsl_if_12 = __gen_e_acsl_size_12;
       }
-      __gen_e_acsl_separated_5 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_5 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 0,
                                                     __gen_e_acsl_if_11,
                                                     (char *)(array) + 8 * 5,
@@ -694,8 +693,7 @@ int main(void)
                                    (void *)(& array[1]));
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_19,
                                      "sizeof(double)",0,sizeof(double));
-      __gen_e_acsl_separated_6 = __e_acsl_separated((size_t)2,array,
-                                                    sizeof(double),
+      __gen_e_acsl_separated_6 = __e_acsl_separated(2UL,array,sizeof(double),
                                                     & array[1],
                                                     sizeof(double));
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_19,
@@ -819,7 +817,7 @@ int main(void)
                                      __gen_e_acsl_size_16);
         __gen_e_acsl_if_16 = __gen_e_acsl_size_16;
       }
-      __gen_e_acsl_separated_7 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_7 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 0,
                                                     __gen_e_acsl_if_15,
                                                     (char *)(array) + 8 * 1,
@@ -946,7 +944,7 @@ int main(void)
                                      __gen_e_acsl_size_20);
         __gen_e_acsl_if_20 = __gen_e_acsl_size_20;
       }
-      __gen_e_acsl_separated_8 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_8 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 15,
                                                     __gen_e_acsl_if_19,
                                                     (char *)(array) + 8 * 0,
@@ -1072,7 +1070,7 @@ int main(void)
                                      __gen_e_acsl_size_24);
         __gen_e_acsl_if_24 = __gen_e_acsl_size_24;
       }
-      __gen_e_acsl_separated_9 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_9 = __e_acsl_separated(2UL,
                                                     (char *)(array) + 8 * 0,
                                                     __gen_e_acsl_if_23,
                                                     (char *)(array) + 8 * 0,
@@ -1094,13 +1092,13 @@ int main(void)
   }
   {
     int *a_0 = malloc(sizeof(int));
-    __e_acsl_store_block((void *)(& a_0),(size_t)8);
+    __e_acsl_store_block((void *)(& a_0),8UL);
     __e_acsl_full_init((void *)(& a_0));
     int *b_0 = malloc(sizeof(int));
-    __e_acsl_store_block((void *)(& b_0),(size_t)8);
+    __e_acsl_store_block((void *)(& b_0),8UL);
     __e_acsl_full_init((void *)(& b_0));
     int *c_0 = a_0;
-    __e_acsl_store_block((void *)(& c_0),(size_t)8);
+    __e_acsl_store_block((void *)(& c_0),8UL);
     __e_acsl_full_init((void *)(& c_0));
     {
       int __gen_e_acsl_initialized_2;
@@ -1178,8 +1176,7 @@ int main(void)
                                    (void *)b_0);
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_31,
                                      "sizeof(int)",0,sizeof(int));
-      __gen_e_acsl_separated_10 = __e_acsl_separated((size_t)2,a_0,
-                                                     sizeof(int),b_0,
+      __gen_e_acsl_separated_10 = __e_acsl_separated(2UL,a_0,sizeof(int),b_0,
                                                      sizeof(int));
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_31,
                                    "\\separated(a_0, b_0)",0,
@@ -1307,8 +1304,7 @@ int main(void)
                                    (void *)c_0);
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_34,
                                      "sizeof(int)",0,sizeof(int));
-      __gen_e_acsl_separated_11 = __e_acsl_separated((size_t)3,a_0,
-                                                     sizeof(int),b_0,
+      __gen_e_acsl_separated_11 = __e_acsl_separated(3UL,a_0,sizeof(int),b_0,
                                                      sizeof(int),c_0,
                                                      sizeof(int));
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data_34,
@@ -1333,7 +1329,7 @@ int main(void)
   }
   {
     double *array_0 = malloc(sizeof(double [20]));
-    __e_acsl_store_block((void *)(& array_0),(size_t)8);
+    __e_acsl_store_block((void *)(& array_0),8UL);
     __e_acsl_full_init((void *)(& array_0));
     {
       int __gen_e_acsl_size_25;
@@ -1443,7 +1439,7 @@ int main(void)
                                      __gen_e_acsl_size_28);
         __gen_e_acsl_if_28 = __gen_e_acsl_size_28;
       }
-      __gen_e_acsl_separated_12 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_12 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 0,
                                                      __gen_e_acsl_if_27,
                                                      (char *)array_0 + 8 * 10,
@@ -1570,7 +1566,7 @@ int main(void)
                                      __gen_e_acsl_size_32);
         __gen_e_acsl_if_32 = __gen_e_acsl_size_32;
       }
-      __gen_e_acsl_separated_13 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_13 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 0,
                                                      __gen_e_acsl_if_31,
                                                      (char *)array_0 + 8 * 5,
@@ -1697,7 +1693,7 @@ int main(void)
                                      __gen_e_acsl_size_36);
         __gen_e_acsl_if_36 = __gen_e_acsl_size_36;
       }
-      __gen_e_acsl_separated_14 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_14 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 0,
                                                      __gen_e_acsl_if_35,
                                                      (char *)array_0 + 8 * 5,
@@ -1770,7 +1766,7 @@ int main(void)
                                    (void *)array_0);
       __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_47,
                                      "sizeof(double)",0,sizeof(double));
-      __gen_e_acsl_separated_15 = __e_acsl_separated((size_t)2,array_0 + 0,
+      __gen_e_acsl_separated_15 = __e_acsl_separated(2UL,array_0 + 0,
                                                      sizeof(double),
                                                      array_0 + 1,
                                                      sizeof(double));
@@ -1896,7 +1892,7 @@ int main(void)
                                      __gen_e_acsl_size_40);
         __gen_e_acsl_if_40 = __gen_e_acsl_size_40;
       }
-      __gen_e_acsl_separated_16 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_16 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 0,
                                                      __gen_e_acsl_if_39,
                                                      (char *)array_0 + 8 * 1,
@@ -2023,7 +2019,7 @@ int main(void)
                                      __gen_e_acsl_size_44);
         __gen_e_acsl_if_44 = __gen_e_acsl_size_44;
       }
-      __gen_e_acsl_separated_17 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_17 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 15,
                                                      __gen_e_acsl_if_43,
                                                      (char *)array_0 + 8 * 0,
@@ -2150,7 +2146,7 @@ int main(void)
                                      __gen_e_acsl_size_48);
         __gen_e_acsl_if_48 = __gen_e_acsl_size_48;
       }
-      __gen_e_acsl_separated_18 = __e_acsl_separated((size_t)2,
+      __gen_e_acsl_separated_18 = __e_acsl_separated(2UL,
                                                      (char *)array_0 + 8 * 0,
                                                      __gen_e_acsl_if_47,
                                                      (char *)array_0 + 8 * 0,
@@ -2174,7 +2170,7 @@ int main(void)
   }
   {
     double array_1[10][10][10] = {{{(double)0}}};
-    __e_acsl_store_block((void *)(array_1),(size_t)8000);
+    __e_acsl_store_block((void *)(array_1),8000UL);
     __e_acsl_full_init((void *)(& array_1));
     {
       int __gen_e_acsl_forall;
@@ -2363,7 +2359,7 @@ int main(void)
                   __e_acsl_assert(__gen_e_acsl_valid_read_46,
                                   & __gen_e_acsl_assert_data_65);
                   __e_acsl_assert_clean(& __gen_e_acsl_assert_data_65);
-                  __gen_e_acsl_separated_19 = __e_acsl_separated((size_t)3,
+                  __gen_e_acsl_separated_19 = __e_acsl_separated(3UL,
                                                                  & array_1[0][__gen_e_acsl_range_6][0],
                                                                  sizeof(double),
                                                                  & array_1[0][__gen_e_acsl_range_5][0],
@@ -2606,7 +2602,7 @@ int main(void)
                   __e_acsl_assert(__gen_e_acsl_valid_read_52,
                                   & __gen_e_acsl_assert_data_72);
                   __e_acsl_assert_clean(& __gen_e_acsl_assert_data_72);
-                  __gen_e_acsl_separated_20 = __e_acsl_separated((size_t)3,
+                  __gen_e_acsl_separated_20 = __e_acsl_separated(3UL,
                                                                  & array_1[0][__gen_e_acsl_range_12][0],
                                                                  sizeof(double),
                                                                  & array_1[1][__gen_e_acsl_range_11][0],
@@ -2832,7 +2828,7 @@ int main(void)
                       __e_acsl_assert(__gen_e_acsl_valid_read_56,
                                       & __gen_e_acsl_assert_data_77);
                       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_77);
-                      __gen_e_acsl_separated_21 = __e_acsl_separated((size_t)2,
+                      __gen_e_acsl_separated_21 = __e_acsl_separated(2UL,
                                                                     & array_1[__gen_e_acsl_range_19][__gen_e_acsl_range_20][0],
                                                                     sizeof(double),
                                                                     & array_1[__gen_e_acsl_range_17][__gen_e_acsl_range_18][0],
@@ -3062,7 +3058,7 @@ int main(void)
                       __e_acsl_assert(__gen_e_acsl_valid_read_60,
                                       & __gen_e_acsl_assert_data_82);
                       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_82);
-                      __gen_e_acsl_separated_22 = __e_acsl_separated((size_t)2,
+                      __gen_e_acsl_separated_22 = __e_acsl_separated(2UL,
                                                                     & array_1[__gen_e_acsl_range_27][__gen_e_acsl_range_28][0],
                                                                     sizeof(double),
                                                                     & array_1[__gen_e_acsl_range_25][__gen_e_acsl_range_26][0],
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
index 37e4dc882f8..4e8812b79f9 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
   x ++;
   {
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c b/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
index e29b8a1da4e..a99ef484c82 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
@@ -13,11 +13,11 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& stdout),(size_t)8);
+    __e_acsl_store_block((void *)(& stdout),8UL);
     __e_acsl_full_init((void *)(& stdout));
-    __e_acsl_store_block((void *)(& stdin),(size_t)8);
+    __e_acsl_store_block((void *)(& stdin),8UL);
     __e_acsl_full_init((void *)(& stdin));
-    __e_acsl_store_block((void *)(& stderr),(size_t)8);
+    __e_acsl_store_block((void *)(& stderr),8UL);
     __e_acsl_full_init((void *)(& stderr));
   }
   return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   {
     int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
index e67707de273..de0ff8f65d6 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
@@ -17,10 +17,10 @@ typedef struct __anonstruct_int32_pair_t_1 int32_pair_t;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   {
     int32_pair_t static_pair;
-    __e_acsl_store_block((void *)(& static_pair),(size_t)8);
+    __e_acsl_store_block((void *)(& static_pair),8UL);
     {
       int __gen_e_acsl_initialized;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -178,7 +178,7 @@ int main(void)
   }
   {
     int32_pair_t *heap_pair = malloc(sizeof(int32_pair_t));
-    __e_acsl_store_block((void *)(& heap_pair),(size_t)8);
+    __e_acsl_store_block((void *)(& heap_pair),8UL);
     __e_acsl_full_init((void *)(& heap_pair));
     {
       int __gen_e_acsl_initialized_7;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
index e31b81cecde..0aeeb6ad615 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
@@ -18,11 +18,11 @@ int *__gen_e_acsl_f(int *x);
 int *f(int *x)
 {
   int *y;
-  __e_acsl_store_block((void *)(& y),(size_t)8);
+  __e_acsl_store_block((void *)(& y),8UL);
   {
     int __gen_e_acsl_initialized;
     int __gen_e_acsl_and;
-    __e_acsl_store_block((void *)(& x),(size_t)8);
+    __e_acsl_store_block((void *)(& x),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"&y",
                                  (void *)(& y));
@@ -88,9 +88,9 @@ void g(void)
   int m;
   int *u;
   int **p;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
-  __e_acsl_store_block((void *)(& u),(size_t)8);
-  __e_acsl_store_block((void *)(& m),(size_t)4);
+  __e_acsl_store_block((void *)(& p),8UL);
+  __e_acsl_store_block((void *)(& u),8UL);
+  __e_acsl_store_block((void *)(& m),4UL);
   __e_acsl_full_init((void *)(& p));
   p = & u;
   __e_acsl_full_init((void *)(& u));
@@ -174,10 +174,10 @@ void g(void)
 int *__gen_e_acsl_f(int *x)
 {
   int *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& x),(size_t)8);
+    __e_acsl_store_block((void *)(& x),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"x",(void *)x);
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -228,9 +228,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& Z),(size_t)4);
+    __e_acsl_store_block((void *)(& Z),4UL);
     __e_acsl_full_init((void *)(& Z));
-    __e_acsl_store_block((void *)(& X),(size_t)8);
+    __e_acsl_store_block((void *)(& X),8UL);
     __e_acsl_full_init((void *)(& X));
   }
   return;
@@ -250,14 +250,14 @@ int main(void)
   int *b;
   int **c;
   int ***d;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& d),(size_t)8);
-  __e_acsl_store_block((void *)(& c),(size_t)8);
-  __e_acsl_store_block((void *)(& b),(size_t)8);
-  __e_acsl_store_block((void *)(& a),(size_t)8);
+  __e_acsl_store_block((void *)(& d),8UL);
+  __e_acsl_store_block((void *)(& c),8UL);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   int n = 0;
-  __e_acsl_store_block((void *)(& n),(size_t)4);
+  __e_acsl_store_block((void *)(& n),4UL);
   __e_acsl_full_init((void *)(& n));
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
index b8ce6271bbc..2fa0794d7d8 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
@@ -14,9 +14,9 @@ int main(void)
   int __retres;
   int *a;
   int *b;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& b),(size_t)8);
-  __e_acsl_store_block((void *)(& a),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   int n = 0;
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
index af84a51e13b..82270e4d2c6 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
@@ -26,8 +26,8 @@ struct list *__gen_e_acsl_f(struct list *l);
 struct list *f(struct list *l)
 {
   struct list *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
-  __e_acsl_store_block((void *)(& l),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
+  __e_acsl_store_block((void *)(& l),8UL);
   if (l == (struct list *)0) {
     __e_acsl_full_init((void *)(& __retres));
     __retres = l;
@@ -49,7 +49,7 @@ struct list *f(struct list *l)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __gen_e_acsl_f((struct list *)0);
   __retres = 0;
   __e_acsl_memory_clean();
@@ -69,14 +69,14 @@ struct list *__gen_e_acsl_f(struct list *l)
   __e_acsl_contract_t *__gen_e_acsl_contract;
   struct list *__gen_e_acsl_at;
   struct list *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_or;
-    __e_acsl_store_block((void *)(& l),(size_t)8);
+    __e_acsl_store_block((void *)(& l),8UL);
     __gen_e_acsl_at = l;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            l == (struct list *)0);
     __gen_e_acsl_valid = __e_acsl_valid((void *)l,sizeof(struct list),
                                         (void *)l,(void *)(& l));
@@ -118,14 +118,14 @@ struct list *__gen_e_acsl_f(struct list *l)
       else __gen_e_acsl_and = 0;
       __gen_e_acsl_or = ! __gen_e_acsl_and;
     }
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            __gen_e_acsl_or);
   }
   __retres = f(l);
   {
     int __gen_e_acsl_assumes_value;
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
         {.values = (void *)0};
@@ -145,7 +145,7 @@ struct list *__gen_e_acsl_f(struct list *l)
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
     }
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
         {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
index a41ca5d9a3c..720714a89c4 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
@@ -55,19 +55,19 @@ time_t __gen_e_acsl_time(time_t *timer)
   __e_acsl_contract_t *__gen_e_acsl_contract;
   time_t *__gen_e_acsl_at;
   time_t __retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   {
     int __gen_e_acsl_assumes_value;
     int __gen_e_acsl_active_bhvrs;
-    __e_acsl_store_block((void *)(& timer),(size_t)8);
+    __e_acsl_store_block((void *)(& timer),8UL);
     __gen_e_acsl_at = timer;
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
                                            timer == (time_t *)0);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
                                            timer != (time_t *)0);
     __gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value) {
       int __gen_e_acsl_valid;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -127,7 +127,7 @@ time_t __gen_e_acsl_time(time_t *timer)
   {
     int __gen_e_acsl_assumes_value_2;
     __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
-    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+    ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
     if (__gen_e_acsl_assumes_value_2) {
       int __gen_e_acsl_initialized;
       __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
@@ -163,25 +163,25 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& __gen_e_acsl_time),(size_t)1);
+    __e_acsl_store_block((void *)(& __gen_e_acsl_time),1UL);
     __e_acsl_full_init((void *)(& __gen_e_acsl_time));
-    __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
     __e_acsl_full_init((void *)(& __fc_interrupted));
-    __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
-    __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
-    __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+    __e_acsl_store_block((void *)(__fc_ctime),26UL);
     __e_acsl_full_init((void *)(& __fc_ctime));
-    __e_acsl_store_block((void *)(& time),(size_t)1);
+    __e_acsl_store_block((void *)(& time),1UL);
     __e_acsl_full_init((void *)(& time));
-    __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+    __e_acsl_store_block((void *)(& __fc_time),4UL);
     __e_acsl_full_init((void *)(& __fc_time));
-    __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+    __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
     __e_acsl_full_init((void *)(& __fc_p_sigaction));
-    __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+    __e_acsl_store_block((void *)(sigaction),2080UL);
     __e_acsl_full_init((void *)(& sigaction));
   }
   return;
@@ -205,11 +205,11 @@ void __e_acsl_globals_clean(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   time_t tmp = __gen_e_acsl_time((time_t *)0);
-  __e_acsl_store_block((void *)(& tmp),(size_t)8);
+  __e_acsl_store_block((void *)(& tmp),8UL);
   __e_acsl_full_init((void *)(& tmp));
   {
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
index 72e722866d2..8916d75782c 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
@@ -14,11 +14,11 @@ int *new_inversed(int len, int *v)
 {
   int i;
   int *p;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int __gen_e_acsl_valid;
     int __gen_e_acsl_and;
-    __e_acsl_store_block((void *)(& v),(size_t)8);
+    __e_acsl_store_block((void *)(& v),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"v",(void *)v);
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -93,11 +93,11 @@ int main(void)
 {
   int __retres;
   int *v2;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& v2),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& v2),8UL);
   int x = 3;
   int v1[3] = {1, 2, x};
-  __e_acsl_store_block((void *)(v1),(size_t)12);
+  __e_acsl_store_block((void *)(v1),12UL);
   __e_acsl_full_init((void *)(& v1));
   {
     int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
index 7475c0099ef..defd657b037 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv)
   int __retres;
   unsigned long __lengthof_arr;
   int i;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
   {
     int __gen_e_acsl_and;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
   __lengthof_arr = (unsigned long)LEN;
   int *arr = __builtin_alloca(sizeof(int) * __lengthof_arr);
   __e_acsl_store_block((void *)arr,sizeof(int) * __lengthof_arr);
-  __e_acsl_store_block((void *)(& arr),(size_t)8);
+  __e_acsl_store_block((void *)(& arr),8UL);
   __e_acsl_full_init((void *)(& arr));
   i = 0;
   while (i <= LEN) {
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
index 776ea8b6524..ce258a254eb 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
@@ -29,7 +29,7 @@ int incr(int x)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int i = __gen_e_acsl_f(2);
   __retres = 0;
   __e_acsl_memory_clean();
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
index 6b84d67b8d3..06cd0bcdbc4 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
@@ -11,8 +11,8 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   __e_acsl_full_init((void *)(& __retres));
   __retres = 0;
   __e_acsl_delete_block((void *)(& __retres));
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
index aa340329864..08c7ef0403f 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
index 0853a5bd239..88ce6788cc5 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
@@ -11,9 +11,9 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int value = 1;
-  __e_acsl_store_block((void *)(& value),(size_t)4);
+  __e_acsl_store_block((void *)(& value),4UL);
   __e_acsl_full_init((void *)(& value));
   {
     int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
index fae8de90730..965cc1a7414 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
@@ -16,7 +16,7 @@ int __gen_e_acsl_f(int *p);
 int f(int *p)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int i = 0;
     {
@@ -83,9 +83,9 @@ int g(int *p)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   int y = 0;
   __gen_e_acsl_f(& x);
@@ -107,7 +107,7 @@ int __gen_e_acsl_f(int *p)
     int __gen_e_acsl_valid_read;
     int __gen_e_acsl_initialized;
     int __gen_e_acsl_valid_read_2;
-    __e_acsl_store_block((void *)(& p),(size_t)8);
+    __e_acsl_store_block((void *)(& p),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"p",(void *)p);
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
index 7067ee1a95c..d9974db9f51 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
@@ -37,7 +37,7 @@ int uninstrument2(int *p)
 int instrument1(int *p)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_initialize((void *)p,sizeof(int));
   *p = 0;
   __retres = 0;
@@ -51,10 +51,10 @@ int __gen_e_acsl_instrument2(int *p);
 int instrument2(int *p)
 {
   int __retres;
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int *q = p;
-    __e_acsl_store_block((void *)(& q),(size_t)8);
+    __e_acsl_store_block((void *)(& q),8UL);
     __e_acsl_full_init((void *)(& q));
     __e_acsl_initialize((void *)p,sizeof(int));
     *p = 0;
@@ -72,8 +72,8 @@ int vol(int n, void * const *__va_params)
   int __retres;
   va_list vl;
   int tmp;
-  __e_acsl_store_block((void *)(& vl),(size_t)8);
-  __e_acsl_store_block((void *)(& __va_params),(size_t)8);
+  __e_acsl_store_block((void *)(& vl),8UL);
+  __e_acsl_store_block((void *)(& __va_params),8UL);
   __e_acsl_full_init((void *)(& vl));
   vl = __va_params;
   tmp = *((int *)*vl);
@@ -90,10 +90,10 @@ int main(void)
 {
   int x;
   int tmp;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& x),4UL);
   int y = 0;
-  __e_acsl_store_block((void *)(& y),(size_t)4);
+  __e_acsl_store_block((void *)(& y),4UL);
   __e_acsl_full_init((void *)(& y));
   instrument1(& x);
   __gen_e_acsl_uninstrument1(& x);
@@ -146,10 +146,10 @@ int main(void)
   /*@ assert \initialized(&y); */ ;
   {
     int __va_arg0 = 1;
-    __e_acsl_store_block((void *)(& __va_arg0),(size_t)4);
+    __e_acsl_store_block((void *)(& __va_arg0),4UL);
     __e_acsl_full_init((void *)(& __va_arg0));
     void *__va_args[1] = {& __va_arg0};
-    __e_acsl_store_block((void *)(__va_args),(size_t)8);
+    __e_acsl_store_block((void *)(__va_args),8UL);
     __e_acsl_full_init((void *)(& __va_args));
     tmp = vol(6,(void * const *)(__va_args));
     __e_acsl_delete_block((void *)(__va_args));
@@ -167,7 +167,7 @@ int __gen_e_acsl_instrument2(int *p)
   int __retres;
   {
     int __gen_e_acsl_valid;
-    __e_acsl_store_block((void *)(& p),(size_t)8);
+    __e_acsl_store_block((void *)(& p),8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"p",(void *)p);
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
index 9c8f845614f..e8c90779d5b 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
@@ -11,9 +11,9 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int value = 2147483647;
-  __e_acsl_store_block((void *)(& value),(size_t)4);
+  __e_acsl_store_block((void *)(& value),4UL);
   __e_acsl_full_init((void *)(& value));
   {
     int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
index aa340329864..08c7ef0403f 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __retres = 0;
   __e_acsl_memory_clean();
   return __retres;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
index 6b84d67b8d3..06cd0bcdbc4 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
@@ -11,8 +11,8 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& __retres),(size_t)4);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& __retres),4UL);
   __e_acsl_full_init((void *)(& __retres));
   __retres = 0;
   __e_acsl_delete_block((void *)(& __retres));
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
index 55c6aca7000..32150e3e1e3 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
@@ -35,8 +35,8 @@ void f(int *x, int *y)
   {
     {
       int __gen_e_acsl_valid_read;
-      __e_acsl_store_block((void *)(& y),(size_t)8);
-      __e_acsl_store_block((void *)(& x),(size_t)8);
+      __e_acsl_store_block((void *)(& y),8UL);
+      __e_acsl_store_block((void *)(& x),8UL);
       __e_acsl_assert_data_t __gen_e_acsl_assert_data =
         {.values = (void *)0};
       __e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*x",0,*x);
@@ -133,12 +133,12 @@ void f(int *x, int *y)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int x = 0;
-  __e_acsl_store_block((void *)(& x),(size_t)4);
+  __e_acsl_store_block((void *)(& x),4UL);
   __e_acsl_full_init((void *)(& x));
   int *y = malloc(sizeof(int));
-  __e_acsl_store_block((void *)(& y),(size_t)8);
+  __e_acsl_store_block((void *)(& y),8UL);
   __e_acsl_full_init((void *)(& y));
   __gen_e_acsl_f(& x,y);
   __retres = 0;
@@ -174,9 +174,9 @@ void __gen_e_acsl_f(int *x, int *y)
     int __gen_e_acsl_valid_read;
     int __gen_e_acsl_valid_read_2;
     int __gen_e_acsl_active_bhvrs;
-    __e_acsl_store_block((void *)(& y),(size_t)8);
-    __e_acsl_store_block((void *)(& x),(size_t)8);
-    __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+    __e_acsl_store_block((void *)(& y),8UL);
+    __e_acsl_store_block((void *)(& x),8UL);
+    __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"y",(void *)y);
     __e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -209,8 +209,7 @@ void __gen_e_acsl_f(int *x, int *y)
     __gen_e_acsl_assert_data_2.name = "mem_access";
     __e_acsl_assert(__gen_e_acsl_valid_read,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
-                                           *x == 1);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,*x == 1);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
       {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_3,"x",(void *)x);
@@ -227,8 +226,7 @@ void __gen_e_acsl_f(int *x, int *y)
     __gen_e_acsl_assert_data_3.name = "mem_access";
     __e_acsl_assert(__gen_e_acsl_valid_read_2,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
-    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
-                                           *x == 0);
+    __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,*x == 0);
     __gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
     ((__e_acsl_contract_t const *)__gen_e_acsl_contract);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
index a8e259432fa..75070c93c98 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
@@ -13,11 +13,11 @@ int main(int argc, char **argv)
   int __retres;
   char *p;
   int *q;
-  __e_acsl_memory_init(& argc,& argv,(size_t)8);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
-  uintptr_t addr = (unsigned long)(& argc);
-  __e_acsl_store_block((void *)(& addr),(size_t)8);
+  __e_acsl_memory_init(& argc,& argv,8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
+  uintptr_t addr = (uintptr_t)(& argc);
+  __e_acsl_store_block((void *)(& addr),8UL);
   __e_acsl_full_init((void *)(& addr));
   __e_acsl_full_init((void *)(& q));
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)(& argc));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
index 22c52cd04b6..0109cbcde50 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
@@ -11,7 +11,7 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   {
     int __gen_e_acsl_valid;
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
index fb56df41d34..3360b8dbf46 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
@@ -12,13 +12,13 @@ int main(void)
 {
   int __retres;
   int *src[3];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(src),(size_t)24);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(src),24UL);
   int a = 111;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   int b = 222;
-  __e_acsl_store_block((void *)(& b),(size_t)4);
+  __e_acsl_store_block((void *)(& b),4UL);
   __e_acsl_full_init((void *)(& b));
   __e_acsl_initialize((void *)(src),sizeof(int *));
   __e_acsl_temporal_store_nblock((void *)(src),(void *)(& a));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
index 9e82a6eae3d..b35623e18fd 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
@@ -11,20 +11,20 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   char a __attribute__((__aligned__(4))) = (char)'1';
-  __e_acsl_store_block((void *)(& a),(size_t)1);
+  __e_acsl_store_block((void *)(& a),1UL);
   __e_acsl_full_init((void *)(& a));
   char b __attribute__((__aligned__(4))) = (char)'2';
-  __e_acsl_store_block((void *)(& b),(size_t)1);
+  __e_acsl_store_block((void *)(& b),1UL);
   __e_acsl_full_init((void *)(& b));
   char *p = & a;
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   char *q = & b;
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)(& b));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   __e_acsl_full_init((void *)(& p));
   __e_acsl_temporal_store_nreferent((void *)(& p),(void *)(& q));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
index 2e9704213ce..9f7518fecdf 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
@@ -12,7 +12,7 @@ void area_triangle(double (*vertices)[4])
 {
   {
     int __gen_e_acsl_valid_read;
-    __e_acsl_store_block((void *)(& vertices),(size_t)8);
+    __e_acsl_store_block((void *)(& vertices),8UL);
     __e_acsl_temporal_pull_parameter((void *)(& vertices),0U,8UL);
     __e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
     __e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,
@@ -71,7 +71,7 @@ void area_triangle(double (*vertices)[4])
 
 void abe_matrix(double (*vertices)[4])
 {
-  __e_acsl_store_block((void *)(& vertices),(size_t)8);
+  __e_acsl_store_block((void *)(& vertices),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& vertices),0U,8UL);
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
@@ -88,9 +88,9 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(Vertices2),(size_t)96);
+    __e_acsl_store_block((void *)(Vertices2),96UL);
     __e_acsl_full_init((void *)(& Vertices2));
-    __e_acsl_store_block((void *)(Vertices),(size_t)96);
+    __e_acsl_store_block((void *)(Vertices),96UL);
     __e_acsl_full_init((void *)(& Vertices));
   }
   return;
@@ -109,17 +109,17 @@ int main(int argc, char const **argv)
   double vertices2[3][4];
   double vertices3[3][4];
   double triple_vertices[2][3][4];
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(triple_vertices),(size_t)192);
-  __e_acsl_store_block((void *)(vertices3),(size_t)96);
-  __e_acsl_store_block((void *)(vertices2),(size_t)96);
+  __e_acsl_store_block((void *)(triple_vertices),192UL);
+  __e_acsl_store_block((void *)(vertices3),96UL);
+  __e_acsl_store_block((void *)(vertices2),96UL);
   double vertices[3][4] =
     {{1.0, 2.0, 3.0, 4.0}, {5.0, 6.0, 7.0, 8.0}, {9.0, 10.0, 11.0, 12.0}};
-  __e_acsl_store_block((void *)(vertices),(size_t)96);
+  __e_acsl_store_block((void *)(vertices),96UL);
   __e_acsl_full_init((void *)(& vertices));
   double triple_vertices2[2][3][4] = {};
-  __e_acsl_store_block((void *)(triple_vertices2),(size_t)192);
+  __e_acsl_store_block((void *)(triple_vertices2),192UL);
   __e_acsl_full_init((void *)(& triple_vertices2));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
index fef2d09de76..e1da6a9a2e9 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
@@ -12,12 +12,12 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
   int **p = malloc(sizeof(int *) * (unsigned long)3);
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int i = 0;
   while (i < 3) {
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
index bbf3854ccad..178d5a879b6 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
@@ -19,7 +19,7 @@ void __e_acsl_globals_init(void)
   static char __e_acsl_already_run = 0;
   if (! __e_acsl_already_run) {
     __e_acsl_already_run = 1;
-    __e_acsl_store_block((void *)(& foo),(size_t)1);
+    __e_acsl_store_block((void *)(& foo),1UL);
     __e_acsl_full_init((void *)(& foo));
   }
   return;
@@ -35,16 +35,16 @@ int main(int argc, char const **argv)
 {
   int __retres;
   int *q;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   int *p = & argc;
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& argc));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *(*fp)(int *) = & foo;
   __e_acsl_temporal_store_nblock((void *)(& fp),(void *)(& foo));
-  __e_acsl_store_block((void *)(& fp),(size_t)8);
+  __e_acsl_store_block((void *)(& fp),8UL);
   __e_acsl_full_init((void *)(& fp));
   __e_acsl_full_init((void *)(& fp));
   __e_acsl_temporal_store_nblock((void *)(& fp),(void *)(& foo));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
index bd44e353e0e..df63c9f75ad 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
@@ -26,23 +26,23 @@ void __e_acsl_globals_init(void)
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
   char *c = (char *)__gen_e_acsl_literal_string;
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  char *p = malloc((unsigned long)256);
+  char *p = malloc((size_t)256);
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   char *q = (char *)0;
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)0);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   __e_acsl_full_init((void *)(& q));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  q = (char *)malloc((unsigned long)256);
+  q = (char *)malloc((size_t)256);
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
   {
     int __gen_e_acsl_initialized;
@@ -113,7 +113,7 @@ int main(void)
   __e_acsl_temporal_save_nreferent_parameter((void *)(& q),1U);
   char *path = realpath((char const *)c,q);
   __e_acsl_temporal_store_nblock((void *)(& path),(void *)*(& path));
-  __e_acsl_store_block((void *)(& path),(size_t)8);
+  __e_acsl_store_block((void *)(& path),8UL);
   __e_acsl_full_init((void *)(& path));
   __e_acsl_full_init((void *)(& path));
   __e_acsl_temporal_reset_parameters();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
index c0c6e534d77..4a71a4e72f8 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
@@ -11,11 +11,11 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 int *pfun(char c, int *p, int *p2, int *p3, int *p4, int i)
 {
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& p),1U,8UL);
   int *q = p;
   __e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& p));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   __e_acsl_temporal_save_return((void *)(& q));
   __e_acsl_delete_block((void *)(& p));
@@ -26,15 +26,15 @@ int *pfun(char c, int *p, int *p2, int *p3, int *p4, int i)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   int a = 1;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   int *p = & a;
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
-  uintptr_t addr = (unsigned long)(& addr);
+  uintptr_t addr = (uintptr_t)(& addr);
   __e_acsl_full_init((void *)(& p));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
index 6a3a17e2dfa..fffa5c729ea 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
@@ -26,7 +26,7 @@ char *__gen_e_acsl_getenv(char const *name);
 char *__gen_e_acsl_getenv(char const *name)
 {
   char *__retres;
-  __e_acsl_store_block((void *)(& __retres),(size_t)8);
+  __e_acsl_store_block((void *)(& __retres),8UL);
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
   __retres = getenv(name);
@@ -87,11 +87,11 @@ void __e_acsl_globals_init(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *g1 = (char *)0;
   __e_acsl_temporal_store_nblock((void *)(& g1),(void *)0);
-  __e_acsl_store_block((void *)(& g1),(size_t)8);
+  __e_acsl_store_block((void *)(& g1),8UL);
   __e_acsl_full_init((void *)(& g1));
   __e_acsl_full_init((void *)(& g1));
   __e_acsl_temporal_reset_parameters();
@@ -102,7 +102,7 @@ int main(int argc, char const **argv)
   __e_acsl_temporal_reset_return();
   char *g2 = __gen_e_acsl_getenv(__gen_e_acsl_literal_string_2);
   __e_acsl_temporal_pull_return((void *)(& g2));
-  __e_acsl_store_block((void *)(& g2),(size_t)8);
+  __e_acsl_store_block((void *)(& g2),8UL);
   __e_acsl_full_init((void *)(& g2));
   {
     int __gen_e_acsl_or;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
index 0642483398e..235d548a00e 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
@@ -31,8 +31,8 @@ static tree_desc2 descs2[2] =
 void build_tree(tree_desc *desc)
 {
   int *extra;
-  __e_acsl_store_block((void *)(& extra),(size_t)8);
-  __e_acsl_store_block((void *)(& desc),(size_t)8);
+  __e_acsl_store_block((void *)(& extra),8UL);
+  __e_acsl_store_block((void *)(& desc),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& desc),0U,8UL);
   __e_acsl_full_init((void *)(& extra));
   __e_acsl_temporal_store_nreferent((void *)(& extra),
@@ -101,17 +101,17 @@ void __e_acsl_globals_init(void)
     __e_acsl_store_block((void *)__gen_e_acsl_literal_string_3,sizeof("tha"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_3);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_3);
-    __e_acsl_store_block((void *)(descs2),(size_t)16);
+    __e_acsl_store_block((void *)(descs2),16UL);
     __e_acsl_full_init((void *)(& descs2));
-    __e_acsl_store_block((void *)(& l_desc2),(size_t)8);
+    __e_acsl_store_block((void *)(& l_desc2),8UL);
     __e_acsl_full_init((void *)(& l_desc2));
-    __e_acsl_store_block((void *)(descs),(size_t)16);
+    __e_acsl_store_block((void *)(descs),16UL);
     __e_acsl_full_init((void *)(& descs));
-    __e_acsl_store_block((void *)(& l_desc),(size_t)8);
+    __e_acsl_store_block((void *)(& l_desc),8UL);
     __e_acsl_full_init((void *)(& l_desc));
-    __e_acsl_store_block((void *)(extra_lbits),(size_t)4);
+    __e_acsl_store_block((void *)(extra_lbits),4UL);
     __e_acsl_full_init((void *)(& extra_lbits));
-    __e_acsl_store_block((void *)(strings),(size_t)32);
+    __e_acsl_store_block((void *)(strings),32UL);
     __e_acsl_full_init((void *)(& strings));
     __e_acsl_temporal_store_nblock((void *)(& descs2[0].desc.extra_bits),
                                    (void *)(extra_lbits));
@@ -151,7 +151,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
@@ -179,7 +179,7 @@ int main(int argc, char const **argv)
   build_tree(& descs2[1].desc);
   char **p = (char **)(strings);
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(strings));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
index 75e427d2eea..b8a61ad462a 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
@@ -10,8 +10,8 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 
 void foo(int *a, int *b)
 {
-  __e_acsl_store_block((void *)(& b),(size_t)8);
-  __e_acsl_store_block((void *)(& a),(size_t)8);
+  __e_acsl_store_block((void *)(& b),8UL);
+  __e_acsl_store_block((void *)(& a),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& a),0U,8UL);
   __e_acsl_temporal_pull_parameter((void *)(& b),1U,8UL);
   int t = *a;
@@ -34,20 +34,20 @@ int *bar(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   int a = 11;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   int b = 12;
-  __e_acsl_store_block((void *)(& b),(size_t)4);
+  __e_acsl_store_block((void *)(& b),4UL);
   __e_acsl_full_init((void *)(& b));
   int *p = & a;
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *q = & b;
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)(& b));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   LAB:
   __e_acsl_temporal_reset_parameters();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
index aaeea91f44d..75c4793a0c3 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
@@ -32,14 +32,14 @@ int main(void)
   int __retres;
   char *g;
   char *q;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& g),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& g),8UL);
   char *f = (char *)__gen_e_acsl_literal_string;
   __e_acsl_temporal_store_nblock((void *)(& f),
                                  (void *)__gen_e_acsl_literal_string);
-  __e_acsl_store_block((void *)(& f),(size_t)8);
+  __e_acsl_store_block((void *)(& f),8UL);
   __e_acsl_full_init((void *)(& f));
   {
     int __gen_e_acsl_initialized;
@@ -180,7 +180,7 @@ int main(void)
   /*@ assert \valid_read(g) && !\valid(g); */ ;
   char *p = f;
   __e_acsl_temporal_store_nreferent((void *)(& p),(void *)(& f));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized_5;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
index 59299163b13..db8252a59a2 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
@@ -26,8 +26,8 @@ typedef struct tree_desc2 tree_desc2;
 void build_tree(tree_desc *desc)
 {
   int *extra;
-  __e_acsl_store_block((void *)(& extra),(size_t)8);
-  __e_acsl_store_block((void *)(& desc),(size_t)8);
+  __e_acsl_store_block((void *)(& extra),8UL);
+  __e_acsl_store_block((void *)(& desc),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& desc),0U,8UL);
   __e_acsl_full_init((void *)(& extra));
   __e_acsl_temporal_store_nreferent((void *)(& extra),
@@ -110,9 +110,9 @@ void __e_acsl_globals_init(void)
     __e_acsl_store_block((void *)__gen_e_acsl_literal_string_6,sizeof("bar"));
     __e_acsl_full_init((void *)__gen_e_acsl_literal_string_6);
     __e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_6);
-    __e_acsl_store_block((void *)(Str),(size_t)32);
+    __e_acsl_store_block((void *)(Str),32UL);
     __e_acsl_full_init((void *)(& Str));
-    __e_acsl_store_block((void *)(Strings),(size_t)32);
+    __e_acsl_store_block((void *)(Strings),32UL);
     __e_acsl_full_init((void *)(& Strings));
     __e_acsl_temporal_store_nblock((void *)(Str),
                                    (void *)__gen_e_acsl_literal_string_5);
@@ -143,7 +143,7 @@ void __e_acsl_globals_clean(void)
 int main(int argc, char const **argv)
 {
   int __retres;
-  __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+  __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
   __e_acsl_globals_init();
   char *strings[2][2] =
     {{(char *)__gen_e_acsl_literal_string,
@@ -158,11 +158,11 @@ int main(int argc, char const **argv)
                                  (void *)__gen_e_acsl_literal_string_2);
   __e_acsl_temporal_store_nblock((void *)(& strings[0][0]),
                                  (void *)__gen_e_acsl_literal_string);
-  __e_acsl_store_block((void *)(strings),(size_t)32);
+  __e_acsl_store_block((void *)(strings),32UL);
   __e_acsl_full_init((void *)(& strings));
   char **p = (char **)(strings);
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(strings));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   {
     int __gen_e_acsl_initialized;
@@ -282,7 +282,7 @@ int main(int argc, char const **argv)
                                  (void *)__gen_e_acsl_literal_string_6);
   __e_acsl_temporal_store_nblock((void *)(str),
                                  (void *)__gen_e_acsl_literal_string_5);
-  __e_acsl_store_block((void *)(str),(size_t)32);
+  __e_acsl_store_block((void *)(str),32UL);
   __e_acsl_full_init((void *)(& str));
   __e_acsl_full_init((void *)(& p));
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& str));
@@ -399,7 +399,7 @@ int main(int argc, char const **argv)
   /*@ assert \valid_read(*p); */ ;
   char **P = (char **)(Strings);
   __e_acsl_temporal_store_nblock((void *)(& P),(void *)(Strings));
-  __e_acsl_store_block((void *)(& P),(size_t)8);
+  __e_acsl_store_block((void *)(& P),8UL);
   __e_acsl_full_init((void *)(& P));
   {
     int __gen_e_acsl_initialized_7;
@@ -625,12 +625,12 @@ int main(int argc, char const **argv)
   }
   /*@ assert \valid_read(*P); */ ;
   int extra_lbits[1] = {0};
-  __e_acsl_store_block((void *)(extra_lbits),(size_t)4);
+  __e_acsl_store_block((void *)(extra_lbits),4UL);
   __e_acsl_full_init((void *)(& extra_lbits));
   tree_desc l_desc = {.extra_bits = extra_lbits};
   __e_acsl_temporal_store_nblock((void *)(& l_desc.extra_bits),
                                  (void *)(extra_lbits));
-  __e_acsl_store_block((void *)(& l_desc),(size_t)8);
+  __e_acsl_store_block((void *)(& l_desc),8UL);
   __e_acsl_full_init((void *)(& l_desc));
   tree_desc descs[2] =
     {{.extra_bits = extra_lbits}, {.extra_bits = extra_lbits}};
@@ -638,12 +638,12 @@ int main(int argc, char const **argv)
                                  (void *)(extra_lbits));
   __e_acsl_temporal_store_nblock((void *)(& descs[0].extra_bits),
                                  (void *)(extra_lbits));
-  __e_acsl_store_block((void *)(descs),(size_t)16);
+  __e_acsl_store_block((void *)(descs),16UL);
   __e_acsl_full_init((void *)(& descs));
   tree_desc2 l_desc2 = {.desc = {.extra_bits = extra_lbits}};
   __e_acsl_temporal_store_nblock((void *)(& l_desc2.desc.extra_bits),
                                  (void *)(extra_lbits));
-  __e_acsl_store_block((void *)(& l_desc2),(size_t)8);
+  __e_acsl_store_block((void *)(& l_desc2),8UL);
   __e_acsl_full_init((void *)(& l_desc2));
   tree_desc2 descs2[2] =
     {{.desc = {.extra_bits = extra_lbits}},
@@ -652,7 +652,7 @@ int main(int argc, char const **argv)
                                  (void *)(extra_lbits));
   __e_acsl_temporal_store_nblock((void *)(& descs2[0].desc.extra_bits),
                                  (void *)(extra_lbits));
-  __e_acsl_store_block((void *)(descs2),(size_t)16);
+  __e_acsl_store_block((void *)(descs2),16UL);
   __e_acsl_full_init((void *)(& descs2));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
index f34fde6988d..684e09d1b32 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
@@ -29,16 +29,16 @@ int main(void)
   int __retres;
   int *p;
   int *q;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   __e_acsl_globals_init();
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   int counter = 0;
-  size_t limit = (unsigned long)10000;
+  size_t limit = (size_t)10000;
   __e_acsl_full_init((void *)(& p));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  p = (int *)malloc((unsigned long)(1024 * 1024));
+  p = (int *)malloc((size_t)(1024 * 1024));
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
   __e_acsl_full_init((void *)(& q));
   __e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& p));
@@ -51,7 +51,7 @@ int main(void)
     __e_acsl_full_init((void *)(& p));
     __e_acsl_temporal_reset_parameters();
     __e_acsl_temporal_reset_return();
-    p = (int *)malloc((unsigned long)(1024 * 1024));
+    p = (int *)malloc((size_t)(1024 * 1024));
     __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
     counter ++;
     /*@ assert Eva: dangling_pointer: !\dangling(&q); */
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
index ae85b5ecc53..a5144cc427e 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
@@ -14,9 +14,9 @@ int main(void)
   int __retres;
   int *p;
   int *q;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& q),8UL);
+  __e_acsl_store_block((void *)(& p),8UL);
   {
     int __gen_e_acsl_initialized;
     int __gen_e_acsl_and;
@@ -336,7 +336,7 @@ int main(void)
   __e_acsl_full_init((void *)(& q));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  q = (int *)calloc((unsigned long)4096,(unsigned long)1);
+  q = (int *)calloc((size_t)4096,(size_t)1);
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
   {
     int __gen_e_acsl_initialized_9;
@@ -379,7 +379,7 @@ int main(void)
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
   __e_acsl_temporal_save_nreferent_parameter((void *)(& q),0U);
-  q = (int *)realloc((void *)q,(unsigned long)8192);
+  q = (int *)realloc((void *)q,(size_t)8192);
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
   {
     int __gen_e_acsl_initialized_10;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
index 9d5021eb070..48199433796 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
@@ -43,15 +43,15 @@ int main(void)
   int *src[2];
   int *dest[2];
   int *tmp_1;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
-  __e_acsl_store_block((void *)(dest),(size_t)16);
-  __e_acsl_store_block((void *)(src),(size_t)16);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(& tmp_1),8UL);
+  __e_acsl_store_block((void *)(dest),16UL);
+  __e_acsl_store_block((void *)(src),16UL);
   int a = 111;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   int b = 222;
-  __e_acsl_store_block((void *)(& b),(size_t)4);
+  __e_acsl_store_block((void *)(& b),4UL);
   __e_acsl_full_init((void *)(& b));
   int size = (int)(sizeof(int *) * (unsigned long)2);
   __e_acsl_initialize((void *)(src),sizeof(int *));
@@ -144,8 +144,7 @@ int main(void)
   __e_acsl_temporal_reset_return();
   __e_acsl_temporal_save_nblock_parameter((void *)(& dest),0U);
   __e_acsl_temporal_save_nblock_parameter((void *)(& src),1U);
-  __gen_e_acsl_memcpy((void *)(& dest),(void const *)(& src),
-                      (unsigned long)size);
+  __gen_e_acsl_memcpy((void *)(& dest),(void const *)(& src),(size_t)size);
   {
     int __gen_e_acsl_initialized_3;
     int __gen_e_acsl_and_3;
@@ -224,7 +223,7 @@ int main(void)
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
   __e_acsl_temporal_save_nblock_parameter((void *)(& dest),0U);
-  __gen_e_acsl_memset((void *)(& dest),0,(unsigned long)size);
+  __gen_e_acsl_memset((void *)(& dest),0,(size_t)size);
   {
     int __gen_e_acsl_initialized_5;
     int __gen_e_acsl_and_5;
@@ -302,15 +301,15 @@ int main(void)
   /*@ assert !\valid(dest[1]); */ ;
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  int **p = malloc((unsigned long)size);
+  int **p = malloc((size_t)size);
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  int **q = malloc((unsigned long)size);
+  int **q = malloc((size_t)size);
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   __e_acsl_initialize((void *)p,sizeof(int *));
   __e_acsl_temporal_store_nblock((void *)p,(void *)(& a));
@@ -585,7 +584,7 @@ int main(void)
   __e_acsl_temporal_reset_return();
   __e_acsl_temporal_save_nreferent_parameter((void *)(& q),0U);
   __e_acsl_temporal_save_nreferent_parameter((void *)(& p),1U);
-  __gen_e_acsl_memcpy((void *)q,(void const *)p,(unsigned long)size);
+  __gen_e_acsl_memcpy((void *)q,(void const *)p,(size_t)size);
   {
     int __gen_e_acsl_initialized_13;
     int __gen_e_acsl_and_14;
@@ -736,7 +735,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
 {
   void *__gen_e_acsl_at;
   void *__retres;
-  __e_acsl_store_block((void *)(& s),(size_t)8);
+  __e_acsl_store_block((void *)(& s),8UL);
   __e_acsl_temporal_pull_parameter((void *)(& s),0U,8UL);
   __gen_e_acsl_at = s;
   __e_acsl_temporal_reset_parameters();
@@ -808,8 +807,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     unsigned long __gen_e_acsl__6;
     unsigned long __gen_e_acsl_if_4;
     int __gen_e_acsl_separated;
-    __e_acsl_store_block((void *)(& src),(size_t)8);
-    __e_acsl_store_block((void *)(& dest),(size_t)8);
+    __e_acsl_store_block((void *)(& src),8UL);
+    __e_acsl_store_block((void *)(& dest),8UL);
     __e_acsl_temporal_pull_parameter((void *)(& dest),0U,8UL);
     __e_acsl_temporal_pull_parameter((void *)(& src),1U,8UL);
     __gen_e_acsl_at = dest;
@@ -927,8 +926,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
                                      __gen_e_acsl_size_4);
       __gen_e_acsl_if_4 = __gen_e_acsl_size_4;
     }
-    __gen_e_acsl_separated = __e_acsl_separated((size_t)2,
-                                                (char *)dest + 1 * 0,
+    __gen_e_acsl_separated = __e_acsl_separated(2UL,(char *)dest + 1 * 0,
                                                 __gen_e_acsl_if_3,
                                                 (char *)src + 1 * 0,
                                                 __gen_e_acsl_if_4);
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
index 0579f052c64..e175b3e5377 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
@@ -11,18 +11,18 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int *p = (int *)0;
   __e_acsl_temporal_store_nblock((void *)(& p),(void *)0);
-  __e_acsl_store_block((void *)(& p),(size_t)8);
+  __e_acsl_store_block((void *)(& p),8UL);
   __e_acsl_full_init((void *)(& p));
   int *q = (int *)0;
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)0);
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   {
     int i = 9;
-    __e_acsl_store_block((void *)(& i),(size_t)4);
+    __e_acsl_store_block((void *)(& i),4UL);
     __e_acsl_full_init((void *)(& i));
     __e_acsl_full_init((void *)(& p));
     __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& i));
@@ -107,7 +107,7 @@ int main(void)
   /*@ assert !\valid(q); */ ;
   {
     int j = 8;
-    __e_acsl_store_block((void *)(& j),(size_t)4);
+    __e_acsl_store_block((void *)(& j),4UL);
     __e_acsl_full_init((void *)(& j));
     __e_acsl_full_init((void *)(& p));
     __e_acsl_temporal_store_nblock((void *)(& p),(void *)(& j));
@@ -221,7 +221,7 @@ int main(void)
   q = (int *)0;
   while (len) {
     int a;
-    __e_acsl_store_block((void *)(& a),(size_t)4);
+    __e_acsl_store_block((void *)(& a),4UL);
     {
       int __gen_e_acsl_initialized_5;
       int __gen_e_acsl_and_5;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
index 471aeeec242..9ae8456936c 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
@@ -30,15 +30,15 @@ int main(void)
   larger l;
   larger *lp;
   larger larr[2];
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
-  __e_acsl_store_block((void *)(larr),(size_t)64);
-  __e_acsl_store_block((void *)(& lp),(size_t)8);
-  __e_acsl_store_block((void *)(& l),(size_t)32);
-  __e_acsl_store_block((void *)(tarr),(size_t)32);
-  __e_acsl_store_block((void *)(& t2),(size_t)16);
-  __e_acsl_store_block((void *)(& t1),(size_t)16);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+  __e_acsl_store_block((void *)(larr),64UL);
+  __e_acsl_store_block((void *)(& lp),8UL);
+  __e_acsl_store_block((void *)(& l),32UL);
+  __e_acsl_store_block((void *)(tarr),32UL);
+  __e_acsl_store_block((void *)(& t2),16UL);
+  __e_acsl_store_block((void *)(& t1),16UL);
   int a = 1;
-  __e_acsl_store_block((void *)(& a),(size_t)4);
+  __e_acsl_store_block((void *)(& a),4UL);
   __e_acsl_full_init((void *)(& a));
   int b = 2;
   __e_acsl_initialize((void *)(& t1.p),sizeof(char *));
@@ -179,7 +179,7 @@ int main(void)
   }
   /*@ assert !\valid(t2.p) && !\valid(t2.q); */ ;
   __e_acsl_full_init((void *)(& t2));
-  __e_acsl_temporal_memcpy((void *)(& t2),(void *)(& t1),(size_t)16);
+  __e_acsl_temporal_memcpy((void *)(& t2),(void *)(& t1),16UL);
   t2 = t1;
   {
     int __gen_e_acsl_initialized_5;
@@ -253,7 +253,7 @@ int main(void)
   __e_acsl_initialize((void *)(& t2.q),sizeof(char *));
   __e_acsl_temporal_reset_parameters();
   __e_acsl_temporal_reset_return();
-  t2.q = (char *)malloc((unsigned long)4);
+  t2.q = (char *)malloc((size_t)4);
   __e_acsl_temporal_store_nblock((void *)(& t2.q),(void *)*(& t2.q));
   {
     int __gen_e_acsl_initialized_7;
@@ -322,7 +322,7 @@ int main(void)
   }
   /*@ assert !\valid(t2.p) && \valid(t2.q); */ ;
   __e_acsl_initialize((void *)(& l.t),sizeof(struct temporal_t));
-  __e_acsl_temporal_memcpy((void *)(& l.t),(void *)(& t2),(size_t)16);
+  __e_acsl_temporal_memcpy((void *)(& l.t),(void *)(& t2),16UL);
   l.t = t2;
   {
     int __gen_e_acsl_initialized_9;
@@ -455,7 +455,7 @@ int main(void)
   }
   /*@ assert !\valid(lp->t.p); */ ;
   __e_acsl_initialize((void *)(tarr),sizeof(temporal));
-  __e_acsl_temporal_memcpy((void *)(tarr),(void *)(& t2),(size_t)16);
+  __e_acsl_temporal_memcpy((void *)(tarr),(void *)(& t2),16UL);
   tarr[0] = t2;
   {
     int __gen_e_acsl_initialized_12;
@@ -529,7 +529,7 @@ int main(void)
   }
   /*@ assert !\valid(tarr[0].p) && \valid(tarr[0].q); */ ;
   __e_acsl_initialize((void *)(larr),sizeof(larger));
-  __e_acsl_temporal_memcpy((void *)(larr),(void *)(& l),(size_t)32);
+  __e_acsl_temporal_memcpy((void *)(larr),(void *)(& l),32UL);
   larr[0] = l;
   {
     int __gen_e_acsl_initialized_14;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
index 5a074dd5307..a2fe47cbf60 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
@@ -11,19 +11,19 @@ extern  __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
 int main(void)
 {
   int __retres;
-  __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+  __e_acsl_memory_init((int *)0,(char ***)0,8UL);
   int i = 0;
   int arr[4] = {1, 2, 3, 4};
-  __e_acsl_store_block((void *)(arr),(size_t)16);
+  __e_acsl_store_block((void *)(arr),16UL);
   __e_acsl_full_init((void *)(& arr));
   int arr2[4] = {1, 2, 3, 4};
-  if (! ((unsigned long)(& arr) + sizeof(arr) == (unsigned long)(& arr2))) {
+  if (! ((uintptr_t)(& arr) + sizeof(arr) == (uintptr_t)(& arr2))) {
     __retres = 0;
     goto return_label;
   }
   int *q = arr;
   __e_acsl_temporal_store_nblock((void *)(& q),(void *)(arr));
-  __e_acsl_store_block((void *)(& q),(size_t)8);
+  __e_acsl_store_block((void *)(& q),8UL);
   __e_acsl_full_init((void *)(& q));
   while (i < 4) {
     {
@@ -109,7 +109,7 @@ int main(void)
   /*@ assert !\valid(q); */ ;
   __retres = 0;
   return_label:
-  __e_acsl_store_block_duplicate((void *)(& q),(size_t)8);
+  __e_acsl_store_block_duplicate((void *)(& q),8UL);
   __e_acsl_delete_block((void *)(& q));
   __e_acsl_delete_block((void *)(arr));
   __e_acsl_memory_clean();
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
index c36cdd8459f..b58973f347f 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
@@ -298,17 +298,17 @@ int *calloc_int(size_t num, size_t size)
 int main(void)
 {
   int __retres;
-  int *pi = calloc_int((unsigned long)10,sizeof(int));
-  enum E *pe = calloc_e_E((unsigned long)10,sizeof(enum E));
-  float *pf = calloc_float((unsigned long)10,sizeof(float));
-  struct X *px = calloc_st_X((unsigned long)10,sizeof(struct X));
-  char *pc = calloc_char((unsigned long)10,sizeof(char));
-  int (*pa)[10] = calloc_arr10_int((unsigned long)10,sizeof(int [10]));
+  int *pi = calloc_int((size_t)10,sizeof(int));
+  enum E *pe = calloc_e_E((size_t)10,sizeof(enum E));
+  float *pf = calloc_float((size_t)10,sizeof(float));
+  struct X *px = calloc_st_X((size_t)10,sizeof(struct X));
+  char *pc = calloc_char((size_t)10,sizeof(char));
+  int (*pa)[10] = calloc_arr10_int((size_t)10,sizeof(int [10]));
   struct Flex *f =
-    calloc_st_Flex((unsigned long)1,
+    calloc_st_Flex((size_t)1,
                    sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
-  void *v = calloc((unsigned long)10,sizeof(char));
-  struct incomplete *inc = calloc((unsigned long)10,(unsigned long)10);
+  void *v = calloc((size_t)10,sizeof(char));
+  struct incomplete *inc = calloc((size_t)10,(size_t)10);
   __retres = 0;
   return __retres;
 }
@@ -617,17 +617,17 @@ int *calloc_int(size_t num, size_t size)
 int main(void)
 {
   int __retres;
-  int *pi = calloc_int((unsigned long)10,sizeof(int));
-  enum E *pe = calloc_e_E((unsigned long)10,sizeof(enum E));
-  float *pf = calloc_float((unsigned long)10,sizeof(float));
-  struct X *px = calloc_st_X((unsigned long)10,sizeof(struct X));
-  char *pc = calloc_char((unsigned long)10,sizeof(char));
-  int (*pa)[10] = calloc_arr10_int((unsigned long)10,sizeof(int [10]));
+  int *pi = calloc_int((size_t)10,sizeof(int));
+  enum E *pe = calloc_e_E((size_t)10,sizeof(enum E));
+  float *pf = calloc_float((size_t)10,sizeof(float));
+  struct X *px = calloc_st_X((size_t)10,sizeof(struct X));
+  char *pc = calloc_char((size_t)10,sizeof(char));
+  int (*pa)[10] = calloc_arr10_int((size_t)10,sizeof(int [10]));
   struct Flex *f =
-    calloc_st_Flex((unsigned long)1,
+    calloc_st_Flex((size_t)1,
                    sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
-  void *v = calloc((unsigned long)10,sizeof(char));
-  struct incomplete *inc = calloc((unsigned long)10,(unsigned long)10);
+  void *v = calloc((size_t)10,sizeof(char));
+  struct incomplete *inc = calloc((size_t)10,(size_t)10);
   __retres = 0;
   return __retres;
 }
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
index e0d34460729..e5d86f16bdb 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
@@ -205,12 +205,12 @@ int main(void)
   int *pi = malloc_int(sizeof(int) * (unsigned long)10);
   float *pf = malloc_float(sizeof(float) * (unsigned long)10);
   struct X *px = malloc_st_X(sizeof(struct X) * (unsigned long)10);
-  char *pc = malloc_char((unsigned long)10);
+  char *pc = malloc_char((size_t)10);
   int (*pa)[10] = malloc_arr10_int(sizeof(int [10]) * (unsigned long)10);
   struct Flex *f =
     malloc_st_Flex(sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
   void *v = malloc(sizeof(char) * (unsigned long)10);
-  struct incomplete *inc = malloc((unsigned long)10);
+  struct incomplete *inc = malloc((size_t)10);
   __retres = 0;
   return __retres;
 }
@@ -421,12 +421,12 @@ int main(void)
   int *pi = malloc_int(sizeof(int) * (unsigned long)10);
   float *pf = malloc_float(sizeof(float) * (unsigned long)10);
   struct X *px = malloc_st_X(sizeof(struct X) * (unsigned long)10);
-  char *pc = malloc_char((unsigned long)10);
+  char *pc = malloc_char((size_t)10);
   int (*pa)[10] = malloc_arr10_int(sizeof(int [10]) * (unsigned long)10);
   struct Flex *f =
     malloc_st_Flex(sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
   void *v = malloc(sizeof(char) * (unsigned long)10);
-  struct incomplete *inc = malloc((unsigned long)10);
+  struct incomplete *inc = malloc((size_t)10);
   __retres = 0;
   return __retres;
 }
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
index ca534ce25d9..ab3451d1b58 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
@@ -117,7 +117,7 @@ int *malloc_int(size_t size)
 void foo(void)
 {
   int *p = malloc_int(sizeof(int));
-  int *q = calloc_int((unsigned long)2,sizeof(int));
+  int *q = calloc_int((size_t)2,sizeof(int));
   free_int(p);
   free_int(q);
   return;
@@ -244,7 +244,7 @@ int *malloc_int(size_t size)
 void foo(void)
 {
   int *p = malloc_int(sizeof(int));
-  int *q = calloc_int((unsigned long)2,sizeof(int));
+  int *q = calloc_int((size_t)2,sizeof(int));
   free_int(p);
   free_int(q);
   return;
diff --git a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
index cebb89d4b79..7e10db28495 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
@@ -152,14 +152,14 @@ int nested(int (*s1)[10], int (*s2)[10], int n)
 int with_void(void *s1, void *s2, int n)
 {
   int tmp;
-  tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)10);
+  tmp = memcmp((void const *)s1,(void const *)s2,(size_t)10);
   return tmp;
 }
 
 int with_incomplete(struct incomplete *s1, struct incomplete *s2, int n)
 {
   int tmp;
-  tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)n);
+  tmp = memcmp((void const *)s1,(void const *)s2,(size_t)n);
   return tmp;
 }
 
@@ -332,14 +332,14 @@ int nested(int (*s1)[10], int (*s2)[10], int n)
 int with_void(void *s1, void *s2, int n)
 {
   int tmp;
-  tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)10);
+  tmp = memcmp((void const *)s1,(void const *)s2,(size_t)10);
   return tmp;
 }
 
 int with_incomplete(struct incomplete *s1, struct incomplete *s2, int n)
 {
   int tmp;
-  tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)n);
+  tmp = memcmp((void const *)s1,(void const *)s2,(size_t)n);
   return tmp;
 }
 
diff --git a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
index fab9ddfb4c8..4c91d923d22 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
@@ -164,16 +164,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
 
 void with_void(void *src, void *dest, int n)
 {
-  void *res = memcpy(dest,(void const *)src,(unsigned long)n);
-  memcpy(src,(void const *)res,(unsigned long)n);
+  void *res = memcpy(dest,(void const *)src,(size_t)n);
+  memcpy(src,(void const *)res,(size_t)n);
   return;
 }
 
 void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
 {
-  struct incomplete *res =
-    memcpy((void *)dest,(void const *)src,(unsigned long)n);
-  memcpy((void *)src,(void const *)res,(unsigned long)n);
+  struct incomplete *res = memcpy((void *)dest,(void const *)src,(size_t)n);
+  memcpy((void *)src,(void const *)res,(size_t)n);
   return;
 }
 
@@ -356,16 +355,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
 
 void with_void(void *src, void *dest, int n)
 {
-  void *res = memcpy(dest,(void const *)src,(unsigned long)n);
-  memcpy(src,(void const *)res,(unsigned long)n);
+  void *res = memcpy(dest,(void const *)src,(size_t)n);
+  memcpy(src,(void const *)res,(size_t)n);
   return;
 }
 
 void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
 {
-  struct incomplete *res =
-    memcpy((void *)dest,(void const *)src,(unsigned long)n);
-  memcpy((void *)src,(void const *)res,(unsigned long)n);
+  struct incomplete *res = memcpy((void *)dest,(void const *)src,(size_t)n);
+  memcpy((void *)src,(void const *)res,(size_t)n);
   return;
 }
 
diff --git a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
index 6e9cf511e4b..9f915a3b283 100644
--- a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
@@ -149,16 +149,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
 
 void with_void(void *src, void *dest, int n)
 {
-  void *res = memmove(dest,(void const *)src,(unsigned long)n);
-  memmove(src,(void const *)res,(unsigned long)n);
+  void *res = memmove(dest,(void const *)src,(size_t)n);
+  memmove(src,(void const *)res,(size_t)n);
   return;
 }
 
 void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
 {
-  struct incomplete *res =
-    memmove((void *)dest,(void const *)src,(unsigned long)n);
-  memmove((void *)src,(void const *)res,(unsigned long)n);
+  struct incomplete *res = memmove((void *)dest,(void const *)src,(size_t)n);
+  memmove((void *)src,(void const *)res,(size_t)n);
   return;
 }
 
@@ -329,16 +328,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
 
 void with_void(void *src, void *dest, int n)
 {
-  void *res = memmove(dest,(void const *)src,(unsigned long)n);
-  memmove(src,(void const *)res,(unsigned long)n);
+  void *res = memmove(dest,(void const *)src,(size_t)n);
+  memmove(src,(void const *)res,(size_t)n);
   return;
 }
 
 void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
 {
-  struct incomplete *res =
-    memmove((void *)dest,(void const *)src,(unsigned long)n);
-  memmove((void *)src,(void const *)res,(unsigned long)n);
+  struct incomplete *res = memmove((void *)dest,(void const *)src,(size_t)n);
+  memmove((void *)src,(void const *)res,(size_t)n);
   return;
 }
 
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
index 47c65a2ee1c..dbceb063dfc 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
@@ -35,8 +35,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10])
 {
-  char *res = memset_char(dest,(char)0,(unsigned long)10);
-  memset_char(res,(char)0,(unsigned long)10);
+  char *res = memset_char(dest,(char)0,(size_t)10);
+  memset_char(res,(char)0,(size_t)10);
   return;
 }
 
@@ -59,8 +59,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(unsigned char dest[10])
 {
-  unsigned char *res = memset_uchar(dest,(unsigned char)0,(unsigned long)10);
-  memset_uchar(res,(unsigned char)0,(unsigned long)10);
+  unsigned char *res = memset_uchar(dest,(unsigned char)0,(size_t)10);
+  memset_uchar(res,(unsigned char)0,(size_t)10);
   return;
 }
 
@@ -87,8 +87,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10])
 {
-  char (*res)[10] = memset_arr10_char(dest,(char)0,(unsigned long)100);
-  memset_arr10_char(res,(char)0,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,(char)0,(size_t)100);
+  memset_arr10_char(res,(char)0,(size_t)100);
   return;
 }
 
@@ -261,15 +261,15 @@ void nested(int (*dest)[10], int n)
 
 void with_void(void *dest)
 {
-  void *res = memset(dest,0,(unsigned long)10);
-  memset(res,0,(unsigned long)10);
+  void *res = memset(dest,0,(size_t)10);
+  memset(res,0,(size_t)10);
   return;
 }
 
 void with_null_or_int(void)
 {
-  memset((void *)0,0,(unsigned long)10);
-  memset((void *)((int *)42),0,(unsigned long)10);
+  memset((void *)0,0,(size_t)10);
+  memset((void *)((int *)42),0,(size_t)10);
   return;
 }
 
@@ -309,8 +309,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10])
 {
-  char *res = memset_char(dest,(char)0,(unsigned long)10);
-  memset_char(res,(char)0,(unsigned long)10);
+  char *res = memset_char(dest,(char)0,(size_t)10);
+  memset_char(res,(char)0,(size_t)10);
   return;
 }
 
@@ -335,8 +335,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(unsigned char dest[10])
 {
-  unsigned char *res = memset_uchar(dest,(unsigned char)0,(unsigned long)10);
-  memset_uchar(res,(unsigned char)0,(unsigned long)10);
+  unsigned char *res = memset_uchar(dest,(unsigned char)0,(size_t)10);
+  memset_uchar(res,(unsigned char)0,(size_t)10);
   return;
 }
 
@@ -364,8 +364,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10])
 {
-  char (*res)[10] = memset_arr10_char(dest,(char)0,(unsigned long)100);
-  memset_arr10_char(res,(char)0,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,(char)0,(size_t)100);
+  memset_arr10_char(res,(char)0,(size_t)100);
   return;
 }
 
@@ -539,15 +539,15 @@ void nested(int (*dest)[10], int n)
 
 void with_void(void *dest)
 {
-  void *res = memset(dest,0,(unsigned long)10);
-  memset(res,0,(unsigned long)10);
+  void *res = memset(dest,0,(size_t)10);
+  memset(res,0,(size_t)10);
   return;
 }
 
 void with_null_or_int(void)
 {
-  memset((void *)0,0,(unsigned long)10);
-  memset((void *)((int *)42),0,(unsigned long)10);
+  memset((void *)0,0,(size_t)10);
+  memset((void *)((int *)42),0,(size_t)10);
   return;
 }
 
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
index 1f530f3a135..c7b4c18e63c 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
@@ -35,8 +35,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10])
 {
-  char *res = memset_char(dest,(char)0xFF,(unsigned long)10);
-  memset_char(res,(char)0xFF,(unsigned long)10);
+  char *res = memset_char(dest,(char)0xFF,(size_t)10);
+  memset_char(res,(char)0xFF,(size_t)10);
   return;
 }
 
@@ -59,9 +59,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(unsigned char dest[10])
 {
-  unsigned char *res =
-    memset_uchar(dest,(unsigned char)0xFF,(unsigned long)10);
-  memset_uchar(res,(unsigned char)0xFF,(unsigned long)10);
+  unsigned char *res = memset_uchar(dest,(unsigned char)0xFF,(size_t)10);
+  memset_uchar(res,(unsigned char)0xFF,(size_t)10);
   return;
 }
 
@@ -88,8 +87,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10])
 {
-  char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(unsigned long)100);
-  memset_arr10_char(res,(char)0xFF,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(size_t)100);
+  memset_arr10_char(res,(char)0xFF,(size_t)100);
   return;
 }
 
@@ -399,15 +398,15 @@ void nested(int (*dest)[10], int n)
 
 void with_void(void *dest)
 {
-  void *res = memset(dest,0xFF,(unsigned long)10);
-  memset(res,0xFF,(unsigned long)10);
+  void *res = memset(dest,0xFF,(size_t)10);
+  memset(res,0xFF,(size_t)10);
   return;
 }
 
 void with_null_or_int(void)
 {
-  memset((void *)0,0xFF,(unsigned long)10);
-  memset((void *)((int *)42),0xFF,(unsigned long)10);
+  memset((void *)0,0xFF,(size_t)10);
+  memset((void *)((int *)42),0xFF,(size_t)10);
   return;
 }
 
@@ -447,8 +446,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10])
 {
-  char *res = memset_char(dest,(char)0xFF,(unsigned long)10);
-  memset_char(res,(char)0xFF,(unsigned long)10);
+  char *res = memset_char(dest,(char)0xFF,(size_t)10);
+  memset_char(res,(char)0xFF,(size_t)10);
   return;
 }
 
@@ -473,9 +472,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(unsigned char dest[10])
 {
-  unsigned char *res =
-    memset_uchar(dest,(unsigned char)0xFF,(unsigned long)10);
-  memset_uchar(res,(unsigned char)0xFF,(unsigned long)10);
+  unsigned char *res = memset_uchar(dest,(unsigned char)0xFF,(size_t)10);
+  memset_uchar(res,(unsigned char)0xFF,(size_t)10);
   return;
 }
 
@@ -503,8 +501,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10])
 {
-  char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(unsigned long)100);
-  memset_arr10_char(res,(char)0xFF,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(size_t)100);
+  memset_arr10_char(res,(char)0xFF,(size_t)100);
   return;
 }
 
@@ -817,15 +815,15 @@ void nested(int (*dest)[10], int n)
 
 void with_void(void *dest)
 {
-  void *res = memset(dest,0xFF,(unsigned long)10);
-  memset(res,0xFF,(unsigned long)10);
+  void *res = memset(dest,0xFF,(size_t)10);
+  memset(res,0xFF,(size_t)10);
   return;
 }
 
 void with_null_or_int(void)
 {
-  memset((void *)0,0xFF,(unsigned long)10);
-  memset((void *)((int *)42),0xFF,(unsigned long)10);
+  memset((void *)0,0xFF,(size_t)10);
+  memset((void *)((int *)42),0xFF,(size_t)10);
   return;
 }
 
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
index 5f5002cde26..6fe7a23eb90 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
@@ -68,8 +68,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10], char value)
 {
-  char *res = memset_char(dest,value,(unsigned long)10);
-  memset_char(res,value,(unsigned long)10);
+  char *res = memset_char(dest,value,(size_t)10);
+  memset_char(res,value,(size_t)10);
   return;
 }
 
@@ -92,8 +92,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(char dest[10], unsigned char value)
 {
-  unsigned char *res = memset_char(dest,(char)value,(unsigned long)10);
-  memset_uchar(res,value,(unsigned long)10);
+  unsigned char *res = memset_char(dest,(char)value,(size_t)10);
+  memset_uchar(res,value,(size_t)10);
   return;
 }
 
@@ -120,8 +120,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10], char value)
 {
-  char (*res)[10] = memset_arr10_char(dest,value,(unsigned long)100);
-  memset_arr10_char(res,value,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,value,(size_t)100);
+  memset_arr10_char(res,value,(size_t)100);
   return;
 }
 
@@ -172,22 +172,22 @@ void nested(int (*dest)[10], int n, int value)
 
 void with_void(void *dest, int value)
 {
-  void *res = memset(dest,value,(unsigned long)10);
-  memset(res,value,(unsigned long)10);
+  void *res = memset(dest,value,(size_t)10);
+  memset(res,value,(size_t)10);
   return;
 }
 
 void with_incomplete(struct incomplete *dest, int value)
 {
-  struct incomplete *res = memset((void *)dest,value,(unsigned long)10);
-  memset((void *)res,value,(unsigned long)10);
+  struct incomplete *res = memset((void *)dest,value,(size_t)10);
+  memset((void *)res,value,(size_t)10);
   return;
 }
 
 void with_null_or_int(int value)
 {
-  memset((void *)0,value,(unsigned long)10);
-  memset((void *)((int *)42),value,(unsigned long)10);
+  memset((void *)0,value,(size_t)10);
+  memset((void *)((int *)42),value,(size_t)10);
   return;
 }
 
@@ -228,8 +228,8 @@ char *memset_char(char *ptr, char value, size_t len)
 
 void chars(char dest[10], char value)
 {
-  char *res = memset_char(dest,value,(unsigned long)10);
-  memset_char(res,value,(unsigned long)10);
+  char *res = memset_char(dest,value,(size_t)10);
+  memset_char(res,value,(size_t)10);
   return;
 }
 
@@ -254,8 +254,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
 
 void uchars(char dest[10], unsigned char value)
 {
-  unsigned char *res = memset_char(dest,(char)value,(unsigned long)10);
-  memset_uchar(res,value,(unsigned long)10);
+  unsigned char *res = memset_char(dest,(char)value,(size_t)10);
+  memset_uchar(res,value,(size_t)10);
   return;
 }
 
@@ -283,8 +283,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
 
 void nested_chars(char dest[10][10], char value)
 {
-  char (*res)[10] = memset_arr10_char(dest,value,(unsigned long)100);
-  memset_arr10_char(res,value,(unsigned long)100);
+  char (*res)[10] = memset_arr10_char(dest,value,(size_t)100);
+  memset_arr10_char(res,value,(size_t)100);
   return;
 }
 
@@ -335,22 +335,22 @@ void nested(int (*dest)[10], int n, int value)
 
 void with_void(void *dest, int value)
 {
-  void *res = memset(dest,value,(unsigned long)10);
-  memset(res,value,(unsigned long)10);
+  void *res = memset(dest,value,(size_t)10);
+  memset(res,value,(size_t)10);
   return;
 }
 
 void with_incomplete(struct incomplete *dest, int value)
 {
-  struct incomplete *res = memset((void *)dest,value,(unsigned long)10);
-  memset((void *)res,value,(unsigned long)10);
+  struct incomplete *res = memset((void *)dest,value,(size_t)10);
+  memset((void *)res,value,(size_t)10);
   return;
 }
 
 void with_null_or_int(int value)
 {
-  memset((void *)0,value,(unsigned long)10);
-  memset((void *)((int *)42),value,(unsigned long)10);
+  memset((void *)0,value,(size_t)10);
+  memset((void *)((int *)42),value,(size_t)10);
   return;
 }
 
diff --git a/src/plugins/variadic/tests/known/oracle/openat.res.oracle b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
index 8773e0e6c29..30a3448710c 100644
--- a/src/plugins/variadic/tests/known/oracle/openat.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
@@ -45,7 +45,7 @@ int main(void)
 {
   int __retres;
   int flag = 0;
-  mode_t mode1 = (unsigned int)0;
+  mode_t mode1 = (mode_t)0;
   int mode2 = 0;
   char *file = (char *)"file";
   openat(0,(char const *)file,flag,mode1); /* __va_openat_mode_t */
diff --git a/src/plugins/variadic/tests/known/oracle/printf.res.oracle b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
index e60f797a320..1dbb2458c3d 100644
--- a/src/plugins/variadic/tests/known/oracle/printf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
@@ -625,12 +625,12 @@ int main(void)
   unsigned int ui = (unsigned int)42;
   unsigned long ul = (unsigned long)42;
   unsigned long long ull = (unsigned long long)42;
-  uintmax_t uj = (unsigned long long)42;
+  uintmax_t uj = (uintmax_t)42;
   double f = (double)42.0f;
   long double L = 42.0l;
   uint64_t u64 = 42ul;
-  int8_t i8 = (signed char)42;
-  uint_least64_t uleast64 = (unsigned long)42u;
+  int8_t i8 = (int8_t)42;
+  uint_least64_t uleast64 = (uint_least64_t)42u;
   int_fast32_t ifast32 = 42;
   printf("Hello world !\n"); /* printf_va_1 */
   printf("%s%n",string,& i); /* printf_va_2 */
diff --git a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
index 50337ea49e6..bea7ff5f3c9 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
@@ -45,6 +45,7 @@
 #include "errno.h"
 #include "stdarg.h"
 #include "stddef.h"
+#include "stdint.h"
 #include "stdio.h"
 /*@ assigns \result;
     assigns \result \from \nothing; */
@@ -66,7 +67,7 @@ int printf_va_1(char const * restrict format, int param0);
 void main(void)
 {
   int a[2] = {1, 2};
-  int *b = (int *)((unsigned long)(a) * (unsigned long)2);
+  int *b = (int *)((uintptr_t)(a) * (uintptr_t)2);
   /*@ assert Eva: pointer_downcast: (unsigned long)b ≤ 2147483647; */
   int nb_printed = printf_va_1("%d",(int)b);
   Frama_C_show_each_nb_printed(nb_printed);
diff --git a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
index 6944f603f38..4e8e4cf6cbc 100644
--- a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
@@ -86,7 +86,7 @@ int main(void)
   int __retres;
   char data[100];
   size_t tmp_0;
-  memset((void *)(data),'A',(unsigned long)99);
+  memset((void *)(data),'A',(size_t)99);
   data[99] = (char)0;
   char dest[50] = {(char)'\000'};
   if (nondet) {
diff --git a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
index 4dac7cf95a4..4976f7d1494 100644
--- a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
@@ -99,7 +99,7 @@ int main(void)
   int __retres;
   wchar_t data[100];
   size_t tmp_0;
-  wmemset(data,65,(unsigned long)99);
+  wmemset(data,65,(size_t)99);
   data[99] = 0;
   wchar_t dest[50] = {0};
   if (nondet) {
diff --git a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
index 9d9d36daad0..64c5c703458 100644
--- a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
@@ -265,8 +265,8 @@ int main(void)
           "%" "E" "\\n" ,42.0,42.0,42.0); /* wprintf_va_4 */
   wprintf((wchar_t const *)L"%" "*" "d" " " "\\n" ,4,2); /* wprintf_va_5 */
   wprintf((wchar_t const *)L"%" "l" "s" " " "\\n" ,L"4" "2" ); /* wprintf_va_6 */
-  swprintf(wstring,(unsigned long)0x100,(wchar_t const *)L"%" "s" " " "=" " "
-           "%" "d" ,(char *)L"4" "2" " " "+" " " "4" "2" ,42 + 42); /* swprintf_va_1 */
+  swprintf(wstring,(size_t)0x100,(wchar_t const *)L"%" "s" " " "=" " " "%"
+           "d" ,(char *)L"4" "2" " " "+" " " "4" "2" ,42 + 42); /* swprintf_va_1 */
   wscanf((wchar_t const *)L"%" "l" "s" ,wstring); /* wscanf_va_1 */
   wscanf((wchar_t const *)L"%" "d" " " "%" "d" ,& i,& j); /* wscanf_va_2 */
   swscanf((wchar_t const *)(input),(wchar_t const *)L"%" "l" "s" " " "%" "*"
diff --git a/tests/builtins/oracle/memset.res.oracle b/tests/builtins/oracle/memset.res.oracle
index 8f47613e495..0270d4fc6da 100644
--- a/tests/builtins/oracle/memset.res.oracle
+++ b/tests/builtins/oracle/memset.res.oracle
@@ -39,8 +39,7 @@
 [eva:alarm] memset.c:35: Warning: 
   function memset: precondition 'valid_s' got status unknown.
 [eva:imprecision] memset.c:35: 
-  Call to builtin precise_memset(({{ (void *)&t3[10] }},{17},
-                                  {{ (unsigned int)&t1 }})) failed; size is imprecise
+  Call to builtin precise_memset(({{ (void *)&t3[10] }},{17},{{ (size_t)&t1 }})) failed; size is imprecise
 [eva] memset.c:38: Call to builtin memset
 [eva:alarm] memset.c:38: Warning: 
   function memset: precondition 'valid_s' got status invalid.
diff --git a/tests/cil/oracle/cpu_a.res.oracle b/tests/cil/oracle/cpu_a.res.oracle
index 8733181a2a9..6623ed53971 100644
--- a/tests/cil/oracle/cpu_a.res.oracle
+++ b/tests/cil/oracle/cpu_a.res.oracle
@@ -5,7 +5,7 @@ typedef unsigned short DWORD;
 DWORD f(void)
 {
   DWORD __retres;
-  __retres = (unsigned short)0;
+  __retres = (DWORD)0;
   return __retres;
 }
 
diff --git a/tests/cil/oracle/cpu_b.res.oracle b/tests/cil/oracle/cpu_b.res.oracle
index cbc3f3049ce..1567947463f 100644
--- a/tests/cil/oracle/cpu_b.res.oracle
+++ b/tests/cil/oracle/cpu_b.res.oracle
@@ -14,7 +14,7 @@ DWORD g(void)
 DWORD f(void)
 {
   DWORD __retres;
-  __retres = (unsigned short)0;
+  __retres = (DWORD)0;
   return __retres;
 }
 
diff --git a/tests/libc/oracle/argz_c.res.oracle b/tests/libc/oracle/argz_c.res.oracle
index b3215f8143a..24cc544eb91 100644
--- a/tests/libc/oracle/argz_c.res.oracle
+++ b/tests/libc/oracle/argz_c.res.oracle
@@ -276,6 +276,7 @@
 [eva] Done for function strstr
 [eva] computing for function strndup <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:79.
+[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:333: Automatic loop unrolling.
 [eva] FRAMAC_SHARE/libc/string.c:336: Call to builtin malloc
 [eva] FRAMAC_SHARE/libc/string.c:336: allocating variable __malloc_strndup_l336
 [eva] FRAMAC_SHARE/libc/string.c:341: Call to builtin memcpy
@@ -295,6 +296,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:49: allocating variable __realloc_str_append_l49
 [eva] computing for function mempcpy <- str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:52.
+[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:54: Automatic loop unrolling.
 [eva] Recording results for mempcpy
 [eva] Done for function mempcpy
 [eva] FRAMAC_SHARE/libc/argz.c:56: Call to builtin free
diff --git a/tests/libc/oracle/fc_libc.1.res.oracle b/tests/libc/oracle/fc_libc.1.res.oracle
index db63ecd0f20..783ce70eb1f 100644
--- a/tests/libc/oracle/fc_libc.1.res.oracle
+++ b/tests/libc/oracle/fc_libc.1.res.oracle
@@ -534,10 +534,10 @@ void Frama_C_make_unknown(char *p, size_t l)
 {
   Frama_C_update_entropy();
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < l) {
       *(p + i) = (char)Frama_C_entropy_source;
-      i += (size_t)1;
+      i ++;
     }
   }
   return;
@@ -995,7 +995,7 @@ axiomatic WcsChr {
     ∀ wchar_t *wcs;
     ∀ ℤ wc;
       wcschr(wcs, wc) ≡ \true ⇔
-      (∃ ℤ i; 0 ≤ i ≤ wcslen(wcs) ∧ *(wcs + i) ≡ (int)wc);
+      (∃ ℤ i; 0 ≤ i ≤ wcslen(wcs) ∧ *(wcs + i) ≡ (wchar_t)wc);
   
   }
  */
@@ -2096,7 +2096,7 @@ void argz_stringify(char *argz, size_t len, int sep)
         argz += part_len;
         len -= part_len;
         tmp_0 = len;
-        len -= (size_t)1;
+        len --;
         ;
         if (tmp_0 <= (size_t)1) break;
         tmp_1 = argz;
@@ -2136,7 +2136,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
       char *src = *argz;
       size_t src_len = *argz_len;
       char *dst = (char *)0;
-      size_t dst_len = (unsigned int)0;
+      size_t dst_len = (size_t)0;
       int delayed_copy = 1;
       size_t str_len = strlen(str);
       size_t with_len = strlen(with);
@@ -2150,7 +2150,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
           char *match = strstr((char const *)arg,str);
           if (match) {
             char *from = match + str_len;
-            size_t to_len = (unsigned int)(match - arg);
+            size_t to_len = (size_t)(match - arg);
             char *to = strndup((char const *)arg,to_len);
             while (1) {
               if (to) {
@@ -2162,7 +2162,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
                 match = strstr((char const *)from,str);
                 if (match) {
                   str_append(& to,& to_len,(char const *)from,
-                             (unsigned int)(match - from));
+                             (size_t)(match - from));
                   from = match + str_len;
                 }
                 else {
@@ -2178,7 +2178,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
               if (delayed_copy) {
                 if (arg > src) er = argz_append(& dst,& dst_len,
                                                 (char const *)src,
-                                                (unsigned int)(arg - src));
+                                                (size_t)(arg - src));
                 delayed_copy = 0;
               }
               if (! er) er = argz_add(& dst,& dst_len,(char const *)to);
@@ -2341,8 +2341,8 @@ error_t argz_create_sep(char const *string, int delim, char **argz,
             wp ++;
             *tmp_1 = (char)'\000';
           }
-          else nlen -= (size_t)1;
-        else nlen -= (size_t)1;
+          else nlen --;
+        else nlen --;
       else {
         char *tmp_2;
         tmp_2 = wp;
@@ -2357,13 +2357,13 @@ error_t argz_create_sep(char const *string, int delim, char **argz,
     if (nlen == (size_t)0) {
       free((void *)*argz);
       *argz = (char *)0;
-      *len = (unsigned int)0;
+      *len = (size_t)0;
     }
     *len = nlen;
   }
   else {
     *argz = (char *)0;
-    *len = (unsigned int)0;
+    *len = (size_t)0;
   }
   __retres = 0;
   return_label: return __retres;
@@ -2375,7 +2375,7 @@ error_t argz_create(char * const *argv, char **argz, size_t *len)
   int argc;
   char * const *ap;
   char *p;
-  size_t tlen = (unsigned int)0;
+  size_t tlen = (size_t)0;
   argc = 0;
   while (*(argv + argc) != (char *)0) {
     size_t tmp;
@@ -2405,12 +2405,12 @@ error_t argz_create(char * const *argv, char **argz, size_t *len)
 
 size_t argz_count(char const *argz, size_t len)
 {
-  size_t count = (unsigned int)0;
+  size_t count = (size_t)0;
   while (len > (size_t)0) {
     size_t part_len = strlen(argz);
     argz += part_len + (size_t)1;
     len -= part_len + (size_t)1;
-    count += (size_t)1;
+    count ++;
   }
   return count;
 }
@@ -2474,8 +2474,8 @@ error_t argz_add_sep(char **argz, size_t *argz_len, char const *string,
             wp ++;
             *tmp_1 = (char)'\000';
           }
-          else nlen -= (size_t)1;
-        else nlen -= (size_t)1;
+          else nlen --;
+        else nlen --;
       else {
         char *tmp_2;
         tmp_2 = wp;
@@ -3462,9 +3462,9 @@ int glob(char const *pattern, int flags,
   pglob->gl_pathc = (unsigned int)tmp;
   if (flags & (1 << 3)) tmp_0 = pglob->gl_offs; else tmp_0 = (unsigned int)0;
   size_t reserve_offs = tmp_0;
-  size_t prev_len = (unsigned int)0;
+  size_t prev_len = (size_t)0;
   if (flags & (1 << 5)) 
-    while (*(pglob->gl_pathv + (reserve_offs + prev_len))) prev_len += (size_t)1;
+    while (*(pglob->gl_pathv + (reserve_offs + prev_len))) prev_len ++;
   if (flags & (1 << 5)) tmp_1 = pglob->gl_pathv; else tmp_1 = (char **)0;
   char **path = tmp_1;
   if (pglob->gl_pathc == (unsigned int)0) 
@@ -3476,10 +3476,10 @@ int glob(char const *pattern, int flags,
         goto return_label;
       }
       {
-        size_t i = (unsigned int)0;
+        size_t i = (size_t)0;
         while (i < reserve_offs) {
           *(pglob->gl_pathv + i) = (char *)0;
-          i += (size_t)1;
+          i ++;
         }
       }
       *(pglob->gl_pathv + (reserve_offs + prev_len)) = (char *)pattern;
@@ -3498,17 +3498,17 @@ int glob(char const *pattern, int flags,
     goto return_label;
   }
   {
-    size_t i_0 = (unsigned int)0;
+    size_t i_0 = (size_t)0;
     while (i_0 < reserve_offs) {
       *(pglob->gl_pathv + i_0) = (char *)0;
-      i_0 += (size_t)1;
+      i_0 ++;
     }
   }
   {
-    size_t i_1 = (unsigned int)0;
+    size_t i_1 = (size_t)0;
     while (i_1 < pglob->gl_pathc) {
       *(pglob->gl_pathv + ((reserve_offs + prev_len) + i_1)) = (char *)"glob result";
-      i_1 += (size_t)1;
+      i_1 ++;
     }
   }
   *(pglob->gl_pathv + ((prev_len + reserve_offs) + pglob->gl_pathc)) = (char *)0;
@@ -3581,7 +3581,7 @@ intmax_t imaxabs(intmax_t c)
 }
 
 /*@ requires no_div_by_zero: denom ≢ 0;
-    requires no_overflow: denom ≢ -1 ∨ (long long)(-numer) ≢ numer;
+    requires no_overflow: denom ≢ -1 ∨ (intmax_t)(-numer) ≢ numer;
     ensures correct_div: \result.quot ≡ \old(numer) / \old(denom);
     ensures correct_mod: \result.rem ≡ \old(numer) % \old(denom);
     assigns \result;
@@ -5157,7 +5157,7 @@ int getaddrinfo(char const * restrict nodename,
         goto return_label;
       }
       tmp_3 = Frama_C_interval(0,43);
-      sa->sa_family = (unsigned short)tmp_3;
+      sa->sa_family = (sa_family_t)tmp_3;
       /*@ slevel 15; */
       {
         int i = 0;
@@ -5177,7 +5177,7 @@ int getaddrinfo(char const * restrict nodename,
       ai->ai_protocol = Frama_C_interval(0,IPPROTO_MAX);
       ai->ai_addrlen = sizeof(*sa);
       ai->ai_addr = sa;
-      ai->ai_canonname = (char *)malloc((unsigned int)6);
+      ai->ai_canonname = (char *)malloc((size_t)6);
       if (! ai->ai_canonname) {
         __retres = -10;
         goto return_label;
@@ -5233,8 +5233,8 @@ struct hostent *gethostbyname(char const *name)
             goto return_label;
           }
           memcpy((void *)(__fc_ghbn.host_addr),(void const *)(& addr),
-                 (unsigned int)__fc_ghbn.host.h_length);
-          strncpy(__fc_ghbn.hostbuf,name,(unsigned int)(128 - 1));
+                 (size_t)__fc_ghbn.host.h_length);
+          strncpy(__fc_ghbn.hostbuf,name,(size_t)(128 - 1));
           __fc_ghbn.hostbuf[128 - 1] = (char)'\000';
           __fc_ghbn.host.h_name = __fc_ghbn.hostbuf;
           __fc_ghbn.host.h_aliases = __fc_ghbn.host_aliases;
@@ -5267,8 +5267,8 @@ struct hostent *gethostbyname(char const *name)
     struct in_addr addr_0;
     addr_0.s_addr = inet_addr(name);
     memcpy((void *)(__fc_ghbn.host_addr),(void const *)(& addr_0),
-           (unsigned int)__fc_ghbn.host.h_length);
-    strncpy(__fc_ghbn.hostbuf,name,(unsigned int)(128 - 1));
+           (size_t)__fc_ghbn.host.h_length);
+    strncpy(__fc_ghbn.hostbuf,name,(size_t)(128 - 1));
     __fc_ghbn.hostbuf[128 - 1] = (char)'\000';
     __fc_ghbn.host.h_name = __fc_ghbn.hostbuf;
     __fc_ghbn.host.h_aliases = __fc_ghbn.host_aliases;
@@ -5282,24 +5282,24 @@ struct hostent *gethostbyname(char const *name)
   return_label: return __retres;
 }
 
-struct in6_addr const in6addr_any = {.s6_addr = {(unsigned char)0}};
+struct in6_addr const in6addr_any = {.s6_addr = {(uint8_t)0}};
 struct in6_addr const in6addr_loopback =
-  {.s6_addr = {(unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)0,
-               (unsigned char)1}};
+  {.s6_addr = {(uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)0,
+               (uint8_t)1}};
 char __fc_getpw_pw_name[64];
 char __fc_getpw_pw_passwd[64];
 char __fc_getpw_pw_gecos[64];
@@ -5347,15 +5347,15 @@ static int __fc_getpw_r(struct passwd *pwd, char *buf, size_t buflen,
   int tmp_2;
   if (! __fc_getpw_init) {
     __fc_getpw_init = 1;
-    Frama_C_make_unknown(__fc_getpw_pw_name,(unsigned int)63);
+    Frama_C_make_unknown(__fc_getpw_pw_name,(size_t)63);
     __fc_getpw_pw_name[63] = (char)0;
-    Frama_C_make_unknown(__fc_getpw_pw_passwd,(unsigned int)63);
+    Frama_C_make_unknown(__fc_getpw_pw_passwd,(size_t)63);
     __fc_getpw_pw_passwd[63] = (char)0;
-    Frama_C_make_unknown(__fc_getpw_pw_gecos,(unsigned int)63);
+    Frama_C_make_unknown(__fc_getpw_pw_gecos,(size_t)63);
     __fc_getpw_pw_gecos[63] = (char)0;
-    Frama_C_make_unknown(__fc_getpw_pw_dir,(unsigned int)63);
+    Frama_C_make_unknown(__fc_getpw_pw_dir,(size_t)63);
     __fc_getpw_pw_dir[63] = (char)0;
-    Frama_C_make_unknown(__fc_getpw_pw_shell,(unsigned int)63);
+    Frama_C_make_unknown(__fc_getpw_pw_shell,(size_t)63);
     __fc_getpw_pw_shell[63] = (char)0;
   }
   tmp_2 = Frama_C_interval(0,1);
@@ -5789,7 +5789,7 @@ extern void tzset(void);
 
 /*@ requires
       valid:
-        valid_read_or_empty((void *)s, (unsigned int)(sizeof(wchar_t) * n)) ∨
+        valid_read_or_empty((void *)s, (size_t)(sizeof(wchar_t) * n)) ∨
         \valid_read((unsigned char *)s + (0 .. wmemchr_off(s, c, n)));
     requires
       initialization:
@@ -5797,10 +5797,9 @@ extern void tzset(void);
         \initialized(s + (0 .. wmemchr_off(s, c, n)));
     requires
       danglingness:
-        non_escaping((void *)s, (unsigned int)(sizeof(wchar_t) * n)) ∨
+        non_escaping((void *)s, (size_t)(sizeof(wchar_t) * n)) ∨
         non_escaping((void *)s,
-                    (unsigned int)(sizeof(wchar_t) *
-                                   (wmemchr_off(s, c, n) + 1)));
+                    (size_t)(sizeof(wchar_t) * (wmemchr_off(s, c, n) + 1)));
     ensures
       result_null_or_inside_s:
         \result ≡ \null ∨ \subset(\result, \old(s) + (0 .. \old(n) - 1));
@@ -5812,18 +5811,18 @@ extern wchar_t *wmemchr(wchar_t const *s, wchar_t c, size_t n);
 
 /*@ requires
       valid_s1:
-        valid_read_or_empty((void *)s1, (unsigned int)(sizeof(wchar_t) * n));
+        valid_read_or_empty((void *)s1, (size_t)(sizeof(wchar_t) * n));
     requires
       valid_s2:
-        valid_read_or_empty((void *)s2, (unsigned int)(sizeof(wchar_t) * n));
+        valid_read_or_empty((void *)s2, (size_t)(sizeof(wchar_t) * n));
     requires initialization: s1: \initialized(s1 + (0 .. n - 1));
     requires initialization: s2: \initialized(s2 + (0 .. n - 1));
     requires
       danglingness: s1:
-        non_escaping((void *)s1, (unsigned int)(sizeof(wchar_t) * n));
+        non_escaping((void *)s1, (size_t)(sizeof(wchar_t) * n));
     requires
       danglingness: s2:
-        non_escaping((void *)s2, (unsigned int)(sizeof(wchar_t) * n));
+        non_escaping((void *)s2, (size_t)(sizeof(wchar_t) * n));
     assigns \result;
     assigns \result
       \from (indirect: *(s1 + (0 .. n - 1))),
@@ -6180,22 +6179,22 @@ unsigned long long __fc_atomic_exchange(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)desired;
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)desired;
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)desired;
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)desired;
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)desired;
+        *((atomic_uint volatile *)obj) = (atomic_uint)desired;
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)desired;
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)desired;
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -6268,22 +6267,22 @@ unsigned long long __fc_atomic_fetch_add(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) + operand);
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) + operand);
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) + operand);
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) + operand);
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) + operand);
+        *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) + operand);
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) + operand);
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) + operand);
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -6311,22 +6310,22 @@ unsigned long long __fc_atomic_fetch_sub(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) - operand);
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) - operand);
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) - operand);
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) - operand);
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) - operand);
+        *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) - operand);
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) - operand);
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) - operand);
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -6354,22 +6353,22 @@ unsigned long long __fc_atomic_fetch_or(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) | operand);
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) | operand);
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) | operand);
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) | operand);
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) | operand);
+        *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) | operand);
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) | operand);
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) | operand);
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -6397,22 +6396,22 @@ unsigned long long __fc_atomic_fetch_xor(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) ^ operand);
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) ^ operand);
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) ^ operand);
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) ^ operand);
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) ^ operand);
+        *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) ^ operand);
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) ^ operand);
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) ^ operand);
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -6440,22 +6439,22 @@ unsigned long long __fc_atomic_fetch_and(void *obj,
   unsigned long long r = (unsigned long long)0;
   if (obj_size == sizeof(char)) {
     r = (unsigned long long)*((atomic_uchar volatile *)obj);
-    *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) & operand);
+    *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) & operand);
   }
   else 
     if (obj_size == sizeof(short)) {
       r = (unsigned long long)*((atomic_ushort volatile *)obj);
-      *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) & operand);
+      *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) & operand);
     }
     else 
       if (obj_size == sizeof(int)) {
         r = (unsigned long long)*((atomic_uint volatile *)obj);
-        *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) & operand);
+        *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) & operand);
       }
       else 
         if (obj_size == sizeof(long)) {
           r = (unsigned long long)*((atomic_ulong volatile *)obj);
-          *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) & operand);
+          *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) & operand);
         }
         else 
           if (obj_size == sizeof(long long)) {
@@ -7090,16 +7089,16 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
     if (*n == (size_t)0) {
       _LOR_1:
       {
-        *lineptr = (char *)malloc((unsigned int)2);
+        *lineptr = (char *)malloc((size_t)2);
         if (! lineptr) {
           __fc_errno = 12;
           __retres = -1;
           goto return_label;
         }
-        *n = (unsigned int)2;
+        *n = (size_t)2;
       }
     }
-  size_t cur = (unsigned int)0;
+  size_t cur = (size_t)0;
   while (1) {
     int tmp_3;
     tmp_3 = ferror(stream);
@@ -7122,7 +7121,7 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
         if ((int)c != -1) {
           size_t tmp_2;
           tmp_2 = cur;
-          cur += (size_t)1;
+          cur ++;
           *(*lineptr + tmp_2) = c;
         }
         if ((int)c == '\n') goto _LOR_2;
@@ -7131,7 +7130,7 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
             _LOR_2:
             {
               *(*lineptr + cur) = (char)'\000';
-              __retres = (int)cur;
+              __retres = (ssize_t)cur;
               goto return_label;
             }
           }
@@ -7173,7 +7172,7 @@ int asprintf(char **strp, char const *fmt, void * const *__va_params)
   int tmp;
   args = __va_params;
   tmp = Frama_C_interval(1,256);
-  size_t len = (unsigned int)tmp;
+  size_t len = (size_t)tmp;
   *strp = (char *)malloc(len);
   if (! *strp) {
     __retres = -1;
@@ -7378,7 +7377,7 @@ static char __fc_initenv_init;
 static void __fc_initenv(void)
 {
   if (! __fc_initenv_init) {
-    Frama_C_make_unknown(__fc_env_strings,(unsigned int)(64 - 1));
+    Frama_C_make_unknown(__fc_env_strings,(size_t)(64 - 1));
     {
       int i = 0;
       while (i < 4096) {
@@ -7492,7 +7491,7 @@ int setenv(char const *name, char const *value, int overwrite)
     int tmp_2;
     int tmp_3;
     tmp_1 = Frama_C_nondet(0,1);
-    if (tmp_1) Frama_C_make_unknown(__fc_env_strings,(unsigned int)(64 - 1));
+    if (tmp_1) Frama_C_make_unknown(__fc_env_strings,(size_t)(64 - 1));
     tmp_2 = Frama_C_interval(0,4096 - 1);
     tmp_3 = Frama_C_interval(0,64 - 1);
     __fc_env[tmp_2] = & __fc_env_strings[tmp_3];
@@ -7622,14 +7621,14 @@ char *realpath(char const * restrict file_name, char * restrict resolved_name)
   }
   int realpath_len = Frama_C_interval(1,256);
   if (! resolved_name) {
-    resolved_name = (char *)malloc((unsigned int)256);
+    resolved_name = (char *)malloc((size_t)256);
     if (! resolved_name) {
       __fc_errno = 12;
       __retres = (char *)0;
       goto return_label;
     }
   }
-  Frama_C_make_unknown(resolved_name,(unsigned int)realpath_len);
+  Frama_C_make_unknown(resolved_name,(size_t)realpath_len);
   *(resolved_name + (realpath_len - 1)) = (char)'\000';
   __retres = resolved_name;
   return_label: return __retres;
@@ -7660,7 +7659,7 @@ char *canonicalize_file_name(char const *path)
 void *memcpy(void * restrict dest, void const * restrict src, size_t n)
 {
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     /*@ loop invariant no_eva: 0 ≤ i ≤ n;
         loop invariant
           no_eva:
@@ -7671,7 +7670,7 @@ void *memcpy(void * restrict dest, void const * restrict src, size_t n)
     */
     while (i < n) {
       *((char *)dest + i) = *((char *)src + i);
-      i += (size_t)1;
+      i ++;
     }
   }
   return dest;
@@ -7696,7 +7695,7 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
 {
   void *__retres;
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   /*@ loop invariant no_eva: 0 ≤ i ≤ n;
       loop invariant
         no_eva:
@@ -7707,7 +7706,7 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
   */
   while (i < n) {
     *((char *)dest + i) = *((char *)src + i);
-    i += (size_t)1;
+    i ++;
   }
   __retres = (void *)((char *)dest + i);
   return __retres;
@@ -7740,10 +7739,10 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
 static int memoverlap(char const *p, char const *q, size_t n)
 {
   int __retres;
-  uintptr_t p1 = (unsigned int)p;
-  uintptr_t p2 = (unsigned int)(p + n);
-  uintptr_t q1 = (unsigned int)q;
-  uintptr_t q2 = (unsigned int)(q + n);
+  uintptr_t p1 = (uintptr_t)p;
+  uintptr_t p2 = (uintptr_t)(p + n);
+  uintptr_t q1 = (uintptr_t)q;
+  uintptr_t q2 = (uintptr_t)(q + n);
   if (p1 <= q1) {
     if (p2 > q1) {
       __retres = -1;
@@ -7794,7 +7793,7 @@ void *memmove(void *dest, void const *src, size_t n)
   char *d = (char *)dest;
   tmp = memoverlap((char const *)dest,(char const *)src,n);
   if (tmp <= 0) {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     /*@ loop invariant no_eva: 0 ≤ i ≤ n;
         loop invariant
           no_eva:
@@ -7811,7 +7810,7 @@ void *memmove(void *dest, void const *src, size_t n)
     */
     while (i < n) {
       *(d + i) = *(s + i);
-      i += (size_t)1;
+      i ++;
     }
   }
   else {
@@ -7833,7 +7832,7 @@ void *memmove(void *dest, void const *src, size_t n)
       */
       while (i_0 > (size_t)0) {
         *(d + i_0) = *(s + i_0);
-        i_0 -= (size_t)1;
+        i_0 --;
       }
     }
     *(d + 0) = *(s + 0);
@@ -7850,8 +7849,8 @@ void *memmove(void *dest, void const *src, size_t n)
 size_t strlen(char const *s)
 {
   size_t i;
-  i = (unsigned int)0;
-  while ((int)*(s + i) != 0) i += (size_t)1;
+  i = (size_t)0;
+  while ((int)*(s + i) != 0) i ++;
   return i;
 }
 
@@ -7866,13 +7865,13 @@ size_t strlen(char const *s)
 size_t strnlen(char const *s, size_t maxlen)
 {
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (1) {
     if (i < maxlen) {
       if (! ((int)*(s + i) != 0)) break;
     }
     else break;
-    i += (size_t)1;
+    i ++;
   }
   return i;
 }
@@ -7889,10 +7888,10 @@ void *memset(void *s, int c, size_t n)
 {
   unsigned char *p = (unsigned char *)s;
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < n) {
       *(p + i) = (unsigned char)c;
-      i += (size_t)1;
+      i ++;
     }
   }
   return s;
@@ -7909,13 +7908,13 @@ int strcmp(char const *s1, char const *s2)
 {
   int __retres;
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while ((int)*(s1 + i) == (int)*(s2 + i)) {
     if ((int)*(s1 + i) == 0) {
       __retres = 0;
       goto return_label;
     }
-    i += (size_t)1;
+    i ++;
   }
   __retres = (int)*((unsigned char *)s1 + i) - (int)*((unsigned char *)s2 + i);
   return_label: return __retres;
@@ -7933,7 +7932,7 @@ int strncmp(char const *s1, char const *s2, size_t n)
 {
   int __retres;
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < n) {
       if ((int)*(s1 + i) != (int)*(s2 + i)) {
         __retres = (int)*((unsigned char *)s1 + i) - (int)*((unsigned char *)s2 + i);
@@ -7943,7 +7942,7 @@ int strncmp(char const *s1, char const *s2, size_t n)
         __retres = 0;
         goto return_label;
       }
-      i += (size_t)1;
+      i ++;
     }
   }
   __retres = 0;
@@ -7973,13 +7972,13 @@ int memcmp(void const *s1, void const *s2, size_t n)
   p1 = (unsigned char const *)s1;
   p2 = (unsigned char const *)s2;
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < n) {
       if ((int)*(p1 + i) != (int)*(p2 + i)) {
         __retres = (int)*(p1 + i) - (int)*(p2 + i);
         goto return_label;
       }
-      i += (size_t)1;
+      i ++;
     }
   }
   __retres = 0;
@@ -8014,7 +8013,7 @@ int strcasecmp(char const *s1, char const *s2)
 {
   int __retres;
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (1) {
     if ((int)*(s1 + i) != 0) {
       if (! ((int)*(s2 + i) != 0)) break;
@@ -8027,7 +8026,7 @@ int strcasecmp(char const *s1, char const *s2)
         goto return_label;
       }
     }
-    i += (size_t)1;
+    i ++;
   }
   if ((int)*(s1 + i) == 0) {
     if ((int)*(s2 + i) == 0) {
@@ -8074,10 +8073,10 @@ char *strcat(char *dest, char const *src)
 {
   size_t i;
   size_t n = strlen((char const *)dest);
-  i = (unsigned int)0;
+  i = (size_t)0;
   while ((int)*(src + i) != 0) {
     *(dest + (n + i)) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + (n + i)) = (char)0;
   return dest;
@@ -8125,11 +8124,11 @@ char *strncat(char *dest, char const *src, size_t n)
 {
   size_t i;
   size_t dest_len = strlen((char const *)dest);
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (i < n) {
     if ((int)*(src + i) == 0) break;
     *(dest + (dest_len + i)) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + (dest_len + i)) = (char)0;
   return dest;
@@ -8150,10 +8149,10 @@ char *strncat(char *dest, char const *src, size_t n)
 char *strcpy(char *dest, char const *src)
 {
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while ((int)*(src + i) != 0) {
     *(dest + i) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + i) = (char)0;
   return dest;
@@ -8175,10 +8174,10 @@ char *stpcpy(char *dest, char const *src)
 {
   char *__retres;
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while ((int)*(src + i) != 0) {
     *(dest + i) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + i) = (char)0;
   __retres = dest + i;
@@ -8207,15 +8206,15 @@ char *stpcpy(char *dest, char const *src)
 char *strncpy(char *dest, char const *src, size_t n)
 {
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (i < n) {
     *(dest + i) = *(src + i);
     if ((int)*(src + i) == 0) break;
-    i += (size_t)1;
+    i ++;
   }
   while (i < n) {
     *(dest + i) = (char)0;
-    i += (size_t)1;
+    i ++;
   }
   return dest;
 }
@@ -8250,13 +8249,13 @@ char *strchr(char const *s, int c)
   char *__retres;
   size_t i;
   char const ch = (char)c;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while ((int)*(s + i) != (int)ch) {
     if ((int)*(s + i) == 0) {
       __retres = (char *)0;
       goto return_label;
     }
-    i += (size_t)1;
+    i ++;
   }
   __retres = (char *)(s + i);
   return_label: return __retres;
@@ -8294,7 +8293,7 @@ char *strrchr(char const *s, int c)
         __retres = (char *)(s + (i - (size_t)1));
         goto return_label;
       }
-      i -= (size_t)1;
+      i --;
     }
   }
   __retres = (char *)0;
@@ -8312,7 +8311,7 @@ char *strrchr(char const *s, int c)
     requires
       danglingness:
         non_escaping(s, n) ∨
-        non_escaping(s, (unsigned int)(memchr_off((char *)s, c, n) + 1));
+        non_escaping(s, (size_t)(memchr_off((char *)s, c, n) + 1));
     assigns \result;
     assigns \result \from s, c, *((unsigned char *)s + (0 .. n - 1));
     
@@ -8337,13 +8336,13 @@ void *memchr(void const *s, int c, size_t n)
   unsigned char const ch = (unsigned char)c;
   unsigned char const *ss = (unsigned char const *)s;
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < n) {
       if ((int)*(ss + i) == (int)ch) {
         __retres = (void *)(ss + i);
         goto return_label;
       }
-      i += (size_t)1;
+      i ++;
     }
   }
   __retres = (void *)0;
@@ -8362,7 +8361,7 @@ void *memrchr(void const *s, int c, size_t n)
         __retres = (void *)(ss + (i - (size_t)1));
         goto return_label;
       }
-      i -= (size_t)1;
+      i --;
     }
   }
   __retres = (void *)0;
@@ -8390,21 +8389,21 @@ char *strstr(char const *haystack, char const *needle)
     goto return_label;
   }
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while ((int)*(haystack + i) != 0) {
       {
         size_t j;
-        j = (unsigned int)0;
+        j = (size_t)0;
         while ((int)*(haystack + (i + j)) != 0) {
           if ((int)*(haystack + (i + j)) != (int)*(needle + j)) break;
-          j += (size_t)1;
+          j ++;
         }
         if ((int)*(needle + j) == 0) {
           __retres = (char *)(haystack + i);
           goto return_label;
         }
       }
-      i += (size_t)1;
+      i ++;
     }
   }
   __retres = (char *)0;
@@ -8422,7 +8421,7 @@ char *strerror(int errnum)
 {
   char *__retres;
   if (! strerror___fc_strerror_init) {
-    Frama_C_make_unknown(__fc_strerror,(unsigned int)63);
+    Frama_C_make_unknown(__fc_strerror,(size_t)63);
     __fc_strerror[63] = (char)0;
     strerror___fc_strerror_init = 1;
   }
@@ -8508,10 +8507,10 @@ char *strndup(char const *s, size_t n)
 {
   char *__retres;
   size_t l;
-  l = (unsigned int)0;
+  l = (size_t)0;
   while (l < n) {
     if ((int)*(s + l) == 0) break;
-    l += (size_t)1;
+    l ++;
   }
   char *p = malloc(l + (size_t)1);
   if (! p) {
@@ -8536,7 +8535,7 @@ char *strsignal(int signum)
 {
   char *__retres;
   if (! strsignal___fc_strsignal_init) {
-    Frama_C_make_unknown(__fc_strsignal,(unsigned int)63);
+    Frama_C_make_unknown(__fc_strsignal,(size_t)63);
     __fc_strsignal[63] = (char)0;
     strsignal___fc_strsignal_init = 1;
   }
@@ -8545,11 +8544,10 @@ char *strsignal(int signum)
 }
 
 /*@ requires
-      valid_dest:
-        valid_or_empty((void *)dest, (unsigned int)(sizeof(wchar_t) * n));
+      valid_dest: valid_or_empty((void *)dest, (size_t)(sizeof(wchar_t) * n));
     requires
       valid_src:
-        valid_read_or_empty((void *)src, (unsigned int)(sizeof(wchar_t) * n));
+        valid_read_or_empty((void *)src, (size_t)(sizeof(wchar_t) * n));
     requires
       separation: dest: src:
         \separated(dest + (0 .. n - 1), src + (0 .. n - 1));
@@ -8562,10 +8560,10 @@ char *strsignal(int signum)
 wchar_t *wmemcpy(wchar_t *dest, wchar_t const *src, size_t n)
 {
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < n) {
       *(dest + i) = *(src + i);
-      i += (size_t)1;
+      i ++;
     }
   }
   return dest;
@@ -8585,10 +8583,10 @@ wchar_t *wmemcpy(wchar_t *dest, wchar_t const *src, size_t n)
 wchar_t *wmemset(wchar_t *dest, wchar_t val, size_t len)
 {
   {
-    size_t i = (unsigned int)0;
+    size_t i = (size_t)0;
     while (i < len) {
       *(dest + i) = val;
-      i += (size_t)1;
+      i ++;
     }
   }
   return dest;
@@ -8608,10 +8606,10 @@ wchar_t *wmemset(wchar_t *dest, wchar_t val, size_t len)
 wchar_t *wcscpy(wchar_t *dest, wchar_t const *src)
 {
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (*(src + i) != 0) {
     *(dest + i) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + i) = 0;
   return dest;
@@ -8625,8 +8623,8 @@ wchar_t *wcscpy(wchar_t *dest, wchar_t const *src)
 size_t wcslen(wchar_t const *str)
 {
   size_t i;
-  i = (unsigned int)0;
-  while (*(str + i) != 0) i += (size_t)1;
+  i = (size_t)0;
+  while (*(str + i) != 0) i ++;
   return i;
 }
 
@@ -8645,15 +8643,15 @@ size_t wcslen(wchar_t const *str)
 wchar_t *wcsncpy(wchar_t *dest, wchar_t const *src, size_t n)
 {
   size_t i;
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (i < n) {
     *(dest + i) = *(src + i);
     if (*(src + i) == 0) break;
-    i += (size_t)1;
+    i ++;
   }
   while (i < n) {
     *(dest + i) = 0;
-    i += (size_t)1;
+    i ++;
   }
   return dest;
 }
@@ -8679,10 +8677,10 @@ wchar_t *wcscat(wchar_t *dest, wchar_t const *src)
 {
   size_t i;
   size_t n = wcslen((wchar_t const *)dest);
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (*(src + i) != 0) {
     *(dest + (n + i)) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + (n + i)) = 0;
   return dest;
@@ -8709,14 +8707,14 @@ wchar_t *wcsncat(wchar_t *dest, wchar_t const *src, size_t n)
 {
   size_t i;
   size_t dest_len = wcslen((wchar_t const *)dest);
-  i = (unsigned int)0;
+  i = (size_t)0;
   while (1) {
     if (i < n) {
       if (! (*(src + i) != 0)) break;
     }
     else break;
     *(dest + (dest_len + i)) = *(src + i);
-    i += (size_t)1;
+    i ++;
   }
   *(dest + (dest_len + i)) = 0;
   return dest;
diff --git a/tests/libc/oracle/glob_c.res.oracle b/tests/libc/oracle/glob_c.res.oracle
index 6cebcdd93d5..7b0f8fbed93 100644
--- a/tests/libc/oracle/glob_c.res.oracle
+++ b/tests/libc/oracle/glob_c.res.oracle
@@ -21,14 +21,12 @@
 [eva:alarm] FRAMAC_SHARE/libc/glob.c:74: Warning: 
   out of bounds write.
   assert
-  \valid(pglob->gl_pathv +
-         (unsigned int)((unsigned int)(reserve_offs + prev_len) + i_1));
+  \valid(pglob->gl_pathv + (size_t)((size_t)(reserve_offs + prev_len) + i_1));
 [eva:alarm] FRAMAC_SHARE/libc/glob.c:76: Warning: 
   out of bounds write.
   assert
   \valid(pglob->gl_pathv +
-         (unsigned int)((unsigned int)(prev_len + reserve_offs) +
-                        pglob->gl_pathc));
+         (size_t)((size_t)(prev_len + reserve_offs) + pglob->gl_pathc));
 [eva] computing for function Frama_C_nondet <- glob <- main.
   Called from FRAMAC_SHARE/libc/glob.c:77.
 [eva] using specification for function Frama_C_nondet
diff --git a/tests/libc/oracle/stdio_c.res.oracle b/tests/libc/oracle/stdio_c.res.oracle
index e8a8e4a0300..87610795caa 100644
--- a/tests/libc/oracle/stdio_c.res.oracle
+++ b/tests/libc/oracle/stdio_c.res.oracle
@@ -261,7 +261,7 @@
   function Frama_C_make_unknown: precondition 'valid_p' got status unknown.
 [eva] Done for function Frama_C_make_unknown
 [eva:alarm] FRAMAC_SHARE/libc/stdio.c:131: Warning: 
-  out of bounds write. assert \valid(*strp + (unsigned int)(len - 1U));
+  out of bounds write. assert \valid(*strp + (size_t)(len - 1U));
 [eva] Recording results for asprintf
 [eva] Done for function asprintf
 [eva] computing for function printf_va_1 <- main.
diff --git a/tests/libc/oracle/stdlib_c.0.res.oracle b/tests/libc/oracle/stdlib_c.0.res.oracle
index af921e770cc..eb2edb9decf 100644
--- a/tests/libc/oracle/stdlib_c.0.res.oracle
+++ b/tests/libc/oracle/stdlib_c.0.res.oracle
@@ -38,7 +38,7 @@
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31) to fit 0..63
 [eva:alarm] stdlib_c.c:34: Warning: 
-  out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+  out of bounds write. assert \valid(s + (size_t)(i - 1));
 [eva] stdlib_c.c:32: starting to merge loop iterations
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
diff --git a/tests/libc/oracle/stdlib_c.1.res.oracle b/tests/libc/oracle/stdlib_c.1.res.oracle
index 0e783c36cec..96a5d173a35 100644
--- a/tests/libc/oracle/stdlib_c.1.res.oracle
+++ b/tests/libc/oracle/stdlib_c.1.res.oracle
@@ -33,7 +33,7 @@
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..63
 [eva:alarm] stdlib_c.c:34: Warning: 
-  out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+  out of bounds write. assert \valid(s + (size_t)(i - 1));
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..95
diff --git a/tests/libc/oracle/stdlib_c.2.res.oracle b/tests/libc/oracle/stdlib_c.2.res.oracle
index df04a967191..ff5db5635ef 100644
--- a/tests/libc/oracle/stdlib_c.2.res.oracle
+++ b/tests/libc/oracle/stdlib_c.2.res.oracle
@@ -61,7 +61,7 @@
 [eva] Recording results for calloc
 [eva] Done for function calloc
 [eva:alarm] stdlib_c.c:34: Warning: 
-  out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+  out of bounds write. assert \valid(s + (size_t)(i - 1));
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:33.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
diff --git a/tests/libc/oracle/unistd_h.0.res.oracle b/tests/libc/oracle/unistd_h.0.res.oracle
index 5536fefad65..2c6070858f6 100644
--- a/tests/libc/oracle/unistd_h.0.res.oracle
+++ b/tests/libc/oracle/unistd_h.0.res.oracle
@@ -9,6 +9,7 @@
   \return(gethostname) == 0 (auto)
   \return(getpgrp) == 0 (auto)
   \return(isatty) == 0 (auto)
+  \return(lseek) == -1 (auto)
   \return(pipe) == 0 (auto)
   \return(setegid) == 0 (auto)
   \return(seteuid) == 0 (auto)
diff --git a/tests/libc/oracle/unistd_h.1.res.oracle b/tests/libc/oracle/unistd_h.1.res.oracle
index 6f144d2ae3b..31219df8042 100644
--- a/tests/libc/oracle/unistd_h.1.res.oracle
+++ b/tests/libc/oracle/unistd_h.1.res.oracle
@@ -9,6 +9,7 @@
   \return(gethostname) == 0 (auto)
   \return(getpgrp) == 0 (auto)
   \return(isatty) == 0 (auto)
+  \return(lseek) == -1 (auto)
   \return(pipe) == 0 (auto)
   \return(setegid) == 0 (auto)
   \return(seteuid) == 0 (auto)
diff --git a/tests/rte/oracle/addsub_typedef.res.oracle b/tests/rte/oracle/addsub_typedef.res.oracle
index 3c40e7028eb..84af60c46ab 100644
--- a/tests/rte/oracle/addsub_typedef.res.oracle
+++ b/tests/rte/oracle/addsub_typedef.res.oracle
@@ -12,7 +12,7 @@
 [rte] addsub_typedef.c:13: Warning: 
   guaranteed RTE:
   assert
-  signed_overflow: -2147483648 ≤ (int)(-((int)((int)(-0x7fffffff) - 1))) - 1;
+  signed_overflow: -2147483648 ≤ (tint)(-((int)((int)(-0x7fffffff) - 1))) - 1;
 /* Generated by Frama-C */
 typedef int tint;
 int main(void)
@@ -30,7 +30,7 @@ int main(void)
   /*@ assert rte: signed_overflow: -2147483647 ≤ (int)(-0x7fffffff) - 1; */
   /*@ assert
       rte: signed_overflow:
-        -2147483648 ≤ (int)(-((int)((int)(-0x7fffffff) - 1))) - 1;
+        -2147483648 ≤ (tint)(-((int)((int)(-0x7fffffff) - 1))) - 1;
   */
   z = - (-0x7fffffff - 1) - 1;
   z = 0x7fffffff + 0;
@@ -38,7 +38,8 @@ int main(void)
   /*@ assert rte: signed_overflow: -2147483648 ≤ x + y; */
   /*@ assert rte: signed_overflow: x + y ≤ 2147483647; */
   z = x + y;
-  /*@ assert rte: signed_overflow: -2147483648 ≤ (int)(-0x7ffffffc) - y; */
+  /*@ assert rte: signed_overflow: -2147483648 ≤ (tint)(-0x7ffffffc) - y;
+  */
   z = -0x7ffffffc - y;
   /*@ assert rte: signed_overflow: -2147483647 ≤ x; */
   /*@ assert rte: signed_overflow: -2147483648 ≤ (tint)(-x) - 0x7ffffffc;
diff --git a/tests/rte/oracle/divmod_typedef.res.oracle b/tests/rte/oracle/divmod_typedef.res.oracle
index e87059926ae..9bf2d9db039 100644
--- a/tests/rte/oracle/divmod_typedef.res.oracle
+++ b/tests/rte/oracle/divmod_typedef.res.oracle
@@ -31,9 +31,9 @@ int main(void)
   tint x = 0;
   tint y = 0;
   tint z = 0;
-  tuint ux = (unsigned int)0;
-  tuint uy = (unsigned int)0;
-  tuint uz = (unsigned int)0;
+  tuint ux = (tuint)0;
+  tuint uy = (tuint)0;
+  tuint uz = (tuint)0;
   /*@ assert
       rte: signed_overflow:
         (int)((int)(-2147483647) - 1) / (int)(-1) ≤ 2147483647;
@@ -41,16 +41,16 @@ int main(void)
   z = (-2147483647 - 1) / -1;
   z = (-2147483647 - 1) % -1;
   /*@ assert rte: division_by_zero: 0 ≢ 0; */
-  uz = (unsigned int)(1 / 0);
+  uz = (tuint)(1 / 0);
   /*@ assert rte: division_by_zero: (unsigned int)(0xffffffff + 1) ≢ 0; */
   uz = (unsigned int)1 / (0xffffffff + (unsigned int)1);
   ux = 0x80000000;
   uy = 0xffffffff;
   /*@ assert rte: signed_downcast: ux ≤ 2147483647; */
   /*@ assert rte: signed_downcast: uy ≤ 2147483647; */
-  /*@ assert rte: division_by_zero: (int)uy ≢ 0; */
-  /*@ assert rte: signed_overflow: (int)ux / (int)uy ≤ 2147483647; */
-  uz = (unsigned int)((int)ux / (int)uy);
+  /*@ assert rte: division_by_zero: (tint)uy ≢ 0; */
+  /*@ assert rte: signed_overflow: (tint)ux / (tint)uy ≤ 2147483647; */
+  uz = (tuint)((tint)ux / (tint)uy);
   /*@ assert rte: division_by_zero: uy ≢ 0; */
   uz = ux / uy;
   /*@ assert rte: division_by_zero: (unsigned int)(0xffffffff + 1) ≢ 0; */
@@ -59,10 +59,10 @@ int main(void)
       rte: signed_overflow:
         (int)((int)(-0x7fffffff) - 1) / (int)(-1) ≤ 2147483647;
   */
-  uz = (unsigned int)((-0x7fffffff - 1) / -1);
+  uz = (tuint)((-0x7fffffff - 1) / -1);
   uz = (unsigned int)(-0x7fffffff - 1) / 0xffffffff;
   uz = 0x80000000 / (unsigned int)(-1);
-  uz = (unsigned int)((int)(0x80000000 / 0xffffffff));
+  uz = (tuint)((tint)(0x80000000 / 0xffffffff));
   /*@ assert rte: signed_overflow: -2147483648 ≤ x + y; */
   /*@ assert rte: signed_overflow: x + y ≤ 2147483647; */
   /*@ assert rte: division_by_zero: (tint)(x + y) ≢ 0; */
@@ -76,9 +76,9 @@ int main(void)
         (long long)((long long)(-2147483648L) / (long long)((long)(-1L))) ≤
         2147483647;
   */
-  z = (int)(-2147483648L / (long long)(-1L));
-  z = (int)(0x80000000 / (unsigned int)(-1));
-  z = (int)(0x80000000 / 0xffffffff);
+  z = (tint)(-2147483648L / (long long)(-1L));
+  z = (tint)(0x80000000 / (unsigned int)(-1));
+  z = (tint)(0x80000000 / 0xffffffff);
   __retres = 0;
   return __retres;
 }
diff --git a/tests/sparecode/oracle/glob_decls.0.res.oracle b/tests/sparecode/oracle/glob_decls.0.res.oracle
index 9971a7bf8f2..3bb7b213279 100644
--- a/tests/sparecode/oracle/glob_decls.0.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.0.res.oracle
@@ -63,7 +63,7 @@ typedef int Int;
 typedef Int Tx;
 Ts2 S2;
 char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
 int main(int x)
 {
   int __retres;
diff --git a/tests/sparecode/oracle/glob_decls.1.res.oracle b/tests/sparecode/oracle/glob_decls.1.res.oracle
index e260eefd069..40cd8e42ce5 100644
--- a/tests/sparecode/oracle/glob_decls.1.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.1.res.oracle
@@ -59,7 +59,7 @@ typedef int Int;
 typedef Int Tx;
 Ts2 S2;
 char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
 /*@ requires S2.a > S2.b; */
 int main(int x)
 {
diff --git a/tests/sparecode/oracle/glob_decls.2.res.oracle b/tests/sparecode/oracle/glob_decls.2.res.oracle
index 6ceff3b59b3..d5e83032365 100644
--- a/tests/sparecode/oracle/glob_decls.2.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.2.res.oracle
@@ -29,7 +29,7 @@ int f(void)
 }
 
 char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
 int Y;
 int use_in_PX_init;
 int *PX;
diff --git a/tests/spec/oracle/acsl_basic_allocator.res.oracle b/tests/spec/oracle/acsl_basic_allocator.res.oracle
index 6d2b0811ba6..210a19385d1 100644
--- a/tests/spec/oracle/acsl_basic_allocator.res.oracle
+++ b/tests/spec/oracle/acsl_basic_allocator.res.oracle
@@ -73,7 +73,7 @@ memory_block *memory_alloc(memory_pool *arena, size_t s)
       }
     mbl = mbl->next;
   }
-  if ((size_t)1000 < s) mb_size = s; else mb_size = (unsigned int)1000;
+  if ((size_t)1000 < s) mb_size = s; else mb_size = (size_t)1000;
   mb_data = (char *)malloc(mb_size);
   mb = (memory_block *)malloc(sizeof(memory_block));
   mb->size = mb_size;
diff --git a/tests/spec/oracle/array_typedef.res.oracle b/tests/spec/oracle/array_typedef.res.oracle
index dc4596be3be..0c93761a3ac 100644
--- a/tests/spec/oracle/array_typedef.res.oracle
+++ b/tests/spec/oracle/array_typedef.res.oracle
@@ -74,7 +74,7 @@ void send_addr(int const addr[4]);
 
 void send_msg(msg const *msg)
 {
-  send_addr(msg->src);
+  send_addr((int const *)(msg->src));
   return;
 }
 
diff --git a/tests/spec/oracle/conversion.res.oracle b/tests/spec/oracle/conversion.res.oracle
index b79d46ad10e..6c6fda7c533 100644
--- a/tests/spec/oracle/conversion.res.oracle
+++ b/tests/spec/oracle/conversion.res.oracle
@@ -34,7 +34,7 @@ int g(void)
 T const X;
 T const Tab[4];
 T_PTR_T4 const Tab_Ptr =
-  {(int *)(& X), (int *)(& X), (int *)(& X), (int *)(& X)};
+  {(T_PTR)(& X), (T_PTR)(& X), (T_PTR)(& X), (T_PTR)(& X)};
 /*@
 axiomatic useless_logic_cast {
   logic ℤ v2= 1 + 1;
diff --git a/tests/syntax/oracle/array_cast_bts1099.res.oracle b/tests/syntax/oracle/array_cast_bts1099.res.oracle
index 3219449ef21..256825a2395 100644
--- a/tests/syntax/oracle/array_cast_bts1099.res.oracle
+++ b/tests/syntax/oracle/array_cast_bts1099.res.oracle
@@ -1,6 +1,6 @@
 [kernel] Parsing array_cast_bts1099.i (no preprocessing)
 [kernel] array_cast_bts1099.i:12: User Error: 
-  Cast over a non-scalar type int [10]
+  Cast over a non-scalar type t
   10      int tab1[4];
   11      u* p = &tab1;
   12      t* p2 = (t) p;
diff --git a/tests/syntax/oracle/assembly_gmp.0.res.oracle b/tests/syntax/oracle/assembly_gmp.0.res.oracle
index 5c32c280c28..1797d1ec6f5 100644
--- a/tests/syntax/oracle/assembly_gmp.0.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.0.res.oracle
@@ -38,12 +38,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     B2modb = *(bmodb + 3);
     B2mb = B2modb - b;
     {
-      UDItype __m0 = (unsigned long)r1;
-      UDItype __m1 = (unsigned long)B2modb;
+      UDItype __m0 = (UDItype)r1;
+      UDItype __m1 = (UDItype)B2modb;
       /*@ assigns p1;
           assigns p1 \from r1, B2modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-      p0 = (long)(__m0 * __m1);
+      p0 = (mp_limb_t)(__m0 * __m1);
     }
     tmp = USItype(r0);
     tmp_0 = USItype(p1);
@@ -70,12 +70,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
         int tmp_5;
         int tmp_6;
         {
-          UDItype __m0_0 = (unsigned long)r1;
-          UDItype __m1_0 = (unsigned long)B2modb;
+          UDItype __m0_0 = (UDItype)r1;
+          UDItype __m1_0 = (UDItype)B2modb;
           /*@ assigns p1;
               assigns p1 \from r1, B2modb; */
           __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-          p0 = (long)(__m0_0 * __m1_0);
+          p0 = (mp_limb_t)(__m0_0 * __m1_0);
         }
         ADDC_LIMB(cy,r0,r0,r2 & B2modb);
         r0 -= - cy & b;
@@ -96,7 +96,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
           : "1" (tmp_3), "g" (tmp_4), "%2" (tmp_5), "g" (tmp_6)
           );
       }
-      j -= (mp_size_t)1;
+      j --;
     }
     r1 -= r2 & b;
   }
@@ -105,12 +105,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     mp_limb_t t;
     mp_limb_t B1modb = *(bmodb + 2);
     {
-      UDItype __m0_1 = (unsigned long)r1;
-      UDItype __m1_1 = (unsigned long)B1modb;
+      UDItype __m0_1 = (UDItype)r1;
+      UDItype __m1_1 = (UDItype)B1modb;
       /*@ assigns r1;
           assigns r1 \from r1, B1modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
-      t = (long)(__m0_1 * __m1_1);
+      t = (mp_limb_t)(__m0_1 * __m1_1);
     }
     r0 += t;
     r1 += (mp_limb_t)(r0 < t);
@@ -118,7 +118,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     r0 <<= cnt;
   }
   else {
-    mp_limb_t mask = - ((long)(r1 >= b));
+    mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
     r1 -= mask & b;
   }
   bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/assembly_gmp.1.res.oracle b/tests/syntax/oracle/assembly_gmp.1.res.oracle
index 0ec2933aaa1..a7c070cdd18 100644
--- a/tests/syntax/oracle/assembly_gmp.1.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.1.res.oracle
@@ -30,38 +30,37 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     B2modb = *(bmodb + 3);
     B2mb = B2modb - b;
     {
-      UDItype __m0 = (unsigned long)r1;
-      UDItype __m1 = (unsigned long)B2modb;
+      UDItype __m0 = (UDItype)r1;
+      UDItype __m1 = (UDItype)B2modb;
       /*@ assigns p1;
           assigns p1 \from r1, B2modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-      p0 = (long)(__m0 * __m1);
+      p0 = (mp_limb_t)(__m0 * __m1);
     }
     /*@ assigns r2, r1, r0;
-        assigns r2 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
-        assigns r1 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
-        assigns r0 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
+        assigns r2 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+        assigns r1 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+        assigns r0 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
     */
     __asm__ (
       "add\t%6, %q2\n\t"
       "adc\t%4, %q1\n\t"
       "sbb\t%q0, %q0"
       : "=r" (r2), "=r" (r1), "=&r" (r0)
-      : "1" ((unsigned long)r0), "rme" ((unsigned long)p1),
-        "%2" ((unsigned long)*(ap + (n - (mp_size_t)3))),
-        "rme" ((unsigned long)p0)
+      : "1" ((UDItype)r0), "rme" ((UDItype)p1),
+        "%2" ((UDItype)*(ap + (n - (mp_size_t)3))), "rme" ((UDItype)p0)
       );
     j = n - (mp_size_t)4;
     while (j >= (mp_size_t)0) {
       {
         mp_limb_t cy;
         {
-          UDItype __m0_0 = (unsigned long)r1;
-          UDItype __m1_0 = (unsigned long)B2modb;
+          UDItype __m0_0 = (UDItype)r1;
+          UDItype __m1_0 = (UDItype)B2modb;
           /*@ assigns p1;
               assigns p1 \from r1, B2modb; */
           __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-          p0 = (long)(__m0_0 * __m1_0);
+          p0 = (mp_limb_t)(__m0_0 * __m1_0);
         }
         ADDC_LIMB(cy,r0,r0,r2 & B2modb);
         r0 -= - cy & b;
@@ -75,11 +74,11 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
           "adc\t%4, %q1\n\t"
           "sbb\t%q0, %q0"
           : "=r" (r2), "=r" (r1), "=&r" (r0)
-          : "1" ((unsigned long)r0), "rme" ((unsigned long)p1),
-            "%2" ((unsigned long)*(ap + j)), "rme" ((unsigned long)p0)
+          : "1" ((UDItype)r0), "rme" ((UDItype)p1),
+            "%2" ((UDItype)*(ap + j)), "rme" ((UDItype)p0)
           );
       }
-      j -= (mp_size_t)1;
+      j --;
     }
     r1 -= r2 & b;
   }
@@ -88,12 +87,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     mp_limb_t t;
     mp_limb_t B1modb = *(bmodb + 2);
     {
-      UDItype __m0_1 = (unsigned long)r1;
-      UDItype __m1_1 = (unsigned long)B1modb;
+      UDItype __m0_1 = (UDItype)r1;
+      UDItype __m1_1 = (UDItype)B1modb;
       /*@ assigns r1;
           assigns r1 \from r1, B1modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
-      t = (long)(__m0_1 * __m1_1);
+      t = (mp_limb_t)(__m0_1 * __m1_1);
     }
     r0 += t;
     r1 += (mp_limb_t)(r0 < t);
@@ -101,7 +100,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     r0 <<= cnt;
   }
   else {
-    mp_limb_t mask = - ((long)(r1 >= b));
+    mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
     r1 -= mask & b;
   }
   bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/assembly_gmp.2.res.oracle b/tests/syntax/oracle/assembly_gmp.2.res.oracle
index 3b3b101646a..cec6659a998 100644
--- a/tests/syntax/oracle/assembly_gmp.2.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.2.res.oracle
@@ -30,17 +30,17 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     B2modb = *(bmodb + 3);
     B2mb = B2modb - b;
     {
-      UDItype __m0 = (unsigned long)r1;
-      UDItype __m1 = (unsigned long)B2modb;
+      UDItype __m0 = (UDItype)r1;
+      UDItype __m1 = (UDItype)B2modb;
       /*@ assigns p1;
           assigns p1 \from r1, B2modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-      p0 = (long)(__m0 * __m1);
+      p0 = (mp_limb_t)(__m0 * __m1);
     }
     /*@ assigns r2, r1, r0;
-        assigns r2 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
-        assigns r1 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
-        assigns r0 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
+        assigns r2 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+        assigns r1 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+        assigns r0 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
     */
     __asm__ (
       "add%I6c\t%2, %5, %6\n\t"
@@ -55,12 +55,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
       {
         mp_limb_t cy;
         {
-          UDItype __m0_0 = (unsigned long)r1;
-          UDItype __m1_0 = (unsigned long)B2modb;
+          UDItype __m0_0 = (UDItype)r1;
+          UDItype __m1_0 = (UDItype)B2modb;
           /*@ assigns p1;
               assigns p1 \from r1, B2modb; */
           __asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
-          p0 = (long)(__m0_0 * __m1_0);
+          p0 = (mp_limb_t)(__m0_0 * __m1_0);
         }
         ADDC_LIMB(cy,r0,r0,r2 & B2modb);
         r0 -= - cy & b;
@@ -78,7 +78,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
           : "r" (r0), "r" (p1), "%r" (*(ap + j)), "rI" (p0)
           );
       }
-      j -= (mp_size_t)1;
+      j --;
     }
     r1 -= r2 & b;
   }
@@ -87,12 +87,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     mp_limb_t t;
     mp_limb_t B1modb = *(bmodb + 2);
     {
-      UDItype __m0_1 = (unsigned long)r1;
-      UDItype __m1_1 = (unsigned long)B1modb;
+      UDItype __m0_1 = (UDItype)r1;
+      UDItype __m1_1 = (UDItype)B1modb;
       /*@ assigns r1;
           assigns r1 \from r1, B1modb; */
       __asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
-      t = (long)(__m0_1 * __m1_1);
+      t = (mp_limb_t)(__m0_1 * __m1_1);
     }
     r0 += t;
     r1 += (mp_limb_t)(r0 < t);
@@ -100,7 +100,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
     r0 <<= cnt;
   }
   else {
-    mp_limb_t mask = - ((long)(r1 >= b));
+    mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
     r1 -= mask & b;
   }
   bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle b/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
index 8b1788aed0b..d47e7ccfd11 100644
--- a/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
+++ b/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
@@ -29,7 +29,7 @@ aint g(int __attribute__((__a2__)) i3);
 aint g(int __attribute__((__a2__)) i3)
 {
   aint __retres;
-  __retres = (int __attribute__((__a1__)))i3;
+  __retres = (aint)i3;
   return __retres;
 }
 
@@ -38,7 +38,7 @@ iptr h(iptr volatile ip2);
 iptr h(iptr volatile ip2)
 {
   iptr __retres;
-  __retres = (int __attribute__((__p1__)) *)0;
+  __retres = (iptr)0;
   return __retres;
 }
 
diff --git a/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle b/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
index e4786af29d7..f3676f59c8f 100644
--- a/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
+++ b/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
@@ -15,7 +15,7 @@ int main(void)
      (char)'\000'};
   char const d[5] =
     {(char)'t', (char)'o', (char)'t', (char)'o', (char)'\000'};
-  char const e = (char)7815260946135808373ULL;
+  char const e = (char)117;
   /*@ assert p("to/*to") ∧ p("toto"); */ ;
   /*@ assert (char)7815260946135808373 ≡ 'u'; */ ;
   __retres = (int)c[sizeof(c) - (unsigned int)1];
diff --git a/tests/syntax/oracle/enum_repr.0.res.oracle b/tests/syntax/oracle/enum_repr.0.res.oracle
index c38989f2000..9d288accee5 100644
--- a/tests/syntax/oracle/enum_repr.0.res.oracle
+++ b/tests/syntax/oracle/enum_repr.0.res.oracle
@@ -1,26 +1,15 @@
 [kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:40: 
-  Inserted implicit cast from unsigned int to enum __anonenum_bu2_4
-[kernel] enum_repr.i:41: 
-  Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43: 
-  Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:44: 
-  Inserted implicit cast from long long to enum __anonenum_bs3_8
-[kernel] enum_repr.i:45: 
-  Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:46: 
-  Inserted implicit cast from unsigned char to enum __anonenum_bc2_10
-[kernel] enum_repr.i:47: 
-  Inserted implicit cast from signed char to enum __anonenum_bd1_11
-[kernel] enum_repr.i:48: 
-  Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
-[kernel] enum_repr.i:66: 
-  Inserted implicit cast from enum __anonenum_foo_1 to unsigned int
-[kernel] enum_repr.i:67: 
-  Inserted implicit cast from unsigned int to enum __anonenum_foo_1
-[kernel] enum_repr.i:68: 
-  Inserted implicit cast from unsigned int to enum __anonenum_foo_1
+[kernel] enum_repr.i:40: Inserted implicit cast from unsigned int to bu2
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:44: Inserted implicit cast from long long to bs3
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:46: Inserted implicit cast from unsigned char to bc2
+[kernel] enum_repr.i:47: Inserted implicit cast from signed char to bd1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
+[kernel] enum_repr.i:66: Inserted implicit cast from foo to bla
+[kernel] enum_repr.i:67: Inserted implicit cast from bla to foo
+[kernel] enum_repr.i:68: Inserted implicit cast from unsigned int to foo
 [kernel] Enum __anonenum_foo_1 is represented by int
 [kernel] Enum __anonenum_bar_2 is represented by int
 [kernel] Enum __anonenum_bu1_3 is represented by int
@@ -95,14 +84,14 @@ int main(void)
   bar y = B;
   bu1 u1 = Bu1;
   bu2 u2 = Bu2;
-  bu3 u3 = (enum __anonenum_bu3_5)Bu3;
+  bu3 u3 = (bu3)Bu3;
   bs1 s1 = Bs1;
   bs2 s2 = Bs2;
-  bs3 s3 = (enum __anonenum_bs3_8)Bs3;
-  bc1 c1 = (enum __anonenum_bc1_9)Bc1;
-  bc2 c2 = (enum __anonenum_bc2_10)Bc2;
-  bd1 d1 = (enum __anonenum_bd1_11)Bd1;
-  bd2 d2 = (enum __anonenum_bd2_12)Bd2;
+  bs3 s3 = (bs3)Bs3;
+  bc1 c1 = (bc1)Bc1;
+  bc2 c2 = (bc2)Bc2;
+  bd1 d1 = (bd1)Bd1;
+  bd2 d2 = (bd2)Bd2;
   if (x == A) 
     if (y == B) {
       __retres = 0;
@@ -132,14 +121,14 @@ int g(void)
   int tmp_3;
   int tmp_4;
   foo x = A;
-  int res = f1((unsigned int)x);
+  int res = f1((bla)x);
   tmp_0 = f2((unsigned int)x);
   res += tmp_0;
-  tmp_1 = f3((unsigned int)x);
+  tmp_1 = f3((bla)x);
   res += tmp_1;
-  tmp_2 = h1((enum __anonenum_foo_1)((unsigned int)x));
+  tmp_2 = h1((foo)((bla)x));
   res += tmp_2;
-  tmp_3 = h2((enum __anonenum_foo_1)((unsigned int)x));
+  tmp_3 = h2((foo)((unsigned int)x));
   res += tmp_3;
   tmp_4 = h3(x);
   res += tmp_4;
diff --git a/tests/syntax/oracle/enum_repr.1.res.oracle b/tests/syntax/oracle/enum_repr.1.res.oracle
index 1251ed7ec1b..aa3f97bfcad 100644
--- a/tests/syntax/oracle/enum_repr.1.res.oracle
+++ b/tests/syntax/oracle/enum_repr.1.res.oracle
@@ -1,28 +1,17 @@
 [kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:37: 
-  Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:38: 
-  Inserted implicit cast from int to enum __anonenum_bar_2
-[kernel] enum_repr.i:39: 
-  Inserted implicit cast from int to enum __anonenum_bu1_3
-[kernel] enum_repr.i:41: 
-  Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43: 
-  Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:45: 
-  Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:48: 
-  Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
+[kernel] enum_repr.i:37: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:38: Inserted implicit cast from int to bar
+[kernel] enum_repr.i:39: Inserted implicit cast from int to bu1
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
 [kernel] enum_repr.i:49: Inserted implicit cast from foo to int
 [kernel] enum_repr.i:49: Inserted implicit cast from bar to int
-[kernel] enum_repr.i:63: 
-  Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:66: 
-  Inserted implicit cast from enum __anonenum_foo_1 to unsigned int
-[kernel] enum_repr.i:67: 
-  Inserted implicit cast from unsigned int to enum __anonenum_foo_1
-[kernel] enum_repr.i:68: 
-  Inserted implicit cast from unsigned int to enum __anonenum_foo_1
+[kernel] enum_repr.i:63: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:66: Inserted implicit cast from foo to bla
+[kernel] enum_repr.i:67: Inserted implicit cast from bla to foo
+[kernel] enum_repr.i:68: Inserted implicit cast from unsigned int to foo
 [kernel] Enum __anonenum_foo_1 is represented by unsigned char
 [kernel] Enum __anonenum_bar_2 is represented by unsigned char
 [kernel] Enum __anonenum_bu1_3 is represented by unsigned int
@@ -93,13 +82,13 @@ typedef unsigned int bla;
 int main(void)
 {
   int __retres;
-  foo x = (enum __anonenum_foo_1)A;
-  bar y = (enum __anonenum_bar_2)B;
+  foo x = (foo)A;
+  bar y = (bar)B;
   bu1 u1 = Bu1;
   bu2 u2 = Bu2;
   bu3 u3 = Bu3;
   bs1 s1 = Bs1;
-  bs2 s2 = (enum __anonenum_bs2_7)Bs2;
+  bs2 s2 = (bs2)Bs2;
   bs3 s3 = Bs3;
   bc1 c1 = Bc1;
   bc2 c2 = Bc2;
@@ -133,15 +122,15 @@ int g(void)
   int tmp_2;
   int tmp_3;
   int tmp_4;
-  foo x = (enum __anonenum_foo_1)A;
-  int res = f1((unsigned int)x);
+  foo x = (foo)A;
+  int res = f1((bla)x);
   tmp_0 = f2((unsigned int)x);
   res += tmp_0;
-  tmp_1 = f3((unsigned int)x);
+  tmp_1 = f3((bla)x);
   res += tmp_1;
-  tmp_2 = h1((enum __anonenum_foo_1)((unsigned int)x));
+  tmp_2 = h1((foo)((bla)x));
   res += tmp_2;
-  tmp_3 = h2((enum __anonenum_foo_1)((unsigned int)x));
+  tmp_3 = h2((foo)((unsigned int)x));
   res += tmp_3;
   tmp_4 = h3(x);
   res += tmp_4;
diff --git a/tests/syntax/oracle/enum_repr.2.res.oracle b/tests/syntax/oracle/enum_repr.2.res.oracle
index 49446d4c181..232112a2f95 100644
--- a/tests/syntax/oracle/enum_repr.2.res.oracle
+++ b/tests/syntax/oracle/enum_repr.2.res.oracle
@@ -1,26 +1,16 @@
 [kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:37: 
-  Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:38: 
-  Inserted implicit cast from int to enum __anonenum_bar_2
-[kernel] enum_repr.i:39: 
-  Inserted implicit cast from int to enum __anonenum_bu1_3
-[kernel] enum_repr.i:41: 
-  Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43: 
-  Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:45: 
-  Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:46: 
-  Inserted implicit cast from unsigned char to enum __anonenum_bc2_10
-[kernel] enum_repr.i:47: 
-  Inserted implicit cast from signed char to enum __anonenum_bd1_11
-[kernel] enum_repr.i:48: 
-  Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
+[kernel] enum_repr.i:37: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:38: Inserted implicit cast from int to bar
+[kernel] enum_repr.i:39: Inserted implicit cast from int to bu1
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:46: Inserted implicit cast from unsigned char to bc2
+[kernel] enum_repr.i:47: Inserted implicit cast from signed char to bd1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
 [kernel] enum_repr.i:49: Inserted implicit cast from int to unsigned int
 [kernel] enum_repr.i:49: Inserted implicit cast from bar to int
-[kernel] enum_repr.i:63: 
-  Inserted implicit cast from int to enum __anonenum_foo_1
+[kernel] enum_repr.i:63: Inserted implicit cast from int to foo
 [kernel] Enum __anonenum_foo_1 is represented by unsigned int
 [kernel] Enum __anonenum_bar_2 is represented by unsigned char
 [kernel] Enum __anonenum_bu1_3 is represented by unsigned int
@@ -92,17 +82,17 @@ int main(void)
 {
   int __retres;
   foo x = A;
-  bar y = (enum __anonenum_bar_2)B;
+  bar y = (bar)B;
   bu1 u1 = Bu1;
   bu2 u2 = Bu2;
   bu3 u3 = Bu3;
   bs1 s1 = Bs1;
-  bs2 s2 = (enum __anonenum_bs2_7)Bs2;
+  bs2 s2 = (bs2)Bs2;
   bs3 s3 = Bs3;
-  bc1 c1 = (enum __anonenum_bc1_9)Bc1;
-  bc2 c2 = (enum __anonenum_bc2_10)Bc2;
-  bd1 d1 = (enum __anonenum_bd1_11)Bd1;
-  bd2 d2 = (enum __anonenum_bd2_12)Bd2;
+  bc1 c1 = (bc1)Bc1;
+  bc2 c2 = (bc2)Bc2;
+  bd1 d1 = (bd1)Bd1;
+  bd2 d2 = (bd2)Bd2;
   if (x == (unsigned int)A) 
     if ((int)y == B) {
       __retres = 0;
@@ -132,12 +122,12 @@ int g(void)
   int tmp_3;
   int tmp_4;
   foo x = A;
-  int res = f1((unsigned int)x);
+  int res = f1((bla)x);
   tmp_0 = f2((unsigned int)x);
   res += tmp_0;
   tmp_1 = f3(x);
   res += tmp_1;
-  tmp_2 = h1((unsigned int)x);
+  tmp_2 = h1((bla)x);
   res += tmp_2;
   tmp_3 = h2((unsigned int)x);
   res += tmp_3;
diff --git a/tests/syntax/oracle/gcc_builtins.res.oracle b/tests/syntax/oracle/gcc_builtins.res.oracle
index 3288584e07b..8ebd3d736a0 100644
--- a/tests/syntax/oracle/gcc_builtins.res.oracle
+++ b/tests/syntax/oracle/gcc_builtins.res.oracle
@@ -221,9 +221,9 @@ void main(void)
   int tmp;
   {
     int16_t result;
-    int16_t content = (short)100;
+    int16_t content = (int16_t)100;
     int16_t volatile *ptr = (int16_t volatile *)(& content);
-    int16_t value = (short)33;
+    int16_t value = (int16_t)33;
     {
       void *__va_args[1] = {(void *)0};
       result = __sync_fetch_and_add_int16_t(ptr,value,
@@ -281,9 +281,9 @@ void main(void)
   }
   {
     int64_t result_1;
-    int64_t content_1 = (long long)100;
+    int64_t content_1 = (int64_t)100;
     int64_t volatile *ptr_1 = (int64_t volatile *)(& content_1);
-    int64_t value_1 = (long long)33;
+    int64_t value_1 = (int64_t)33;
     {
       void *__va_args_49[1] = {(void *)0};
       result_1 = __sync_fetch_and_add_int64_t(ptr_1,value_1,
@@ -311,10 +311,10 @@ void main(void)
   }
   {
     int result_2;
-    uint16_t content_2 = (unsigned short)100;
+    uint16_t content_2 = (uint16_t)100;
     uint16_t volatile *ptr_2 = (uint16_t volatile *)(& content_2);
-    uint16_t oldval = (unsigned short)100;
-    uint16_t newval = (unsigned short)133;
+    uint16_t oldval = (uint16_t)100;
+    uint16_t newval = (uint16_t)133;
     {
       void *__va_args_57[1] = {(void *)0};
       result_2 = __sync_bool_compare_and_swap_uint16_t(ptr_2,oldval,newval,
@@ -324,10 +324,10 @@ void main(void)
   }
   {
     int result_3;
-    uint32_t content_3 = (unsigned int)100;
+    uint32_t content_3 = (uint32_t)100;
     uint32_t volatile *ptr_3 = (uint32_t volatile *)(& content_3);
-    uint32_t oldval_0 = (unsigned int)100;
-    uint32_t newval_0 = (unsigned int)133;
+    uint32_t oldval_0 = (uint32_t)100;
+    uint32_t newval_0 = (uint32_t)133;
     {
       void *__va_args_59[1] = {(void *)0};
       result_3 = __sync_bool_compare_and_swap_uint32_t(ptr_3,oldval_0,
@@ -338,10 +338,10 @@ void main(void)
   }
   {
     int result_4;
-    uint64_t content_4 = (unsigned long long)100;
+    uint64_t content_4 = (uint64_t)100;
     uint64_t volatile *ptr_4 = (uint64_t volatile *)(& content_4);
-    uint64_t oldval_1 = (unsigned long long)100;
-    uint64_t newval_1 = (unsigned long long)133;
+    uint64_t oldval_1 = (uint64_t)100;
+    uint64_t newval_1 = (uint64_t)133;
     {
       void *__va_args_61[1] = {(void *)0};
       result_4 = __sync_bool_compare_and_swap_uint64_t(ptr_4,oldval_1,
diff --git a/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle b/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
index 6b474ebcb72..04b6994f796 100644
--- a/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
+++ b/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
@@ -47,7 +47,7 @@ int main(void)
   n((int *(*)(int , fp1 **))0);
   o((char)0,(char)0);
   p(0);
-  q((int *)0);
+  q((iptr)0);
   r((int (*)(char ))0,(int (*)(char ))0);
   s((int *)0,(int *)0);
   __retres = 0;
diff --git a/tests/syntax/oracle/offset.res.oracle b/tests/syntax/oracle/offset.res.oracle
index 4aebbc69c8d..02951ec9257 100644
--- a/tests/syntax/oracle/offset.res.oracle
+++ b/tests/syntax/oracle/offset.res.oracle
@@ -1,6 +1,6 @@
 [kernel] Parsing offset.c (with preprocessing)
 /* Generated by Frama-C */
 #include "__fc_define_off_t.h"
-off_t x = (long)0;
-off64_t y = (long long)0;
+off_t x = (off_t)0;
+off64_t y = (off64_t)0;
 
diff --git a/tests/syntax/oracle/unroll_visit.res.oracle b/tests/syntax/oracle/unroll_visit.res.oracle
index 1fdd3426d7a..9c64eaa41d0 100644
--- a/tests/syntax/oracle/unroll_visit.res.oracle
+++ b/tests/syntax/oracle/unroll_visit.res.oracle
@@ -26,26 +26,26 @@
 typedef char i8;
 void main(void)
 {
-  i8 i = (char)0;
+  i8 i = (i8)0;
   if (! ((int)i < 100)) goto unrolling_2_loop;
-  i = (char)((int)i - 1);
+  i = (i8)((int)i - 1);
   /*@ assert i < 100; */ ;
-  i = (char)((int)i + 1);
-  i = (char)((int)i + 1);
+  i = (i8)((int)i + 1);
+  i = (i8)((int)i + 1);
   unrolling_4_loop: ;
   if (! ((int)i < 100)) goto unrolling_2_loop;
-  i = (char)((int)i - 1);
+  i = (i8)((int)i - 1);
   /*@ assert i < 100; */ ;
-  i = (char)((int)i + 1);
-  i = (char)((int)i + 1);
+  i = (i8)((int)i + 1);
+  i = (i8)((int)i + 1);
   unrolling_3_loop: ;
   /*@ loop pragma UNROLL 2;
       loop pragma UNROLL "done", 2; */
   while ((int)i < 100) {
-    i = (char)((int)i - 1);
+    i = (i8)((int)i - 1);
     /*@ assert i < 100; */ ;
-    i = (char)((int)i + 1);
-    i = (char)((int)i + 1);
+    i = (i8)((int)i + 1);
+    i = (i8)((int)i + 1);
   }
   unrolling_2_loop: ;
   return;
diff --git a/tests/syntax/oracle/vla_strlen.res.oracle b/tests/syntax/oracle/vla_strlen.res.oracle
index ef641c31261..204989bc5c4 100644
--- a/tests/syntax/oracle/vla_strlen.res.oracle
+++ b/tests/syntax/oracle/vla_strlen.res.oracle
@@ -18,8 +18,7 @@ void f(char *s)
   size_t tmp;
   tmp = strlen((char const *)s);
   /*@
-  assert
-  alloca_bounds: 0 < sizeof(char) * (unsigned int)(tmp + 1) ≤ 4294967295;
+  assert alloca_bounds: 0 < sizeof(char) * (size_t)(tmp + 1) ≤ 4294967295;
    */
   ;
   __lengthof_t = tmp + (size_t)1;
diff --git a/tests/value/oracle/backward_add_ptr.res.oracle b/tests/value/oracle/backward_add_ptr.res.oracle
index e7ad5824993..98ae39a1f63 100644
--- a/tests/value/oracle/backward_add_ptr.res.oracle
+++ b/tests/value/oracle/backward_add_ptr.res.oracle
@@ -7,16 +7,15 @@
 [eva] computing for function main1 <- main.
   Called from backward_add_ptr.c:185.
 [eva:alarm] backward_add_ptr.c:25: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0; 1}, {{ &a }}, {0}
 [eva:alarm] backward_add_ptr.c:32: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:33: 
   Frama_C_show_each_reduced_offset:
   {0; 1}, {{ NULL + {0; 1; 2; 3} ; &a }}, {{ NULL + {0; 1; 2; 3} ; &b }}
 [eva:alarm] backward_add_ptr.c:38: Warning: 
-  out of bounds read.
-  assert \valid_read(p + (unsigned int)((unsigned int)q / 4));
+  out of bounds read. assert \valid_read(p + (uintptr_t)((uintptr_t)q / 4));
 [eva] backward_add_ptr.c:39: 
   Frama_C_show_each_no_reduction:
   {0; 1}, {{ NULL + [0..4294967295] ; &a }}, {{ NULL + [0..4294967295] ; &b }}
@@ -25,11 +24,11 @@
 [eva] computing for function main2 <- main.
   Called from backward_add_ptr.c:186.
 [eva:alarm] backward_add_ptr.c:54: Warning: 
-  out of bounds read. assert \valid_read((int *)((char *)p + (unsigned int)q));
+  out of bounds read. assert \valid_read((int *)((char *)p + (uintptr_t)q));
 [eva] backward_add_ptr.c:55: Frama_C_show_each_int_if: {{ &a }}, {0}
 [eva] backward_add_ptr.c:57: Frama_C_show_each_int_else: {0}, {{ &b }}
 [eva:alarm] backward_add_ptr.c:60: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:61: 
   Frama_C_show_each_char_if:
   {{ NULL + {1; 2; 3} ; &a }}, {{ NULL + {0; 1; 2; 3} ; &b }}
@@ -52,12 +51,12 @@
   Assigning imprecise value to p.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:81: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:82: 
   Frama_C_show_each_GM_only_a:
   {{ &a + [-17179869180..0],0%4 }}, [0..4294967295]
 [eva:alarm] backward_add_ptr.c:87: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:88: 
   Frama_C_show_each_GM_reduce_p_offset:
   {{ NULL + {0; 1; 2; 3} ; &a + [-4294967295..3] }},
@@ -67,7 +66,7 @@
   Assigning imprecise value to p.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:96: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] computing for function gm <- main3 <- main.
   Called from backward_add_ptr.c:100.
 [eva] Recording results for gm
@@ -76,7 +75,7 @@
   Assigning imprecise value to p.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:106: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:107: 
   Frama_C_show_each_GM_no_reduction:
   {{ garbled mix of &{a; b}
@@ -87,10 +86,10 @@
   Assigning imprecise value to p.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:115: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:116: Frama_C_show_each_GM_only_c: {0}, {{ &c }}
 [eva:alarm] backward_add_ptr.c:121: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:122: 
   Frama_C_show_each_GM_only_b:
   {{ &b + [-17179869180..0],0%4 }}, [0..4294967295]
@@ -99,9 +98,9 @@
   Assigning imprecise value to p.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:130: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva:alarm] backward_add_ptr.c:136: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:137: 
   Frama_C_show_each_GM_only_b_and_gm:
   {{ garbled mix of &{b}
@@ -129,7 +128,7 @@
   Assigning imprecise value to q.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:150: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:151: 
   Frama_C_show_each_2GM_no_reduction:
   {{ garbled mix of &{a; b}
@@ -137,7 +136,7 @@
   {{ garbled mix of &{c}
   (origin: Arithmetic {backward_add_ptr.c:68}) }}
 [eva:alarm] backward_add_ptr.c:156: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:157: 
   Frama_C_show_each_2GM_only_b:
   {{ garbled mix of &{b}
@@ -155,7 +154,7 @@
   Assigning imprecise value to q.
   The imprecision originates from Arithmetic {backward_add_ptr.c:68}
 [eva:alarm] backward_add_ptr.c:165: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:166: 
   Frama_C_show_each_2GM_TEST:
   {{ garbled mix of &{b}
@@ -163,7 +162,7 @@
   {{ garbled mix of &{b}
   (origin: Arithmetic {backward_add_ptr.c:68}) }}
 [eva:alarm] backward_add_ptr.c:171: Warning: 
-  out of bounds read. assert \valid_read(p + (unsigned int)q);
+  out of bounds read. assert \valid_read(p + (uintptr_t)q);
 [eva] backward_add_ptr.c:172: 
   Frama_C_show_each_2GM_gm_of_a_b:
   {{ garbled mix of &{a; b}
@@ -171,7 +170,7 @@
   {{ garbled mix of &{b}
   (origin: Arithmetic {backward_add_ptr.c:68}) }}
 [eva:alarm] backward_add_ptr.c:177: Warning: 
-  out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+  out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
 [eva] backward_add_ptr.c:178: 
   Frama_C_show_each_2GM_gm_of_b_c:
   {{ garbled mix of &{b}
diff --git a/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle b/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
index 8eada729302..3aebd25e834 100644
--- a/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
+++ b/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
@@ -10,15 +10,13 @@
   invalid pointer comparison: invalid pointer(s)
 [eva:alarm] cmp_ptr_follow_all_branches.i:14: Warning: 
   pointer comparison.
-  assert
-  \pointer_comparable((void *)(p + (unsigned int)((int)(-5))), (void *)p);
+  assert \pointer_comparable((void *)(p + (size_t)((int)(-5))), (void *)p);
 [eva] cmp_ptr_follow_all_branches.i:14: Frama_C_show_each_2:
 [eva:pointer-comparison] cmp_ptr_follow_all_branches.i:15: 
   invalid pointer comparison: invalid pointer(s)
 [eva:alarm] cmp_ptr_follow_all_branches.i:15: Warning: 
   pointer comparison.
-  assert
-  \pointer_comparable((void *)(q + (unsigned int)((int)(-5))), (void *)q);
+  assert \pointer_comparable((void *)(q + (size_t)((int)(-5))), (void *)q);
 [eva] cmp_ptr_follow_all_branches.i:15: Frama_C_show_each_4:
 [eva] Recording results for main
 [eva] done for function main
diff --git a/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle b/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
index 4d03fa78462..5dbedf5245f 100644
--- a/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
+++ b/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
@@ -12,8 +12,7 @@
   evaluating condition to {0; 1} instead of {1} because of UPCPA
 [eva:alarm] cmp_ptr_follow_all_branches.i:14: Warning: 
   pointer comparison.
-  assert
-  \pointer_comparable((void *)(p + (unsigned int)((int)(-5))), (void *)p);
+  assert \pointer_comparable((void *)(p + (size_t)((int)(-5))), (void *)p);
 [eva] cmp_ptr_follow_all_branches.i:14: Frama_C_show_each_1:
 [eva:pointer-comparison] cmp_ptr_follow_all_branches.i:14: 
   evaluating condition to {0; 1} instead of {0} because of UPCPA
@@ -24,8 +23,7 @@
   evaluating condition to {0; 1} instead of {1} because of UPCPA
 [eva:alarm] cmp_ptr_follow_all_branches.i:15: Warning: 
   pointer comparison.
-  assert
-  \pointer_comparable((void *)(q + (unsigned int)((int)(-5))), (void *)q);
+  assert \pointer_comparable((void *)(q + (size_t)((int)(-5))), (void *)q);
 [eva] cmp_ptr_follow_all_branches.i:15: Frama_C_show_each_3:
 [eva:pointer-comparison] cmp_ptr_follow_all_branches.i:15: 
   evaluating condition to {0; 1} instead of {0} because of UPCPA
diff --git a/tests/value/oracle/fun_ptr.1.res.oracle b/tests/value/oracle/fun_ptr.1.res.oracle
index 2c0114c2a15..2ec8f10d50d 100644
--- a/tests/value/oracle/fun_ptr.1.res.oracle
+++ b/tests/value/oracle/fun_ptr.1.res.oracle
@@ -24,7 +24,7 @@
   Called from fun_ptr.i:78.
 [eva:alarm] fun_ptr.i:28: Warning: 
   pointer to function with incompatible type.
-  assert \valid_function((int (*)(int ))t[nd]);
+  assert \valid_function((fptr1)t[nd]);
 [eva] computing for function f <- test1 <- main.
   Called from fun_ptr.i:28.
 [eva] Recording results for f
@@ -35,7 +35,7 @@
   Called from fun_ptr.i:79.
 [eva:alarm] fun_ptr.i:33: Warning: 
   pointer to function with incompatible type.
-  assert \valid_function((int (*)(int , int ))t[nd]);
+  assert \valid_function((fptr2)t[nd]);
 [eva] computing for function g <- test2 <- main.
   Called from fun_ptr.i:33.
 [eva] Recording results for g
@@ -47,7 +47,7 @@
   Called from fun_ptr.i:80.
 [eva:alarm] fun_ptr.i:38: Warning: 
   pointer to function with incompatible type.
-  assert \valid_function((double (*)(int ))t[nd]);
+  assert \valid_function((fptr3)t[nd]);
 [eva] Recording results for test3
 [eva] Done for function test3
 [eva:alarm] fun_ptr.i:83: Warning: 
diff --git a/tests/value/oracle/invalid_pointer.0.res.oracle b/tests/value/oracle/invalid_pointer.0.res.oracle
index 281853ab1dd..02094a3d258 100644
--- a/tests/value/oracle/invalid_pointer.0.res.oracle
+++ b/tests/value/oracle/invalid_pointer.0.res.oracle
@@ -112,8 +112,7 @@
 [eva:alarm] invalid_pointer.c:142: Warning: 
   invalid pointer creation.
   assert
-  \object_pointer((int *)((unsigned int)((unsigned int)(&x) +
-                                         (unsigned int)undet)));
+  \object_pointer((int *)((uintptr_t)((uintptr_t)(&x) + (uintptr_t)undet)));
 [eva] invalid_pointer.c:143: assertion got status valid.
 [eva] invalid_pointer.c:144: assertion got status valid.
 [eva] invalid_pointer.c:145: 
-- 
GitLab