diff --git a/lib/cli.nix b/lib/cli.nix
index 37f9e270a313..fe2a03a7beef 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -1,6 +1,22 @@
 { lib }:
 
-{
+let
+  inherit (lib)
+    concatLists
+    concatMap
+    escapeShellArgs
+    isBool
+    isList
+    mapAttrsToList
+    oldestSupportedReleaseIsAtLeast
+    optional
+    stringLength
+    warnIf
+    ;
+  inherit (lib.generators) mkValueStringDefault;
+  mkValueString = mkValueStringDefault { };
+in
+rec {
   /**
     Automatically convert an attribute set to command-line options.
 
@@ -40,9 +56,9 @@
     :::
   */
   toGNUCommandLineShell =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+    warnIf (oldestSupportedReleaseIsAtLeast 2511)
       "lib.cli.toGNUCommandLineShell is deprecated, please use lib.cli.toCommandLineShell or lib.cli.toCommandLineShellGNU instead."
-      (options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs));
+      (options: attrs: escapeShellArgs (toGNUCommandLine options attrs));
 
   /**
     Automatically convert an attribute set to a list of command-line options.
@@ -116,15 +132,15 @@
     :::
   */
   toGNUCommandLine =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+    warnIf (oldestSupportedReleaseIsAtLeast 2511)
       "lib.cli.toGNUCommandLine is deprecated, please use lib.cli.toCommandLine or lib.cli.toCommandLineShellGNU instead."
       (
         {
-          mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
+          mkOptionName ? k: if stringLength k == 1 then "-${k}" else "--${k}",
 
-          mkBool ? k: v: lib.optional v (mkOptionName k),
+          mkBool ? k: v: optional v (mkOptionName k),
 
-          mkList ? k: v: lib.concatMap (mkOption k) v,
+          mkList ? k: concatMap (mkOption k),
 
           mkOption ?
             k: v:
@@ -133,26 +149,24 @@
             else if optionValueSeparator == null then
               [
                 (mkOptionName k)
-                (lib.generators.mkValueStringDefault { } v)
+                (mkValueString v)
               ]
             else
-              [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
+              [ "${mkOptionName k}${optionValueSeparator}${mkValueString v}" ],
 
           optionValueSeparator ? null,
         }:
-        options:
         let
           render =
             k: v:
-            if builtins.isBool v then
+            if isBool v then
               mkBool k v
-            else if builtins.isList v then
+            else if isList v then
               mkList k v
             else
               mkOption k v;
-
         in
-        builtins.concatLists (lib.mapAttrsToList render options)
+        options: concatLists (mapAttrsToList render options)
       );
 
   /**
@@ -163,8 +177,7 @@
     For further reference see:
     [`lib.cli.toCommandLineGNU`](#function-library-lib.cli.toCommandLineGNU)
   */
-  toCommandLineShellGNU =
-    options: attrs: lib.escapeShellArgs (lib.cli.toCommandLineGNU options attrs);
+  toCommandLineShellGNU = options: attrs: escapeShellArgs (toCommandLineGNU options attrs);
 
   /**
     Converts an attribute set into a list of GNU-style command-line arguments.
@@ -227,9 +240,9 @@
   */
   toCommandLineGNU =
     {
-      isLong ? optionName: builtins.stringLength optionName > 1,
+      isLong ? optionName: stringLength optionName > 1,
       explicitBool ? false,
-      formatArg ? lib.generators.mkValueStringDefault { },
+      formatArg ? mkValueString,
     }:
     let
       optionFormat = optionName: {
@@ -238,7 +251,7 @@
         inherit explicitBool formatArg;
       };
     in
-    lib.cli.toCommandLine optionFormat;
+    toCommandLine optionFormat;
 
   /**
     Converts the given attributes into a single shell-escaped command-line
@@ -248,8 +261,7 @@
     For further reference see:
     [`lib.cli.toCommandLine`](#function-library-lib.cli.toCommandLine)
   */
-  toCommandLineShell =
-    optionFormat: attrs: lib.escapeShellArgs (lib.cli.toCommandLine optionFormat attrs);
+  toCommandLineShell = optionFormat: attrs: escapeShellArgs (toCommandLine optionFormat attrs);
 
   /**
     Converts an attribute set into a list of command-line arguments.
@@ -421,14 +433,14 @@
     - `lib.cli.toCommandLineShellGNU`
   */
   toCommandLine =
-    optionFormat: attrs:
+    optionFormat:
     let
       handlePair =
         k: v:
         if k == "" then
-          lib.throw "lib.cli.toCommandLine only accepts non-empty option names."
-        else if builtins.isList v then
-          builtins.concatMap (handleOption k) v
+          throw "lib.cli.toCommandLine only accepts non-empty option names."
+        else if isList v then
+          concatMap (handleOption k) v
         else
           handleOption k v;
 
@@ -439,7 +451,7 @@
           option,
           sep,
           explicitBool,
-          formatArg ? lib.generators.mkValueStringDefault { },
+          formatArg ? mkValueString,
         }:
         k: v:
         if v == null || (!explicitBool && v == false) then
@@ -458,5 +470,5 @@
               arg
             ];
     in
-    builtins.concatLists (lib.mapAttrsToList handlePair attrs);
+    attrs: concatLists (mapAttrsToList handlePair attrs);
 }