diff --git a/conf/templates/pyproject.toml b/conf/templates/pyproject.toml
index 6b6a5d57..50c7c7bf 100644
--- a/conf/templates/pyproject.toml
+++ b/conf/templates/pyproject.toml
@@ -18,6 +18,11 @@
 [tool.isort]
 
   multi_line_output = 3
+
+  # Keep trailing commas so that yapf's split_arguments_when_comma_terminated
+  # keeps the one-per-line layout that isort produces.
+  include_trailing_comma = true
+
   line_length = 88
   lines_after_imports = 1
   lines_between_sections = 1
diff --git a/src/python/jw/pkg/lib/App.py b/src/python/jw/pkg/lib/App.py
index a0febcc7..b35d7c8e 100644
--- a/src/python/jw/pkg/lib/App.py
+++ b/src/python/jw/pkg/lib/App.py
@@ -7,7 +7,10 @@ import sys
 import warnings
 
 from argparse import (
-    ArgumentDefaultsHelpFormatter, ArgumentParser, Namespace, _SubParsersAction
+    ArgumentDefaultsHelpFormatter,
+    ArgumentParser,
+    Namespace,
+    _SubParsersAction,
 )
 from typing import TYPE_CHECKING, Any, NamedTuple, cast, override
 
@@ -24,7 +27,7 @@ from .log import (
     parse_log_flags,
     parse_log_level,
     set_log_flags,
-    set_log_level
+    set_log_level,
 )
 from .Types import LoadTypes
 from .util import pretty_cmd