diff --git a/src/Nixfmt/Pretty.hs b/src/Nixfmt/Pretty.hs
index f03f7bcf..b96f0771 100644
--- a/src/Nixfmt/Pretty.hs
+++ b/src/Nixfmt/Pretty.hs
@@ -183,6 +183,15 @@ prettyTermWide :: Term -> Doc
 prettyTermWide (Set krec paropen items parclose) = prettySet True (krec, paropen, items, parclose)
 prettyTermWide t = prettyTerm t
 
+prettyList :: Doc -> Leaf -> Items Term -> Leaf -> Doc
+prettyList sep paropen@Ann{trailComment = post} items parclose =
+  pretty paropen{trailComment = Nothing}
+    <> surroundWith sur (nest $ pretty post <> sepBy sep (unItems items))
+    <> pretty parclose
+  where
+    -- If the brackets are on different lines, keep them like that
+    sur = if sourceLine paropen /= sourceLine parclose then hardline else line
+
 -- | Pretty print a term without wrapping it in a group.
 prettyTerm :: Term -> Doc
 prettyTerm (Token t) = pretty t
@@ -211,14 +220,7 @@ prettyTerm (List paropen@Ann{trailComment = Nothing} (Items []) parclose@Ann{pre
     -- If the brackets are on different lines, keep them like that
     sep = if sourceLine paropen /= sourceLine parclose then hardline else hardspace
 -- General list
--- Always expand if len > 1
-prettyTerm (List paropen@Ann{trailComment = post} items parclose) =
-  pretty (paropen{trailComment = Nothing})
-    <> surroundWith sur (nest $ pretty post <> prettyItems items)
-    <> pretty parclose
-  where
-    -- If the brackets are on different lines, keep them like that
-    sur = if sourceLine paropen /= sourceLine parclose then hardline else line
+prettyTerm (List paropen items parclose) = prettyList hardline paropen items parclose
 prettyTerm (Set krec paropen items parclose) = prettySet False (krec, paropen, items, parclose)
 -- Parentheses
 prettyTerm (Parenthesized paropen expr parclose@Ann{preTrivia = closePre}) =
@@ -376,36 +378,44 @@ instance Pretty Parameter where
 prettyApp :: Bool -> Doc -> Bool -> Expression -> Expression -> Doc
 prettyApp indentFunction pre hasPost f a =
   let -- Walk the function call chain
-      absorbApp :: Expression -> Doc
+      absorbApp :: Bool -> Expression -> Doc
       -- This is very hacky, but selections shouldn't be in a priority group,
       -- because if they get expanded before anything else,
       -- only the `.`-and-after part gets to a new line, which looks very odd
-      absorbApp (Application f' a'@(Term Selection{})) = group' Transparent (absorbApp f') <> line <> nest (group' RegularG $ absorbInner a')
-      absorbApp (Application f' a') = group' Transparent (absorbApp f') <> line <> nest (group' Priority $ absorbInner a')
+      absorbApp _ (Application f' a'@(Term Selection{})) =
+        group' Transparent (absorbApp False f') <> line <> nest (group' RegularG $ absorbInner a')
+      absorbApp nextIsAList (Application f' a'@(Term List{})) =
+        group' Transparent (absorbApp True f') <> sep <> nest (group' Priority $ absorbInner a')
+        where
+          sep = if nextIsAList then hardline else line
+      -- Problem: The hardline forces multiple lines even when stuff fits on a single one
+      -- Something like https://github.com/NixOS/nixfmt/pull/256 should work better
+      absorbApp _ (Application f' a') =
+        group' Transparent (absorbApp False f') <> line <> nest (group' Priority $ absorbInner a')
       -- First argument
-      absorbApp expr
+      absorbApp _ expr
         | indentFunction && null comment' = nest $ group' RegularG $ line' <> pretty expr
         | otherwise = pretty expr
 
+      isSimpleItems = all (isSimple . Term)
+
       -- Render the inner arguments of a function call
       absorbInner :: Expression -> Doc
-      -- If lists have only simple items, try to render them single-line instead of expanding
-      -- This is just a copy of the list rendering code, but with `sepBy line` instead of `sepBy hardline`
-      absorbInner (Term (List paropen@Ann{trailComment = post'} items parclose))
-        | length (unItems items) <= 4 && all (isSimple . Term) items =
-            pretty (paropen{trailComment = Nothing})
-              <> surroundWith sur (nest $ pretty post' <> sepBy line (unItems items))
-              <> pretty parclose
-        where
-          -- If the brackets are on different lines, keep them like that
-          sur = if sourceLine paropen /= sourceLine parclose then hardline else line
+      -- If the list is simple, try to render it single-line instead of expanding
+      absorbInner (Term (List paropen items parclose))
+        | isSimpleItems items =
+            prettyList line paropen items parclose
       absorbInner expr = pretty expr
 
       -- Render the last argument of a function call
-      absorbLast :: Expression -> Doc
+      absorbLast :: Expression -> (Bool, Doc)
+      -- If the list is simple, try to render it single-line instead of expanding
+      absorbLast (Term (List paropen items parclose))
+        | isSimpleItems items =
+            (True, group' Priority $ nest $ prettyList line paropen items parclose)
       absorbLast (Term t)
         | isAbsorbable t =
-            group' Priority $ nest $ prettyTerm t
+            (False, group' Priority $ nest $ prettyTerm t)
       -- Special case: Absorb parenthesized function declaration with absorbable body
       absorbLast
         ( Term
@@ -416,14 +426,16 @@ prettyApp indentFunction pre hasPost f a =
               )
           )
           | isAbsorbableTerm body && not (any hasTrivia [open, name, colon]) =
-              group' Priority $
-                nest $
-                  pretty open
-                    <> pretty name
-                    <> pretty colon
-                    <> hardspace
-                    <> prettyTermWide body
-                    <> pretty close
+              ( False,
+                group' Priority $
+                  nest $
+                    pretty open
+                      <> pretty name
+                      <> pretty colon
+                      <> hardspace
+                      <> prettyTermWide body
+                      <> pretty close
+              )
       -- Special case: Absorb parenthesized function application with absorbable body
       absorbLast
         ( Term
@@ -434,16 +446,18 @@ prettyApp indentFunction pre hasPost f a =
               )
           )
           | isAbsorbableTerm body && not (any hasTrivia [open, ident, close]) =
-              group' Priority $
-                nest $
-                  pretty open
-                    <> pretty fn
-                    <> hardspace
-                    <> prettyTermWide body
-                    <> pretty close
+              ( False,
+                group' Priority $
+                  nest $
+                    pretty open
+                      <> pretty fn
+                      <> hardspace
+                      <> prettyTermWide body
+                      <> pretty close
+              )
       absorbLast (Term (Parenthesized open expr close)) =
-        absorbParen open expr close
-      absorbLast arg = group' RegularG $ nest $ pretty arg
+        (False, absorbParen open expr close)
+      absorbLast arg = (False, group' RegularG $ nest $ pretty arg)
 
       -- Extract comment before the first function and move it out, to prevent functions being force-expanded
       (fWithoutComment, comment') =
@@ -451,14 +465,16 @@ prettyApp indentFunction pre hasPost f a =
           ((\a'@Ann{preTrivia} -> (a'{preTrivia = []}, preTrivia)) . moveTrailingCommentUp)
           f
 
-      renderedF = pre <> group' Transparent (absorbApp fWithoutComment)
+      renderedF = pre <> group' Transparent (absorbApp endsWithAList fWithoutComment)
       renderedFUnexpanded = unexpandSpacing' Nothing renderedF
 
       post = if hasPost then line' else mempty
+
+      (endsWithAList, lastAbsorbed) = absorbLast a
   in pretty comment'
       <> ( if isSimple (Application f a) && isJust renderedFUnexpanded
-            then group' RegularG $ fromJust renderedFUnexpanded <> hardspace <> absorbLast a
-            else group' RegularG $ renderedF <> line <> absorbLast a <> post
+            then group' RegularG $ fromJust renderedFUnexpanded <> hardspace <> lastAbsorbed
+            else group' RegularG $ renderedF <> line <> lastAbsorbed <> post
          )
       <> (if hasPost && not (null comment') then hardline else mempty)
 
diff --git a/test/diff/apply/out-pure.nix b/test/diff/apply/out-pure.nix
index 99114616..6a8570b7 100644
--- a/test/diff/apply/out-pure.nix
+++ b/test/diff/apply/out-pure.nix
@@ -155,15 +155,11 @@
       utils.lib.eachDefaultSystem (system: { });
   }
   {
-    escapeSingleline = libStr.escape [
-      "\\"
-      ''"''
-      "\${"
-    ];
-    escapeMultiline = libStr.replaceStrings [ "\${" "''" ] [
-      "''\${"
-      "'''"
-    ];
+    escapeSingleline = libStr.escape [ "\\" ''"'' "\${" ];
+    escapeMultiline =
+      libStr.replaceStrings
+        [ "\${" "''" ]
+        [ "''\${" "'''" ];
     test =
       foo
         [
diff --git a/test/diff/attr_set/out-pure.nix b/test/diff/attr_set/out-pure.nix
index f28d2e25..2f39949f 100644
--- a/test/diff/attr_set/out-pure.nix
+++ b/test/diff/attr_set/out-pure.nix
@@ -143,10 +143,7 @@
       ]
       ++ (if foo then [ bar ] else [ baz ])
       ++ [ ]
-      ++ (optionals condition [
-        more
-        items
-      ]);
+      ++ (optionals condition [ more items ]);
     b = with pkgs; [
       a
       lot
diff --git a/test/diff/attr_set/out.nix b/test/diff/attr_set/out.nix
index 7b52a916..ce3441a3 100644
--- a/test/diff/attr_set/out.nix
+++ b/test/diff/attr_set/out.nix
@@ -146,10 +146,7 @@
       ]
       ++ (if foo then [ bar ] else [ baz ])
       ++ [ ]
-      ++ (optionals condition [
-        more
-        items
-      ]);
+      ++ (optionals condition [ more items ]);
     b = with pkgs; [
       a
       lot
diff --git a/test/diff/idioms_lib_2/out-pure.nix b/test/diff/idioms_lib_2/out-pure.nix
index 1fc274f0..8cbc7ab2 100644
--- a/test/diff/idioms_lib_2/out-pure.nix
+++ b/test/diff/idioms_lib_2/out-pure.nix
@@ -351,13 +351,7 @@ rec {
     Type: string -> a -> a
   */
   warn =
-    if
-      lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") [
-        "1"
-        "true"
-        "yes"
-      ]
-    then
+    if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") [ "1" "true" "yes" ] then
       msg:
       builtins.trace "warning: ${msg}" (
         abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors."
diff --git a/test/diff/idioms_lib_2/out.nix b/test/diff/idioms_lib_2/out.nix
index 1fc274f0..8cbc7ab2 100644
--- a/test/diff/idioms_lib_2/out.nix
+++ b/test/diff/idioms_lib_2/out.nix
@@ -351,13 +351,7 @@ rec {
     Type: string -> a -> a
   */
   warn =
-    if
-      lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") [
-        "1"
-        "true"
-        "yes"
-      ]
-    then
+    if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") [ "1" "true" "yes" ] then
       msg:
       builtins.trace "warning: ${msg}" (
         abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors."
diff --git a/test/diff/idioms_lib_3/out-pure.nix b/test/diff/idioms_lib_3/out-pure.nix
index 387e9df3..70a9a02b 100644
--- a/test/diff/idioms_lib_3/out-pure.nix
+++ b/test/diff/idioms_lib_3/out-pure.nix
@@ -361,15 +361,11 @@ rec {
         else if isString v then
           let
             lines = filter (v: !isList v) (builtins.split "\n" v);
-            escapeSingleline = libStr.escape [
-              "\\"
-              ''"''
-              "\${"
-            ];
-            escapeMultiline = libStr.replaceStrings [ "\${" "''" ] [
-              "''\${"
-              "'''"
-            ];
+            escapeSingleline = libStr.escape [ "\\" ''"'' "\${" ];
+            escapeMultiline =
+              libStr.replaceStrings
+                [ "\${" "''" ]
+                [ "''\${" "'''" ];
             singlelineResult =
               ''"'' + concatStringsSep "\\n" (map escapeSingleline lines) + ''"'';
             multilineResult =
diff --git a/test/diff/idioms_lib_3/out.nix b/test/diff/idioms_lib_3/out.nix
index 469184e6..366649bc 100644
--- a/test/diff/idioms_lib_3/out.nix
+++ b/test/diff/idioms_lib_3/out.nix
@@ -374,15 +374,11 @@ rec {
         else if isString v then
           let
             lines = filter (v: !isList v) (builtins.split "\n" v);
-            escapeSingleline = libStr.escape [
-              "\\"
-              ''"''
-              "\${"
-            ];
-            escapeMultiline = libStr.replaceStrings [ "\${" "''" ] [
-              "''\${"
-              "'''"
-            ];
+            escapeSingleline = libStr.escape [ "\\" ''"'' "\${" ];
+            escapeMultiline =
+              libStr.replaceStrings
+                [ "\${" "''" ]
+                [ "''\${" "'''" ];
             singlelineResult =
               ''"'' + concatStringsSep "\\n" (map escapeSingleline lines) + ''"'';
             multilineResult =
diff --git a/test/diff/idioms_lib_4/out-pure.nix b/test/diff/idioms_lib_4/out-pure.nix
index c1ed4245..a50f10cb 100644
--- a/test/diff/idioms_lib_4/out-pure.nix
+++ b/test/diff/idioms_lib_4/out-pure.nix
@@ -771,13 +771,7 @@ rec {
       "3" =
         # cpu-kernel-environment
         if
-          elemAt l 1 == "linux"
-          || elem (elemAt l 2) [
-            "eabi"
-            "eabihf"
-            "elf"
-            "gnu"
-          ]
+          elemAt l 1 == "linux" || elem (elemAt l 2) [ "eabi" "eabihf" "elf" "gnu" ]
         then
           {
             cpu = elemAt l 0;
@@ -788,13 +782,7 @@ rec {
         # cpu-vendor-os
         else if
           elemAt l 1 == "apple"
-          || elem (elemAt l 2) [
-            "wasi"
-            "redox"
-            "mmixware"
-            "ghcjs"
-            "mingw32"
-          ]
+          || elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ]
           || hasPrefix "freebsd" (elemAt l 2)
           || hasPrefix "netbsd" (elemAt l 2)
           || hasPrefix "genode" (elemAt l 2)
diff --git a/test/diff/idioms_lib_4/out.nix b/test/diff/idioms_lib_4/out.nix
index c1ed4245..a50f10cb 100644
--- a/test/diff/idioms_lib_4/out.nix
+++ b/test/diff/idioms_lib_4/out.nix
@@ -771,13 +771,7 @@ rec {
       "3" =
         # cpu-kernel-environment
         if
-          elemAt l 1 == "linux"
-          || elem (elemAt l 2) [
-            "eabi"
-            "eabihf"
-            "elf"
-            "gnu"
-          ]
+          elemAt l 1 == "linux" || elem (elemAt l 2) [ "eabi" "eabihf" "elf" "gnu" ]
         then
           {
             cpu = elemAt l 0;
@@ -788,13 +782,7 @@ rec {
         # cpu-vendor-os
         else if
           elemAt l 1 == "apple"
-          || elem (elemAt l 2) [
-            "wasi"
-            "redox"
-            "mmixware"
-            "ghcjs"
-            "mingw32"
-          ]
+          || elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ]
           || hasPrefix "freebsd" (elemAt l 2)
           || hasPrefix "netbsd" (elemAt l 2)
           || hasPrefix "genode" (elemAt l 2)
diff --git a/test/diff/idioms_nixos_1/out-pure.nix b/test/diff/idioms_nixos_1/out-pure.nix
index f8ec98ac..e0ab0fb7 100644
--- a/test/diff/idioms_nixos_1/out-pure.nix
+++ b/test/diff/idioms_nixos_1/out-pure.nix
@@ -290,12 +290,9 @@ in
 
       # Implement consoleLogLevel both in early boot and using sysctl
       # (so you don't need to reboot to have changes take effect).
-      boot.kernelParams =
-        [ "loglevel=${toString config.boot.consoleLogLevel}" ]
-        ++ optionals config.boot.vesa [
-          "vga=0x317"
-          "nomodeset"
-        ];
+      boot.kernelParams = [
+        "loglevel=${toString config.boot.consoleLogLevel}"
+      ] ++ optionals config.boot.vesa [ "vga=0x317" "nomodeset" ];
 
       boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
 
diff --git a/test/diff/idioms_nixos_1/out.nix b/test/diff/idioms_nixos_1/out.nix
index f8ec98ac..e0ab0fb7 100644
--- a/test/diff/idioms_nixos_1/out.nix
+++ b/test/diff/idioms_nixos_1/out.nix
@@ -290,12 +290,9 @@ in
 
       # Implement consoleLogLevel both in early boot and using sysctl
       # (so you don't need to reboot to have changes take effect).
-      boot.kernelParams =
-        [ "loglevel=${toString config.boot.consoleLogLevel}" ]
-        ++ optionals config.boot.vesa [
-          "vga=0x317"
-          "nomodeset"
-        ];
+      boot.kernelParams = [
+        "loglevel=${toString config.boot.consoleLogLevel}"
+      ] ++ optionals config.boot.vesa [ "vga=0x317" "nomodeset" ];
 
       boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
 
diff --git a/test/diff/idioms_nixos_2/out-pure.nix b/test/diff/idioms_nixos_2/out-pure.nix
index a2743768..bb4daf78 100644
--- a/test/diff/idioms_nixos_2/out-pure.nix
+++ b/test/diff/idioms_nixos_2/out-pure.nix
@@ -200,12 +200,7 @@ in
       description = lib.mdDoc "Log level value between 0 (DEBUG) and 4 (FATAL).";
     };
     logType = mkOption {
-      type = types.enum [
-        "errorlog"
-        "file"
-        "syslog"
-        "systemd"
-      ];
+      type = types.enum [ "errorlog" "file" "syslog" "systemd" ];
       default = "syslog";
       description = lib.mdDoc ''
         Logging backend to use.
@@ -358,11 +353,7 @@ in
 
     config = {
       dbtype = mkOption {
-        type = types.enum [
-          "sqlite"
-          "pgsql"
-          "mysql"
-        ];
+        type = types.enum [ "sqlite" "pgsql" "mysql" ];
         default = "sqlite";
         description = lib.mdDoc "Database type.";
       };
@@ -436,12 +427,7 @@ in
       };
 
       overwriteProtocol = mkOption {
-        type = types.nullOr (
-          types.enum [
-            "http"
-            "https"
-          ]
-        );
+        type = types.nullOr (types.enum [ "http" "https" ]);
         default = null;
         example = "https";
 
diff --git a/test/diff/idioms_nixos_2/out.nix b/test/diff/idioms_nixos_2/out.nix
index b63a9379..5de188b6 100644
--- a/test/diff/idioms_nixos_2/out.nix
+++ b/test/diff/idioms_nixos_2/out.nix
@@ -203,12 +203,7 @@ in
       description = lib.mdDoc "Log level value between 0 (DEBUG) and 4 (FATAL).";
     };
     logType = mkOption {
-      type = types.enum [
-        "errorlog"
-        "file"
-        "syslog"
-        "systemd"
-      ];
+      type = types.enum [ "errorlog" "file" "syslog" "systemd" ];
       default = "syslog";
       description = lib.mdDoc ''
         Logging backend to use.
@@ -361,11 +356,7 @@ in
 
     config = {
       dbtype = mkOption {
-        type = types.enum [
-          "sqlite"
-          "pgsql"
-          "mysql"
-        ];
+        type = types.enum [ "sqlite" "pgsql" "mysql" ];
         default = "sqlite";
         description = lib.mdDoc "Database type.";
       };
@@ -439,12 +430,7 @@ in
       };
 
       overwriteProtocol = mkOption {
-        type = types.nullOr (
-          types.enum [
-            "http"
-            "https"
-          ]
-        );
+        type = types.nullOr (types.enum [ "http" "https" ]);
         default = null;
         example = "https";
 
diff --git a/test/diff/idioms_pkgs_3/out-pure.nix b/test/diff/idioms_pkgs_3/out-pure.nix
index 066bc56e..47afce68 100644
--- a/test/diff/idioms_pkgs_3/out-pure.nix
+++ b/test/diff/idioms_pkgs_3/out-pure.nix
@@ -297,10 +297,7 @@ buildStdenv.mkDerivation ({
       which
       wrapGAppsHook
     ]
-    ++ lib.optionals crashreporterSupport [
-      dump_syms
-      patchelf
-    ]
+    ++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
     ++ lib.optionals pgoSupport [ xvfb-run ]
     ++ extraNativeBuildInputs;
 
@@ -484,10 +481,7 @@ buildStdenv.mkDerivation ({
     ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
     ++ lib.optional sndioSupport sndio
     ++ lib.optional gssSupport libkrb5
-    ++ lib.optionals waylandSupport [
-      libxkbcommon
-      libdrm
-    ]
+    ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
     ++ lib.optional jemallocSupport jemalloc
     ++ extraBuildInputs;
 
diff --git a/test/diff/idioms_pkgs_3/out.nix b/test/diff/idioms_pkgs_3/out.nix
index 13f30559..b30ad4b4 100644
--- a/test/diff/idioms_pkgs_3/out.nix
+++ b/test/diff/idioms_pkgs_3/out.nix
@@ -299,10 +299,7 @@ buildStdenv.mkDerivation ({
       which
       wrapGAppsHook
     ]
-    ++ lib.optionals crashreporterSupport [
-      dump_syms
-      patchelf
-    ]
+    ++ lib.optionals crashreporterSupport [ dump_syms patchelf ]
     ++ lib.optionals pgoSupport [ xvfb-run ]
     ++ extraNativeBuildInputs;
 
@@ -486,10 +483,7 @@ buildStdenv.mkDerivation ({
     ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
     ++ lib.optional sndioSupport sndio
     ++ lib.optional gssSupport libkrb5
-    ++ lib.optionals waylandSupport [
-      libxkbcommon
-      libdrm
-    ]
+    ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
     ++ lib.optional jemallocSupport jemalloc
     ++ extraBuildInputs;
 
diff --git a/test/diff/idioms_pkgs_5/out-pure.nix b/test/diff/idioms_pkgs_5/out-pure.nix
index fc02b21a..791aa3c2 100644
--- a/test/diff/idioms_pkgs_5/out-pure.nix
+++ b/test/diff/idioms_pkgs_5/out-pure.nix
@@ -164,16 +164,10 @@ let
       # Including it then would cause needless mass rebuilds.
       #
       # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909
-      configurePlatforms ?
-        optionals
-          (
-            stdenv.hostPlatform != stdenv.buildPlatform
-            || config.configurePlatformsByDefault
-          )
-          [
-            "build"
-            "host"
-          ],
+      configurePlatforms ? optionals (
+        stdenv.hostPlatform != stdenv.buildPlatform
+        || config.configurePlatformsByDefault
+      ) [ "build" "host" ],
 
       # TODO(@Ericson2314): Make unconditional / resolve #33599
       # Check phase
diff --git a/test/diff/idioms_pkgs_5/out.nix b/test/diff/idioms_pkgs_5/out.nix
index eab21af3..0ac33685 100644
--- a/test/diff/idioms_pkgs_5/out.nix
+++ b/test/diff/idioms_pkgs_5/out.nix
@@ -164,16 +164,10 @@ let
       # Including it then would cause needless mass rebuilds.
       #
       # TODO(@Ericson2314): Make [ "build" "host" ] always the default / resolve #87909
-      configurePlatforms ?
-        optionals
-          (
-            stdenv.hostPlatform != stdenv.buildPlatform
-            || config.configurePlatformsByDefault
-          )
-          [
-            "build"
-            "host"
-          ],
+      configurePlatforms ? optionals (
+        stdenv.hostPlatform != stdenv.buildPlatform
+        || config.configurePlatformsByDefault
+      ) [ "build" "host" ],
 
       # TODO(@Ericson2314): Make unconditional / resolve #33599
       # Check phase
diff --git a/test/diff/operation/out-pure.nix b/test/diff/operation/out-pure.nix
index f032b244..d00cd9b4 100644
--- a/test/diff/operation/out-pure.nix
+++ b/test/diff/operation/out-pure.nix
@@ -168,10 +168,7 @@
     ]
     ++ (if foo then [ bar ] else [ baz ])
     ++ [ ]
-    ++ (optionals condition [
-      more
-      items
-    ])
+    ++ (optionals condition [ more items ])
   )
 
   # Test precedence
diff --git a/test/diff/operation/out.nix b/test/diff/operation/out.nix
index 3e1759f4..1d207f29 100644
--- a/test/diff/operation/out.nix
+++ b/test/diff/operation/out.nix
@@ -168,10 +168,7 @@
     ]
     ++ (if foo then [ bar ] else [ baz ])
     ++ [ ]
-    ++ (optionals condition [
-      more
-      items
-    ])
+    ++ (optionals condition [ more items ])
   )
 
   # Test precedence