diff --git a/ivette/src/frama-c/plugins/eva/Coverage.tsx b/ivette/src/frama-c/plugins/eva/Coverage.tsx
index 0c65625999285482cf5fa4b8c9134345218cac1b..2d11327b2ceb1e5c996d8ae4e58db2083bc909c1 100644
--- a/ivette/src/frama-c/plugins/eva/Coverage.tsx
+++ b/ivette/src/frama-c/plugins/eva/Coverage.tsx
@@ -37,16 +37,14 @@ type stats = Eva.functionStatsData;
 
 // --- Coverage Table ---
 
-function map<A, B>(f: (x: B) => A, compare: Compare.Order<A>):
-Compare.Order<B> {
-  return (x: B, y: B) => compare(f(x), f(y));
-}
-
 const ordering: Arrays.ByColumns<stats> = {
   fct: Compare.byFields({ key: Compare.string }),
-  alarms: Compare.byFields(
-    { alarmStatuses: map((x) => x.unknown + x.invalid, Compare.number) },
-  ),
+  alarms: Compare.byFields({
+    alarmStatuses: Compare.lift(
+      (x) => x.unknown + x.invalid,
+      Compare.number,
+    ),
+  }),
   sureAlarms: Compare.byFields(
     { alarmStatuses: Compare.byFields({ invalid: Compare.number }) },
   ),
@@ -61,11 +59,11 @@ const ordering: Arrays.ByColumns<stats> = {
     ),
   }),
   totalStatements: Compare.byFields(
-    { coverage: map((x) => x.reachable + x.dead, Compare.number) },
+    { coverage: Compare.lift((x) => x.reachable + x.dead, Compare.number) },
   ),
   coverage: Compare.byFields(
     {
-      coverage: map(
+      coverage: Compare.lift(
         (x) => x.reachable / (x.reachable + x.dead),
         Compare.number,
       ),