diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 05abf28116..b8714bd75a 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -5021,7 +5021,8 @@ static const char *startup_source =
 " 'current-module-name-resolver"
 "            \"(and/c (procedure-arity-includes/c 2) (procedure-arity-includes/c 4))\""
 " v_0)))"
-" v_0))))"
+" v_0))"
+" 'current-module-name-resolver))"
 "(define-values"
 "(1/current-module-declare-name)"
 "(make-parameter"
@@ -5031,7 +5032,8 @@ static const char *startup_source =
 "(if(let-values(((or-part_0)(not r_0)))(if or-part_0 or-part_0(1/resolved-module-path? r_0)))"
 "(void)"
 "         (let-values () (raise-argument-error 'current-module-declare-name \"(or/c #f resolved-module-path?)\" r_0)))"
-" r_0))))"
+" r_0))"
+" 'current-module-declare-name))"
 "(define-values"
 "(1/current-module-declare-source)"
 "(make-parameter"
@@ -5046,7 +5048,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "           (raise-argument-error 'current-module-declare-source \"(or/c #f symbol? (and/c path? complete-path?))\" s_0)))"
-" s_0))))"
+" s_0))"
+" 'current-module-declare-source))"
 "(define-values"
 "(substitute-module-declare-name)"
 "(lambda(default-name_0)"
@@ -5794,7 +5797,7 @@ static const char *startup_source =
 "(define-values(tamper-needs-propagate?)(lambda(t_0)(begin(eq? t_0 'tainted/need-propagate))))"
 "(define-values(tamper-propagated)(lambda(t_0)(begin(if(eq? t_0 'tainted/need-propagate) 'tainted t_0))))"
 "(define-values(serialize-tamper)(lambda(t_0)(begin(if(tamper-armed? t_0) 'armed t_0))))"
-"(define-values(current-arm-inspectors)(make-parameter(seteq)))"
+"(define-values(current-arm-inspectors)(make-parameter(seteq) #f 'current-arm-inspectors))"
 "(define-values(deserialize-tamper)(lambda(t_0)(begin(if(eq? t_0 'armed)(current-arm-inspectors) t_0))))"
 "(define-values"
 "(struct:syntax"
@@ -12606,7 +12609,8 @@ static const char *startup_source =
 "(lambda(v_0)"
 "(begin"
 "       (if (1/namespace? v_0) (void) (let-values () (raise-argument-error 'current-namespace \"namespace?\" v_0)))"
-" v_0))))"
+" v_0))"
+" 'current-namespace))"
 "(define-values"
 "(namespace-get-root-expand-ctx)"
 "(lambda(ns_0)(begin(force(unbox(namespace-root-expand-ctx ns_0))))))"
@@ -15877,7 +15881,8 @@ static const char *startup_source =
 "(if or-part_0 or-part_0(if(procedure? v_0)(procedure-arity-includes? v_0 2) #f)))"
 "(void)"
 "         (let-values () (raise-argument-error 'current-expand-observe \"(or/c (procedure-arity-includes/c 2) #f)\" v_0)))"
-" v_0))))"
+" v_0))"
+" 'current-expand-observe))"
 "(define-values"
 "(as-expression-context)"
 "(lambda(ctx_0)"
@@ -37615,7 +37620,7 @@ static const char *startup_source =
 "(lambda(key_0)"
 "(begin"
 "(let-values(((e_0)(hash-ref(unsafe-place-local-ref cell.1$3) key_0 #f)))(if e_0(ephemeron-value e_0) #f)))))"
-"(define-values(current-module-declare-as-predefined)(make-parameter #f))"
+"(define-values(current-module-declare-as-predefined)(make-parameter #f #f 'current-module-declare-as-predefined))"
 "(define-values"
 "(eval-module8.1)"
 "(lambda(namespace1_0 supermodule-name3_0 with-submodules?2_0 c7_0)"
@@ -50587,7 +50592,8 @@ static const char *startup_source =
 "(if((lambda(p_1)(if(procedure? p_1)(procedure-arity-includes? p_1 1) #f)) p_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-eval \"(procedure-arity-includes/c 1)\" p_0)))"
-" p_0))))))"
+" p_0))"
+" 'current-eval))))"
 "(define-values"
 "(1/current-compile)"
 "(let-values()"
@@ -50599,7 +50605,8 @@ static const char *startup_source =
 "(if((lambda(p_1)(if(procedure? p_1)(procedure-arity-includes? p_1 2) #f)) p_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-compile \"(procedure-arity-includes/c 2)\" p_0)))"
-" p_0))))))"
+" p_0))"
+" 'current-compile))))"
 "(define-values"
 "(1/current-load)"
 "(let-values()"
@@ -50611,7 +50618,8 @@ static const char *startup_source =
 "(if((lambda(p_1)(if(procedure? p_1)(procedure-arity-includes? p_1 2) #f)) p_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-load \"(procedure-arity-includes/c 2)\" p_0)))"
-" p_0))))))"
+" p_0))"
+" 'current-load))))"
 "(define-values"
 "(1/current-load/use-compiled)"
 "(let-values()"
@@ -50623,7 +50631,8 @@ static const char *startup_source =
 "(if((lambda(p_1)(if(procedure? p_1)(procedure-arity-includes? p_1 2) #f)) p_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-load/use-compiled \"(procedure-arity-includes/c 2)\" p_0)))"
-" p_0))))))"
+" p_0))"
+" 'current-load/use-compiled))))"
 "(define-values"
 "(1/current-library-collection-paths)"
 "(let-values()"
@@ -50639,7 +50648,8 @@ static const char *startup_source =
 " 'current-library-collection-paths"
 "                \"(listof (and/c path-string? complete-path?))\""
 " l_0)))"
-"(map2 to-path l_0)))))))"
+"(map2 to-path l_0)))"
+" 'current-library-collection-paths))))"
 "(define-values"
 "(1/current-library-collection-links)"
 "(let-values()"
@@ -50753,7 +50763,8 @@ static const char *startup_source =
 " for-loop_0)"
 " '#hash()"
 "(hash-iterate-first ht_0)))))))))"
-" l_0)))))))"
+" l_0)))"
+" 'current-library-collection-links))))"
 "(define-values"
 "(1/use-compiled-file-paths)"
 "(let-values()"
@@ -50766,7 +50777,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "               (raise-argument-error 'use-compiled-file-paths \"(listof (and/c path-string? relative-path?))\" l_0)))"
-"(map2 to-path l_0)))))))"
+"(map2 to-path l_0)))"
+" 'use-compiled-file-paths))))"
 "(define-values"
 "(1/current-compiled-file-roots)"
 "(let-values()"
@@ -50786,7 +50798,8 @@ static const char *startup_source =
 "(void)"
 "(let-values()"
 "               (raise-argument-error 'current-compiled-file-roots \"(listof (or/c path-string? 'same))\" l_0)))"
-"(map2 to-path l_0)))))))"
+"(map2 to-path l_0)))"
+" 'current-compiled-file-roots))))"
 "(define-values"
 "(1/use-compiled-file-check)"
 "(let-values()"
@@ -50800,9 +50813,14 @@ static const char *startup_source =
 " v_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'use-compiled-file-check \"(or/c 'modify-seconds 'exists)\" v_0)))"
-" v_0))))))"
-"(define-values(1/use-collection-link-paths)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/use-user-specific-search-paths)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
+" v_0))"
+" 'use-compiled-file-check))))"
+"(define-values"
+"(1/use-collection-link-paths)"
+"(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'use-collection-link-paths))"
+"(define-values"
+"(1/use-user-specific-search-paths)"
+"(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'use-user-specific-search-paths))"
 "(define-values(complete-path-string?)(lambda(p_0)(begin(if(path-string? p_0)(complete-path? p_0) #f))))"
 "(define-values"
 "(relative-path-string?$1)"
@@ -52114,7 +52132,8 @@ static const char *startup_source =
 " v_0)"
 "(void)"
 "             (let-values () (raise-argument-error 'current-readtable \"(or/c prop:readtable? #f)\" v_0)))"
-" v_0))))))"
+" v_0))"
+" 'current-readtable))))"
 "(define-values"
 "(struct:read-config/outer"
 " read-config/outer1.1"
@@ -52597,22 +52616,31 @@ static const char *startup_source =
 "(if(if(procedure? v_0)(procedure-arity-includes? v_0 1) #f)"
 "(void)"
 "         (let-values () (raise-argument-error 'current-reader-guard \"(procedure-arity-includes/c 1)\" v_0)))"
-" v_0))))"
-"(define-values(1/read-square-bracket-as-paren)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-curly-brace-as-paren)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-square-bracket-with-tag)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-curly-brace-with-tag)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-cdot)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-graph)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-compiled)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-box)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-single-flonum)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-dot)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-infix-dot)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-quasiquote)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-reader)(make-parameter #f(lambda(v_0)(if v_0 #t #f))))"
-"(define-values(1/read-accept-lang)(make-parameter #t(lambda(v_0)(if v_0 #t #f))))"
+" v_0))"
+" 'current-reader-guard))"
+"(define-values"
+"(1/read-square-bracket-as-paren)"
+"(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-square-bracket-as-paren))"
+"(define-values"
+"(1/read-curly-brace-as-paren)"
+"(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-curly-brace-as-paren))"
+"(define-values"
+"(1/read-square-bracket-with-tag)"
+"(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-square-bracket-with-tag))"
+"(define-values"
+"(1/read-curly-brace-with-tag)"
+"(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-curly-brace-with-tag))"
+"(define-values(1/read-cdot)(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-cdot))"
+"(define-values(1/read-accept-graph)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-graph))"
+"(define-values(1/read-accept-compiled)(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-accept-compiled))"
+"(define-values(1/read-accept-box)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-box))"
+"(define-values(1/read-single-flonum)(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-single-flonum))"
+"(define-values(1/read-decimal-as-inexact)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-decimal-as-inexact))"
+"(define-values(1/read-accept-dot)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-dot))"
+"(define-values(1/read-accept-infix-dot)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-infix-dot))"
+"(define-values(1/read-accept-quasiquote)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-quasiquote))"
+"(define-values(1/read-accept-reader)(make-parameter #f(lambda(v_0)(if v_0 #t #f)) 'read-accept-reader))"
+"(define-values(1/read-accept-lang)(make-parameter #t(lambda(v_0)(if v_0 #t #f)) 'read-accept-lang))"
 "(define-values(unknown)(gensym 'unknown))"
 "(define-values"
 "(check-parameter)"
@@ -62719,7 +62747,8 @@ static const char *startup_source =
 "             \" (and/c syntax? (lambda (stx) (module-path? (syntax->datum stx))))\""
 "             \" #f)\")"
 " v_0)))"
-" v_0))))"
+" v_0))"
+" 'current-module-path-for-load))"
 "(define-values"
 "(maybe-raise-missing-module)"
 "(lambda(name_0 filename_0 pre_0 rel_0 post_0 errstr_0)"