diff --git a/cfg/std.cfg b/cfg/std.cfg
index e9c40a07f..9b0d874ec 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -983,9 +983,7 @@
       <not-null/>
       <not-uninit/>
     </arg>
-    <formatstr/>
     <arg nr="2">
-      <formatstr/>
       <not-uninit/>
     </arg>
     <arg nr="3"/>
@@ -998,9 +996,7 @@
       <not-null/>
       <not-uninit/>
     </arg>
-    <formatstr/>
     <arg nr="2">
-      <formatstr/>
       <not-uninit/>
     </arg>
     <arg nr="3"/>
@@ -1149,9 +1145,7 @@
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <formatstr scan="true"/>
     <arg nr="2">
-      <formatstr/>
       <not-uninit/>
     </arg>
     <arg nr="3"/>
@@ -1163,10 +1157,7 @@
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <formatstr scan="true"/>
-    <arg nr="2">
-      <formatstr/>
-    </arg>
+    <arg nr="2"/>
   </function>
   <!-- int fseek(FILE* stream, long int offset, int origin); -->
   <function name="fseek,std::fseek">
@@ -2586,9 +2577,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vprintf,std::vprintf">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <formatstr/>
     <arg nr="1">
-      <formatstr/>
       <not-uninit/>
     </arg>
     <arg nr="2"/>
@@ -2597,9 +2586,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vwprintf,std::vwprintf">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <formatstr/>
     <arg nr="1">
-      <formatstr/>
       <not-uninit/>
     </arg>
     <arg nr="2"/>
@@ -2821,9 +2808,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <formatstr scan="true"/>
     <arg nr="2">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2837,9 +2822,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
     </arg>
-    <formatstr scan="true"/>
     <arg nr="2">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2849,9 +2832,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vscanf,std::vscanf">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <formatstr scan="true"/>
     <arg nr="1">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2861,9 +2842,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vwscanf,std::vwscanf">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <formatstr scan="true"/>
     <arg nr="1">
-      <formatstr/>
       <not-null/>
     </arg>
     <arg nr="2"/>
@@ -3726,9 +3705,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="vsprintf,std::vsprintf">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <formatstr/>
     <arg nr="2">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3745,9 +3722,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="2">
       <not-uninit/>
     </arg>
-    <formatstr/>
     <arg nr="3">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3796,9 +3771,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="2">
       <not-uninit/>
     </arg>
-    <formatstr/>
     <arg nr="3">
-      <formatstr/>
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4110,6 +4083,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <function name="count" action="find"/>
       <function name="find" action="find" yields="iterator"/>
       <function name="emplace_hint" action="push"/>
+      <function name="try_emplace" action="push"/>
+      <function name="insert_or_assign" action="push"/>
       <function name="rehash" action="change-internal"/>
       <function name="lower_bound" yields="iterator"/>
       <function name="upper_bound" yields="iterator"/>