diff --git a/src/hardpoint/ArcanistHardpointList.php b/src/hardpoint/ArcanistHardpointList.php
--- a/src/hardpoint/ArcanistHardpointList.php
+++ b/src/hardpoint/ArcanistHardpointList.php
@@ -27,7 +27,9 @@
           pht(
             'Hardpoint (at index "%s") has the same key ("%s") as an earlier '.
             'hardpoint. Each hardpoint must have a key that is unique '.
-            'among hardpoints on the object.'));
+            'among hardpoints on the object.',
+            $idx,
+            $key));
       }
 
       $map[$key] = $hardpoint;
diff --git a/src/land/engine/ArcanistLandEngine.php b/src/land/engine/ArcanistLandEngine.php
--- a/src/land/engine/ArcanistLandEngine.php
+++ b/src/land/engine/ArcanistLandEngine.php
@@ -1459,6 +1459,7 @@
             'Merge strategy "%s" specified in "%s" configuration is '.
             'unknown. Supported merge strategies are: %s.',
             $strategy,
+            $this->getStrategyConfigurationKey(),
             $strategy_list));
       }
 
diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php
--- a/src/repository/api/ArcanistMercurialAPI.php
+++ b/src/repository/api/ArcanistMercurialAPI.php
@@ -778,7 +778,7 @@
                 pht(
                   "'%s' has been amended with 'Differential Revision:', ".
                   "as specified by '%s' in your %s 'base' configuration.",
-                  '.'.
+                  '.',
                   $rule,
                   $source));
               // NOTE: This should be safe because Mercurial doesn't support
diff --git a/src/runtime/ArcanistRuntime.php b/src/runtime/ArcanistRuntime.php
--- a/src/runtime/ArcanistRuntime.php
+++ b/src/runtime/ArcanistRuntime.php
@@ -553,6 +553,7 @@
             'workflow in a given toolset must have a unique name.',
             get_class($workflow),
             get_class($map[$key]),
+            $key,
             get_class($toolset),
             $toolset->getToolsetKey()));
       }
diff --git a/src/toolset/ArcanistAliasEngine.php b/src/toolset/ArcanistAliasEngine.php
--- a/src/toolset/ArcanistAliasEngine.php
+++ b/src/toolset/ArcanistAliasEngine.php
@@ -72,8 +72,8 @@
           pht(
             'Configuration source ("%s") defines an invalid alias, which '.
             'will be ignored: %s',
-            $alias->getConfigurationSource()->getSourceDisplayName()),
-            $exception->getMessage());
+            $alias->getConfigurationSource()->getSourceDisplayName(),
+            $exception->getMessage()));
     }
 
     $command = array_shift($argv);
diff --git a/src/workflow/ArcanistCloseRevisionWorkflow.php b/src/workflow/ArcanistCloseRevisionWorkflow.php
--- a/src/workflow/ArcanistCloseRevisionWorkflow.php
+++ b/src/workflow/ArcanistCloseRevisionWorkflow.php
@@ -35,8 +35,7 @@
         'help' => pht(
           "Close only if the repository is untracked and the revision is ".
           "accepted. Continue even if the close can't happen. This is a soft ".
-          "version of '' used by other workflows.",
-          'close-revision'),
+          "version of 'close-revision' used by other workflows."),
       ),
       'quiet' => array(
         'help' => pht('Do not print a success message.'),