diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index 3f14471..3ba6e22 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -131,15 +131,19 @@
       throw new IllegalStateException("Help template for '" + topic + "' omits %{options}!");
     }
 
-    return template.
-        replace("%{product}", Constants.PRODUCT_NAME).
-        replace("%{command}", topic).
-        replace("%{options}", parser.describeOptions(categoryDescriptions, helpVerbosity)).
-        trim()
+    String optionStr =
+        parser
+            .describeOptions(categoryDescriptions, helpVerbosity)
+            .replace("%{product}", Constants.PRODUCT_NAME);
+    return template
+            .replace("%{product}", Constants.PRODUCT_NAME)
+            .replace("%{command}", topic)
+            .replace("%{options}", optionStr)
+            .trim()
         + "\n\n"
         + (helpVerbosity == OptionsParser.HelpVerbosity.MEDIUM
-           ? "(Use 'help --long' for full details or --short to just enumerate options.)\n"
-           : "");
+            ? "(Use 'help --long' for full details or --short to just enumerate options.)\n"
+            : "");
   }
 
   /**