diff --git a/infer/src/absint/AbstractDomain.ml b/infer/src/absint/AbstractDomain.ml
index 77cf52dfc..f263f5220 100644
--- a/infer/src/absint/AbstractDomain.ml
+++ b/infer/src/absint/AbstractDomain.ml
@@ -607,11 +607,7 @@ module SafeInvertedMap (Key : PrettyPrintable.PrintableOrderedType) (ValueDomain
 
   let filter = M.filter
 
-  let filter_map f x =
-    M.filter_map
-      (fun k v -> match f k v with Some v when ValueDomain.is_top v -> None | v_opt -> v_opt)
-      x
-
+  let filter_map f x = M.filter_map (fun k v -> f k v |> none_if_top_opt) x
 
   let partition = M.partition