diff --git a/cfg/std.cfg b/cfg/std.cfg
index 9273a4888..dfb76de9c 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -21,7 +21,7 @@
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
-    <returnValue>arg1&gt;0?arg1:-arg1</returnValue>
+    <returnValue type="intmax_t">arg1&gt;0?arg1:-arg1</returnValue>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -228,6 +228,7 @@
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="size_t"/>
     <arg nr="1">
       <not-null/>
     </arg>
@@ -297,6 +298,7 @@
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-uninit/>
     </arg>
@@ -305,6 +307,7 @@
   <function name="fegetenv,std::fegetenv">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-null/>
     </arg>
@@ -313,6 +316,7 @@
   <function name="fegetexceptflag,std::fegetexceptflag">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-null/>
     </arg>
@@ -323,6 +327,7 @@
   <!-- int fegetround(void); -->
   <function name="fegetround,std::fegetround">
     <use-retval/>
+    <returnValue type="int"/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -330,6 +335,7 @@
   <!-- int feholdexcept(fenv_t* envp); -->
   <function name="feholdexcept,std::feholdexcept">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -338,6 +344,7 @@
   <!-- int feraiseexcept(int excepts); -->
   <function name="feraiseexcept,std::feraiseexcept">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -346,6 +353,7 @@
   <!-- int fesetenv(const fenv_t* envp); -->
   <function name="fesetenv,std::fesetenv">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -355,6 +363,7 @@
   <!-- int fesetexceptflag(const fexcept_t* flagp, int excepts); -->
   <function name="fesetexceptflag,std::fesetexceptflag">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -367,6 +376,7 @@
   <!-- int fesetround(int rdir); -->
   <function name="fesetround,std::fesetround">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -375,6 +385,7 @@
   <!-- int fetestexcept(int excepts); -->
   <function name="fetestexcept,std::fetestexcept">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -383,6 +394,7 @@
   <!-- int feupdateenv(const fenv_t* envp); -->
   <function name="feupdateenv,std::feupdateenv">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -479,6 +491,7 @@
   <!-- int atexit(void (*func)(void)); -->
   <function name="atexit,std::atexit">
     <pure/>
+    <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -486,12 +499,49 @@
     </arg>
   </function>
   <!-- int atoi(const char *s); -->
-  <!-- long int atol(const char *s); -->
-  <!-- long long int atoll(const char *s); -->
-  <!-- double atof(const char *s); -->
-  <function name="atoi,atol,atoll,std::atoi,std::atol,std::atoll,atof,std::atof">
+  <function name="atoi,std::atoi">
     <use-retval/>
     <pure/>
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- long int atol(const char *s); -->
+  <function name="atol,std::atol">
+    <use-retval/>
+    <pure/>
+    <returnValue type="long int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- long long int atoll(const char *s); -->
+  <function name="atoll,std::atoll">
+    <use-retval/>
+    <pure/>
+    <returnValue type="long long int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- double atof(const char *s); -->
+  <function name="atof,std::atof">
+    <use-retval/>
+    <pure/>
+    <returnValue type="double"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -628,6 +678,7 @@
   <!-- double difftime(time_t time2, time_t time1); -->
   <function name="difftime,std::difftime">
     <use-retval/>
+    <returnValue type="double"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -641,6 +692,7 @@
   <function name="div,std::div">
     <pure/>
     <noreturn>false</noreturn>
+    <returnValue type="div_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -654,6 +706,7 @@
   <function name="imaxdiv,std::imaxdiv">
     <pure/>
     <noreturn>false</noreturn>
+    <returnValue type="imaxdiv_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -803,6 +856,7 @@
   <!-- int fclose(FILE * stream); -->
   <function name="fclose,std::fclose">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -812,6 +866,7 @@
   <function name="feof,std::feof">
     <use-retval/>
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -821,6 +876,7 @@
   <!-- int ferror(FILE *stream);-->
   <function name="ferror,std::ferror">
     <use-retval/>
+    <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -831,6 +887,7 @@
   <!-- int fflush(FILE *stream); -->
   <function name="fflush,std::fflush">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -852,6 +909,7 @@
   <function name="fgetpos,std::fgetpos">
     <noreturn>false</noreturn>
     <leak-ignore/>
+    <returnValue type="int"/>
     <arg nr="1">
       <not-null/>
       <not-uninit/>
@@ -954,6 +1012,7 @@
                 const char *restrict mode); -->
   <function name="fopen_s">
     <noreturn>false</noreturn>
+    <returnValue type="errno_t"/>
     <arg nr="1">
       <not-null/>
     </arg>
@@ -970,6 +1029,7 @@
   <!-- int fprintf(FILE *stream, const char *format, ...); -->
   <function name="fprintf,std::fprintf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -984,6 +1044,7 @@
   <!-- int vfprintf(FILE *stream, const char *format, va_list arg); -->
   <function name="vfprintf,std::vfprintf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -997,6 +1058,7 @@
   <!-- int vfwprintf(FILE *stream, const wchar_t *format, va_list arg); -->
   <function name="vfwprintf,std::vfwprintf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1010,6 +1072,7 @@
   <!-- int fputc(int c, FILE *stream); -->
   <function name="fputc,std::fputc">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1024,6 +1087,7 @@
   <!-- wint_t fputwc(wchar_t wc, FILE * stream); -->
   <function name="fputwc,std::fputwc">
     <noreturn>false</noreturn>
+    <returnValue type="wint_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1037,6 +1101,7 @@
   <!-- int fputs(const char *string, FILE* stream); -->
   <function name="fputs,std::fputs">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1051,6 +1116,7 @@
   <!-- int fputws(const wchar_t* ws, FILE* stream); -->
   <function name="fputws,std::fputws">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1064,6 +1130,7 @@
   <!-- size_t fread(void *ptr, size_t size, size_t nobj, FILE *stream); -->
   <function name="fread,std::fread">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1109,6 +1176,7 @@
   <!-- errno_t freopen_s(FILE *restrict *restrict newstreamptr, const char *restrict filename, const char *restrict mode, FILE *restrict stream) -->
   <function name="freopen_s">
     <noreturn>false</noreturn>
+    <returnValue type="errno_t"/>
     <use-retval/>
     <arg nr="1">
       <not-uninit/>
@@ -1160,6 +1228,7 @@
   <!-- int fscanf(FILE *stream, const char *format, ...); -->
   <function name="fscanf,std::fscanf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1173,6 +1242,7 @@
   <!-- int vfscanf(FILE *stream, const char * format, va_list arg); -->
   <function name="vfscanf,std::vfscanf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1185,6 +1255,7 @@
   <!-- int vfwscanf(FILE *stream, const wchar_t * format, va_list arg); -->
   <function name="vfwscanf,std::vfwscanf">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1198,6 +1269,7 @@
   <!-- int fseek(FILE* stream, long int offset, int origin); -->
   <function name="fseek,std::fseek">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1213,6 +1285,7 @@
   <!-- int fsetpos(FILE *stream, const fpos_t *ptr); -->
   <function name="fsetpos,std::fsetpos">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1262,6 +1335,7 @@
   <!-- long int ftell(FILE *stream); -->
   <function name="ftell,std::ftell">
     <noreturn>false</noreturn>
+    <returnValue type="long int"/>
     <use-retval/>
     <leak-ignore/>
     <arg nr="1">
@@ -1272,6 +1346,7 @@
   <!-- int fwide(FILE* stream, int mode); -->
   <function name="fwide,std::fwide">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1284,6 +1359,7 @@
   <!-- size_t fwrite(const void *ptr, size_t size, size_t nobj, FILE *stream); -->
   <function name="fwrite,std::fwrite">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1306,6 +1382,7 @@
   <!-- int mblen(const char *string, size_t size); -->
   <function name="mblen,std::mblen">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1318,6 +1395,7 @@
   <!-- int mbtowc(wchar_t* pwc, const char* pmb, size_t max); -->
   <function name="mbtowc,std::mbtowc">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="2">
       <not-uninit/>
@@ -1330,6 +1408,7 @@
   <!-- size_t mbrlen(const char* pmb, size_t max, mbstate_t* ps); -->
   <function name="mbrlen,std::mbrlen">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1346,6 +1425,7 @@
   <!-- wint_t btowc(int c); -->
   <function name="btowc,std::btowc">
     <use-retval/>
+    <returnValue type="wint_t"/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1357,6 +1437,7 @@
   <!-- int mbsinit(const mbstate_t* ps); -->
   <function name="mbsinit,std::mbsinit">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1365,11 +1446,13 @@
   <!-- wint_t getwchar(void); -->
   <function name="getwchar">
     <noreturn>false</noreturn>
+    <returnValue type="wint_t"/>
     <leak-ignore/>
   </function>
   <!-- size_t mbstowcs(wchar_t *ws, const char *s, size_t n); -->
   <function name="mbstowcs,std::mbstowcs">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="2">
       <not-null/>
@@ -1383,6 +1466,7 @@
   <!-- size_t mbsrtowcs(wchar_t* dest, const char** src, size_t max, mbstate_t* ps); -->
   <function name="mbsrtowcs,std::mbsrtowcs">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="2">
       <not-null/>
@@ -1399,6 +1483,7 @@
   <!-- int wctob(wint_t wc); -->
   <function name="wctob,std::wctob">
     <use-retval/>
+    <returnValue type="int"/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1409,6 +1494,7 @@
   <!-- int wctomb(char *s, wchar_t wchar); -->
   <function name="wctomb,std::wctomb">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1420,6 +1506,7 @@
   <!-- size_t wcstombs(char *mbstr, const wchar_t *wcstr, size_t n);-->
   <function name="wcstombs,std::wcstombs">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <arg nr="2">
       <not-null/>
@@ -1432,12 +1519,14 @@
   </function>
   <!-- int getchar(void); -->
   <function name="getchar">
+    <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
   </function>
   <!-- int ungetc(int c, FILE *stream); -->
   <function name="ungetc,std::ungetc">
     <noreturn>false</noreturn>
+    <returnValue type="int"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -1450,6 +1539,7 @@
   </function>
   <!-- wint_t ungetwc(wint_t c, FILE *stream); -->
   <function name="ungetwc,std::ungetwc">
+    <returnValue type="wint_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">