diff --git a/cfg/std.cfg b/cfg/std.cfg
index 7a9fe6829..50ddadd00 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -29,13 +29,13 @@
 	  <leak-ignore/>
 	  <arg nr="1"><not-uninit/></arg>
   </function>
-  <function name="difftime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="difftime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg><arg nr="2"><not-uninit/></arg></function>
   <function name="div">
 	  <pure/>
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
-	  <arg nr="1"><not-null/><not-uninit/></arg>
-	  <arg nr="2"><not-null/><not-uninit/></arg>
+	  <arg nr="1"><not-uninit/></arg>
+	  <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="exit"><noreturn>true</noreturn><arg nr="1"><not-uninit/></arg></function>
   <function name="exp"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
@@ -74,8 +74,8 @@
 	  <arg nr="1"><not-null/><not-uninit/></arg>
 	  <arg nr="2"><not-null/><not-uninit/></arg>
   </function>
-  <function name="floor"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="fmod"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
+  <function name="floor"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="fmod"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg><arg nr="2"><not-uninit/></arg></function>
   <function name="fopen">
 	  <noreturn>false</noreturn>
 	  <arg nr="1"><not-null/><not-uninit/></arg>
@@ -130,8 +130,8 @@
         <noreturn>false</noreturn>
         <leak-ignore/>
         <arg nr="1"><not-null/><minsize type="mul" arg="2" arg2="3"/></arg>
-        <arg nr="2"><not-null/><not-uninit/></arg>
-        <arg nr="3"><not-null/><not-uninit/></arg>
+        <arg nr="2"><not-uninit/></arg>
+        <arg nr="3"><not-uninit/></arg>
         <arg nr="4"><not-null/><not-uninit/></arg>
   </function>
   <function name="free">
@@ -147,7 +147,7 @@
   <function name="frexp">
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
        <arg nr="2"><not-null/></arg>
   </function>
   <function name="fscanf">
@@ -191,8 +191,8 @@
         <noreturn>false</noreturn>
         <leak-ignore/>
         <arg nr="1"><not-null/><not-uninit/><minsize type="mul" arg="2" arg2="3"/></arg>
-        <arg nr="2"><not-null/><not-uninit/></arg>
-        <arg nr="3"><not-null/><not-uninit/></arg>
+        <arg nr="2"><not-uninit/></arg>
+        <arg nr="3"><not-uninit/></arg>
         <arg nr="4"><not-null/><not-uninit/></arg>
   </function>
   <function name="mbstowcs">
@@ -247,13 +247,13 @@
   <function name="isspace"> <pure/><noreturn>false</noreturn> <leak-ignore/>  <arg nr="1"><valid>0:255</valid></arg> </function>
   <function name="isupper"> <pure/><noreturn>false</noreturn> <leak-ignore/>  <arg nr="1"><valid>0:255</valid></arg> </function>
   <function name="isxdigit"><pure/><noreturn>false</noreturn> <leak-ignore/>  <arg nr="1"><valid>0:255</valid></arg> </function>
-  <function name="labs">    <pure/><noreturn>false</noreturn><leak-ignore/>   <arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="labs">    <pure/><noreturn>false</noreturn><leak-ignore/>   <arg nr="1"><not-uninit/></arg></function>
   <function name="ldexp">
        <pure/>
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
+       <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="rand">
        <noreturn>false</noreturn>
@@ -267,21 +267,21 @@
        <pure/>
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
+       <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="localtime">
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
-	  <arg nr="1"><not-null/><not-uninit/></arg>
+	  <arg nr="1"><not-uninit/></arg>
   </function>
-  <function name="log"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="log10"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="log"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
+  <function name="log10"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="longjmp">
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
+       <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="malloc"><noreturn>false</noreturn><arg nr="1"><not-uninit/></arg></function>
   <function name="alloca"><noreturn>false</noreturn><arg nr="1"><not-uninit/></arg></function>
@@ -330,7 +330,7 @@
   <function name="modf">
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
        <arg nr="2"><not-null/></arg>
   </function>
   <function name="perror">
@@ -342,8 +342,8 @@
        <pure/>
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
+       <arg nr="1"><not-uninit/></arg>
+       <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="printf">
 	  <noreturn>false</noreturn>
@@ -369,28 +369,28 @@
        <leak-ignore/>
        <arg nr="1"><not-null/><not-uninit/></arg>
        <arg nr="2"><not-null/><not-uninit/></arg>
-       <arg nr="3"><not-null/><not-uninit/></arg>
-       <arg nr="4"><not-null/><not-uninit/></arg>
+       <arg nr="3"><not-uninit/></arg>
+       <arg nr="4"><not-uninit/></arg>
        <arg nr="5"><not-null/><not-uninit/></arg>
   </function>
   <function name="qsort">
        <noreturn>false</noreturn>
        <leak-ignore/>
        <arg nr="1"><not-null/><not-uninit/></arg>
-       <arg nr="2"><not-null/><not-uninit/></arg>
-       <arg nr="3"><not-null/><not-uninit/></arg>
+       <arg nr="2"><not-uninit/></arg>
+       <arg nr="3"><not-uninit/></arg>
        <arg nr="4"><not-null/><not-uninit/></arg>
   </function>
   <function name="putc">
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/><not-bool/><valid>0:</valid></arg>
+       <arg nr="1"><not-uninit/><not-bool/><valid>0:</valid></arg>
        <arg nr="2"><not-null/><not-uninit/></arg>
   </function>
   <function name="putwc">
        <noreturn>false</noreturn>
        <leak-ignore/>
-       <arg nr="1"><not-null/><not-uninit/><not-bool/></arg>
+       <arg nr="1"><not-uninit/><not-bool/></arg>
        <arg nr="2"><not-null/><not-uninit/></arg>
   </function>
   <function name="putchar">
@@ -423,7 +423,7 @@
 	  <leak-ignore/>
 	  <arg nr="1"><not-null/><not-uninit/></arg>
   </function>
-  <function name="round"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="round"><pure/><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
   <function name="scanf">
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
@@ -448,7 +448,7 @@
         <arg nr="3"><not-uninit/></arg>
         <arg nr="4"><not-uninit/></arg>
   </function>
-  <function name="setjmp"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="setjmp"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-uninit/></arg></function>
 
   <memory>
     <dealloc>free</dealloc>
@@ -479,11 +479,13 @@
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
 	  <arg nr="1"><not-null/><not-uninit/></arg>
+	  <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="wcschr">
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
 	  <arg nr="1"><not-null/><not-uninit/></arg>
+	  <arg nr="2"><not-uninit/></arg>
   </function>
   <function name="strcmp">
 	  <noreturn>false</noreturn>
@@ -515,7 +517,7 @@
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
 	  <arg nr="1"><not-null/></arg>
-	  <arg nr="2"><not-null/><not-uninit/></arg>
+	  <arg nr="2"><not-uninit/></arg>
 	  <arg nr="3"><not-null/><not-uninit/></arg>
 	  <arg nr="4"><not-null/><not-uninit/></arg>
   </function>