diff --git a/src/library.js b/src/library.js
index 87deaa1299b7a..18dd286755fde 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1946,8 +1946,10 @@ addToLibrary({
 
   $callRuntimeCallbacks__internal: true,
   $callRuntimeCallbacks: (callbacks) => {
-    // Pass the module as the first argument.
-    callbacks.forEach((f) => f(Module));
+    while (callbacks.length > 0) {
+      // Pass the module as the first argument.
+      callbacks.shift()(Module);
+    }
   },
 
 #if SHRINK_LEVEL == 0 || ASYNCIFY == 2
diff --git a/src/postamble.js b/src/postamble.js
index 3678bcd50d2be..075ed1048e48d 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -27,7 +27,6 @@ if (ENVIRONMENT_IS_WORKER) {
 {{{ exportRuntime() }}}
 
 var calledRun;
-var calledPrerun;
 
 #if STANDALONE_WASM && MAIN_READS_PARAMS
 var mainArgs = undefined;
@@ -47,7 +46,7 @@ function callMain() {
 #endif
 #if ASSERTIONS
   assert(runDependencies == 0, 'cannot call main when async dependencies remain! (listen on Module["onRuntimeInitialized"])');
-  assert(calledPrerun, 'cannot call main without calling preRun first');
+  assert(__ATPRERUN__.length == 0, 'cannot call main when preRun functions remain to be called');
 #endif
 
   var entryFunction = {{{ getEntryFunction() }}};
@@ -189,25 +188,22 @@ function run() {
   stackCheckInit();
 #endif
 
-  if (!calledPrerun) {
-    calledPrerun = 1;
-    preRun();
+  preRun();
 
-    // a preRun added a dependency, run will be called later
-    if (runDependencies > 0) {
+  // a preRun added a dependency, run will be called later
+  if (runDependencies > 0) {
 #if RUNTIME_DEBUG
-      dbg('run() called, but dependencies remain, so not running');
+    dbg('run() called, but dependencies remain, so not running');
 #endif
-      return;
-    }
+    return;
   }
 
   function doRun() {
     // run may have just been called through dependencies being fulfilled just in this very frame,
     // or while the async setStatus time below was happening
     if (calledRun) return;
-    calledRun = 1;
-    Module['calledRun'] = 1;
+    calledRun = true;
+    Module['calledRun'] = true;
 
     if (ABORT) return;
 
diff --git a/src/preamble.js b/src/preamble.js
index 3a6aee9c9ad3a..d37cb9fe76951 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -195,10 +195,11 @@ function preRun() {
   assert(!ENVIRONMENT_IS_PTHREAD); // PThreads reuse the runtime from the main thread.
 #endif
 #if expectToReceiveOnModule('preRun')
-  var preRuns = Module['preRun'];
-  if (preRuns) {
-    if (typeof preRuns == 'function') preRuns = [preRuns];
-    preRuns.forEach(addOnPreRun);
+  if (Module['preRun']) {
+    if (typeof Module['preRun'] == 'function') Module['preRun'] = [Module['preRun']];
+    while (Module['preRun'].length) {
+      addOnPreRun(Module['preRun'].shift());
+    }
   }
 #endif
   callRuntimeCallbacks(__ATPRERUN__);
@@ -288,10 +289,11 @@ function postRun() {
 #endif
 
 #if expectToReceiveOnModule('postRun')
-  var postRuns = Module['postRun'];
-  if (postRuns) {
-    if (typeof postRuns == 'function') postRuns = [postRuns];
-    postRuns.forEach(addOnPostRun);
+  if (Module['postRun']) {
+    if (typeof Module['postRun'] == 'function') Module['postRun'] = [Module['postRun']];
+    while (Module['postRun'].length) {
+      addOnPostRun(Module['postRun'].shift());
+    }
   }
 #endif
 
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
index bdab782884e7c..f9c1a1545b3f2 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8472
+8465
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
index 5c6b69f267b0b..bf1ad5c781aae 100644
--- a/test/other/codesize/test_codesize_cxx_ctors1.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20767
+20821
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
index ef1ec3d26c2c1..b4742a2b4cad8 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.gzsize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8453
+8449
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
index 6093276be9d72..67fe6b2955cac 100644
--- a/test/other/codesize/test_codesize_cxx_ctors2.jssize
+++ b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20735
+20789
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
index 4eea0f3a6687c..f4b0fd2854df0 100644
--- a/test/other/codesize/test_codesize_cxx_except.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9499
+9487
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
index 38cbc8e8ce881..f950ba1a40eb3 100644
--- a/test/other/codesize/test_codesize_cxx_except.jssize
+++ b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24611
+24665
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
index 5e15f114c79fb..3baad46c76930 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8431
+8427
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
index e31823e04344c..b1391fab5c15e 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20660
+20715
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
index 5e15f114c79fb..3baad46c76930 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8431
+8427
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
index e31823e04344c..b1391fab5c15e 100644
--- a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
+++ b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20660
+20715
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
index 1c35f29ce93d9..665f0801b8460 100644
--- a/test/other/codesize/test_codesize_cxx_lto.gzsize
+++ b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8365
+8359
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
index b14f4b5c068a5..14b9275a949a7 100644
--- a/test/other/codesize/test_codesize_cxx_lto.jssize
+++ b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20346
+20399
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
index ca7a892146d59..959f89db8c82c 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.gzsize
+++ b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9502
+9490
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
index ae9477568010b..f950ba1a40eb3 100644
--- a/test/other/codesize/test_codesize_cxx_mangle.jssize
+++ b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24612
+24665
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
index bdab782884e7c..f9c1a1545b3f2 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.gzsize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8472
+8465
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
index 5c6b69f267b0b..bf1ad5c781aae 100644
--- a/test/other/codesize/test_codesize_cxx_noexcept.jssize
+++ b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20767
+20821
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
index 33196dc99838a..1ffa5bc74e2d3 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.gzsize
@@ -1 +1 @@
-3903
+3899
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.jssize b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
index a32df27cb8771..9b275a0979023 100644
--- a/test/other/codesize/test_codesize_cxx_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
@@ -1 +1 @@
-8638
+8693
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
index 49b2da6655ab9..b426c45d86f70 100644
--- a/test/other/codesize/test_codesize_files_js_fs.gzsize
+++ b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7601
+7603
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
index 0351a114bbe9a..e536b345a43d5 100644
--- a/test/other/codesize/test_codesize_files_js_fs.jssize
+++ b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18662
+18716
diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize
index 00eda6ef936d1..96fd0f9dd03d9 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_files_wasmfs.gzsize
@@ -1 +1 @@
-2993
+2987
diff --git a/test/other/codesize/test_codesize_files_wasmfs.jssize b/test/other/codesize/test_codesize_files_wasmfs.jssize
index d2f62da3ce3c2..41fb47a7ed833 100644
--- a/test/other/codesize/test_codesize_files_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_files_wasmfs.jssize
@@ -1 +1 @@
-6275
+6329
diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize
index 0d7889080c9fa..a6dc95f140f75 100644
--- a/test/other/codesize/test_codesize_hello_O0.gzsize
+++ b/test/other/codesize/test_codesize_hello_O0.gzsize
@@ -1 +1 @@
-8032
+8052
diff --git a/test/other/codesize/test_codesize_hello_O0.jssize b/test/other/codesize/test_codesize_hello_O0.jssize
index d9ccc54644ba4..64d28ab2f7fbc 100644
--- a/test/other/codesize/test_codesize_hello_O0.jssize
+++ b/test/other/codesize/test_codesize_hello_O0.jssize
@@ -1 +1 @@
-21321
+21435
diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize
index 1d6219b116cab..c1fe14e0295ce 100644
--- a/test/other/codesize/test_codesize_hello_O1.gzsize
+++ b/test/other/codesize/test_codesize_hello_O1.gzsize
@@ -1 +1 @@
-2816
+2818
diff --git a/test/other/codesize/test_codesize_hello_O1.jssize b/test/other/codesize/test_codesize_hello_O1.jssize
index 3de258dcc34a7..331d936bc2012 100644
--- a/test/other/codesize/test_codesize_hello_O1.jssize
+++ b/test/other/codesize/test_codesize_hello_O1.jssize
@@ -1 +1 @@
-6932
+7025
diff --git a/test/other/codesize/test_codesize_hello_O2.gzsize b/test/other/codesize/test_codesize_hello_O2.gzsize
index ea908ff33b176..fbeb93ef34fe3 100644
--- a/test/other/codesize/test_codesize_hello_O2.gzsize
+++ b/test/other/codesize/test_codesize_hello_O2.gzsize
@@ -1 +1 @@
-2503
+2499
diff --git a/test/other/codesize/test_codesize_hello_O2.jssize b/test/other/codesize/test_codesize_hello_O2.jssize
index f96bb2f7a5857..f61405c38790b 100644
--- a/test/other/codesize/test_codesize_hello_O2.jssize
+++ b/test/other/codesize/test_codesize_hello_O2.jssize
@@ -1 +1 @@
-4982
+5036
diff --git a/test/other/codesize/test_codesize_hello_O3.jssize b/test/other/codesize/test_codesize_hello_O3.jssize
index 61dcbb9b95299..2fe2a2bc84df4 100644
--- a/test/other/codesize/test_codesize_hello_O3.jssize
+++ b/test/other/codesize/test_codesize_hello_O3.jssize
@@ -1 +1 @@
-4828
+4882
diff --git a/test/other/codesize/test_codesize_hello_Os.jssize b/test/other/codesize/test_codesize_hello_Os.jssize
index 61dcbb9b95299..2fe2a2bc84df4 100644
--- a/test/other/codesize/test_codesize_hello_Os.jssize
+++ b/test/other/codesize/test_codesize_hello_Os.jssize
@@ -1 +1 @@
-4828
+4882
diff --git a/test/other/codesize/test_codesize_hello_Oz.gzsize b/test/other/codesize/test_codesize_hello_Oz.gzsize
index a0198be084430..38ac9c5946d9c 100644
--- a/test/other/codesize/test_codesize_hello_Oz.gzsize
+++ b/test/other/codesize/test_codesize_hello_Oz.gzsize
@@ -1 +1 @@
-2400
+2398
diff --git a/test/other/codesize/test_codesize_hello_Oz.jssize b/test/other/codesize/test_codesize_hello_Oz.jssize
index 5352d47c64d98..c8db55238c8e5 100644
--- a/test/other/codesize/test_codesize_hello_Oz.jssize
+++ b/test/other/codesize/test_codesize_hello_Oz.jssize
@@ -1 +1 @@
-4794
+4849
diff --git a/test/other/codesize/test_codesize_hello_dylink.gzsize b/test/other/codesize/test_codesize_hello_dylink.gzsize
index de3d8348049da..97efd5dbc5030 100644
--- a/test/other/codesize/test_codesize_hello_dylink.gzsize
+++ b/test/other/codesize/test_codesize_hello_dylink.gzsize
@@ -1 +1 @@
-6340
+6339
diff --git a/test/other/codesize/test_codesize_hello_dylink.jssize b/test/other/codesize/test_codesize_hello_dylink.jssize
index a20d3e9da0ac7..9195b2fc9c83d 100644
--- a/test/other/codesize/test_codesize_hello_dylink.jssize
+++ b/test/other/codesize/test_codesize_hello_dylink.jssize
@@ -1 +1 @@
-13882
+13936
diff --git a/test/other/codesize/test_codesize_hello_export_nothing.jssize b/test/other/codesize/test_codesize_hello_export_nothing.jssize
index f1f3ca0baba94..3dc49aa04aae0 100644
--- a/test/other/codesize/test_codesize_hello_export_nothing.jssize
+++ b/test/other/codesize/test_codesize_hello_export_nothing.jssize
@@ -1 +1 @@
-3672
+3733
diff --git a/test/other/codesize/test_codesize_hello_wasmfs.jssize b/test/other/codesize/test_codesize_hello_wasmfs.jssize
index 61dcbb9b95299..2fe2a2bc84df4 100644
--- a/test/other/codesize/test_codesize_hello_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_hello_wasmfs.jssize
@@ -1 +1 @@
-4828
+4882
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
index 54ece5b58e987..22c92a24f4a53 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize
@@ -1 +1 @@
-1974
+1971
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
index 094b123f88fb8..a6813d6cb29fd 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-4049
+4110
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
index 48ad625d0644d..05da436b8dd78 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize
@@ -1 +1 @@
-2010
+2007
diff --git a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
index e11a7374b2ca3..8b49a4492ddcf 100644
--- a/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-4098
+4157
diff --git a/test/other/codesize/test_codesize_mem_O3.gzsize b/test/other/codesize/test_codesize_mem_O3.gzsize
index 6d92b9495f826..51d5790fa9f86 100644
--- a/test/other/codesize/test_codesize_mem_O3.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3.gzsize
@@ -1 +1 @@
-2431
+2434
diff --git a/test/other/codesize/test_codesize_mem_O3.jssize b/test/other/codesize/test_codesize_mem_O3.jssize
index 386dbe73c9173..19320f4b34e76 100644
--- a/test/other/codesize/test_codesize_mem_O3.jssize
+++ b/test/other/codesize/test_codesize_mem_O3.jssize
@@ -1 +1 @@
-4971
+5024
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.gzsize b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
index e2c12dfcdca3e..ab72fdf600b77 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.gzsize
@@ -1 +1 @@
-2577
+2579
diff --git a/test/other/codesize/test_codesize_mem_O3_grow.jssize b/test/other/codesize/test_codesize_mem_O3_grow.jssize
index cc1d64bcf857b..59a265c26452e 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow.jssize
@@ -1 +1 @@
-5253
+5306
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
index eb8c15407016f..53fa0c0ad5a83 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize
@@ -1 +1 @@
-2274
+2277
diff --git a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
index 748cd1a12b5e6..b9dafcc314664 100644
--- a/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-4659
+4713
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
index f9bef4af2873b..e64ac59301f60 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.gzsize
@@ -1 +1 @@
-2233
+2243
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone.jssize b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
index 0da8daf710b2c..4fbccb1a0a505 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone.jssize
@@ -1 +1 @@
-4589
+4643
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
index 44173d5cb77fe..b2a5d94cf583d 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.gzsize
@@ -1 +1 @@
-1996
+1991
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
index d7df15d1cdfb2..2b0a18cec8ad2 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-4100
+4161
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
index 48ad625d0644d..05da436b8dd78 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.gzsize
@@ -1 +1 @@
-2010
+2007
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
index e11a7374b2ca3..8b49a4492ddcf 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-4098
+4157
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
index 48ad625d0644d..05da436b8dd78 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.gzsize
@@ -1 +1 @@
-2010
+2007
diff --git a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
index e11a7374b2ca3..8b49a4492ddcf 100644
--- a/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
+++ b/test/other/codesize/test_codesize_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-4098
+4157
diff --git a/test/other/codesize/test_codesize_minimal_64.gzsize b/test/other/codesize/test_codesize_minimal_64.gzsize
index aa6f5d2f2a091..8ba317efe6514 100644
--- a/test/other/codesize/test_codesize_minimal_64.gzsize
+++ b/test/other/codesize/test_codesize_minimal_64.gzsize
@@ -1 +1 @@
-1587
+1589
diff --git a/test/other/codesize/test_codesize_minimal_64.jssize b/test/other/codesize/test_codesize_minimal_64.jssize
index 56e3ff90a524a..37023f76951aa 100644
--- a/test/other/codesize/test_codesize_minimal_64.jssize
+++ b/test/other/codesize/test_codesize_minimal_64.jssize
@@ -1 +1 @@
-3276
+3311
diff --git a/test/other/codesize/test_codesize_minimal_O0.gzsize b/test/other/codesize/test_codesize_minimal_O0.gzsize
index e561a75d77e6e..88f43e582800d 100644
--- a/test/other/codesize/test_codesize_minimal_O0.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O0.gzsize
@@ -1 +1 @@
-6559
+6576
diff --git a/test/other/codesize/test_codesize_minimal_O0.jssize b/test/other/codesize/test_codesize_minimal_O0.jssize
index 52e2932fa14bd..f3909521c0eb3 100644
--- a/test/other/codesize/test_codesize_minimal_O0.jssize
+++ b/test/other/codesize/test_codesize_minimal_O0.jssize
@@ -1 +1 @@
-17442
+17571
diff --git a/test/other/codesize/test_codesize_minimal_O1.gzsize b/test/other/codesize/test_codesize_minimal_O1.gzsize
index d6d863f32e2b8..99814cec1f592 100644
--- a/test/other/codesize/test_codesize_minimal_O1.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O1.gzsize
@@ -1 +1 @@
-1590
+1595
diff --git a/test/other/codesize/test_codesize_minimal_O1.jssize b/test/other/codesize/test_codesize_minimal_O1.jssize
index aee6816abc573..1f6788945a43a 100644
--- a/test/other/codesize/test_codesize_minimal_O1.jssize
+++ b/test/other/codesize/test_codesize_minimal_O1.jssize
@@ -1 +1 @@
-3641
+3726
diff --git a/test/other/codesize/test_codesize_minimal_O2.gzsize b/test/other/codesize/test_codesize_minimal_O2.gzsize
index 31d5cbb73d57a..d370470db85b8 100644
--- a/test/other/codesize/test_codesize_minimal_O2.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O2.gzsize
@@ -1 +1 @@
-1450
+1451
diff --git a/test/other/codesize/test_codesize_minimal_O2.jssize b/test/other/codesize/test_codesize_minimal_O2.jssize
index aaaa5469490af..049730c1f78a4 100644
--- a/test/other/codesize/test_codesize_minimal_O2.jssize
+++ b/test/other/codesize/test_codesize_minimal_O2.jssize
@@ -1 +1 @@
-2849
+2884
diff --git a/test/other/codesize/test_codesize_minimal_O3.gzsize b/test/other/codesize/test_codesize_minimal_O3.gzsize
index 889191761232e..b03a71123e693 100644
--- a/test/other/codesize/test_codesize_minimal_O3.gzsize
+++ b/test/other/codesize/test_codesize_minimal_O3.gzsize
@@ -1 +1 @@
-1414
+1416
diff --git a/test/other/codesize/test_codesize_minimal_O3.jssize b/test/other/codesize/test_codesize_minimal_O3.jssize
index d79c1203bb9d6..28520983963f1 100644
--- a/test/other/codesize/test_codesize_minimal_O3.jssize
+++ b/test/other/codesize/test_codesize_minimal_O3.jssize
@@ -1 +1 @@
-2799
+2834
diff --git a/test/other/codesize/test_codesize_minimal_Os.gzsize b/test/other/codesize/test_codesize_minimal_Os.gzsize
index 889191761232e..b03a71123e693 100644
--- a/test/other/codesize/test_codesize_minimal_Os.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Os.gzsize
@@ -1 +1 @@
-1414
+1416
diff --git a/test/other/codesize/test_codesize_minimal_Os.jssize b/test/other/codesize/test_codesize_minimal_Os.jssize
index d79c1203bb9d6..28520983963f1 100644
--- a/test/other/codesize/test_codesize_minimal_Os.jssize
+++ b/test/other/codesize/test_codesize_minimal_Os.jssize
@@ -1 +1 @@
-2799
+2834
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
index ed45f450e2506..a11d586ce91d1 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.gzsize
@@ -1 +1 @@
-1404
+1407
diff --git a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
index 949b816292eee..eebd44e48e8dd 100644
--- a/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz-ctors.jssize
@@ -1 +1 @@
-2784
+2819
diff --git a/test/other/codesize/test_codesize_minimal_Oz.gzsize b/test/other/codesize/test_codesize_minimal_Oz.gzsize
index 889191761232e..b03a71123e693 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.gzsize
+++ b/test/other/codesize/test_codesize_minimal_Oz.gzsize
@@ -1 +1 @@
-1414
+1416
diff --git a/test/other/codesize/test_codesize_minimal_Oz.jssize b/test/other/codesize/test_codesize_minimal_Oz.jssize
index d79c1203bb9d6..28520983963f1 100644
--- a/test/other/codesize/test_codesize_minimal_Oz.jssize
+++ b/test/other/codesize/test_codesize_minimal_Oz.jssize
@@ -1 +1 @@
-2799
+2834
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.gzsize b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
index 05166d8462423..84cfdfa7c8a08 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.gzsize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.gzsize
@@ -1 +1 @@
-4735
+4711
diff --git a/test/other/codesize/test_codesize_minimal_pthreads.jssize b/test/other/codesize/test_codesize_minimal_pthreads.jssize
index 0b713b42c5542..a6b22531474c3 100644
--- a/test/other/codesize/test_codesize_minimal_pthreads.jssize
+++ b/test/other/codesize/test_codesize_minimal_pthreads.jssize
@@ -1 +1 @@
-9954
+9984
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
index 889191761232e..b03a71123e693 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.gzsize
@@ -1 +1 @@
-1414
+1416
diff --git a/test/other/codesize/test_codesize_minimal_wasmfs.jssize b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
index d79c1203bb9d6..28520983963f1 100644
--- a/test/other/codesize/test_codesize_minimal_wasmfs.jssize
+++ b/test/other/codesize/test_codesize_minimal_wasmfs.jssize
@@ -1 +1 @@
-2799
+2834
diff --git a/test/other/test_unoptimized_code_size.js.size b/test/other/test_unoptimized_code_size.js.size
index 4900d73773e5d..cd3f56037e9bc 100644
--- a/test/other/test_unoptimized_code_size.js.size
+++ b/test/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-54876
+54982
diff --git a/test/other/test_unoptimized_code_size_no_asserts.js.size b/test/other/test_unoptimized_code_size_no_asserts.js.size
index a8ff86faa1431..f2ec7bf35fc85 100644
--- a/test/other/test_unoptimized_code_size_no_asserts.js.size
+++ b/test/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-30529
+30610
diff --git a/test/other/test_unoptimized_code_size_strict.js.size b/test/other/test_unoptimized_code_size_strict.js.size
index 3dbe8359fb262..48742928c5482 100644
--- a/test/other/test_unoptimized_code_size_strict.js.size
+++ b/test/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-53785
+53778
diff --git a/test/test_other.py b/test/test_other.py
index 95d682a03be10..4c6b0b5b39666 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -3620,6 +3620,21 @@ def test_file_packager_separate_metadata(self):
 
     self.assertEqual(metadata['package_uuid'], 'sha256-53ddc03623f867c7d4a631ded19c2613f2cb61d47b6aa214f47ff3cc15445bcd')
 
+    create_file('src.c', r'''
+    #include <assert.h>
+    #include <sys/stat.h>
+    #include <stdio.h>
+
+    int main() {
+      struct stat buf;
+      assert(stat("data1.txt", &buf) == 0);
+      assert(stat("subdir/data2.txt", &buf) == 0);
+      printf("done\n");
+      return 0;
+    }
+    ''')
+    self.do_runf('src.c', emcc_args=['--pre-js=immutable.js', '-sFORCE_FILESYSTEM'])
+
   def test_file_packager_unicode(self):
     unicode_name = 'unicode…☃'
     try:
diff --git a/tools/file_packager.py b/tools/file_packager.py
index c17b0b576521a..ed006c16f516e 100755
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -616,8 +616,11 @@ def generate_js(data_target, data_files, metadata):
     // Do not attempt to redownload the virtual filesystem data when in a pthread or a Wasm Worker context.
     var isPthread = typeof ENVIRONMENT_IS_PTHREAD != 'undefined' && ENVIRONMENT_IS_PTHREAD;
     var isWasmWorker = typeof ENVIRONMENT_IS_WASM_WORKER != 'undefined' && ENVIRONMENT_IS_WASM_WORKER;
-    if (isPthread || isWasmWorker) return;
-    function loadPackage(metadata) {\n'''
+    if (isPthread || isWasmWorker) return;\n'''
+
+  if options.support_node:
+    ret += "    var isNode = typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string';\n"
+  ret += '    function loadPackage(metadata) {\n'
 
   code = '''
       function assert(check, msg) {
@@ -785,15 +788,6 @@ def generate_js(data_target, data_files, metadata):
 
       code += r'''
         var PACKAGE_UUID = metadata['package_uuid'];
-        var indexedDB;
-        if (typeof window === 'object') {
-          indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
-        } else if (typeof location !== 'undefined') {
-          // worker
-          indexedDB = self.indexedDB;
-        } else {
-          throw 'using IndexedDB to cache data can only be done on a web page or in a web worker';
-        }
         var IDB_RO = "readonly";
         var IDB_RW = "readwrite";
         var DB_NAME = "''' + options.indexeddb_name + '''";
@@ -801,6 +795,18 @@ def generate_js(data_target, data_files, metadata):
         var METADATA_STORE_NAME = 'METADATA';
         var PACKAGE_STORE_NAME = 'PACKAGES';
         function openDatabase(callback, errback) {
+          if (isNode) {
+            return errback();
+          }
+          var indexedDB;
+          if (typeof window === 'object') {
+            indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
+          } else if (typeof location !== 'undefined') {
+            // worker
+            indexedDB = self.indexedDB;
+          } else {
+            throw 'using IndexedDB to cache data can only be done on a web page or in a web worker';
+          }
           try {
             var openRequest = indexedDB.open(DB_NAME, DB_VERSION);
           } catch (e) {
@@ -942,7 +948,7 @@ def generate_js(data_target, data_files, metadata):
     node_support_code = ''
     if options.support_node:
       node_support_code = '''
-        if (typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string') {
+        if (isNode) {
           require('fs').readFile(packageName, (err, contents) => {
             if (err) {
               errback(err);
@@ -1098,14 +1104,29 @@ def generate_js(data_target, data_files, metadata):
     }\n'''
 
   if options.separate_metadata:
-      _metadata_template = '''
+    node_support_code = ''
+    if options.support_node:
+      node_support_code = '''
+        if (isNode) {
+          require('fs').readFile(metadataUrl, 'utf8', (err, contents) => {
+            if (err) {
+              return Promise.reject(err);
+            } else {
+              loadPackage(JSON.parse(contents));
+            }
+          });
+          return;
+        }'''.strip()
+
+    ret += '''
     Module['removeRunDependency']('%(metadata_file)s');
   }
 
   function runMetaWithFS() {
     Module['addRunDependency']('%(metadata_file)s');
-    var REMOTE_METADATA_NAME = Module['locateFile'] ? Module['locateFile']('%(metadata_file)s', '') : '%(metadata_file)s';
-    fetch(REMOTE_METADATA_NAME)
+    var metadataUrl = Module['locateFile'] ? Module['locateFile']('%(metadata_file)s', '') : '%(metadata_file)s';
+    %(node_support_code)s
+    fetch(metadataUrl)
       .then((response) => {
         if (response.ok) {
           return response.json();
@@ -1120,14 +1141,14 @@ def generate_js(data_target, data_files, metadata):
   } else {
     if (!Module['preRun']) Module['preRun'] = [];
     Module["preRun"].push(runMetaWithFS);
-  }\n''' % {'metadata_file': os.path.basename(options.jsoutput + '.metadata')}
+  }\n''' % {'node_support_code': node_support_code, 'metadata_file': os.path.basename(options.jsoutput + '.metadata')}
   else:
-      _metadata_template = '''
+    ret += '''
     }
     loadPackage(%s);\n''' % json.dumps(metadata)
 
-  ret += '''%s
-  })();\n''' % _metadata_template
+  ret += '''
+  })();\n'''
 
   return ret