diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
index c0ae67efa..43b86ad99 100644
--- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
@@ -41,7 +41,7 @@ int CEF_CALLBACK jsdialog_handler_on_jsdialog(
   if (!suppress_message)
     return 0;
   // Unverified params: origin_url, accept_lang, message_text,
-      default_prompt_text
+  // default_prompt_text
 
   // Translate param: suppress_message; type: bool_byref
   bool suppress_messageBool = (
diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
index 180c88ea4..bb8146590 100644
--- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
+++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
@@ -36,7 +36,7 @@ bool CefJSDialogHandlerCToCpp::OnJSDialog(CefRefPtr<CefBrowser> browser,
   if (!callback.get())
     return false;
   // Unverified params: origin_url, accept_lang, message_text,
-      default_prompt_text
+  // default_prompt_text
 
   // Translate param: suppress_message; type: bool_byref
   int suppress_messageInt = suppress_message;
diff --git a/tools/make_cpptoc_impl.py b/tools/make_cpptoc_impl.py
index 0872b362e..442f8270d 100644
--- a/tools/make_cpptoc_impl.py
+++ b/tools/make_cpptoc_impl.py
@@ -123,8 +123,16 @@ def make_cpptoc_function_impl_new(name, func, defined_names):
                       '\n    return'+retval_default+';'
 
     if len(optional) > 0:
-        result += '\n  // Unverified params: '+string.join(optional,', ')
-    
+        # Wrap the comment at 80 characters.
+        str = '\n  // Unverified params: ' + optional[0]
+        for name in optional[1:]:
+            str += ','
+            if len(str) + len(name) + 1 > 80:
+                result += str
+                str = '\n  //'
+            str += ' ' + name
+        result += str
+
     if len(result) != result_len:
         result += '\n'
     result_len = len(result)
diff --git a/tools/make_ctocpp_impl.py b/tools/make_ctocpp_impl.py
index dab3c9f13..4cae75010 100644
--- a/tools/make_ctocpp_impl.py
+++ b/tools/make_ctocpp_impl.py
@@ -129,7 +129,15 @@ def make_ctocpp_function_impl_new(clsname, name, func):
                       '\n    return'+retval_default+';'
 
     if len(optional) > 0:
-        result += '\n  // Unverified params: '+string.join(optional,', ')
+        # Wrap the comment at 80 characters.
+        str = '\n  // Unverified params: ' + optional[0]
+        for name in optional[1:]:
+            str += ','
+            if len(str) + len(name) + 1 > 80:
+                result += str
+                str = '\n  //'
+            str += ' ' + name
+        result += str
 
     if len(result) != result_len:
         result += '\n'