diff --git a/cfg/std.cfg b/cfg/std.cfg
index 48c2a5580..21b260da1 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -5003,14 +5003,85 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="2"/>
   </function>
   <!-- long strtol(const char *s, char **endp, int base); -->
-  <!-- unsigned long strtoul(const char *s, char **endp, int base); -->
-  <!-- long long strtoll(const char *s, char **endp, int base); -->
-  <!-- unsigned long long strtoull(const char *s, char **endp, int base); -->
-  <!-- intmax_t strtoimax (const char* str, char** endptr, int base); -->
-  <!-- uintmax_t strtoumax (const char* str, char** endptr, int base); -->
-  <function name="strtol,std::strtol,strtoul,std::strtoul,strtoll,std::strtoll,strtoull,std::strtoull,strtoimax,std::strtoimax,strtoumax,std::strtoumax">
+  <function name="strtol,std::strtol">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long strtoul(const char *s, char **endp, int base); -->
+  <function name="strtoul,std::strtoul">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- long long strtoll(const char *s, char **endp, int base); -->
+  <function name="strtoll,std::strtoll">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long long strtoull(const char *s, char **endp, int base); -->
+  <function name="strtoull,std::strtoull">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- intmax_t strtoimax (const char* str, char** endptr, int base); -->
+  <function name="strtoimax,std::strtoimax">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="intmax_t"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- uintmax_t strtoumax (const char* str, char** endptr, int base); -->
+  <function name="strtoumax,std::strtoumax">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="uintmax_t"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -5025,6 +5096,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="time,std::time">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="time_t"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -5054,6 +5126,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- FILE *tmpfile(void); -->
   <function name="tmpfile">
     <use-retval/>
+    <returnValue type="FILE *"/>
     <noreturn>false</noreturn>
   </function>
   <!-- int tolower(int c); -->
@@ -5108,12 +5181,35 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="2"/>
   </function>
   <!-- float wcstof(const wchar_t *s, wchar ** endp); -->
-  <!-- double wcstod(const wchar_t *s, wchar ** endp); -->
-  <!-- long double wcstold(const wchar_t *s, wchar ** endp); -->
-  <function name="wcstof,std::wcstof,wcstod,std::wcstod,wcstold,std::wcstold">
+  <function name="wcstof,std::wcstof">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2"/>
+  </function>
+  <!-- double wcstod(const wchar_t *s, wchar ** endp); -->
+  <function name="wcstod,std::wcstod">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2"/>
+  </function>
+  <!-- long double wcstold(const wchar_t *s, wchar ** endp); -->
+  <function name="wcstold,std::wcstold">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -5122,14 +5218,39 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- float stof (const string&  str, size_t* idx = 0); -->
   <!-- float stof (const wstring& str, size_t* idx = 0); -->
-  <!-- double stod (const string&  str, size_t* idx = 0); -->
-  <!-- double stod (const wstring& str, size_t* idx = 0); -->
-  <!-- long double stold (const string&  str, size_t* idx = 0); -->
-  <!-- long double stold (const wstring& str, size_t* idx = 0); -->
-  <function name="std::stod,std::stof,std::stold">
+  <function name="std::stof">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="float"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- double stod (const string&  str, size_t* idx = 0); -->
+  <!-- double stod (const wstring& str, size_t* idx = 0); -->
+  <function name="std::stod">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="double"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- long double stold (const string&  str, size_t* idx = 0); -->
+  <!-- long double stold (const wstring& str, size_t* idx = 0); -->
+  <function name="std::stold">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long double"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -5139,18 +5260,83 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- int stoi (const string&  str, size_t* idx = 0, int base = 10);
        int stoi (const wstring& str, size_t* idx = 0, int base = 10); -->
-  <!-- long stol (const string&  str, size_t* idx = 0, int base = 10);
-       long stol (const wstring& str, size_t* idx = 0, int base = 10); -->
-  <!-- long long stoll (const string&  str, size_t* idx = 0, int base = 10);
-       long long stoll (const wstring& str, size_t* idx = 0, int base = 10); -->
-  <!-- unsigned long stoul (const string&  str, size_t* idx = 0, int base = 10);
-       unsigned long stoul (const wstring& str, size_t* idx = 0, int base = 10); -->
-  <!-- unsigned long long stoull (const string&  str, size_t* idx = 0, int base = 10);
-       unsigned long long stoull (const wstring& str, size_t* idx = 0, int base = 10); -->
-  <function name="std::stoi,std::stol,std::stoll,std::stoul,std::stoull">
+  <function name="std::stoi">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="int"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" default="10">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- long stol (const string&  str, size_t* idx = 0, int base = 10);
+       long stol (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <function name="std::stol">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" default="10">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- long long stoll (const string&  str, size_t* idx = 0, int base = 10);
+       long long stoll (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <function name="std::stoll">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long long"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" default="10">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long stoul (const string&  str, size_t* idx = 0, int base = 10);
+       unsigned long stoul (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <function name="std::stoul">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="0">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" default="10">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long long stoull (const string&  str, size_t* idx = 0, int base = 10);
+       unsigned long long stoull (const wstring& str, size_t* idx = 0, int base = 10); -->
+  <function name="std::stoull">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long long"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -5171,10 +5357,29 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- string to_string (float val); -->
   <!-- string to_string (double val); -->
   <!-- string to_string (long double val);-->
-  <function name="std::to_string,std::to_wstring">
+  <function name="std::to_string">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="std::string"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- wstring to_wstring (int val); -->
+  <!-- wstring to_wstring (long val); -->
+  <!-- wstring to_wstring (long long val); -->
+  <!-- wstring to_wstring (unsigned val); -->
+  <!-- wstring to_wstring (unsigned long val); -->
+  <!-- wstring to_wstring (unsigned long long val); -->
+  <!-- wstring to_wstring (float val); -->
+  <!-- wstring to_wstring (double val); -->
+  <!-- wstring to_wstring (long double val);-->
+  <function name="std::to_wstring">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="std::wstring"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -5199,6 +5404,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="wcstok,std::wcstok">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="wchar_t *"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -5211,11 +5417,26 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- intmax_t wcstoimax(const wchar_t *s, wchar_t ** endp, int base); -->
-  <!-- uintmax_t wcstoumax(const wchar_t *s, wchar_t ** endp, int base); -->
-  <function name="wcstoimax,std::wcstoimax,wcstoumax,std::wcstoumax">
+  <function name="wcstoimax,std::wcstoimax">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="intmax_t"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- uintmax_t wcstoumax(const wchar_t *s, wchar_t ** endp, int base); -->
+  <function name="wcstoumax,std::wcstoumax">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="uintmax_t"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -5226,15 +5447,56 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- long wcstol(const wchar_t *s, wchar ** endp, int base); -->
-  <!-- long long wcstoll(const wchar_t *s, wchar ** endp, int base); -->
-  <!-- unsigned long wcstoul(const wchar_t *s, wchar ** endp, int base); -->
-  <!-- unsigned long long wcstoull(const wchar_t *s, wchar ** endp, int base); -->
-  <!-- intmax_t wcstoimax (const wchar_t* wcs, wchar_t** endptr, int base); -->
-  <!-- uintmax_t wcstoumax (const wchar_t* wcs, wchar_t** endptr, int base); -->
-  <function name="wcstol,std::wcstol,wcstoll,std::wcstoll,wcstoul,std::wcstoul,wcstoull,std::wcstoull,wcstoimax,std::wcstoimax,wcstoumax,std::wcstoumax">
+  <function name="wcstol,std::wcstol">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- long long wcstoll(const wchar_t *s, wchar ** endp, int base); -->
+  <function name="wcstoll,std::wcstoll">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="long long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long wcstoul(const wchar_t *s, wchar ** endp, int base); -->
+  <function name="wcstoul,std::wcstoul">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long"/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <valid>0,2:36</valid>
+    </arg>
+  </function>
+  <!-- unsigned long long wcstoull(const wchar_t *s, wchar ** endp, int base); -->
+  <function name="wcstoull,std::wcstoull">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="unsigned long long"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -5517,6 +5779,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="struct tmx *"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -5529,6 +5792,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- size_t c32rtomb ( char * pmb, char32_t c32, mbstate_t * ps ); -->
   <function name="c16rtomb,c32rtomb">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1"/>
     <arg nr="2">
@@ -5543,6 +5807,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- size_t mbrtoc32 ( char32_t * pc32, const char * pmb, size_t max, mbstate_t * ps); -->
   <function name="mbrtoc16,mbrtoc32">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1"/>
     <arg nr="2">