diff --git a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc
index cafe1c28f..fec6067f9 100644
--- a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc
+++ b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=8a13049bee943d760534a354df5d0e6b59cfa3d0$
+// $hash=9b9187a75a85ff63f2244471af1e54f40eae5a82$
 //
 
 #include "libcef_dll/cpptoc/shared_memory_region_cpptoc.h"
@@ -59,8 +59,6 @@ const void* CEF_CALLBACK
 shared_memory_region_memory(struct _cef_shared_memory_region_t* self) {
   shutdown_checker::AssertNotShutdown();
 
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
   DCHECK(self);
   if (!self) {
     return NULL;
diff --git a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc
index e1924b934..dfc3b34a7 100644
--- a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc
+++ b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=eb7080f1bb2346bd513267f4c8c66af1ca0eb91f$
+// $hash=79771feab6c6d60667691c826ca9d6deaa23d068$
 //
 
 #include "libcef_dll/ctocpp/shared_memory_region_ctocpp.h"
@@ -59,8 +59,6 @@ NO_SANITIZE("cfi-icall") const void* CefSharedMemoryRegionCToCpp::Memory() {
     return NULL;
   }
 
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
   // Execute
   const void* _retval = _struct->memory(_struct);
 
diff --git a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc
index 5061ddb18..35839ea5f 100644
--- a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc
+++ b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=fe7f63c4ce0c3110dd9ff9170b5bb2ac59a83602$
+// $hash=439e6639c3e7a3f99de34d6c499b1c6766dc7fa7$
 //
 
 #include "libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h"
diff --git a/tools/cef_parser.py b/tools/cef_parser.py
index 81c095368..57abf78d1 100644
--- a/tools/cef_parser.py
+++ b/tools/cef_parser.py
@@ -344,8 +344,6 @@ _cre_attrib = '/\*--cef\(([A-Za-z0-9_ ,=:\n]{0,})\)--\*/'
 _cre_cfname = '([A-Za-z0-9_]{1,})'
 # regex for matching class and function names including path separators
 _cre_cfnameorpath = '([A-Za-z0-9_\/]{1,})'
-# regex for matching function return values
-_cre_retval = '([A-Za-z0-9_<>:,\*\&]{1,})'
 # regex for matching typedef value and name combination
 _cre_typedef = '([A-Za-z0-9_<>:,\*\&\s]{1,})'
 # regex for matching function return value and name combination
@@ -418,6 +416,10 @@ def get_function_impls(content, ident, has_impl=True):
     return value, name, arguments and body. Ident must occur somewhere in
     the value.
     """
+  # Remove prefix from methods in CToCpp files.
+  content = content.replace('NO_SANITIZE("cfi-icall") ', '')
+  content = content.replace('NO_SANITIZE("cfi-icall")\n', '')
+
   # extract the functions
   find_regex = '\n' + _cre_func + '\((.*?)\)([A-Za-z0-9_\s]{0,})'
   if has_impl: