diff --git a/common/formatter/formatter_tree.cpp b/common/formatter/formatter_tree.cpp
index 0fecbbed6e..96e49517dc 100644
--- a/common/formatter/formatter_tree.cpp
+++ b/common/formatter/formatter_tree.cpp
@@ -138,9 +138,8 @@ void FormatterTree::construct_formatter_tree_recursive(const std::string& source
       }
     } else {
       construct_formatter_tree_recursive(source, child_node, tree_node, next_node_prefix);
-      // TODO - im not sure if this is correct
-      if (node_prefix && !tree_node.refs.empty()) {
-        tree_node.refs.at(tree_node.refs.size() - 1).node_prefix = node_prefix;
+      if (next_node_prefix && !tree_node.refs.empty()) {
+        tree_node.refs.at(tree_node.refs.size() - 1).node_prefix = next_node_prefix;
       }
     }
   }
diff --git a/goal_src/jak1/compiler-setup.gc b/goal_src/jak1/compiler-setup.gc
index 4dbef56e1a..50b57718da 100644
--- a/goal_src/jak1/compiler-setup.gc
+++ b/goal_src/jak1/compiler-setup.gc
@@ -1,4 +1,6 @@
-#|@file Compiler Setup for Jak 1 |#
+;;
+;; Compiler Setup for Jak 1
+;;
 
 ;; load kernel type definitions.
 ;; these types/functions are provided by Jak 1's runtime.
diff --git a/goal_src/jak1/engine/anim/aligner-h.gc b/goal_src/jak1/engine/anim/aligner-h.gc
index 130adb067d..c69e421add 100644
--- a/goal_src/jak1/engine/anim/aligner-h.gc
+++ b/goal_src/jak1/engine/anim/aligner-h.gc
@@ -3,6 +3,11 @@
 (bundles "ENGINE.CGO" "GAME.CGO")
 (require "engine/draw/drawable-h.gc")
 (require "kernel/gstate.gc")
+
+;; name: aligner-h.gc
+;; name in dgo: aligner-h
+;; dgos: GAME, ENGINE
+
 (defenum align-flags
   :bitfield #t
   :type uint32
diff --git a/goal_src/jak1/engine/anim/aligner.gc b/goal_src/jak1/engine/anim/aligner.gc
index 1935efdb89..654362d23f 100644
--- a/goal_src/jak1/engine/anim/aligner.gc
+++ b/goal_src/jak1/engine/anim/aligner.gc
@@ -4,6 +4,10 @@
 (require "engine/anim/aligner-h.gc")
 (require "engine/common-obs/process-drawable.gc")
 
+;; name: aligner.gc
+;; name in dgo: aligner
+;; dgos: GAME, ENGINE
+
 ;; DECOMP BEGINS
 
 ;; ERROR: Unsupported inline assembly instruction kind - [lw ra, return-from-thread(s7)]
diff --git a/goal_src/jak1/engine/anim/joint-exploder.gc b/goal_src/jak1/engine/anim/joint-exploder.gc
index ca8b769fa9..d699b1a632 100644
--- a/goal_src/jak1/engine/anim/joint-exploder.gc
+++ b/goal_src/jak1/engine/anim/joint-exploder.gc
@@ -4,6 +4,10 @@
 (require "engine/collide/collide-cache.gc")
 (require "engine/common-obs/process-drawable.gc")
 
+;; name: joint-exploder.gc
+;; name in dgo: joint-exploder
+;; dgos: GAME, COMMON, L1
+
 ;; DECOMP BEGINS
 
 (deftype joint-exploder-tuning (structure)
@@ -400,7 +404,7 @@
   (set! (-> self root trans quad) (-> self parent-override 0 root trans quad))
   (quaternion-copy! (-> self root quat) (-> self parent-override 0 root quat))
   (set! (-> self root scale quad) (-> self parent-override 0 root scale quad))
-  (initialize-skeleton self arg0 ())
+  (initialize-skeleton self arg0 '())
   (logior! (-> self skel status) (janim-status inited))
   (set! (-> self anim) (the-as art-joint-anim (-> self draw art-group data arg1)))
   (ja-channel-set! 1)
diff --git a/goal_src/jak1/engine/anim/joint.gc b/goal_src/jak1/engine/anim/joint.gc
index 25ef0b8690..9ed9645577 100644
--- a/goal_src/jak1/engine/anim/joint.gc
+++ b/goal_src/jak1/engine/anim/joint.gc
@@ -1325,22 +1325,22 @@
 
 (defun make-joint-jump-tables ()
   #|
-   #x3ee6b6f9, // = 9 ^ 1055307504
-   #x3ee6b6ff, // = 15 ^ 1055307504
-   #x3ee6b6e2, // = 18 ^ 1055307504
-   #x3ee6b6e4, // = 20 ^ 1055307504
-   #x3ee6b6e5, // = 21 ^ 1055307504
-   #x3ee6b6eb, // = 27 ^ 1055307504
-   #x3ee6b6ee, // = 30 ^ 1055307504
-   #x3ee6b6f6, // = 6 ^ 1055307504
-   #x3ee6b6fc, // = 12 ^ 1055307504
-   #x3ee6b6ff, // = 15 ^ 1055307504
-   #x3ee6b6e3, // = 19 ^ 1055307504
-   #x3ee6b6e4, // = 20 ^ 1055307504
-   #x3ee6b6e8, // = 24 ^ 1055307504
-   #x3ee6b6eb, // = 27 ^ 1055307504
-   #x3ee6b6ef, // = 31 ^ 1055307504
-   #x3ee6b6f6, // = 6 ^ 1055307504
+    #x3ee6b6f9, // = 9 ^ 1055307504
+    #x3ee6b6ff, // = 15 ^ 1055307504
+    #x3ee6b6e2, // = 18 ^ 1055307504
+    #x3ee6b6e4, // = 20 ^ 1055307504
+    #x3ee6b6e5, // = 21 ^ 1055307504
+    #x3ee6b6eb, // = 27 ^ 1055307504
+    #x3ee6b6ee, // = 30 ^ 1055307504
+    #x3ee6b6f6, // = 6 ^ 1055307504
+    #x3ee6b6fc, // = 12 ^ 1055307504
+    #x3ee6b6ff, // = 15 ^ 1055307504
+    #x3ee6b6e3, // = 19 ^ 1055307504
+    #x3ee6b6e4, // = 20 ^ 1055307504
+    #x3ee6b6e8, // = 24 ^ 1055307504
+    #x3ee6b6eb, // = 27 ^ 1055307504
+    #x3ee6b6ef, // = 31 ^ 1055307504
+    #x3ee6b6f6, // = 6 ^ 1055307504
   |#
   (set! (-> (scratchpad-object terrain-context) work foreground joint-work fix-jmp-table 0)
         (the-as (function none) (+ 0 #x3ee6b6f9)))
diff --git a/goal_src/jak1/engine/camera/cam-debug-h.gc b/goal_src/jak1/engine/camera/cam-debug-h.gc
index b4fe2d921e..72e0d59f98 100644
--- a/goal_src/jak1/engine/camera/cam-debug-h.gc
+++ b/goal_src/jak1/engine/camera/cam-debug-h.gc
@@ -152,3 +152,5 @@
   (let ((a0-3 (mod (+ (the int arg0) -1 *timeplot-index*) 400))) (-> *timeplot-table* a0-3)))
 
 (define-perm *cam-layout* symbol #f)
+
+0
diff --git a/goal_src/jak1/engine/camera/cam-states-dbg.gc b/goal_src/jak1/engine/camera/cam-states-dbg.gc
index ccd0988cbc..0c592a452b 100644
--- a/goal_src/jak1/engine/camera/cam-states-dbg.gc
+++ b/goal_src/jak1/engine/camera/cam-states-dbg.gc
@@ -280,7 +280,7 @@
         (set! (-> self blend-to-type) (the-as uint 1))))
   :exit
     (behavior ()
-      ())
+      '())
   :code
     (behavior ()
       (loop
diff --git a/goal_src/jak1/engine/camera/cam-states.gc b/goal_src/jak1/engine/camera/cam-states.gc
index e82fe3afef..292c84ae76 100644
--- a/goal_src/jak1/engine/camera/cam-states.gc
+++ b/goal_src/jak1/engine/camera/cam-states.gc
@@ -376,7 +376,7 @@
       (matrix-rotate-y! (the-as matrix (-> self tracking)) (the-as float -32768.0)))
   :exit
     (behavior ()
-      ())
+      '())
   :trans
     (behavior ()
       (if (not (logtest? (-> *camera* master-options) 2)) (go cam-free-floating)))
diff --git a/goal_src/jak1/engine/camera/pov-camera.gc b/goal_src/jak1/engine/camera/pov-camera.gc
index 65bbca907e..f47cd3c96f 100644
--- a/goal_src/jak1/engine/camera/pov-camera.gc
+++ b/goal_src/jak1/engine/camera/pov-camera.gc
@@ -143,7 +143,7 @@
   (when (logtest? (-> self flags) (pov-camera-flag inherit-orientation))
     (let ((v1-20 (if (and (nonzero? arg4) (type-type? (-> arg4 type) process-drawable)) arg4)))
       (quaternion-copy! (-> self root quat) (-> v1-20 root quat))))
-  (initialize-skeleton self arg1 ())
+  (initialize-skeleton self arg1 '())
   (logior! (-> self draw status) (draw-status skip-bones))
   (logior! (-> self skel status) (janim-status inited))
   (set! (-> self anim-name) arg2)
diff --git a/goal_src/jak1/engine/collide/collide-shape-h.gc b/goal_src/jak1/engine/collide/collide-shape-h.gc
index 13cccd5e7e..c63310c6d3 100644
--- a/goal_src/jak1/engine/collide/collide-shape-h.gc
+++ b/goal_src/jak1/engine/collide/collide-shape-h.gc
@@ -669,7 +669,7 @@
   "Allocate a new collide-sticky-rider-group with space for riders-amount sticky riders."
   (let ((this (object-new allocation
                           type-to-make
-                          (the int (+ (-> type-to-make size) (the uint (* (1 - riders-amount) (size-of collide-sticky-rider))))))))
+                          (the int (+ (-> type-to-make size) (the uint (* (1- riders-amount) (size-of collide-sticky-rider))))))))
     (set! (-> this allocated-riders) riders-amount)
     (set! (-> this num-riders) 0)
     this))
diff --git a/goal_src/jak1/engine/common-obs/babak.gc b/goal_src/jak1/engine/common-obs/babak.gc
index bb3ebbb007..3765b4622b 100644
--- a/goal_src/jak1/engine/common-obs/babak.gc
+++ b/goal_src/jak1/engine/common-obs/babak.gc
@@ -234,7 +234,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this babak))
-  (initialize-skeleton this *babak-sg* ())
+  (initialize-skeleton this *babak-sg* '())
   (init-defaults! this *babak-nav-enemy-info*)
   (set! (-> this neck up) (the-as uint 0))
   (set! (-> this neck nose) (the-as uint 1))
diff --git a/goal_src/jak1/engine/common-obs/basebutton.gc b/goal_src/jak1/engine/common-obs/basebutton.gc
index c19e095fe9..ee3c124cf8 100644
--- a/goal_src/jak1/engine/common-obs/basebutton.gc
+++ b/goal_src/jak1/engine/common-obs/basebutton.gc
@@ -1,14 +1,11 @@
 ;;-*-Lisp-*-
-
 (in-package goal)
 (bundles "GAME.CGO")
 (require "engine/common-obs/generic-obs.gc")
 (require "engine/target/logic-target.gc")
 
 ;; name: basebutton.gc
-
 ;; name in dgo: basebutton
-
 ;; dgos: GAME, COMMON, L1
 
 ;; DECOMP BEGINS
@@ -210,7 +207,7 @@
   (let ((v0-0 'trigger)) (set! (-> this event-going-down) v0-0) v0-0))
 
 (defmethod basebutton-method-26 ((this basebutton))
-  (initialize-skeleton this *generic-button-sg* ())
+  (initialize-skeleton this *generic-button-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (cond
diff --git a/goal_src/jak1/engine/common-obs/collectables.gc b/goal_src/jak1/engine/common-obs/collectables.gc
index fc04119477..00821172fc 100644
--- a/goal_src/jak1/engine/common-obs/collectables.gc
+++ b/goal_src/jak1/engine/common-obs/collectables.gc
@@ -755,7 +755,7 @@
     (if (when a0-10
           (let ((a0-11 (-> a0-10 extra perm task))) (if a0-11 (= a0-11 (game-task none)))))
       (set! (-> this entity extra perm task) (game-task complete))))
-  (initialize-skeleton this *money-sg* ())
+  (initialize-skeleton this *money-sg* '())
   (if (-> this entity) (nav-mesh-connect this (-> this root) (the-as nav-control #f)))
   (set-vector! (-> this draw color-mult) 0.8 0.8 0.8 1.0)
   (set-vector! (-> this draw color-emissive) 0.2 0.2 0.2 1.0)
@@ -832,17 +832,17 @@
         ((logtest? (-> *target* control root-prim prim-core action) (collide-action racer)) (set! v1-7 16))
         ((logtest? (-> *target* control root-prim prim-core action) (collide-action flut)) (set! v1-7 32))))
     (cond
-      ((zero? v1-7) (new 'static 'spool-anim :name "fuel-cell-victory" :index 3 :parts 2 :command-list ()))
-      ((= v1-7 1) (new 'static 'spool-anim :name "fuel-cell-victory-2" :index 4 :parts 2 :command-list ()))
-      ((= v1-7 2) (new 'static 'spool-anim :name "fuel-cell-victory-3" :index 5 :parts 2 :command-list ()))
-      ((= v1-7 3) (new 'static 'spool-anim :name "fuel-cell-victory-4" :index 6 :parts 2 :command-list ()))
-      ((= v1-7 4) (new 'static 'spool-anim :name "fuel-cell-victory-5" :index 7 :parts 2 :command-list ()))
-      ((= v1-7 5) (new 'static 'spool-anim :name "fuel-cell-victory-6" :index 8 :parts 2 :command-list ()))
-      ((= v1-7 6) (new 'static 'spool-anim :name "fuel-cell-victory-7" :index 9 :parts 2 :command-list ()))
-      ((= v1-7 7) (new 'static 'spool-anim :name "fuel-cell-victory-8" :index 10 :parts 2 :command-list ()))
-      ((= v1-7 16) (new 'static 'spool-anim :name "fuel-cell-racer-victory-1" :index 40 :parts 2 :command-list ()))
-      ((= v1-7 32) (new 'static 'spool-anim :name "fuel-cell-flut-victory-1" :index 44 :parts 2 :command-list ()))
-      (else (new 'static 'spool-anim :name "fuel-cell-victory-3" :index 5 :parts 2 :command-list ())))))
+      ((zero? v1-7) (new 'static 'spool-anim :name "fuel-cell-victory" :index 3 :parts 2 :command-list '()))
+      ((= v1-7 1) (new 'static 'spool-anim :name "fuel-cell-victory-2" :index 4 :parts 2 :command-list '()))
+      ((= v1-7 2) (new 'static 'spool-anim :name "fuel-cell-victory-3" :index 5 :parts 2 :command-list '()))
+      ((= v1-7 3) (new 'static 'spool-anim :name "fuel-cell-victory-4" :index 6 :parts 2 :command-list '()))
+      ((= v1-7 4) (new 'static 'spool-anim :name "fuel-cell-victory-5" :index 7 :parts 2 :command-list '()))
+      ((= v1-7 5) (new 'static 'spool-anim :name "fuel-cell-victory-6" :index 8 :parts 2 :command-list '()))
+      ((= v1-7 6) (new 'static 'spool-anim :name "fuel-cell-victory-7" :index 9 :parts 2 :command-list '()))
+      ((= v1-7 7) (new 'static 'spool-anim :name "fuel-cell-victory-8" :index 10 :parts 2 :command-list '()))
+      ((= v1-7 16) (new 'static 'spool-anim :name "fuel-cell-racer-victory-1" :index 40 :parts 2 :command-list '()))
+      ((= v1-7 32) (new 'static 'spool-anim :name "fuel-cell-flut-victory-1" :index 44 :parts 2 :command-list '()))
+      (else (new 'static 'spool-anim :name "fuel-cell-victory-3" :index 5 :parts 2 :command-list '())))))
 
 (defbehavior fuel-cell-animate fuel-cell ()
   (let* ((gp-0 self)
@@ -1115,7 +1115,7 @@
   (set! (-> this actor-pause) #t)
   (set! (-> this notify-parent) #f)
   (set! (-> this fact) (new 'process 'fact-info this (pickup-type fuel-cell) (the-as float 0.0)))
-  (initialize-skeleton this *fuel-cell-sg* ())
+  (initialize-skeleton this *fuel-cell-sg* '())
   (set! (-> this base quad) (-> this root trans quad))
   (set! (-> this old-base quad) (-> this root trans quad))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 63) this))
@@ -1326,7 +1326,7 @@
   (set! (-> this actor-pause) #t)
   (set! (-> this notify-parent) #f)
   (set! (-> this fact) (new 'process 'fact-info this (pickup-type buzzer) (the-as float 0.0)))
-  (initialize-skeleton this *buzzer-sg* ())
+  (initialize-skeleton this *buzzer-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 65) this))
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "buzzer" :fo-max 40) (-> this root trans)))
   (set! (-> this victory-anim) (fuel-cell-pick-anim this))
@@ -1619,7 +1619,7 @@
   (if (not ((-> self block-func) (the-as vent (ppointer->process (-> self parent)))))
     (set-vector! (-> self offset-target) 0.0 0.0 0.0 1.0))
   (set! (-> self offset quad) (-> self offset-target quad))
-  (initialize-skeleton self *ecovalve-sg* ())
+  (initialize-skeleton self *ecovalve-sg* '())
   (move-to-point! (-> self root)
                   (vector+! (new 'stack-no-clear 'vector) (-> (the-as process-drawable (-> self parent 0)) root trans) (-> self offset)))
   (go ecovalve-idle)
diff --git a/goal_src/jak1/engine/common-obs/crates.gc b/goal_src/jak1/engine/common-obs/crates.gc
index 126ec5b7f1..9ae2e972d8 100644
--- a/goal_src/jak1/engine/common-obs/crates.gc
+++ b/goal_src/jak1/engine/common-obs/crates.gc
@@ -818,25 +818,25 @@
   (case (-> this look)
     (('iron)
      (set! (-> this root root-prim prim-core offense) (collide-offense normal-attack))
-     (initialize-skeleton this *crate-iron-sg* ()))
+     (initialize-skeleton this *crate-iron-sg* '()))
     (('steel)
      (set! (-> this root root-prim prim-core offense) (collide-offense indestructible))
-     (initialize-skeleton this *crate-steel-sg* ()))
+     (initialize-skeleton this *crate-steel-sg* '()))
     (('darkeco)
      (when (= (-> this fact pickup-type) (pickup-type eco-pill-random))
        (set! (-> this fact pickup-type) (pickup-type none))
        (set! (-> this fact pickup-amount) 0.0))
-     (initialize-skeleton this *crate-darkeco-sg* ())
+     (initialize-skeleton this *crate-darkeco-sg* '())
      (set-vector! (-> this draw color-mult) 0.8 0.8 0.8 1.0)
      (set-vector! (-> this draw color-emissive) 0.2 0.2 0.2 1.0))
-    (('barrel) (initialize-skeleton this *crate-barrel-sg* ()))
+    (('barrel) (initialize-skeleton this *crate-barrel-sg* '()))
     (('bucket)
      (when (= (-> this fact pickup-type) (pickup-type eco-pill-random))
        (set! (-> this fact pickup-type) (pickup-type none))
        (set! (-> this fact pickup-amount) 0.0))
-     (initialize-skeleton this *crate-bucket-sg* ()))
-    ((none) (initialize-skeleton this *crate-wood-sg* ()) (logior! (-> this draw status) (draw-status hidden)))
-    (else (initialize-skeleton this *crate-wood-sg* ())))
+     (initialize-skeleton this *crate-bucket-sg* '()))
+    (('none) (initialize-skeleton this *crate-wood-sg* '()) (logior! (-> this draw status) (draw-status hidden)))
+    (else (initialize-skeleton this *crate-wood-sg* '())))
   (cond
     ((logtest? (fact-options indestructible) (-> this fact options))
      (set! (-> this root root-prim prim-core offense) (collide-offense indestructible)))
@@ -976,7 +976,7 @@
 
 (defmethod params-init ((this pickup-spawner) (arg0 entity))
   (let ((t9-0 (method-of-type crate params-init))) (t9-0 this arg0))
-  (set! (-> this look) none)
+  (set! (-> this look) 'none)
   (set! (-> this blocker) #f)
   (if (logtest? (-> this fact options) (fact-options vent-blocked))
     (set! (-> this blocker) (entity-actor-lookup (-> this entity) 'alt-actor 0)))
diff --git a/goal_src/jak1/engine/common-obs/generic-obs.gc b/goal_src/jak1/engine/common-obs/generic-obs.gc
index 8164221551..a0e274ebdb 100644
--- a/goal_src/jak1/engine/common-obs/generic-obs.gc
+++ b/goal_src/jak1/engine/common-obs/generic-obs.gc
@@ -47,7 +47,7 @@
             (joint-control-remap! (-> self skel)
                                   (-> self draw art-group)
                                   (-> (the-as process-drawable s5-0) draw art-group)
-                                  ()
+                                  '()
                                   0
                                   arg3))
        (when arg2
@@ -275,7 +275,7 @@
              (joint-control-remap! (-> self skel)
                                    (-> self draw art-group)
                                    (-> (the-as process-drawable gp-0) draw art-group)
-                                   ()
+                                   '()
                                    0
                                    ""))
            (do-joint-math! self))
@@ -318,7 +318,7 @@
        (set! (-> self root) s4-2)))
     (else (set! (-> self root) (new 'process 'trsqv))))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self arg2 ())
+  (initialize-skeleton self arg2 '())
   (if (type-type? (-> self root type) collide-shape) (update-transforms! (the-as collide-shape (-> self root))))
   (set! (-> self shadow-backup) (-> self draw shadow))
   (set! (-> self new-trans-hook) nothing)
@@ -669,8 +669,8 @@
   (set! (-> self callback) #f)
   (set! (-> self userdata) #f)
   (set-time! (-> self start-time))
-  (set! (-> self script) ())
-  (set! (-> self script-line) ())
+  (set! (-> self script) '())
+  (set! (-> self script-line) '())
   (set! (-> self script-func) #f)
   (set! (-> self message) #f)
   (set! (-> self border-value) #f)
@@ -759,7 +759,7 @@
       (process-drawable-from-entity! this arg0)
       (logclear! (-> this mask) (process-mask actor-pause))
       (format (clear *lev-string*) "med-res-~S~S" s4-1 (if (zero? s3-1) "" (* s3-1 8)))
-      (initialize-skeleton-by-name this *lev-string* ())
+      (initialize-skeleton-by-name this *lev-string* '())
       (logior! (-> this draw status) (draw-status do-not-check-distance))
       (if (nonzero? (-> this draw)) (go med-res-level-idle))))
   (none))
diff --git a/goal_src/jak1/engine/common-obs/orb-cache.gc b/goal_src/jak1/engine/common-obs/orb-cache.gc
index d6d74eb453..8efd776079 100644
--- a/goal_src/jak1/engine/common-obs/orb-cache.gc
+++ b/goal_src/jak1/engine/common-obs/orb-cache.gc
@@ -205,7 +205,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *orb-cache-top-sg* ())
+  (initialize-skeleton this *orb-cache-top-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (baseplat-method-21 this)
diff --git a/goal_src/jak1/engine/common-obs/plat-button.gc b/goal_src/jak1/engine/common-obs/plat-button.gc
index 32c17ca102..a84548fbcc 100644
--- a/goal_src/jak1/engine/common-obs/plat-button.gc
+++ b/goal_src/jak1/engine/common-obs/plat-button.gc
@@ -286,7 +286,7 @@
   (none))
 
 (defmethod plat-button-method-31 ((this plat-button))
-  (initialize-skeleton this *plat-button-sg* ())
+  (initialize-skeleton this *plat-button-sg* '())
   0
   (none))
 
diff --git a/goal_src/jak1/engine/common-obs/plat-eco.gc b/goal_src/jak1/engine/common-obs/plat-eco.gc
index 6707723006..9f09c29a10 100644
--- a/goal_src/jak1/engine/common-obs/plat-eco.gc
+++ b/goal_src/jak1/engine/common-obs/plat-eco.gc
@@ -188,7 +188,7 @@
   (process-drawable-from-entity! this arg0)
   (let ((s4-0 (get-unlit-skel this))
         (s5-1 (get-lit-skel this)))
-    (initialize-skeleton this s4-0 ())
+    (initialize-skeleton this s4-0 '())
     (setup-lods! (-> this unlit-look) s4-0 (-> this draw art-group) (-> this entity))
     (setup-lods! (-> this lit-look) s5-1 (-> this draw art-group) (-> this entity)))
   (logclear! (-> this mask) (process-mask actor-pause))
diff --git a/goal_src/jak1/engine/common-obs/plat.gc b/goal_src/jak1/engine/common-obs/plat.gc
index ecdc9b7c90..33a47fe8df 100644
--- a/goal_src/jak1/engine/common-obs/plat.gc
+++ b/goal_src/jak1/engine/common-obs/plat.gc
@@ -182,7 +182,7 @@
   (logior! (-> this mask) (process-mask platform))
   (baseplat-method-24 this)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this (get-unlit-skel this) ())
+  (initialize-skeleton this (get-unlit-skel this) '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (baseplat-method-21 this)
diff --git a/goal_src/jak1/engine/common-obs/process-drawable-h.gc b/goal_src/jak1/engine/common-obs/process-drawable-h.gc
index 57281e86c3..ed7329ddf6 100644
--- a/goal_src/jak1/engine/common-obs/process-drawable-h.gc
+++ b/goal_src/jak1/engine/common-obs/process-drawable-h.gc
@@ -148,11 +148,11 @@
    - min = the start of the animation.
    - max = the end of the animation.
    "
-  (let* ((num-args (if (pair? num!) (cdr num!) ()))
+  (let* ((num-args (if (pair? num!) (cdr num!) '()))
          (num! (if (pair? num!) (car num!) num!))
          (nf (cond
                ((or (eq? num! 'identity) (eq? num! 'min) (eq? num! 'max)) 'num-func-identity)
-               ((eq? num! none) 'num-func-none)
+               ((eq? num! 'none) 'num-func-none)
                ((eq? num! '+!) 'num-func-+!)
                ((eq? num! '-!) 'num-func--!)
                ((eq? num! 'seek!) 'num-func-seek!)
@@ -170,20 +170,20 @@
                     1.0
                     (if (eq? 'max (car num-args))
                       (if group!
-                        `(the float (1 - (-> (the art-joint-anim ,group!) data 0 length)))
-                        `(the float (1 - (-> ja-ch frame-group data 0 length))))
+                        `(the float (1- (-> (the art-joint-anim ,group!) data 0 length)))
+                        `(the float (1- (-> ja-ch frame-group data 0 length))))
                       (car num-args))))
                  ((eq? num! 'seek!)
                   (if (or (null? num-args) (eq? (car num-args) 'max))
                     (if group!
-                      `(the float (1 - (-> (the art-joint-anim ,group!) data 0 length)))
-                      `(the float (1 - (-> ja-ch frame-group data 0 length))))
+                      `(the float (1- (-> (the art-joint-anim ,group!) data 0 length)))
+                      `(the float (1- (-> ja-ch frame-group data 0 length))))
                     (car num-args))))))
          (p1 (if param1 param1 (cond   ((eq? num! 'seek!) (if (or (null? num-args) (null? (cdr num-args))) 1.0 (cadr num-args))))))
          (frame-num (if (eq? 'max frame-num)
                       (if group!
-                        `(the float (1 - (-> (the art-joint-anim ,group!) data 0 length)))
-                        `(the float (1 - (-> ja-ch frame-group data 0 length))))
+                        `(the float (1- (-> (the art-joint-anim ,group!) data 0 length)))
+                        `(the float (1- (-> ja-ch frame-group data 0 length))))
                       frame-num))
          (frame-group (if (or p0 p1 frame-num (not nf)) group! #f)))
     `(let ((ja-ch (-> self skel root-channel ,chan)))
@@ -201,8 +201,8 @@
         ((eq? num! 'min) `(set! (-> ja-ch frame-num) 0.0))
         ((eq? num! 'max)
          (if group!
-           `(set! (-> ja-ch frame-num) (the float (1 - (-> (the art-joint-anim ,group!) data 0 length))))
-           `(set! (-> ja-ch frame-num) (the float (1 - (-> ja-ch frame-group data 0 length))))))
+           `(set! (-> ja-ch frame-num) (the float (1- (-> (the art-joint-anim ,group!) data 0 length))))
+           `(set! (-> ja-ch frame-num) (the float (1- (-> ja-ch frame-group data 0 length))))))
         ((eq? num! 'identity) `(set! (-> ja-ch frame-num) ,(car num-args)))
         (#t `(none))))))
 
diff --git a/goal_src/jak1/engine/common-obs/process-drawable.gc b/goal_src/jak1/engine/common-obs/process-drawable.gc
index f522e41a5f..7424e5b7a0 100644
--- a/goal_src/jak1/engine/common-obs/process-drawable.gc
+++ b/goal_src/jak1/engine/common-obs/process-drawable.gc
@@ -67,7 +67,7 @@
   (vector-matrix*! arg0 arg2 (-> arg1 bone transform)))
 
 (defun-debug cspace-children ((arg0 process-drawable) (arg1 int))
-  (let ((a3-0 ()))
+  (let ((a3-0 '()))
     (countdown (s4-0 (-> arg0 node-list length))
       (if (= (-> arg0 node-list data s4-0 parent) arg1) (set! a3-0 (cons (-> arg0 node-list data s4-0) a3-0))))
     a3-0))
diff --git a/goal_src/jak1/engine/common-obs/process-taskable.gc b/goal_src/jak1/engine/common-obs/process-taskable.gc
index c034ad9d02..6b1abb44e1 100644
--- a/goal_src/jak1/engine/common-obs/process-taskable.gc
+++ b/goal_src/jak1/engine/common-obs/process-taskable.gc
@@ -40,7 +40,7 @@
   (none))
 
 (defmethod get-response ((this gui-query))
-  (kill-current-level-hint () '(sidekick voicebox stinger) 'exit)
+  (kill-current-level-hint '() '(sidekick voicebox stinger) 'exit)
   (level-hint-surpress!)
   (hide-hud)
   (when (hud-hidden?)
@@ -554,7 +554,7 @@
         ((or (= (-> self next-state name) 'dead-state) (= (-> self next-state name) 'idle))
          (process-entity-status! self (entity-perm-status bit-3) #f))
         (else
-         (kill-current-level-hint () () 'exit)
+         (kill-current-level-hint '() '() 'exit)
          (logior! (-> self skel status) (janim-status inited))
          (logclear! (-> self mask) (process-mask actor-pause))
          (process-entity-status! self (entity-perm-status bit-3) #t)
@@ -591,7 +591,7 @@
                (task-status need-reminder)
                (task-status need-reminder-a)
                (task-status need-reward-speech))
-              (kill-current-level-hint () '(sidekick voicebox ambient) 'exit)
+              (kill-current-level-hint '() '(sidekick voicebox ambient) 'exit)
               (level-hint-surpress!)
               (hide-hud)
               (when (and (hud-hidden?) (can-grab-display? self))
@@ -644,7 +644,7 @@
   (stack-size-set! (-> this main-thread) 512)
   (initialize-collision this arg2 arg4)
   (process-drawable-from-entity! this (the-as entity-actor arg0))
-  (initialize-skeleton this arg1 ())
+  (initialize-skeleton this arg1 '())
   (set! (-> this shadow-backup) (-> this draw shadow))
   (logior! (-> this skel status) (janim-status eye))
   ;; og:preserve-this
diff --git a/goal_src/jak1/engine/common-obs/ropebridge.gc b/goal_src/jak1/engine/common-obs/ropebridge.gc
index 686280325b..e63ee1017d 100644
--- a/goal_src/jak1/engine/common-obs/ropebridge.gc
+++ b/goal_src/jak1/engine/common-obs/ropebridge.gc
@@ -900,7 +900,7 @@
     (alloc-riders a0-13 3))
   (add-collision-meshes this)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton-by-name this (-> this subtype-name) ())
+  (initialize-skeleton-by-name this (-> this subtype-name) '())
   (logior! (-> this skel status) (janim-status inited))
   (let ((v1-29 (-> this tuning)))
     (set! (-> this draw bounds w) (-> v1-29 view-frustum-radius))
diff --git a/goal_src/jak1/engine/common-obs/sharkey.gc b/goal_src/jak1/engine/common-obs/sharkey.gc
index 46a51c577a..84bc3a1ecf 100644
--- a/goal_src/jak1/engine/common-obs/sharkey.gc
+++ b/goal_src/jak1/engine/common-obs/sharkey.gc
@@ -488,7 +488,7 @@ nav-enemy-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *sharkey-sg* ())
+  (initialize-skeleton this *sharkey-sg* '())
   (init-defaults! this *sharkey-nav-enemy-info*)
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this water) (new 'process 'water-control this 3 12288.0 8192.0 2048.0))
diff --git a/goal_src/jak1/engine/common-obs/tippy.gc b/goal_src/jak1/engine/common-obs/tippy.gc
index 31a1b5592f..1e9f1c20f8 100644
--- a/goal_src/jak1/engine/common-obs/tippy.gc
+++ b/goal_src/jak1/engine/common-obs/tippy.gc
@@ -16,7 +16,7 @@
    (orig       quaternion :inline)
    (dist-ratio float)
    (damping    float)
-   (1          -damping float))
+   (1-damping  float))
   (:methods
    (reset! (_type_ process-drawable float float) none)
    (tippy-method-10 (_type_ process-drawable vector) symbol)))
@@ -27,7 +27,7 @@
   (quaternion-copy! (-> this orig) (-> arg0 root quat))
   (set! (-> this dist-ratio) arg1)
   (set! (-> this damping) arg2)
-  (set! (-> this 1 -damping) (- 1.0 arg2))
+  (set! (-> this 1-damping) (- 1.0 arg2))
   0
   (none))
 
@@ -43,13 +43,13 @@
          (let ((f0-6 (vector-length s3-0)))
            (vector-float*! s3-0 s3-0 (/ 1.0 f0-6))
            (let ((f30-0 (* f0-6 (-> this dist-ratio))))
-             (set! (-> this axis x) (+ (* (-> this 1 -damping) (-> this axis x)) (* (-> this damping) (-> s3-0 x))))
+             (set! (-> this axis x) (+ (* (-> this 1-damping) (-> this axis x)) (* (-> this damping) (-> s3-0 x))))
              (set! (-> this axis y) 0.0)
-             (set! (-> this axis z) (+ (* (-> this 1 -damping) (-> this axis z)) (* (-> this damping) (-> s3-0 z))))
+             (set! (-> this axis z) (+ (* (-> this 1-damping) (-> this axis z)) (* (-> this damping) (-> s3-0 z))))
              (vector-normalize! (-> this axis) 1.0)
-             (set! (-> this angle) (+ (* (-> this 1 -damping) (-> this angle)) (* (-> this damping) f30-0)))))))
+             (set! (-> this angle) (+ (* (-> this 1-damping) (-> this angle)) (* (-> this damping) f30-0)))))))
       (else
-       (set! (-> this angle) (* (-> this 1 -damping) (-> this angle)))
+       (set! (-> this angle) (* (-> this 1-damping) (-> this angle)))
        (when (< (-> this angle) 182.04445)
          (set! (-> this angle) 0.0)
          (set! s4-0 #f))))
diff --git a/goal_src/jak1/engine/common-obs/voicebox.gc b/goal_src/jak1/engine/common-obs/voicebox.gc
index 5e03c2c8ac..5c35f8ca3c 100644
--- a/goal_src/jak1/engine/common-obs/voicebox.gc
+++ b/goal_src/jak1/engine/common-obs/voicebox.gc
@@ -145,7 +145,7 @@
   (set! (-> self hint) arg1)
   (set! (-> self root trans quad) (-> arg0 quad))
   (set! (-> self base-trans quad) (-> arg0 quad))
-  (initialize-skeleton self *voicebox-sg* ())
+  (initialize-skeleton self *voicebox-sg* '())
   (set! (-> self blend) 1.0)
   (go-virtual enter)
   (none))
diff --git a/goal_src/jak1/engine/common-obs/water-anim.gc b/goal_src/jak1/engine/common-obs/water-anim.gc
index 7dff318845..dbaecc6df6 100644
--- a/goal_src/jak1/engine/common-obs/water-anim.gc
+++ b/goal_src/jak1/engine/common-obs/water-anim.gc
@@ -578,7 +578,7 @@
         (let ((s3-0 s4-0))
           (if (not (if (and (nonzero? s3-0) (type-type? (-> (the-as basic s3-0) type) skeleton-group)) s3-0))
             (go process-drawable-art-error "skel group")))
-        (initialize-skeleton this (the-as skeleton-group s4-0) ()))
+        (initialize-skeleton this (the-as skeleton-group s4-0) '()))
       (ja-channel-set! 1)
       (let ((s4-1 (-> this skel root-channel 0)))
         (joint-control-channel-group-eval! s4-1
diff --git a/goal_src/jak1/engine/data/art-h.gc b/goal_src/jak1/engine/data/art-h.gc
index c3ec3dffaa..661e93d72f 100644
--- a/goal_src/jak1/engine/data/art-h.gc
+++ b/goal_src/jak1/engine/data/art-h.gc
@@ -290,7 +290,7 @@
   `(-> self node-list data (joint-node-index ,jg ,name)))
 
 (defmacro defskelgroup (name art-name joint-geom joint-anim lods &key (shadow 0) &key bounds &key (longest-edge 0.0) &key (texture-level 0) &key (sort 0))
-  "define a new static skeleton group."
+  "define a new static skeleton group"
   `(let ((skel (new 'static
                    'skeleton-group
                    :art-group-name ,(symbol->string art-name)
diff --git a/goal_src/jak1/engine/debug/debug.gc b/goal_src/jak1/engine/debug/debug.gc
index 447a63d23e..95976f519c 100644
--- a/goal_src/jak1/engine/debug/debug.gc
+++ b/goal_src/jak1/engine/debug/debug.gc
@@ -93,7 +93,8 @@
 (defun-debug internal-draw-debug-line ((bucket bucket-id) (p0 vector) (p1 vector) (first-color rgba) (mode symbol) (second-color rgba))
   "Draw a debug line from p0 to p1. Mode can be:
    'fade, 'fade-depth, or #f.
-   second-color can be -1 to just use the same color."
+   second-color can be -1 to just use the same color.
+   "
   (let ((a0-4 (-> (current-frame) debug-buf)))
     (if (< (the-as uint (shr (+ (&- (-> a0-4 end) (the-as uint (-> a0-4 base))) 15) 4)) (the-as uint #x8000))
       (return (the-as pointer #f))))
@@ -123,7 +124,7 @@
                                   (gs-reg-list rgbaq xyzf2 rgbaq xyzf2))
           (case mode
             (('fade-depth)
-             (let ((f0-3 (fminmax (* (1 / #xffffff) (the float (-> s4-0 vector 0 z))) 0.2 1.0)))
+             (let ((f0-3 (fminmax (* (1/ #xffffff) (the float (-> s4-0 vector 0 z))) 0.2 1.0)))
                (set! (-> s1-0 vector 0 x) (the int (* (the float (-> first-color r)) f0-3)))
                (set! (-> s1-0 vector 0 y) (the int (* (the float (-> first-color g)) f0-3)))
                (set! (-> s1-0 vector 0 z) (the int (* (the float (-> first-color b)) f0-3))))
@@ -135,7 +136,7 @@
              (set! (-> s1-0 vector 0 w) (the-as int (-> first-color a)))))
           (cond
             ((= mode 'fade-depth)
-             (let ((f0-7 (fminmax (* (1 / #xffffff) (the float (-> s4-0 vector 1 z))) 0.2 1.0)))
+             (let ((f0-7 (fminmax (* (1/ #xffffff) (the float (-> s4-0 vector 1 z))) 0.2 1.0)))
                (set! (-> s1-0 vector 1 x) (the int (* (the float (-> second-color r)) f0-7)))
                (set! (-> s1-0 vector 1 y) (the int (* (the float (-> second-color g)) f0-7)))
                (set! (-> s1-0 vector 1 z) (the int (* (the float (-> second-color b)) f0-7))))
@@ -179,10 +180,10 @@
   (when enable
     (let ((s4-0 (new 'stack-no-clear 'vector))
           (s3-0 (vector-3pt-cross! (new 'stack-no-clear 'vector) p0 p1 p2)))
-      (vector-float / ! s3-0 s3-0 (* (1 / METER_LENGTH) (vector-length s3-0)))
+      (vector-float/! s3-0 s3-0 (* (1/ METER_LENGTH) (vector-length s3-0)))
       (vector+! s4-0 p0 p1)
       (vector+! s4-0 s4-0 p2)
-      (vector-float / ! s4-0 s4-0 3.0)
+      (vector-float/! s4-0 s4-0 3.0)
       (vector+! s3-0 s3-0 s4-0)
       (add-debug-line #t bucket s4-0 s3-0 color #f (the-as rgba -1))))
   #f)
@@ -692,12 +693,12 @@
     (when (>= (-> arg0 h-first) (-> arg0 num-points))
       (set! (-> arg0 h-first) 0)))
   (when arg1
-    (dotimes (s5-1 (1 - (-> arg0 num-points)))
+    (dotimes (s5-1 (1- (-> arg0 num-points)))
       (if (!= (+ s5-1 1) (-> arg0 h-first))
         (add-debug-line #t
                         (bucket-id debug-no-zbuf)
                         (-> arg0 points s5-1)
-                        (-> arg0 points (1 + s5-1))
+                        (-> arg0 points (1+ s5-1))
                         (static-rgba #x80 #xc0 #x80 #x80)
                         #f
                         (the-as rgba -1)))))
diff --git a/goal_src/jak1/engine/debug/memory-usage-h.gc b/goal_src/jak1/engine/debug/memory-usage-h.gc
index a2fa219ea7..cc70b19cb0 100644
--- a/goal_src/jak1/engine/debug/memory-usage-h.gc
+++ b/goal_src/jak1/engine/debug/memory-usage-h.gc
@@ -138,9 +138,9 @@
   (debug-dma 84) ;; maybe
   (sky-dma 85) ;; maybe
   (pris-generic)
-  (4 k-dead-pool 87)
-  (8 k-dead-pool 88)
-  (16 k-dead-pool 89)
+  (4k-dead-pool 87)
+  (8k-dead-pool 88)
+  (16k-dead-pool 89)
   (nk-dead-pool 90)
   (target-dead-pool 91)
   (camera-dead-pool 92)
diff --git a/goal_src/jak1/engine/debug/menu.gc b/goal_src/jak1/engine/debug/menu.gc
index a76d3018e1..15dc924266 100644
--- a/goal_src/jak1/engine/debug/menu.gc
+++ b/goal_src/jak1/engine/debug/menu.gc
@@ -89,7 +89,7 @@
     (set! (-> v0-0 name) name)
     (set! (-> v0-0 parent) #f)
     (set! (-> v0-0 selected-item) #f)
-    (set! (-> v0-0 items) ())
+    (set! (-> v0-0 items) '())
     v0-0))
 
 ;; Parent type for an item (an individual, selectable entry within a menu)
@@ -376,7 +376,7 @@
          (was-active (-> context is-active)))
     (if was-active (debug-menu-context-send-msg context (debug-menu-msg deactivate) (debug-menu-dest activation)))
     (set! (-> item parent) menu)
-    (set! (-> menu items) (the-as pair (append! (-> menu items) (dcons item ())))) ;; was normal cons
+    (set! (-> menu items) (the-as pair (append! (-> menu items) (dcons item '())))) ;; was normal cons
     (debug-menu-rebuild menu)
     (if was-active (debug-menu-context-send-msg context (debug-menu-msg activate) (debug-menu-dest activation))))
   item)
@@ -386,7 +386,7 @@
   (let* ((gp-0 (-> arg0 context))
          (s4-0 (-> gp-0 is-active)))
     (if s4-0 (debug-menu-context-send-msg gp-0 (debug-menu-msg deactivate) (debug-menu-dest activation)))
-    (set! (-> arg0 items) ())
+    (set! (-> arg0 items) '())
     (set! (-> arg0 selected-item) #f)
     (debug-menu-rebuild arg0)
     (if s4-0 (debug-menu-context-send-msg gp-0 (debug-menu-msg activate) (debug-menu-dest activation))))
@@ -545,11 +545,11 @@
           (cond
             ((> (-> item hilite-timer) 0)
              ;; if the hilite is >0, we ran the function successfully, so we hilite in blue for a bit
-             (1 -! (-> item hilite-timer))
+             (1-! (-> item hilite-timer))
              (font-color menu-selected))
             ((< (-> item hilite-timer) 0)
              ;; if we're negative, it failed, so hilite in red
-             (1 +! (-> item hilite-timer))
+             (1+! (-> item hilite-timer))
              (font-color menu-func-bad))
             ((nonzero? submenus)
              ;; in a parent menu
@@ -706,8 +706,8 @@
   ;; search for the currently selected thing.
   (let ((s5-0 (-> arg0 sel-menu (+ (-> arg0 sel-length) -1))))
     (let ((a2-0 (-> s5-0 selected-item))
-          (a0-1 ()) ;; thing before selection
-          (v1-4 ()) ;; current selection
+          (a0-1 '()) ;; thing before selection
+          (v1-4 '()) ;; current selection
           )
       (let ((a3-0 (-> s5-0 items)))
         (while (not (null? a3-0))
diff --git a/goal_src/jak1/engine/debug/stats-h.gc b/goal_src/jak1/engine/debug/stats-h.gc
index 871632ed43..90c5b8c2b9 100644
--- a/goal_src/jak1/engine/debug/stats-h.gc
+++ b/goal_src/jak1/engine/debug/stats-h.gc
@@ -56,21 +56,21 @@
   (when (nonzero? (-> this ctrl))
     (set! *pc-perf-stat-counter* (get-cpu-clock)))
   #|
-   (let ((v1-0 (-> this ctrl)))
-   (+! (-> this count) 1)
-   (b! (zero? v1-0) cfg-2 :delay (nop!))
-   (.mtc0 Perf 0)
-   (.sync.l)
-   (.sync.p)
-   (.mtpc pcr0 0)
-   (.mtpc pcr1 0)
-   (.sync.l)
-   (.sync.p)
-   (.mtc0 Perf v1-0)
-   )
-   (.sync.l)
-   (.sync.p)
-   (label cfg-2)
+  (let ((v1-0 (-> this ctrl)))
+    (+! (-> this count) 1)
+    (b! (zero? v1-0) cfg-2 :delay (nop!))
+    (.mtc0 Perf 0)
+    (.sync.l)
+    (.sync.p)
+    (.mtpc pcr0 0)
+    (.mtpc pcr1 0)
+    (.sync.l)
+    (.sync.p)
+    (.mtc0 Perf v1-0)
+    )
+  (.sync.l)
+  (.sync.p)
+  (label cfg-2)
   |#
   0
   (none))
@@ -81,16 +81,16 @@
     (+! (-> this accum0) (- (get-cpu-clock) *pc-perf-stat-counter*))
     (set! (-> this accum1) 0))
   #|
-   (local-vars (v1-1 int) (v1-3 int))
-   (b! (zero? (-> this ctrl)) cfg-2 :delay (nop!))
-   (.mtc0 Perf 0)
-   (.sync.l)
-   (.sync.p)
-   (.mfpc v1-1 pcr0)
-   (+! (-> this accum0) v1-1)
-   (.mfpc v1-3 pcr1)
-   (+! (-> this accum1) v1-3)
-   (label cfg-2)
+  (local-vars (v1-1 int) (v1-3 int))
+  (b! (zero? (-> this ctrl)) cfg-2 :delay (nop!))
+  (.mtc0 Perf 0)
+  (.sync.l)
+  (.sync.p)
+  (.mfpc v1-1 pcr0)
+  (+! (-> this accum0) v1-1)
+  (.mfpc v1-3 pcr1)
+  (+! (-> this accum1) v1-3)
+  (label cfg-2)
   |#
   0
   (none))
diff --git a/goal_src/jak1/engine/debug/viewer.gc b/goal_src/jak1/engine/debug/viewer.gc
index 339428bd9a..a6ed234451 100644
--- a/goal_src/jak1/engine/debug/viewer.gc
+++ b/goal_src/jak1/engine/debug/viewer.gc
@@ -111,7 +111,7 @@
          (set! (-> a1-3 jgeo) s3-0)
          (set! (-> a1-3 janim) s5-0)
          (set! (-> a1-3 mgeo 0) s4-0)
-         (initialize-skeleton self a1-3 ()))
+         (initialize-skeleton self a1-3 '()))
        (set! (-> self align) (new 'process 'align-control self))
        (go viewer-process))
       (else (go process-drawable-art-error arg0)))))
diff --git a/goal_src/jak1/engine/dma/dma.gc b/goal_src/jak1/engine/dma/dma.gc
index 11e5279c2a..c4133f7447 100644
--- a/goal_src/jak1/engine/dma/dma.gc
+++ b/goal_src/jak1/engine/dma/dma.gc
@@ -264,7 +264,7 @@
             (-> s4-0 (+ (shl s2-0 2) 2))
             (-> s4-0 (+ (shl s2-0 2) 3)))
     (set! s3-0 (+ s3-0 1)))
-  #f)
+  '#f)
 
 ;; if we send junk DMA data due to an engine bug, the PS2 will eventually time out the transfer.
 ;; in this case, the main loop will attempt to reset everything to hopefully recover.
diff --git a/goal_src/jak1/engine/draw/drawable.gc b/goal_src/jak1/engine/draw/drawable.gc
index 2b4e71eca2..e06553b60d 100644
--- a/goal_src/jak1/engine/draw/drawable.gc
+++ b/goal_src/jak1/engine/draw/drawable.gc
@@ -116,13 +116,13 @@
   ;; todo
   #t
   #|
-      (let* ((addr (scratchpad-ptr int8 :offset (+ #x3b80 (/ id 8)))) ;; address of the vis data
-             (vis-byte (-> addr 0)) ;; vis byte
-             (shift-amount (+ 56 (logand id 7)))
-             (shifted (shl vis-byte shift-amount))
-             )
-        (< shifted 0)
-        )
+  (let* ((addr (scratchpad-ptr int8 :offset (+ #x3b80 (/ id 8)))) ;; address of the vis data
+         (vis-byte (-> addr 0)) ;; vis byte
+         (shift-amount (+ 56 (logand id 7)))
+         (shifted (shl vis-byte shift-amount))
+         )
+    (< shifted 0)
+    )
   |#
   )
 
@@ -989,9 +989,9 @@
       (#when PC_PORT
         (if (< float-time-ratio 1.3) (set! time-ratio 1.0))
         #|
-                        (if (> time-ratio 1.)
-                            (format #t "LAG ~f frames~%" (- time-ratio 1.))
-                            )
+        (if (> time-ratio 1.)
+            (format #t "LAG ~f frames~%" (- time-ratio 1.))
+            )
         |#
         ))
     ;; inform display system of our speed. This will adjust the scaling used in all physics calculations
diff --git a/goal_src/jak1/engine/entity/ambient.gc b/goal_src/jak1/engine/entity/ambient.gc
index 260492a33e..7dad05bcd9 100644
--- a/goal_src/jak1/engine/entity/ambient.gc
+++ b/goal_src/jak1/engine/entity/ambient.gc
@@ -133,14 +133,14 @@
   (if (< (the-as uint 1) (the-as uint arg4)) (close-specific-task! arg4 (task-status need-hint)))
   (let ((s3-1 (level-hint-task-process arg2 (the-as uint128 arg0) arg1)))
     (when (!= s3-1 -1)
-      (kill-current-level-hint () () 'exit)
+      (kill-current-level-hint '() '() 'exit)
       (process-spawn level-hint s3-1 arg1 arg2 :to arg3)))
   0
   (none))
 
 (defun ambient-hint-spawn ((arg0 string) (arg1 vector) (arg2 process-tree) (arg3 symbol))
   (case arg3
-    (('camera) (kill-current-level-hint () () 'exit)))
+    (('camera) (kill-current-level-hint '() '() 'exit)))
   (and (not *hint-semaphore*) (process-spawn level-hint :init ambient-hint-init-by-other arg0 arg1 arg3 :to arg2)))
 
 (defun kill-current-level-hint ((arg0 pair) (arg1 pair) (arg2 symbol))
@@ -417,7 +417,7 @@
              (let ((v1-6 a1-3)) (set! (-> v1-6 height) (the float 96)))
              (set! (-> a1-3 flags) (font-flags shadow kerning middle large))
              (print-game-text "AS: UNKNOWN ID" a1-3 #f 128 22))))
-        ((!= s5-0 -1) (kill-current-level-hint () () 'exit) (process-spawn level-hint s5-0 #f (-> arg0 ambient) :to pp))))
+        ((!= s5-0 -1) (kill-current-level-hint '() '() 'exit) (process-spawn level-hint s5-0 #f (-> arg0 ambient) :to pp))))
     0
     (none)))
 
diff --git a/goal_src/jak1/engine/entity/entity-table.gc b/goal_src/jak1/engine/entity/entity-table.gc
index 12635fda16..5e0c9045af 100644
--- a/goal_src/jak1/engine/entity/entity-table.gc
+++ b/goal_src/jak1/engine/entity/entity-table.gc
@@ -32,7 +32,7 @@
             (type-ref sage-finalboss :method-count 53)
             :package "l1"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x8000)
        (new 'static
@@ -41,7 +41,7 @@
             (type-ref robotboss :method-count 21)
             :package "l1"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x8000)
        (new 'static
@@ -50,7 +50,7 @@
             (type-ref assistant-levitator :method-count 53)
             :package "l1"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x8000)
        (new 'static
@@ -86,7 +86,7 @@
             (type-ref launcher :method-count 20)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x400)
        (new 'static
@@ -95,7 +95,7 @@
             (type-ref pickup-spawner :method-count 30)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00)
        (new 'static
@@ -104,7 +104,7 @@
             (type-ref bucket :method-count 30)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00)
        (new 'static
@@ -113,7 +113,7 @@
             (type-ref barrel :method-count 30)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00)
        (new 'static
@@ -122,7 +122,7 @@
             (type-ref crate :method-count 30)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00)
        (new 'static
@@ -140,7 +140,7 @@
             (type-ref eco :method-count 31)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x1000)
        (new 'static
@@ -149,7 +149,7 @@
             (type-ref ecovent :method-count 21)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x1000)
        (new 'static
@@ -158,7 +158,7 @@
             (type-ref fuel-cell :method-count 31)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x1400)
        (new 'static
@@ -167,7 +167,7 @@
             (type-ref buzzer :method-count 31)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x1000)
        (new 'static
@@ -176,7 +176,7 @@
             (type-ref money :method-count 31)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00
             ;; og:preserve-this CHANGED from 2k!!
@@ -187,7 +187,7 @@
             (type-ref water-vol :method-count 30)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #xc00)
        (new 'static
@@ -196,7 +196,7 @@
             (type-ref target-start :method-count 15)
             :package "game"
             :art-group
-            ()
+            '()
             :pool '*16k-dead-pool*
             :heap-size #x400)))
 
diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc
index eeb12aaac7..9133e97901 100644
--- a/goal_src/jak1/engine/entity/entity.gc
+++ b/goal_src/jak1/engine/entity/entity.gc
@@ -736,21 +736,21 @@
                             (none))
                           *null-kernel-context*))
   #|
-       This is where the "actor graph" is drawn, but the plot functions don't do anything.
-        (when (and *display-actor-graph* (not (or (= *master-mode* 'menu) (= *master-mode* 'progress))))
-          (if (not (paused?))
-              (float-save-timeplot (if (< (the int (the float (mod (-> *display* base-frame-counter) 600))) 300)
-                                       1.0
-                                       0.0
-                                       )
-                                   )
-              )
-          (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-redline (new 'static 'vector4w :x #xff :w #x80))
-          (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-blueline (new 'static 'vector4w :z #xff :w #x80))
-          (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-greenline (new 'static 'vector4w :y #xff :w #x80))
-          (camera-plot-float-func 0.0 399.0 0.0 409600.0 float-lookup-yellowline (new 'static 'vector4w :x #xff :y #xff :w #x80))
-          (camera-plot-float-func 0.0 399.0 0.0 1.0 float-lookup-timeplot (new 'static 'vector4w :x #x80 :y #x80 :z #x80 :w #x80))
-          )
+ This is where the "actor graph" is drawn, but the plot functions don't do anything.
+  (when (and *display-actor-graph* (not (or (= *master-mode* 'menu) (= *master-mode* 'progress))))
+    (if (not (paused?))
+        (float-save-timeplot (if (< (the int (the float (mod (-> *display* base-frame-counter) 600))) 300)
+                                 1.0
+                                 0.0
+                                 )
+                             )
+        )
+    (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-redline (new 'static 'vector4w :x #xff :w #x80))
+    (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-blueline (new 'static 'vector4w :z #xff :w #x80))
+    (camera-plot-float-func 0.0 399.0 -81920.0 81920.0 float-lookup-greenline (new 'static 'vector4w :y #xff :w #x80))
+    (camera-plot-float-func 0.0 399.0 0.0 409600.0 float-lookup-yellowline (new 'static 'vector4w :x #xff :y #xff :w #x80))
+    (camera-plot-float-func 0.0 399.0 0.0 1.0 float-lookup-timeplot (new 'static 'vector4w :x #x80 :y #x80 :z #x80 :w #x80))
+    )
   |#
   (when *display-split-boxes*
     (dotimes (s5-4 (-> this length))
diff --git a/goal_src/jak1/engine/entity/res.gc b/goal_src/jak1/engine/entity/res.gc
index 1c2dde055a..f72bc5e70b 100644
--- a/goal_src/jak1/engine/entity/res.gc
+++ b/goal_src/jak1/engine/entity/res.gc
@@ -10,28 +10,28 @@
 ;; dgos: GAME, ENGINE
 
 #|
- res is a generic storage system for not very large data, used mostly for the game entities.
- These res files store collections of data, which can be as values (int8, int16, int32, int64, uint8, uint16, uint32, uint64, float, vector), or any structure (as references), which are tagged and identified with a res-tag.
- The data is stored similar to an unboxed inline-array, the type of the data is stored in the res-tag.
- 
- A res-lump stores and is used to access all of the data for a single "resource", a collection of varying data.
- This is similar to a C++ map or C# dictionary. The key is a res-tag and the value is the corresponding binary data.
- 
- A res-tag is a tag that contains information about a particular property of this resource, such as type, name, and amount of elements.
- For example, information about an array of vectors that make up a path - for a moving platform - or an integer to store its entity ID.
- 
- Keyframes are used to specify when/where the data is relevant.
- For example (this is made-up), say you have a camera spline, and you want the FOV to change at three specific points:
- when it starts, somewhere in the middle, and at the end.
- You would store an array of three FOV values. The key-frame field could then be used to say at which point in the spline
- the FOV should be at that value. If the camera is somewhere between those points, the result could then be interpolated.
- 
- Properties are looked up from a res-lump using their name (a symbol).
- You can look up the data of the property you want directly using the various get-property methods.
- Curves can be quickly filled in using the get-curve-data! method.
- 
- 
- This is updated from the entity system used in Crash 2, which had most of these features and worked very similarly!
+res is a generic storage system for not very large data, used mostly for the game entities.
+These res files store collections of data, which can be as values (int8, int16, int32, int64, uint8, uint16, uint32, uint64, float, vector), or any structure (as references), which are tagged and identified with a res-tag.
+The data is stored similar to an unboxed inline-array, the type of the data is stored in the res-tag.
+
+A res-lump stores and is used to access all of the data for a single "resource", a collection of varying data.
+This is similar to a C++ map or C# dictionary. The key is a res-tag and the value is the corresponding binary data.
+
+A res-tag is a tag that contains information about a particular property of this resource, such as type, name, and amount of elements.
+For example, information about an array of vectors that make up a path - for a moving platform - or an integer to store its entity ID.
+
+Keyframes are used to specify when/where the data is relevant.
+For example (this is made-up), say you have a camera spline, and you want the FOV to change at three specific points:
+when it starts, somewhere in the middle, and at the end.
+You would store an array of three FOV values. The key-frame field could then be used to say at which point in the spline
+the FOV should be at that value. If the camera is somewhere between those points, the result could then be interpolated.
+
+Properties are looked up from a res-lump using their name (a symbol).
+You can look up the data of the property you want directly using the various get-property methods.
+Curves can be quickly filled in using the get-curve-data! method.
+
+
+This is updated from the entity system used in Crash 2, which had most of these features and worked very similarly!
 |#
 
 (defmacro res-ref? (tag)
@@ -78,7 +78,7 @@
   "Allocate a new res-lump."
   (let ((this (object-new allocation
                           type-to-make
-                          (the int (+ (-> type-to-make size) (* (1 - data-count) (size-of res-tag)) data-size)))))
+                          (the int (+ (-> type-to-make size) (* (1- data-count) (size-of res-tag)) data-size)))))
     (set! (-> this allocated-length) data-count)
     (set! (-> this data-size) data-size)
     (set! (-> this length) 0)
@@ -380,14 +380,14 @@
             (tag-stop (+ (-> this length) -2)))
         (while (>= tag-stop i)
           (let* ((tag1 (-> this tag i))
-                 (tag2 (-> this tag (1 + i)))
+                 (tag2 (-> this tag (1+ i)))
                  (tag-name1 (deref uint64 (-> (symbol->string (-> tag1 name)) data)))
                  (tag-name2 (deref uint64 (-> (symbol->string (-> tag2 name)) data))))
             (when (or (< tag-name2 tag-name1) (and (= tag-name1 tag-name2) (< (-> tag2 key-frame) (-> tag1 key-frame))))
-              (1 +! tags-sorted)
+              (1+! tags-sorted)
               (set! (-> this tag i) tag2)
-              (set! (-> this tag (1 + i)) tag1)))
-          (1 +! i)))))
+              (set! (-> this tag (1+ i)) tag1)))
+          (1+! i)))))
   this)
 
 (defmethod allocate-data-memory-for-tag! ((this res-lump) (arg0 res-tag))
@@ -479,13 +479,13 @@
   (set! (-> arg0 inlined?) 1)
   (add-data! this arg0 (& arg1)) ;; note, only 32-bits are spilled to the stack here.
   #|
-      (local-vars (sv-16 object))
-      (set! sv-16 arg1)
-      (let* ((v1-0 arg0)
-             (a1-4 (copy-and-set-bf v1-0 :inlined? 1))
-             )
-       (add-data! this a1-4 (& sv-16))
-       )
+  (local-vars (sv-16 object))
+  (set! sv-16 arg1)
+  (let* ((v1-0 arg0)
+         (a1-4 (copy-and-set-bf v1-0 :inlined? 1))
+         )
+   (add-data! this a1-4 (& sv-16))
+   )
   |#
   )
 
diff --git a/goal_src/jak1/engine/game/game-info.gc b/goal_src/jak1/engine/game/game-info.gc
index f900106597..7f833119c8 100644
--- a/goal_src/jak1/engine/game/game-info.gc
+++ b/goal_src/jak1/engine/game/game-info.gc
@@ -63,7 +63,7 @@
        :camera-trans
        (new 'static 'vector :w 1.0)
        :load-commands
-       ()
+       '()
        :vis-nick #f
        :lev0 #f
        :disp0 #f
@@ -171,7 +171,7 @@
         ;; not in play mode, we're done.
         (set! this this)
         (goto cfg-50)))))
-  (kill-current-level-hint () () 'die)
+  (kill-current-level-hint '() '() 'die)
   (case cause
     (('game)
      ;; we are doing a full restart.
diff --git a/goal_src/jak1/engine/game/main.gc b/goal_src/jak1/engine/game/main.gc
index 2c309bd817..d924008989 100644
--- a/goal_src/jak1/engine/game/main.gc
+++ b/goal_src/jak1/engine/game/main.gc
@@ -255,20 +255,20 @@
                         (cheats-sound-play *cheat-mode*)))
     ;; language cheat, REMOVED IN PC PORT because it's literally useless
     #|
-                (case (scf-get-territory)
-                  ;; japan-only
-                  ((GAME_TERRITORY_SCEI)
-                    (check-cheat-code (-> *cheat-temp* 2) 0
-                        (l1 r1 l1 r1 triangle circle x square)
-                          (cpad-clear! 0 r1)
-                          (set! *progress-cheat* (if *progress-cheat*
-                                                       #f
-                                                       'language
-                                                       ))
-                          (cheats-sound-play *progress-cheat*)
-                        )
-                   )
-                  )
+    (case (scf-get-territory)
+      ;; japan-only
+      ((GAME_TERRITORY_SCEI)
+        (check-cheat-code (-> *cheat-temp* 2) 0
+            (l1 r1 l1 r1 triangle circle x square)
+              (cpad-clear! 0 r1)
+              (set! *progress-cheat* (if *progress-cheat*
+                                           #f
+                                           'language
+                                           ))
+              (cheats-sound-play *progress-cheat*)
+            )
+       )
+      )
     |#
     ;; debug only PAL cheat
     (when *debug-segment*
diff --git a/goal_src/jak1/engine/gfx/background/subdivide.gc b/goal_src/jak1/engine/gfx/background/subdivide.gc
index 70bdf236b4..9c164d0a30 100644
--- a/goal_src/jak1/engine/gfx/background/subdivide.gc
+++ b/goal_src/jak1/engine/gfx/background/subdivide.gc
@@ -260,14 +260,14 @@
     (b! (zero? a0-76) cfg-28 :delay (nop!))
     (set! *pc-perf-stat-counter* (get-cpu-clock)) ;; patched
     #|
-            (.mtc0 Perf 0)
-            (.sync.l)
-            (.sync.p)
-            (.mtpc pcr0 0)
-            (.mtpc pcr1 0)
-            (.sync.l)
-            (.sync.p)
-            (.mtc0 Perf a0-76)
+    (.mtc0 Perf 0)
+    (.sync.l)
+    (.sync.p)
+    (.mtpc pcr0 0)
+    (.mtpc pcr1 0)
+    (.sync.l)
+    (.sync.p)
+    (.mtc0 Perf a0-76)
     |#
     )
   (.sync.l)
diff --git a/goal_src/jak1/engine/gfx/foreground/eye.gc b/goal_src/jak1/engine/gfx/foreground/eye.gc
index a9ce8924fa..54c623e077 100644
--- a/goal_src/jak1/engine/gfx/foreground/eye.gc
+++ b/goal_src/jak1/engine/gfx/foreground/eye.gc
@@ -701,7 +701,7 @@
                  (when (< v1-54 (the-as uint 10))
                    (set! (-> s5-3 blink) (-> *eye-work* blink-table v1-54))
                    (if (zero? v1-54)
-                     (set! (-> s5-3 random-time) (the-as uint (the int (* (1 / DISPLAY_FPS_RATIO) (rand-vu-float-range 60.0 240.0)))))))))))
+                     (set! (-> s5-3 random-time) (the-as uint (the int (* (1/ DISPLAY_FPS_RATIO) (rand-vu-float-range 60.0 240.0)))))))))))
           ;; pick between level and common eyes
           (cond
             ((>= (the-as uint 1) (-> s5-3 level))
diff --git a/goal_src/jak1/engine/gfx/hw/gs.gc b/goal_src/jak1/engine/gfx/hw/gs.gc
index 00ef84d340..3c838d4d89 100644
--- a/goal_src/jak1/engine/gfx/hw/gs.gc
+++ b/goal_src/jak1/engine/gfx/hw/gs.gc
@@ -597,25 +597,25 @@
   (let ((reg-count (length reg-ids)))
     (when (> (length reg-ids) 16)
       (ferror "too many regs passed to gs-reg-list"))
-    (let ((list-to-splice ())
+    (let ((list-to-splice '())
           (cur-lst reg-ids)
           (i -1))
       ;; this is questionable.
       (while (and (not (null? cur-lst)) (< i 15))
-        (push! list-to-splice (cons 'gif-reg-id (cons (car cur-lst) ())))
+        (push! list-to-splice (cons 'gif-reg-id (cons (car cur-lst) '())))
         (push! list-to-splice (string->symbol-format ":regs{}" (inc! i)))
         (pop! cur-lst))
       `(new 'static 'gif-tag-regs ,@list-to-splice))
     #|
-         ;; the opengoal compiler does not have enough constant propagation for this for now
-            (let ((i -1))
-        
-              `(the-as gif-tag-regs (logior ,@(apply (lambda (x)
-                  `(shl (the-as uint (gif-reg-id ,x)) ,(* 4 (inc! i)))
-                        ) reg-ids)
-                      ))
-        
-              )
+ ;; the opengoal compiler does not have enough constant propagation for this for now
+    (let ((i -1))
+
+      `(the-as gif-tag-regs (logior ,@(apply (lambda (x)
+          `(shl (the-as uint (gif-reg-id ,x)) ,(* 4 (inc! i)))
+                ) reg-ids)
+              ))
+
+      )
     |#
     ))
 
diff --git a/goal_src/jak1/engine/gfx/math-camera.gc b/goal_src/jak1/engine/gfx/math-camera.gc
index f0d1f1f8f1..ecccc22421 100644
--- a/goal_src/jak1/engine/gfx/math-camera.gc
+++ b/goal_src/jak1/engine/gfx/math-camera.gc
@@ -59,8 +59,8 @@
   ;; the x/y ratio are frustum slopes
   (set! (-> math-cam x-ratio) (tan (* 0.5 (-> math-cam fov))))
   (if (= aspect 'aspect4x3)
-    (set! (-> math-cam y-ratio) (* (1 / ASPECT_4X3) (-> math-cam x-ratio)))
-    (set! (-> math-cam y-ratio) (* (1 / ASPECT_16X9) (-> math-cam x-ratio))))
+    (set! (-> math-cam y-ratio) (* (1/ ASPECT_4X3) (-> math-cam x-ratio)))
+    (set! (-> math-cam y-ratio) (* (1/ ASPECT_16X9) (-> math-cam x-ratio))))
   (with-pc
     (cond
       ((-> *pc-settings* use-vis?)
@@ -71,14 +71,14 @@
       ((real-movie?)
        ;; force the original 16x9 cropping during cutscenes.
        (if (<= (-> *pc-settings* aspect-ratio) ASPECT_16X9)
-         (set! (-> math-cam y-ratio) (* (1 / (-> *pc-settings* aspect-ratio)) (-> math-cam x-ratio)))
+         (set! (-> math-cam y-ratio) (* (1/ (-> *pc-settings* aspect-ratio)) (-> math-cam x-ratio)))
          (begin
-           (set! (-> math-cam y-ratio) (* (1 / ASPECT_16X9) (-> math-cam x-ratio)))
+           (set! (-> math-cam y-ratio) (* (1/ ASPECT_16X9) (-> math-cam x-ratio)))
            (*! (-> math-cam x-ratio) (/ (-> *pc-settings* aspect-ratio) ASPECT_16X9)))))
       (else
        ;; not using game vis, allow *extended* aspect ratios
        ;; there is no vertical cropping, and you can see more of the sides
-       (set! (-> math-cam y-ratio) (* (1 / ASPECT_4X3) (-> math-cam x-ratio))) ;; same cropping as 4x3
+       (set! (-> math-cam y-ratio) (* (1/ ASPECT_4X3) (-> math-cam x-ratio))) ;; same cropping as 4x3
        (*! (-> math-cam x-ratio) (/ (-> *pc-settings* aspect-ratio) ASPECT_4X3)) ;; extend fov! shows more on the sides.
        )))
   ;; compute some culling constants. Not sure what these mean yet
@@ -182,7 +182,7 @@
           ;; cheating this by 1 bit seems to fix it.
           (#when PC_PORT
             ;; #x4b002032 -> #x4b002031
-            (set! (-> math-cam isometric vector 3 z) (the-as float (1 - (the-as int (-> math-cam isometric vector 3 z)))))
+            (set! (-> math-cam isometric vector 3 z) (the-as float (1- (the-as int (-> math-cam isometric vector 3 z)))))
             ;; also do mirror game check here.
             (when (pc-cheats? (-> *pc-settings* cheats) mirror)
               (*! (-> math-cam perspective vector 0 x) -1.))))
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean.gc b/goal_src/jak1/engine/gfx/ocean/ocean.gc
index bd07ea0a26..4ff548ef61 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean.gc
@@ -528,7 +528,7 @@
       (when (= (-> a0-3 status) 'active)
         (let ((a1-3 (-> a0-3 info ocean)))
           (cond
-            ((= a1-3 none)
+            ((= a1-3 'none)
              (when (and (-> a0-3 meta-inside?) (not (-> a0-3 other meta-inside?)))
                (set! *ocean-map* #f)
                (goto cfg-19)))
diff --git a/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc b/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
index ca345279e8..90087bfc25 100644
--- a/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
+++ b/goal_src/jak1/engine/gfx/shadow/shadow-cpu-h.gc
@@ -123,16 +123,17 @@
 ;; it seems like the first definition is not used.
 ;; The OpenGOAL compiler doesn't like this, so this is commented out.
 #|
-(deftype shadow-edge (structure)   
-  ((ind-0 uint16  :offset-assert 0)
-  (ind-1 uint16  :offset-assert 2)
-  (tri-0 uint16  :offset-assert 4)
-  (tri-1 uint16  :offset-assert 6)
-  )                               
-  :method-count-assert 9           
-  :size-assert         #x4         
-  :flag-assert         #x900000004 
-  )
+;; shadow-cpu-h
+; (deftype shadow-edge (structure)      ;
+;   ((ind-0 uint16  :offset-assert 0)   ;
+;    (ind-1 uint16  :offset-assert 2)   ;
+;    (tri-0 uint16  :offset-assert 4)   ;
+;    (tri-1 uint16  :offset-assert 6)   ;
+;    )                                  ;
+;   :method-count-assert 9              ;
+;   :size-assert         #x4            ;
+;   :flag-assert         #x900000004    ;
+;   )                                   ;
 |#
 
 (deftype shadow-tri (structure)
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
index d55273be7d..b24693a51c 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher-h.gc
@@ -51,7 +51,7 @@
   (spt-anim 2)
   (spt-anim-speed 3)
   (spt-birth-func 4)
-  (spt-joint / refpoint 5)
+  (spt-joint/refpoint 5)
   (spt-num 6)
   (spt-sound 7)
   (misc-fields-end 8)
@@ -320,8 +320,8 @@
          (field-name (string->symbol (string-substr head 1 0)))
          (field-lookup (hash-table-try-ref *sparticle-fields* field-name))
          (field (cdr field-lookup))
-         (store? (member :store params))
-         (param-count (if store? (1 - (length params)) (length params))))
+         (store? (member ':store params))
+         (param-count (if store? (1- (length params)) (length params))))
     (when (not (car field-lookup))
       (fmt #t "unknown sparticle field {}\n" x))
     (when (neq? (string-ref head 0) #\:)
@@ -350,8 +350,8 @@
          `(new 'static 'sp-field-init-spec :field (sp-field-id ,field-enum-name) :initial-value ,param0 :flags (sp-flag launcher)))
         ((eq? field-name 'sound)
          `(new 'static 'sp-field-init-spec :field (sp-field-id ,field-enum-name) :sound ,param0 :flags (sp-flag object)))
-        ((and (= 2 param-count) (symbol? param0) (eq? param0 :copy))
-         (let* ((other-field-lookup (hash-table-try-ref *sparticle-fields* (cadr (member :copy params))))
+        ((and (= 2 param-count) (symbol? param0) (eq? param0 ':copy))
+         (let* ((other-field-lookup (hash-table-try-ref *sparticle-fields* (cadr (member ':copy params))))
                 (other-field (cdr other-field-lookup))
                 (other-field-id (car other-field)))
            (when (>= other-field-id field-id)
@@ -365,13 +365,13 @@
                 :flags (sp-flag copy-from-other)
                 :initial-value ,(- other-field-id field-id)
                 :random-mult 1)))
-        ((and (= 2 param-count) (symbol? param0) (eq? param0 :data))
+        ((and (= 2 param-count) (symbol? param0) (eq? param0 ':data))
          `(new 'static
               'sp-field-init-spec
               :field (sp-field-id ,field-enum-name)
               :flags (sp-flag object)
               :object
-              ,(cadr (member :data params))))
+              ,(cadr (member ':data params))))
         ((and (= 1 param-count) (param-symbol? param0))
          `(new 'static 'sp-field-init-spec :field (sp-field-id ,field-enum-name) :flags (sp-flag symbol) :sym ,param0))
         ((and (= 1 param-count) (param-float? param0))
@@ -453,6 +453,6 @@
                (new 'static
                     'inline-array
                     sp-field-init-spec
-                    ,(1 + (length init-specs))
+                    ,(1+ (length init-specs))
                     ,@(apply process-init-spec init-specs)
                     (new 'static 'sp-field-init-spec :field (sp-field-id spt-end)))))))
diff --git a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
index 5483327c4b..e40d3ecf88 100644
--- a/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sparticle/sparticle-launcher.gc
@@ -115,7 +115,7 @@
         (arg2 sp-field-id)
         (arg3 sp-field-id)
         (write-missing-fields symbol))
-  (1 +! arg2)
+  (1+! arg2)
   (let ((cur-spec arg1))
     (while (< (-> cur-spec 0 field) arg2)
       (&+! cur-spec 16))
@@ -139,7 +139,7 @@
               (set! (-> arg0) (-> cur-spec 0 initial-valuef))
               (set! (-> arg0)
                     (+ (-> cur-spec 0 initial-valuef)
-                       (* (-> cur-spec 0 random-multf) (the int (* (rand-vu) (1 + (-> cur-spec 0 random-range)))))))))
+                       (* (-> cur-spec 0 random-multf) (the int (* (rand-vu) (1+ (-> cur-spec 0 random-range)))))))))
            (((sp-flag copy-from-other)) (set! (-> arg0) (-> arg0 (-> cur-spec 0 initial-value))))
            (((sp-flag symbol)) (set! (-> arg0) (the-as float (-> cur-spec 0 sym value))))
            (((sp-flag launcher)) (set! (-> arg0) (the-as float (-> *part-id-table* (-> cur-spec 0 initial-value)))))
@@ -150,7 +150,7 @@
               (set! (-> arg0)
                     (the-as float
                             (+ (-> cur-spec 0 initial-value) (* (-> cur-spec 0 random-mult) (the int (* (rand-vu) (-> cur-spec 0 random-range))))))))))))
-      (1 +! arg2)
+      (1+! arg2)
       (&+! arg0 4)
       (&+! cur-spec 16))
     cur-spec))
diff --git a/goal_src/jak1/engine/gfx/sprite/sprite.gc b/goal_src/jak1/engine/gfx/sprite/sprite.gc
index 698e2143d8..77c7a337a3 100644
--- a/goal_src/jak1/engine/gfx/sprite/sprite.gc
+++ b/goal_src/jak1/engine/gfx/sprite/sprite.gc
@@ -549,19 +549,19 @@
                              (new 'static 'vif-tag :cmd (vif-cmd nop))
                              (new 'static 'vif-tag :cmd (vif-cmd unpack-v4-32) :num qwc-pkt2 :imm (new 'static 'vif-unpack-imm :flg 1 :addr 1))))
   #|
-      ;(when (= mscal-addr 3)
-        (dotimes (i num-sprites)
-          (let ((spidx (+ i start-sprite-idx)))
-            ;(when (or (= spidx (-> sprites num-sprites 0)) (= spidx (+ 1 (-> sprites num-sprites 0))))
-              (let ((data (the sprite-vec-data-2d (&+ (-> sprites vec-data) (* 48 (+ i start-sprite-idx))))))
-                (let ((vec (-> data x-y-z-sx)))
-                  (format 0 "sp: ~d ~f ~f ~f~%" (+ i start-sprite-idx) (-> vec x) (-> vec y) (-> vec z))
-                  )
-                )
-             ; )
+  ;(when (= mscal-addr 3)
+    (dotimes (i num-sprites)
+      (let ((spidx (+ i start-sprite-idx)))
+        ;(when (or (= spidx (-> sprites num-sprites 0)) (= spidx (+ 1 (-> sprites num-sprites 0))))
+          (let ((data (the sprite-vec-data-2d (&+ (-> sprites vec-data) (* 48 (+ i start-sprite-idx))))))
+            (let ((vec (-> data x-y-z-sx)))
+              (format 0 "sp: ~d ~f ~f ~f~%" (+ i start-sprite-idx) (-> vec x) (-> vec y) (-> vec z))
+              )
             )
-          )
-       ; )
+         ; )
+        )
+      )
+   ; )
   |#
   ;; third packet is adgif data (5 qw/sprite)
   (let ((qwc-pkt3 (* 5 num-sprites)))
diff --git a/goal_src/jak1/engine/gfx/texture/texture.gc b/goal_src/jak1/engine/gfx/texture/texture.gc
index de386f6dd2..eaa2ada378 100644
--- a/goal_src/jak1/engine/gfx/texture/texture.gc
+++ b/goal_src/jak1/engine/gfx/texture/texture.gc
@@ -1859,7 +1859,7 @@
   0)
 
 ;; debug menu shader stuff
-(define *shader-list* ())
+(define *shader-list* '())
 
 (define *edit-shader* (new 'static 'texture-id))
 
@@ -2072,13 +2072,13 @@
   (set! (-> arg0 tex1) (new 'static 'gs-tex1 :mmag #x1 :mmin #x1))
   (set! (-> arg0 tex0 tfx) 0)
   #|
-    (set!
-       (-> arg0 tex0)
-       (the-as
-        gs-tex0
-        (logand (the-as uint (-> arg0 tex0)) (the-as uint #xffffffe7ffffffff))
-        )
-       )
+(set!
+   (-> arg0 tex0)
+   (the-as
+    gs-tex0
+    (logand (the-as uint (-> arg0 tex0)) (the-as uint #xffffffe7ffffffff))
+    )
+   )
   |#
   (if arg1 (adgif-shader<-texture! arg0 arg1))
   (set! (-> arg0 clamp) (new 'static 'gs-clamp :wms (gs-tex-wrap-mode clamp) :wmt (gs-tex-wrap-mode clamp)))
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
index 089fa6018b..03cd151897 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
@@ -50,26 +50,26 @@
     (let ((s5-0 (+ (-> arg0 length) -1))) ;; get the number of trees with draw-nodes (see doc, the last one is always tfragments)
       ;; TODO
       #|
-                  (when (nonzero? s5-0) ;; only if we have draw-nodes (levels like INT have only like 2 tfrags)
-                    (dotimes (s4-0 s5-0) ;; loop over tree depths
-            
-                      ;; not sure of the details yet, but we take two levels as inputs
-                      (let* ((v1-7 (-> arg0 arrays s4-0))
-                             (a0-4 (-> arg0 arrays (+ s4-0 1)))
-                             (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
-                             (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
-                             (a1-3 (&-> (scratchpad-object terrain-context) work background vis-list a1-1))
-                             (a0-8 (&-> (scratchpad-object terrain-context) work background vis-list a0-6))
-                             )
-                        (draw-node-cull
-                          a0-8
-                          a1-3
-                          (-> (the-as drawable-inline-array-node v1-7) data)
-                          (-> (the-as drawable-inline-array-node v1-7) length)
-                          )
-                        )
-                      )
-                    )
+      (when (nonzero? s5-0) ;; only if we have draw-nodes (levels like INT have only like 2 tfrags)
+        (dotimes (s4-0 s5-0) ;; loop over tree depths
+
+          ;; not sure of the details yet, but we take two levels as inputs
+          (let* ((v1-7 (-> arg0 arrays s4-0))
+                 (a0-4 (-> arg0 arrays (+ s4-0 1)))
+                 (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
+                 (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
+                 (a1-3 (&-> (scratchpad-object terrain-context) work background vis-list a1-1))
+                 (a0-8 (&-> (scratchpad-object terrain-context) work background vis-list a0-6))
+                 )
+            (draw-node-cull
+              a0-8
+              a1-3
+              (-> (the-as drawable-inline-array-node v1-7) data)
+              (-> (the-as drawable-inline-array-node v1-7) length)
+              )
+            )
+          )
+        )
       |#
       ;; draw, using the full list of all tfrags (not tree format)
       (let* ((v1-13 (the-as drawable-inline-array-tfrag (-> arg0 arrays s5-0)))
@@ -166,25 +166,25 @@
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
     (let ((s5-0 (+ (-> arg0 length) -1)))
       #|
-             TODO
-                (when (nonzero? s5-0)
-                 (dotimes (s4-0 s5-0)
-                  (let* ((v1-7 (-> arg0 arrays s4-0))
-                         (a0-4 (-> arg0 arrays (+ s4-0 1)))
-                         (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
-                         (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
-                         (a1-3 (&-> (the-as terrain-context #x70000000) work background vis-list a1-1))
-                         (a0-8 (&-> (the-as terrain-context #x70000000) work background vis-list a0-6))
-                         )
-                   (draw-node-cull
-                    a0-8
-                    a1-3
-                    (-> (the-as drawable-inline-array-node v1-7) data)
-                    (-> (the-as drawable-inline-array-node v1-7) length)
-                    )
-                   )
-                  )
-                 )
+ TODO
+    (when (nonzero? s5-0)
+     (dotimes (s4-0 s5-0)
+      (let* ((v1-7 (-> arg0 arrays s4-0))
+             (a0-4 (-> arg0 arrays (+ s4-0 1)))
+             (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
+             (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
+             (a1-3 (&-> (the-as terrain-context #x70000000) work background vis-list a1-1))
+             (a0-8 (&-> (the-as terrain-context #x70000000) work background vis-list a0-6))
+             )
+       (draw-node-cull
+        a0-8
+        a1-3
+        (-> (the-as drawable-inline-array-node v1-7) data)
+        (-> (the-as drawable-inline-array-node v1-7) length)
+        )
+       )
+      )
+     )
       |#
       (let* ((v1-13 (-> arg0 arrays s5-0))
              (s5-1 (&+ v1-13 32))
@@ -225,87 +225,87 @@
                                    s3-0
                                    (the-as (pointer dma-tag) a3-3))))
         #|
-                 TODO
-                     (let*
-                      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                       (s3-1 (-> s2-1 base))
-                       )
-                      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
-                      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
-                      (tfrag-near-init-buffer
-                       s2-1
-                       (new 'static 'gs-test
-                        :ate #x1
-                        :atst (gs-atest greater-equal)
-                        :aref #x7e
-                        :afail #x1
-                        :zte #x1
-                        :ztst (gs-ztest greater-equal)
-                        )
-                       1
-                       )
-                      (let* ((v1-48 (-> *perf-stats* data 6))
-                             (a0-32 (-> v1-48 ctrl))
-                             )
-                       (+! (-> v1-48 count) 1)
-                       (b! (zero? a0-32) cfg-15 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtpc pcr0 r0-0)
-                       (.mtpc pcr1 r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtc0 Perf a0-32)
-                       )
-                      (.sync.l)
-                      (.sync.p)
-                      (label cfg-15)
-                      0
-                      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
-                      (let ((v1-51 (-> *perf-stats* data 6)))
-                       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mfpc a0-35 pcr0)
-                       (+! (-> v1-51 accum0) a0-35)
-                       (.mfpc a0-37 pcr1)
-                       (+! (-> v1-51 accum1) a0-37)
-                       )
-                      (label cfg-17)
-                      0
-                      (update-wait-stats
-                       (-> *perf-stats* data 6)
-                       (the-as uint 0)
-                       (-> *tfrag-work* near-wait-to-spr)
-                       (-> *tfrag-work* near-wait-from-spr)
-                       )
-                      (tfrag-near-end-buffer s2-1)
-                      (let ((a3-6 (-> s2-1 base)))
-                       (let ((v1-58 (the-as object (-> s2-1 base))))
-                        (set!
-                         (-> (the-as dma-packet v1-58) dma)
-                         (new 'static 'dma-tag :id (dma-tag-id next))
-                         )
-                        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
-                        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
-                        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
-                        )
-                       (dma-bucket-insert-tag
-                        (-> *display* frames (-> *display* on-screen) frame bucket-group)
-                        (the-as
-                         bucket-id
-                         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
-                          33
-                          40
-                          )
-                         )
-                        s3-1
-                        (the-as (pointer dma-tag) a3-6)
-                        )
-                       )
-                      )
+ TODO
+     (let*
+      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
+       (s3-1 (-> s2-1 base))
+       )
+      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
+      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
+      (tfrag-near-init-buffer
+       s2-1
+       (new 'static 'gs-test
+        :ate #x1
+        :atst (gs-atest greater-equal)
+        :aref #x7e
+        :afail #x1
+        :zte #x1
+        :ztst (gs-ztest greater-equal)
+        )
+       1
+       )
+      (let* ((v1-48 (-> *perf-stats* data 6))
+             (a0-32 (-> v1-48 ctrl))
+             )
+       (+! (-> v1-48 count) 1)
+       (b! (zero? a0-32) cfg-15 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtpc pcr0 r0-0)
+       (.mtpc pcr1 r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtc0 Perf a0-32)
+       )
+      (.sync.l)
+      (.sync.p)
+      (label cfg-15)
+      0
+      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
+      (let ((v1-51 (-> *perf-stats* data 6)))
+       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mfpc a0-35 pcr0)
+       (+! (-> v1-51 accum0) a0-35)
+       (.mfpc a0-37 pcr1)
+       (+! (-> v1-51 accum1) a0-37)
+       )
+      (label cfg-17)
+      0
+      (update-wait-stats
+       (-> *perf-stats* data 6)
+       (the-as uint 0)
+       (-> *tfrag-work* near-wait-to-spr)
+       (-> *tfrag-work* near-wait-from-spr)
+       )
+      (tfrag-near-end-buffer s2-1)
+      (let ((a3-6 (-> s2-1 base)))
+       (let ((v1-58 (the-as object (-> s2-1 base))))
+        (set!
+         (-> (the-as dma-packet v1-58) dma)
+         (new 'static 'dma-tag :id (dma-tag-id next))
+         )
+        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
+        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
+        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
+        )
+       (dma-bucket-insert-tag
+        (-> *display* frames (-> *display* on-screen) frame bucket-group)
+        (the-as
+         bucket-id
+         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
+          33
+          40
+          )
+         )
+        s3-1
+        (the-as (pointer dma-tag) a3-6)
+        )
+       )
+      )
         |#
         )))
   (none))
@@ -315,41 +315,41 @@
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
     (let ((s5-0 (+ (-> arg0 length) -1)))
       #|
-             TODO
-                (when (nonzero? s5-0)
-                 (dotimes (s4-0 s5-0)
-                  (let* ((v1-7 (-> arg0 arrays s4-0))
-                         (a0-4 (-> arg0 arrays (+ s4-0 1)))
-                         (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
-                         (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
-                         (a1-3
-                          (&->
-                           (the-as terrain-context #x70000000)
-                           work
-                           background
-                           vis-list
-                           a1-1
-                           )
-                          )
-                         (a0-8
-                          (&->
-                           (the-as terrain-context #x70000000)
-                           work
-                           background
-                           vis-list
-                           a0-6
-                           )
-                          )
-                         )
-                   (draw-node-cull
-                    a0-8
-                    a1-3
-                    (-> (the-as drawable-inline-array-node v1-7) data)
-                    (-> (the-as drawable-inline-array-node v1-7) length)
-                    )
-                   )
-                  )
-                 )
+ TODO
+    (when (nonzero? s5-0)
+     (dotimes (s4-0 s5-0)
+      (let* ((v1-7 (-> arg0 arrays s4-0))
+             (a0-4 (-> arg0 arrays (+ s4-0 1)))
+             (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
+             (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
+             (a1-3
+              (&->
+               (the-as terrain-context #x70000000)
+               work
+               background
+               vis-list
+               a1-1
+               )
+              )
+             (a0-8
+              (&->
+               (the-as terrain-context #x70000000)
+               work
+               background
+               vis-list
+               a0-6
+               )
+              )
+             )
+       (draw-node-cull
+        a0-8
+        a1-3
+        (-> (the-as drawable-inline-array-node v1-7) data)
+        (-> (the-as drawable-inline-array-node v1-7) length)
+        )
+       )
+      )
+     )
       |#
       (let* ((v1-13 (-> arg0 arrays s5-0))
              (s5-1 (&+ v1-13 32))
@@ -379,84 +379,84 @@
                                    s3-0
                                    (the-as (pointer dma-tag) a3-3))))
         #|
-                     (let*
-                      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                       (s3-1 (-> s2-1 base))
-                       )
-                      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
-                      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
-                      (tfrag-near-init-buffer
-                       s2-1
-                       (new 'static 'gs-test
-                        :ate #x1
-                        :afail #x1
-                        :zte #x1
-                        :ztst (gs-ztest greater-equal)
-                        )
-                       1
-                       )
-                      (let* ((v1-48 (-> *perf-stats* data 6))
-                             (a0-32 (-> v1-48 ctrl))
-                             )
-                       (+! (-> v1-48 count) 1)
-                       (b! (zero? a0-32) cfg-15 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtpc pcr0 r0-0)
-                       (.mtpc pcr1 r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtc0 Perf a0-32)
-                       )
-                      (.sync.l)
-                      (.sync.p)
-                      (label cfg-15)
-                      0
-                      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
-                      (let ((v1-51 (-> *perf-stats* data 6)))
-                       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mfpc a0-35 pcr0)
-                       (+! (-> v1-51 accum0) a0-35)
-                       (.mfpc a0-37 pcr1)
-                       (+! (-> v1-51 accum1) a0-37)
-                       )
-                      (label cfg-17)
-                      0
-                      (update-wait-stats
-                       (-> *perf-stats* data 6)
-                       (the-as uint 0)
-                       (-> *tfrag-work* near-wait-to-spr)
-                       (-> *tfrag-work* near-wait-from-spr)
-                       )
-                      (tfrag-near-end-buffer s2-1)
-                      (let ((a3-6 (-> s2-1 base)))
-                       (let ((v1-58 (the-as object (-> s2-1 base))))
-                        (set!
-                         (-> (the-as dma-packet v1-58) dma)
-                         (new 'static 'dma-tag :id (dma-tag-id next))
-                         )
-                        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
-                        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
-                        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
-                        )
-                       (dma-bucket-insert-tag
-                        (-> *display* frames (-> *display* on-screen) frame bucket-group)
-                        (the-as
-                         bucket-id
-                         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
-                          35
-                          42
-                          )
-                         )
-                        s3-1
-                        (the-as (pointer dma-tag) a3-6)
-                        )
-                       )
-                      )
+     (let*
+      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
+       (s3-1 (-> s2-1 base))
+       )
+      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
+      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
+      (tfrag-near-init-buffer
+       s2-1
+       (new 'static 'gs-test
+        :ate #x1
+        :afail #x1
+        :zte #x1
+        :ztst (gs-ztest greater-equal)
+        )
+       1
+       )
+      (let* ((v1-48 (-> *perf-stats* data 6))
+             (a0-32 (-> v1-48 ctrl))
+             )
+       (+! (-> v1-48 count) 1)
+       (b! (zero? a0-32) cfg-15 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtpc pcr0 r0-0)
+       (.mtpc pcr1 r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtc0 Perf a0-32)
+       )
+      (.sync.l)
+      (.sync.p)
+      (label cfg-15)
+      0
+      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
+      (let ((v1-51 (-> *perf-stats* data 6)))
+       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mfpc a0-35 pcr0)
+       (+! (-> v1-51 accum0) a0-35)
+       (.mfpc a0-37 pcr1)
+       (+! (-> v1-51 accum1) a0-37)
+       )
+      (label cfg-17)
+      0
+      (update-wait-stats
+       (-> *perf-stats* data 6)
+       (the-as uint 0)
+       (-> *tfrag-work* near-wait-to-spr)
+       (-> *tfrag-work* near-wait-from-spr)
+       )
+      (tfrag-near-end-buffer s2-1)
+      (let ((a3-6 (-> s2-1 base)))
+       (let ((v1-58 (the-as object (-> s2-1 base))))
+        (set!
+         (-> (the-as dma-packet v1-58) dma)
+         (new 'static 'dma-tag :id (dma-tag-id next))
+         )
+        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
+        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
+        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
+        )
+       (dma-bucket-insert-tag
+        (-> *display* frames (-> *display* on-screen) frame bucket-group)
+        (the-as
+         bucket-id
+         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
+          35
+          42
+          )
+         )
+        s3-1
+        (the-as (pointer dma-tag) a3-6)
+        )
+       )
+      )
         |#
         )))
   (none))
@@ -466,25 +466,25 @@
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
     (let ((s5-0 (+ (-> arg0 length) -1)))
       #|
-             TODO
-                (when (nonzero? s5-0)
-                 (dotimes (s4-0 s5-0)
-                  (let* ((v1-7 (-> arg0 arrays s4-0))
-                         (a0-4 (-> arg0 arrays (+ s4-0 1)))
-                         (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
-                         (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
-                         (a1-3 (&-> (the-as terrain-context #x70000000) work background vis-list a1-1))
-                         (a0-8 (&-> (the-as terrain-context #x70000000) work background vis-list a0-6))
-                         )
-                   (draw-node-cull
-                    a0-8
-                    a1-3
-                    (-> (the-as drawable-inline-array-node v1-7) data)
-                    (-> (the-as drawable-inline-array-node v1-7) length)
-                    )
-                   )
-                  )
-                 )
+ TODO
+    (when (nonzero? s5-0)
+     (dotimes (s4-0 s5-0)
+      (let* ((v1-7 (-> arg0 arrays s4-0))
+             (a0-4 (-> arg0 arrays (+ s4-0 1)))
+             (a1-1 (/ (-> (the-as drawable-inline-array-node v1-7) data 0 id) 8))
+             (a0-6 (/ (-> (the-as drawable-inline-array-node a0-4) data 0 id) 8))
+             (a1-3 (&-> (the-as terrain-context #x70000000) work background vis-list a1-1))
+             (a0-8 (&-> (the-as terrain-context #x70000000) work background vis-list a0-6))
+             )
+       (draw-node-cull
+        a0-8
+        a1-3
+        (-> (the-as drawable-inline-array-node v1-7) data)
+        (-> (the-as drawable-inline-array-node v1-7) length)
+        )
+       )
+      )
+     )
       |#
       (let* ((v1-13 (-> arg0 arrays s5-0))
              (s5-1 (&+ v1-13 32))
@@ -517,85 +517,85 @@
                                    s3-0
                                    (the-as (pointer dma-tag) a3-3))))
         #|
-                     (let*
-                      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                       (s3-1 (-> s2-1 base))
-                       )
-                      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
-                      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
-                      (tfrag-near-init-buffer
-                       s2-1
-                       (new 'static 'gs-test
-                        :ate #x1
-                        :atst (gs-atest always)
-                        :afail #x1
-                        :zte #x1
-                        :ztst (gs-ztest greater-equal)
-                        )
-                       1
-                       )
-                      (let* ((v1-48 (-> *perf-stats* data 6))
-                             (a0-32 (-> v1-48 ctrl))
-                             )
-                       (+! (-> v1-48 count) 1)
-                       (b! (zero? a0-32) cfg-15 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtpc pcr0 r0-0)
-                       (.mtpc pcr1 r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mtc0 Perf a0-32)
-                       )
-                      (.sync.l)
-                      (.sync.p)
-                      (label cfg-15)
-                      0
-                      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
-                      (let ((v1-51 (-> *perf-stats* data 6)))
-                       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
-                       (.mtc0 Perf r0-0)
-                       (.sync.l)
-                       (.sync.p)
-                       (.mfpc a0-35 pcr0)
-                       (+! (-> v1-51 accum0) a0-35)
-                       (.mfpc a0-37 pcr1)
-                       (+! (-> v1-51 accum1) a0-37)
-                       )
-                      (label cfg-17)
-                      0
-                      (update-wait-stats
-                       (-> *perf-stats* data 6)
-                       (the-as uint 0)
-                       (-> *tfrag-work* near-wait-to-spr)
-                       (-> *tfrag-work* near-wait-from-spr)
-                       )
-                      (tfrag-near-end-buffer s2-1)
-                      (let ((a3-6 (-> s2-1 base)))
-                       (let ((v1-58 (the-as object (-> s2-1 base))))
-                        (set!
-                         (-> (the-as dma-packet v1-58) dma)
-                         (new 'static 'dma-tag :id (dma-tag-id next))
-                         )
-                        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
-                        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
-                        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
-                        )
-                       (dma-bucket-insert-tag
-                        (-> *display* frames (-> *display* on-screen) frame bucket-group)
-                        (the-as
-                         bucket-id
-                         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
-                          37
-                          44
-                          )
-                         )
-                        s3-1
-                        (the-as (pointer dma-tag) a3-6)
-                        )
-                       )
-                      )
+     (let*
+      ((s2-1 (-> *display* frames (-> *display* on-screen) frame global-buf))
+       (s3-1 (-> s2-1 base))
+       )
+      (set! (-> *tfrag-work* near-wait-to-spr) (the-as uint 0))
+      (set! (-> *tfrag-work* near-wait-from-spr) (the-as uint 0))
+      (tfrag-near-init-buffer
+       s2-1
+       (new 'static 'gs-test
+        :ate #x1
+        :atst (gs-atest always)
+        :afail #x1
+        :zte #x1
+        :ztst (gs-ztest greater-equal)
+        )
+       1
+       )
+      (let* ((v1-48 (-> *perf-stats* data 6))
+             (a0-32 (-> v1-48 ctrl))
+             )
+       (+! (-> v1-48 count) 1)
+       (b! (zero? a0-32) cfg-15 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtpc pcr0 r0-0)
+       (.mtpc pcr1 r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mtc0 Perf a0-32)
+       )
+      (.sync.l)
+      (.sync.p)
+      (label cfg-15)
+      0
+      (draw-inline-array-tfrag-near sv-16 s5-1 s4-1 s2-1)
+      (let ((v1-51 (-> *perf-stats* data 6)))
+       (b! (zero? (-> v1-51 ctrl)) cfg-17 :delay (nop!))
+       (.mtc0 Perf r0-0)
+       (.sync.l)
+       (.sync.p)
+       (.mfpc a0-35 pcr0)
+       (+! (-> v1-51 accum0) a0-35)
+       (.mfpc a0-37 pcr1)
+       (+! (-> v1-51 accum1) a0-37)
+       )
+      (label cfg-17)
+      0
+      (update-wait-stats
+       (-> *perf-stats* data 6)
+       (the-as uint 0)
+       (-> *tfrag-work* near-wait-to-spr)
+       (-> *tfrag-work* near-wait-from-spr)
+       )
+      (tfrag-near-end-buffer s2-1)
+      (let ((a3-6 (-> s2-1 base)))
+       (let ((v1-58 (the-as object (-> s2-1 base))))
+        (set!
+         (-> (the-as dma-packet v1-58) dma)
+         (new 'static 'dma-tag :id (dma-tag-id next))
+         )
+        (set! (-> (the-as dma-packet v1-58) vif0) (new 'static 'vif-tag))
+        (set! (-> (the-as dma-packet v1-58) vif1) (new 'static 'vif-tag))
+        (set! (-> s2-1 base) (&+ (the-as pointer v1-58) 16))
+        )
+       (dma-bucket-insert-tag
+        (-> *display* frames (-> *display* on-screen) frame bucket-group)
+        (the-as
+         bucket-id
+         (if (zero? (-> (the-as terrain-context #x70000000) bsp lev-index))
+          37
+          44
+          )
+         )
+        s3-1
+        (the-as (pointer dma-tag) a3-6)
+        )
+       )
+      )
         |#
         )))
   (none))
diff --git a/goal_src/jak1/engine/gfx/tie/tie-methods.gc b/goal_src/jak1/engine/gfx/tie/tie-methods.gc
index f0a602f4a4..dae05a4fe4 100644
--- a/goal_src/jak1/engine/gfx/tie/tie-methods.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie-methods.gc
@@ -97,99 +97,99 @@
           (set! (-> (the-as (pointer uint32) (-> gp-3 last)) 1) (the-as uint s5-3))
           (set! (-> gp-3 last) (the-as (pointer dma-tag) v1-39))))))
   #|
-      ;; level 0's tie near
-      (let ((gp-4 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-0))))
-        (when (!= gp-4 (-> gp-4 last))
-          (let* ((s5-4 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                 (s4-7 (-> s5-4 base))
-                 )
-            (tie-near-init-engine
-              s5-4
-              (new 'static 'gs-test
-                :ate #x1
-                :atst (gs-atest greater-equal)
-                :aref #x26
-                :zte #x1
-                :ztst (gs-ztest greater-equal)
-                )
-              0
-              )
-            (let ((v1-48 (the-as object (-> s5-4 base))))
-              (set! (-> (the-as dma-packet v1-48) dma) (new 'static 'dma-tag :id (dma-tag-id next) :addr (-> gp-4 next)))
-              (set! (-> (the-as dma-packet v1-48) vif0) (new 'static 'vif-tag))
-              (set! (-> (the-as dma-packet v1-48) vif1) (new 'static 'vif-tag))
-              (set! (-> s5-4 base) (&+ (the-as pointer v1-48) 16))
-              )
-            (set! (-> gp-4 next) (the-as uint s4-7))
+  ;; level 0's tie near
+  (let ((gp-4 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-0))))
+    (when (!= gp-4 (-> gp-4 last))
+      (let* ((s5-4 (-> *display* frames (-> *display* on-screen) frame global-buf))
+             (s4-7 (-> s5-4 base))
+             )
+        (tie-near-init-engine
+          s5-4
+          (new 'static 'gs-test
+            :ate #x1
+            :atst (gs-atest greater-equal)
+            :aref #x26
+            :zte #x1
+            :ztst (gs-ztest greater-equal)
             )
+          0
+          )
+        (let ((v1-48 (the-as object (-> s5-4 base))))
+          (set! (-> (the-as dma-packet v1-48) dma) (new 'static 'dma-tag :id (dma-tag-id next) :addr (-> gp-4 next)))
+          (set! (-> (the-as dma-packet v1-48) vif0) (new 'static 'vif-tag))
+          (set! (-> (the-as dma-packet v1-48) vif1) (new 'static 'vif-tag))
+          (set! (-> s5-4 base) (&+ (the-as pointer v1-48) 16))
+          )
+        (set! (-> gp-4 next) (the-as uint s4-7))
+        )
+      )
+    )
+  (let ((gp-5 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-0))))
+    (when (!= gp-5 (-> gp-5 last))
+      (let* ((s4-8 (-> *display* frames (-> *display* on-screen) frame global-buf))
+             (s5-5 (-> s4-8 base))
+             )
+        (tie-near-end-buffer s4-8)
+        (let ((v1-59 (-> s4-8 base)))
+          (let ((a0-55 (the-as object (-> s4-8 base))))
+            (set! (-> (the-as dma-packet a0-55) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
+            (set! (-> (the-as dma-packet a0-55) vif0) (new 'static 'vif-tag))
+            (set! (-> (the-as dma-packet a0-55) vif1) (new 'static 'vif-tag))
+            (set! (-> s4-8 base) (&+ (the-as pointer a0-55) 16))
+            )
+          (set! (-> (the-as (pointer uint32) (-> gp-5 last)) 1) (the-as uint s5-5))
+          (set! (-> gp-5 last) (the-as (pointer dma-tag) v1-59))
           )
         )
-      (let ((gp-5 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-0))))
-        (when (!= gp-5 (-> gp-5 last))
-          (let* ((s4-8 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                 (s5-5 (-> s4-8 base))
-                 )
-            (tie-near-end-buffer s4-8)
-            (let ((v1-59 (-> s4-8 base)))
-              (let ((a0-55 (the-as object (-> s4-8 base))))
-                (set! (-> (the-as dma-packet a0-55) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
-                (set! (-> (the-as dma-packet a0-55) vif0) (new 'static 'vif-tag))
-                (set! (-> (the-as dma-packet a0-55) vif1) (new 'static 'vif-tag))
-                (set! (-> s4-8 base) (&+ (the-as pointer a0-55) 16))
-                )
-              (set! (-> (the-as (pointer uint32) (-> gp-5 last)) 1) (the-as uint s5-5))
-              (set! (-> gp-5 last) (the-as (pointer dma-tag) v1-59))
-              )
-            )
-          )
-        )
-    
-      ;; level 1's tie near
-      (let ((gp-6 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-1))))
-        (when (!= gp-6 (-> gp-6 last))
-          (let* ((s5-6 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                 (s4-10 (-> s5-6 base))
-                 )
-            (tie-near-init-engine
-              s5-6
-              (new 'static 'gs-test
-                :ate #x1
-                :atst (gs-atest greater-equal)
-                :aref #x26
-                :zte #x1
-                :ztst (gs-ztest greater-equal)
-                )
-              0
-              )
-            (let ((v1-68 (the-as object (-> s5-6 base))))
-              (set! (-> (the-as dma-packet v1-68) dma) (new 'static 'dma-tag :id (dma-tag-id next) :addr (-> gp-6 next)))
-              (set! (-> (the-as dma-packet v1-68) vif0) (new 'static 'vif-tag))
-              (set! (-> (the-as dma-packet v1-68) vif1) (new 'static 'vif-tag))
-              (set! (-> s5-6 base) (&+ (the-as pointer v1-68) 16))
-              )
-            (set! (-> gp-6 next) (the-as uint s4-10))
-            )
-          )
-        )
-      (let ((gp-7 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-1))))
-        (when (!= gp-7 (-> gp-7 last))
-          (let* ((s4-11 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                 (s5-7 (-> s4-11 base))
-                 )
-            (tie-near-end-buffer s4-11)
-            (let ((v1-79 (-> s4-11 base)))
-              (let ((a0-74 (the-as object (-> s4-11 base))))
-                (set! (-> (the-as dma-packet a0-74) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
-                (set! (-> (the-as dma-packet a0-74) vif0) (new 'static 'vif-tag))
-                (set! (-> (the-as dma-packet a0-74) vif1) (new 'static 'vif-tag))
-                (set! (-> s4-11 base) (&+ (the-as pointer a0-74) 16))
-                )
-              (set! (-> (the-as (pointer uint32) (-> gp-7 last)) 1) (the-as uint s5-7))
-              (set! (-> gp-7 last) (the-as (pointer dma-tag) v1-79))
-              )
+      )
+    )
+
+  ;; level 1's tie near
+  (let ((gp-6 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-1))))
+    (when (!= gp-6 (-> gp-6 last))
+      (let* ((s5-6 (-> *display* frames (-> *display* on-screen) frame global-buf))
+             (s4-10 (-> s5-6 base))
+             )
+        (tie-near-init-engine
+          s5-6
+          (new 'static 'gs-test
+            :ate #x1
+            :atst (gs-atest greater-equal)
+            :aref #x26
+            :zte #x1
+            :ztst (gs-ztest greater-equal)
             )
+          0
+          )
+        (let ((v1-68 (the-as object (-> s5-6 base))))
+          (set! (-> (the-as dma-packet v1-68) dma) (new 'static 'dma-tag :id (dma-tag-id next) :addr (-> gp-6 next)))
+          (set! (-> (the-as dma-packet v1-68) vif0) (new 'static 'vif-tag))
+          (set! (-> (the-as dma-packet v1-68) vif1) (new 'static 'vif-tag))
+          (set! (-> s5-6 base) (&+ (the-as pointer v1-68) 16))
+          )
+        (set! (-> gp-6 next) (the-as uint s4-10))
+        )
+      )
+    )
+  (let ((gp-7 (-> *display* frames (-> *display* on-screen) frame bucket-group (bucket-id tie-near-1))))
+    (when (!= gp-7 (-> gp-7 last))
+      (let* ((s4-11 (-> *display* frames (-> *display* on-screen) frame global-buf))
+             (s5-7 (-> s4-11 base))
+             )
+        (tie-near-end-buffer s4-11)
+        (let ((v1-79 (-> s4-11 base)))
+          (let ((a0-74 (the-as object (-> s4-11 base))))
+            (set! (-> (the-as dma-packet a0-74) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
+            (set! (-> (the-as dma-packet a0-74) vif0) (new 'static 'vif-tag))
+            (set! (-> (the-as dma-packet a0-74) vif1) (new 'static 'vif-tag))
+            (set! (-> s4-11 base) (&+ (the-as pointer a0-74) 16))
+            )
+          (set! (-> (the-as (pointer uint32) (-> gp-7 last)) 1) (the-as uint s5-7))
+          (set! (-> gp-7 last) (the-as (pointer dma-tag) v1-79))
           )
         )
+      )
+    )
   |#
   0
   (none))
@@ -274,24 +274,24 @@
       ;; The instance drawing will end up looking at too many instances, but this is fine - it
       ;; should reject those, and it plenty fast.
       #|
-                  (when (nonzero? s4-0)
-                    (dotimes (s3-0 s4-0)
-                      (let* ((v1-10 (-> arg0 data s3-0))
-                             (a0-5 (-> arg0 data (+ s3-0 1)))
-                             (a1-2 (/ (-> (the-as drawable-inline-array-node v1-10) data 0 id) 8))
-                             (a0-7 (/ (-> (the-as drawable-inline-array-node a0-5) data 0 id) 8))
-                             (a1-4 (+ a1-2 #x38b0 #x70000000))
-                             (a0-9 (+ a0-7 #x38b0 #x70000000))
-                             )
-                        (draw-node-cull
-                          (the-as pointer a0-9)
-                          (the-as pointer a1-4)
-                          (-> (the-as drawable-inline-array-node v1-10) data)
-                          (-> (the-as drawable-inline-array-node v1-10) length)
-                          )
-                        )
-                      )
-                    )
+      (when (nonzero? s4-0)
+        (dotimes (s3-0 s4-0)
+          (let* ((v1-10 (-> arg0 data s3-0))
+                 (a0-5 (-> arg0 data (+ s3-0 1)))
+                 (a1-2 (/ (-> (the-as drawable-inline-array-node v1-10) data 0 id) 8))
+                 (a0-7 (/ (-> (the-as drawable-inline-array-node a0-5) data 0 id) 8))
+                 (a1-4 (+ a1-2 #x38b0 #x70000000))
+                 (a0-9 (+ a0-7 #x38b0 #x70000000))
+                 )
+            (draw-node-cull
+              (the-as pointer a0-9)
+              (the-as pointer a1-4)
+              (-> (the-as drawable-inline-array-node v1-10) data)
+              (-> (the-as drawable-inline-array-node v1-10) length)
+              )
+            )
+          )
+        )
       |#
       (let* ((v1-16 (-> arg0 data s4-0)) ;; leaves
              (s4-1 (-> arg0 prototypes prototype-array-tie)) ;; prototypes
@@ -414,51 +414,51 @@
                         (&- (-> *display* frames (-> *display* on-screen) frame global-buf base) (the-as uint s3-2)))
                     (set! (-> v1-100 data 9 total) (-> v1-100 data 9 used))))))
             #|
-                                    (when (logtest? *vu1-enable-user* (vu1-renderer-mask tie-near))
-                                      (let ((s3-3 (-> *display* frames (-> *display* on-screen) frame global-buf base)))
-                                        (let* ((s1-2 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                                               (s2-3 (-> s1-2 base))
-                                               )
-                                          (set! (-> *prototype-tie-work* near-wait-to-spr) (the-as uint 0))
-                                          (set! (-> *prototype-tie-work* near-wait-from-spr) (the-as uint 0))
-                                          (reset! (-> *perf-stats* data 12))
-                                          ;;(draw-inline-array-prototype-tie-near-asm s1-2 s5-1 s4-1)
-                                          (read! (-> *perf-stats* data 12))
-                                          (update-wait-stats (-> *perf-stats* data 12) (the-as uint 0)
-                                                             (-> *prototype-tie-work* near-wait-to-spr)
-                                                             (-> *prototype-tie-work* near-wait-from-spr)
-                                                             )
-                                          (let ((a3-16 (-> s1-2 base)))
-                                            (let ((v1-123 (the-as object (-> s1-2 base))))
-                                              (set! (-> (the-as dma-packet v1-123) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
-                                              (set! (-> (the-as dma-packet v1-123) vif0) (new 'static 'vif-tag))
-                                              (set! (-> (the-as dma-packet v1-123) vif1) (new 'static 'vif-tag))
-                                              (set! (-> s1-2 base) (&+ (the-as pointer v1-123) 16))
-                                              )
-                                            (dma-bucket-insert-tag
-                                              (-> *display* frames (-> *display* on-screen) frame bucket-group)
-                                              (if (zero? (-> arg1 index))
-                                                  (bucket-id tie-near-0)
-                                                  (bucket-id tie-near-1)
-                                                  )
-                                              s2-3
-                                              (the-as (pointer dma-tag) a3-16)
-                                              )
-                                            )
-                                          )
-                                        (let ((a0-92 *dma-mem-usage*))
-                                          (when (nonzero? a0-92)
-                                            (set! (-> a0-92 length) (max 16 (-> a0-92 length)))
-                                            (set! (-> a0-92 data 15 name) "tie-near")
-                                            (+! (-> a0-92 data 15 count) 1)
-                                            (+! (-> a0-92 data 15 used)
-                                                (&- (-> *display* frames (-> *display* on-screen) frame global-buf base) (the-as uint s3-3))
-                                                )
-                                            (set! (-> a0-92 data 15 total) (-> a0-92 data 15 used))
-                                            )
-                                          )
-                                        )
-                                      )
+            (when (logtest? *vu1-enable-user* (vu1-renderer-mask tie-near))
+              (let ((s3-3 (-> *display* frames (-> *display* on-screen) frame global-buf base)))
+                (let* ((s1-2 (-> *display* frames (-> *display* on-screen) frame global-buf))
+                       (s2-3 (-> s1-2 base))
+                       )
+                  (set! (-> *prototype-tie-work* near-wait-to-spr) (the-as uint 0))
+                  (set! (-> *prototype-tie-work* near-wait-from-spr) (the-as uint 0))
+                  (reset! (-> *perf-stats* data 12))
+                  ;;(draw-inline-array-prototype-tie-near-asm s1-2 s5-1 s4-1)
+                  (read! (-> *perf-stats* data 12))
+                  (update-wait-stats (-> *perf-stats* data 12) (the-as uint 0)
+                                     (-> *prototype-tie-work* near-wait-to-spr)
+                                     (-> *prototype-tie-work* near-wait-from-spr)
+                                     )
+                  (let ((a3-16 (-> s1-2 base)))
+                    (let ((v1-123 (the-as object (-> s1-2 base))))
+                      (set! (-> (the-as dma-packet v1-123) dma) (new 'static 'dma-tag :id (dma-tag-id next)))
+                      (set! (-> (the-as dma-packet v1-123) vif0) (new 'static 'vif-tag))
+                      (set! (-> (the-as dma-packet v1-123) vif1) (new 'static 'vif-tag))
+                      (set! (-> s1-2 base) (&+ (the-as pointer v1-123) 16))
+                      )
+                    (dma-bucket-insert-tag
+                      (-> *display* frames (-> *display* on-screen) frame bucket-group)
+                      (if (zero? (-> arg1 index))
+                          (bucket-id tie-near-0)
+                          (bucket-id tie-near-1)
+                          )
+                      s2-3
+                      (the-as (pointer dma-tag) a3-16)
+                      )
+                    )
+                  )
+                (let ((a0-92 *dma-mem-usage*))
+                  (when (nonzero? a0-92)
+                    (set! (-> a0-92 length) (max 16 (-> a0-92 length)))
+                    (set! (-> a0-92 data 15 name) "tie-near")
+                    (+! (-> a0-92 data 15 count) 1)
+                    (+! (-> a0-92 data 15 used)
+                        (&- (-> *display* frames (-> *display* on-screen) frame global-buf base) (the-as uint s3-3))
+                        )
+                    (set! (-> a0-92 data 15 total) (-> a0-92 data 15 used))
+                    )
+                  )
+                )
+              )
             |#
             ))))
     0)
diff --git a/goal_src/jak1/engine/gfx/tie/tie.gc b/goal_src/jak1/engine/gfx/tie/tie.gc
index 79b6fb49fe..7a7e28a870 100644
--- a/goal_src/jak1/engine/gfx/tie/tie.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie.gc
@@ -53,10 +53,10 @@
   (the-as int (+ (-> drawable-inline-array-instance-tie size) (* (+ (-> this length) -1) 64))))
 
 #|
- ;; for some reason, this showed up twice.
- (defmethod login ((this drawable-tree-instance-tie))
- this
- )
+;; for some reason, this showed up twice.
+(defmethod login ((this drawable-tree-instance-tie))
+this
+)
 |#
 
 (defmethod login ((this drawable-tree-instance-tie))
diff --git a/goal_src/jak1/engine/level/level-h.gc b/goal_src/jak1/engine/level/level-h.gc
index d455617498..2fdc03604c 100644
--- a/goal_src/jak1/engine/level/level-h.gc
+++ b/goal_src/jak1/engine/level/level-h.gc
@@ -259,7 +259,7 @@
              :border? #f
              :want-level #f
              :load-commands
-             ()
+             '()
              :play? #f
              :level0
              (new 'static
diff --git a/goal_src/jak1/engine/level/level-info.gc b/goal_src/jak1/engine/level/level-info.gc
index c6967778d3..01542289cd 100644
--- a/goal_src/jak1/engine/level/level-info.gc
+++ b/goal_src/jak1/engine/level/level-info.gc
@@ -23,7 +23,7 @@
        :sound-banks '(training)
        :music-bank 'village1
        :ambient-sounds
-       ()
+       '()
        :mood '*training-mood*
        :mood-func 'update-mood-training
        :ocean '*ocean-map-village1*
@@ -120,9 +120,9 @@
        '(92 93 94 95)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x -5079040.0 :z 4055040.0 :w 1024000.0)
@@ -143,7 +143,7 @@
        :sound-banks '(village1)
        :music-bank 'village1
        :ambient-sounds
-       ()
+       '()
        :mood '*village1-mood*
        :mood-func 'update-mood-village1
        :ocean '*ocean-map-village1*
@@ -163,7 +163,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.8947 0.0 -0.4464 0.1082 0.9701 -0.2169 0.4331 -0.2424 -0.868)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi1
              :lev0 'village1
              :disp0 'display
@@ -183,7 +183,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi1
              :lev0 'village1
              :disp0 'display
@@ -203,7 +203,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7221 0.0 -0.6917 -0.0517 0.9972 -0.054 0.6897 0.0747 0.7201)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi1
              :lev0 'village1
              :disp0 'display
@@ -223,7 +223,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7868 0.0 -0.6171 0.0775 0.992 0.0989 0.6122 -0.1257 0.7806)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi1
              :lev0 'village1
              :disp0 'display
@@ -264,7 +264,7 @@
        '(10 11 12 13 14 75)
        :priority #xc8
        :load-commands
-       ()
+       '()
        :alt-load-commands
        '(((display village1) (load misty)) ((special village1) (display misty)) ((display village1) (load beach)))
        :bsp-mask #xffffffffffffffff
@@ -287,7 +287,7 @@
        :sound-banks '(beach)
        :music-bank 'beach
        :ambient-sounds
-       ()
+       '()
        :mood '*beach-mood*
        :mood-func 'update-mood-village1
        :ocean '*ocean-map-village1*
@@ -307,7 +307,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9139 0.0 0.4058 -0.0551 0.9907 -0.1241 -0.4021 -0.1358 -0.9054)
              :load-commands
-             ()
+             '()
              :vis-nick 'bea
              :lev0 'beach
              :disp0 'display
@@ -317,9 +317,9 @@
        '(15 16 17 18 19 20 21 22)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x -819200.0 :z -1556480.0 :w 1474560.0)
@@ -340,7 +340,7 @@
        :sound-banks '(jungle)
        :music-bank 'jungle
        :ambient-sounds
-       ()
+       '()
        :mood '*jungle-mood*
        :mood-func 'update-mood-jungle
        :ocean '*ocean-map-village1*
@@ -360,7 +360,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.5568 0.0 -0.8306 0.201 0.9702 -0.1347 0.8059 -0.2419 -0.5402)
              :load-commands
-             ()
+             '()
              :vis-nick 'jun
              :lev0 'jungle
              :disp0 'display
@@ -370,7 +370,7 @@
        '(2 3 4 5 7 8 9)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
        '(((display jungle) (display jungleb)) ((display jungle) (display village1)))
        :bsp-mask #xffffffffffffffff
@@ -393,10 +393,10 @@
        :sound-banks '(jungleb)
        :music-bank 'jungleb
        :ambient-sounds
-       ()
+       '()
        :mood '*jungleb-mood*
        :mood-func 'update-mood-jungleb
-       :ocean none
+       :ocean 'none
        :sky #f
        :continues
        '((new 'static
@@ -412,19 +412,19 @@
              :camera-rot
              (new 'static 'array float 9 -0.8614 0.0 0.5078 -0.1177 0.9727 -0.1997 -0.4939 -0.2318 -0.8379)
              :load-commands
-             ()
+             '()
              :vis-nick 'jub
              :lev0 'jungle
              :disp0 'display
              :lev1 'jungleb
              :disp1 'display))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsphere
        (new 'static 'sphere :x 1486848.0 :y -1269760.0 :z -1064960.0 :w 1228800.0)
        :buzzer 7
@@ -444,7 +444,7 @@
        :sound-banks '(misty)
        :music-bank 'misty
        :ambient-sounds
-       ()
+       '()
        :mood '*misty-mood*
        :mood-func 'update-mood-misty
        :ocean '*ocean-map-village1*
@@ -605,9 +605,9 @@
        '(23 24 25 26 27 28 29 30)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :z 4096000.0 :w 1269760.0)
@@ -628,10 +628,10 @@
        :sound-banks '(firecanyon)
        :music-bank 'firecanyon
        :ambient-sounds
-       ()
+       '()
        :mood '*firecanyon-mood*
        :mood-func 'update-mood-firecanyon
-       :ocean none
+       :ocean 'none
        :sky #t
        :continues
        '((new 'static
@@ -647,7 +647,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9976 0.0 0.0688 -0.01 0.9893 -0.1452 -0.068 -0.1456 -0.9869)
              :load-commands
-             ()
+             '()
              :vis-nick 'fic
              :lev0 'firecanyon
              :disp0 'display
@@ -666,7 +666,7 @@
              :camera-rot
              (new 'static 'array float 9 0.8847 0.0 0.466 -0.0744 0.9871 0.1414 -0.46 -0.1598 0.8733)
              :load-commands
-             ()
+             '()
              :vis-nick 'fic
              :lev0 'village2
              :disp0 'display
@@ -676,9 +676,9 @@
        '(68 69)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 419840.0 :y 151552.0 :z -3006464.0 :w 2048000.0)
@@ -699,7 +699,7 @@
        :sound-banks '(village2)
        :music-bank 'village2
        :ambient-sounds
-       ()
+       '()
        :mood '*village2-mood*
        :mood-func 'update-mood-village2
        :ocean '*ocean-map-village2*
@@ -718,7 +718,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9941 0.0 0.1076 -0.0261 0.9699 -0.2418 -0.1044 -0.2432 -0.9643)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi2
              :lev0 'village2
              :disp0 'display
@@ -738,7 +738,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.2562 0.0 -0.9666 -0.0253 0.9996 0.0067 0.9662 0.0262 -0.2561)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi2
              :lev0 'village2
              :disp0 'display
@@ -757,7 +757,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9991 0.0 0.0411 -0.0088 0.9764 0.2155 -0.0401 -0.2156 0.9756)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi2
              :lev0 'village2
              :disp0 'display
@@ -767,9 +767,9 @@
        '(31 32 34 35 76)
        :priority #xc8
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 1392640.0 :y 81920.0 :z -6770688.0 :w 696320.0)
@@ -790,7 +790,7 @@
        :sound-banks '(sunken)
        :music-bank 'sunken
        :ambient-sounds
-       ()
+       '()
        :mood '*sunken-mood*
        :mood-func 'update-mood-sunken
        :ocean '*ocean-map-sunken*
@@ -809,7 +809,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7575 0.0 -0.6527 0.0858 0.9913 0.0995 0.647 -0.1314 0.7509)
              :load-commands
-             ()
+             '()
              :vis-nick 'sun
              :lev0 'sunken
              :disp0 'display
@@ -828,7 +828,7 @@
              :camera-rot
              (new 'static 'array float 9 0.3725 0.0 -0.928 0.1121 0.9926 0.045 0.9212 -0.1208 0.3697)
              :load-commands
-             ()
+             '()
              :vis-nick 'sun
              :lev0 'sunken
              :disp0 'display
@@ -847,7 +847,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.6872 0.0 0.7263 -0.0878 0.9926 -0.0831 -0.721 -0.1209 -0.6822)
              :load-commands
-             ()
+             '()
              :vis-nick 'sun
              :lev0 'sunken
              :disp0 'display
@@ -866,19 +866,19 @@
              :camera-rot
              (new 'static 'array float 9 -0.8024 0.0 -0.5967 0.1721 0.9574 -0.2315 0.5713 -0.2885 -0.7683)
              :load-commands
-             ()
+             '()
              :vis-nick 'sun
              :lev0 'sunken
              :disp0 'display
              :lev1 'sunkenb
              :disp1 #f))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0)
@@ -896,11 +896,11 @@
        :visname 'sunkenb-vis
        :nickname 'sub
        :packages
-       ()
+       '()
        :sound-banks '(sunken)
        :music-bank 'sunken
        :ambient-sounds
-       ()
+       '()
        :mood '*sunkenb-mood*
        :mood-func 'update-mood-sunken
        :ocean '*ocean-map-sunken*
@@ -938,19 +938,19 @@
              :camera-rot
              (new 'static 'array float 9 -0.2889 0.0 0.9573 -0.1163 0.9925 -0.0351 -0.9502 -0.1214 -0.2867)
              :load-commands
-             ()
+             '()
              :vis-nick 'sub
              :lev0 'sunken
              :disp0 'display
              :lev1 'sunkenb
              :disp1 'display))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 2867200.0 :y -2048000.0 :z -6553600.0 :w 2048000.0)
@@ -971,7 +971,7 @@
        :sound-banks '(swamp)
        :music-bank 'swamp
        :ambient-sounds
-       ()
+       '()
        :mood '*swamp-mood*
        :mood-func 'update-mood-swamp
        :ocean '*ocean-map-village2*
@@ -1149,9 +1149,9 @@
        '(36 37 38 39 40 41 42 43)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 1986560.0 :z -8417280.0 :w 1003520.0)
@@ -1172,10 +1172,10 @@
        :sound-banks '(rolling)
        :music-bank 'rolling
        :ambient-sounds
-       ()
+       '()
        :mood '*rolling-mood*
        :mood-func 'update-mood-rolling
-       :ocean none
+       :ocean 'none
        :sky #t
        :continues
        '((new 'static
@@ -1191,7 +1191,7 @@
              :camera-rot
              (new 'static 'array float 9 0.1759 0.0 0.9843 -0.2371 0.9705 0.0423 -0.9553 -0.2409 0.1707)
              :load-commands
-             ()
+             '()
              :vis-nick 'rol
              :lev0 'rolling
              :disp0 'display
@@ -1201,9 +1201,9 @@
        '(52 53 54 55 56 57 58 59)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x -753664.0 :y 131072.0 :z -6569984.0 :w 974848.0)
@@ -1224,10 +1224,10 @@
        :sound-banks '(ogre)
        :music-bank 'ogre
        :ambient-sounds
-       ()
+       '()
        :mood '*ogre-mood*
        :mood-func 'update-mood-ogre
-       :ocean none
+       :ocean 'none
        :sky #t
        :continues
        '((new 'static
@@ -1243,7 +1243,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9998 0.0 -0.0159 0.0019 0.9925 -0.1215 0.0158 -0.1215 -0.9924)
              :load-commands
-             ()
+             '()
              :vis-nick 'ogr
              :lev0 'ogre
              :disp0 'display
@@ -1262,7 +1262,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9145 0.0 0.4045 -0.0497 0.9924 -0.1125 -0.4015 -0.123 -0.9075)
              :load-commands
-             ()
+             '()
              :vis-nick 'ogr
              :lev0 'ogre
              :disp0 'display
@@ -1281,7 +1281,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.7611 0.0 0.6485 -0.0932 0.9896 -0.1094 -0.6417 -0.1438 -0.7532)
              :load-commands
-             ()
+             '()
              :vis-nick 'ogr
              :lev0 'village3
              :disp0 'display
@@ -1291,9 +1291,9 @@
        '(86 87 110 88)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 2334720.0 :y 180224.0 :z -10653696.0 :w 3653632.0)
@@ -1314,7 +1314,7 @@
        :sound-banks '(village3)
        :music-bank 'village3
        :ambient-sounds
-       ()
+       '()
        :mood '*village3-mood*
        :mood-func 'update-mood-village3
        :ocean #f
@@ -1333,7 +1333,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9996 0.0 0.0268 -0.0032 0.9925 -0.1216 -0.0266 -0.1216 -0.9922)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi3
              :lev0 'village3
              :disp0 'display
@@ -1353,7 +1353,7 @@
              :camera-rot
              (new 'static 'array float 9 0.8563 0.0 -0.2763 0.0456 0.8875 0.1413 0.2725 -0.1485 0.8446)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi3
              :lev0 'village3
              :disp0 'display
@@ -1372,7 +1372,7 @@
              :camera-rot
              (new 'static 'array float 9 0.442 0.0 -0.8969 0.1099 0.9924 0.0541 0.8902 -0.1225 0.4387)
              :load-commands
-             ()
+             '()
              :vis-nick 'vi3
              :lev0 'village3
              :disp0 'display
@@ -1382,9 +1382,9 @@
        '(96 97 98 99 100 101 74 77)
        :priority #xc8
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 4571136.0 :y 389120.0 :z -14323712.0 :w 409600.0)
@@ -1405,7 +1405,7 @@
        :sound-banks '(snow)
        :music-bank 'snow
        :ambient-sounds
-       ()
+       '()
        :mood '*snow-mood*
        :mood-func 'update-mood-snow
        :ocean #f
@@ -1425,7 +1425,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.4804 0.0 0.877 -0.2049 0.9723 -0.1122 -0.8527 -0.2336 -0.4671)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1444,7 +1444,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9991 0.0 -0.0419 0.0051 0.9925 0.1216 0.0415 -0.1217 0.9916)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1463,7 +1463,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.8224 0.0 0.5688 -0.135 0.9713 -0.1953 -0.5525 -0.2374 -0.7989)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1482,7 +1482,7 @@
              :camera-rot
              (new 'static 'array float 9 0.6061 0.0 0.7953 -0.1493 0.9822 0.1138 -0.7812 -0.1878 0.5953)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1501,7 +1501,7 @@
              :camera-rot
              (new 'static 'array float 9 0.4189 0.0 0.9079 -0.2169 0.971 0.1001 -0.8816 -0.2389 0.4068)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1520,7 +1520,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.987 0.0 -0.1601 0.0195 0.9924 -0.1207 0.1589 -0.1223 -0.9796)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1539,7 +1539,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9998 0.0 -0.0196 0.0023 0.9926 0.1213 0.0195 -0.1213 0.9924)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1558,7 +1558,7 @@
              :camera-rot
              (new 'static 'array float 9 0.4062 0.0 0.9137 -0.1107 0.9926 0.0492 -0.907 -0.1211 0.4032)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1577,7 +1577,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9554 0.0 -0.2951 0.0343 0.9932 0.1111 0.2931 -0.1163 0.9489)
              :load-commands
-             ()
+             '()
              :vis-nick 'sno
              :lev0 'snow
              :disp0 'display
@@ -1587,9 +1587,9 @@
        '(60 61 62 63 64 66 67 65)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 3072000.0 :y 1142784.0 :z -14028800.0 :w 1290240.0)
@@ -1610,7 +1610,7 @@
        :sound-banks '(maincave)
        :music-bank 'maincave
        :ambient-sounds
-       ()
+       '()
        :mood '*maincave-mood*
        :mood-func 'update-mood-maincave
        :ocean #f
@@ -1629,7 +1629,7 @@
              :camera-rot
              (new 'static 'array float 9 0.99 0.0 0.1405 -0.0169 0.9927 0.1192 -0.1395 -0.1204 0.9828)
              :load-commands
-             ()
+             '()
              :vis-nick 'mai
              :lev0 'maincave
              :disp0 'display
@@ -1648,7 +1648,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9052 0.0 0.4248 -0.0514 0.9926 0.1096 -0.4217 -0.1211 0.8986)
              :load-commands
-             ()
+             '()
              :vis-nick 'mai
              :lev0 'maincave
              :disp0 'display
@@ -1667,7 +1667,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7343 0.0 -0.6788 0.1872 0.9611 0.2026 0.6524 -0.2759 0.7058)
              :load-commands
-             ()
+             '()
              :vis-nick 'mai
              :lev0 'maincave
              :disp0 'display
@@ -1677,9 +1677,9 @@
        '(78 79 80 81 82 83 84 85)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 4517888.0 :y 114688.0 :z -12484608.0 :w 655360.0)
@@ -1700,7 +1700,7 @@
        :sound-banks '(darkcave)
        :music-bank 'maincave
        :ambient-sounds
-       ()
+       '()
        :mood '*darkcave-mood*
        :mood-func 'update-mood-darkcave
        :ocean #f
@@ -1719,19 +1719,19 @@
              :camera-rot
              (new 'static 'array float 9 0.7892 0.0 -0.614 0.1178 0.9813 0.1515 0.6026 -0.1919 0.7745)
              :load-commands
-             ()
+             '()
              :vis-nick 'dar
              :lev0 'maincave
              :disp0 'display
              :lev1 'darkcave
              :disp1 'display))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 3620864.0 :y 266240.0 :z -11935744.0 :w 368640.0)
@@ -1752,7 +1752,7 @@
        :sound-banks '(robocave)
        :music-bank 'maincave
        :ambient-sounds
-       ()
+       '()
        :mood '*robocave-mood*
        :mood-func 'update-mood-robocave
        :ocean #f
@@ -1771,7 +1771,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7006 0.0 -0.7134 0.0864 0.9926 0.0849 0.7082 -0.1212 0.6954)
              :load-commands
-             ()
+             '()
              :vis-nick 'rob
              :lev0 'maincave
              :disp0 'display
@@ -1790,19 +1790,19 @@
              :camera-rot
              (new 'static 'array float 9 0.8662 0.0 -0.4996 0.0605 0.9926 0.105 0.4959 -0.1212 0.8598)
              :load-commands
-             ()
+             '()
              :vis-nick 'rob
              :lev0 'maincave
              :disp0 'display
              :lev1 'robocave
              :disp1 'display))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 5529600.0 :y 81920.0 :z -11468800.0 :w 512000.0)
@@ -1823,7 +1823,7 @@
        :sound-banks '(lavatube)
        :music-bank 'lavatube
        :ambient-sounds
-       ()
+       '()
        :mood '*lavatube-mood*
        :mood-func 'update-mood-lavatube
        :ocean #f
@@ -1842,7 +1842,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9992 0.0 -0.0386 0.0178 0.8875 0.4603 0.0343 -0.4606 0.8868)
              :load-commands
-             ()
+             '()
              :vis-nick 'lav
              :lev0 'lavatube
              :disp0 'display
@@ -1861,7 +1861,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.205 0.0 -0.9787 0.2321 0.9714 -0.0486 0.9508 -0.2371 -0.1991)
              :load-commands
-             ()
+             '()
              :vis-nick 'lav
              :lev0 'lavatube
              :disp0 'display
@@ -1880,7 +1880,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.2191 0.0 -0.9756 0.1906 0.9807 -0.0428 0.9568 -0.1953 -0.2149)
              :load-commands
-             ()
+             '()
              :vis-nick 'lav
              :lev0 'lavatube
              :disp0 'display
@@ -1899,7 +1899,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.3027 0.0 0.953 -0.1235 0.9915 -0.0392 -0.945 -0.1296 -0.3001)
              :load-commands
-             ()
+             '()
              :vis-nick 'lav
              :lev0 'lavatube
              :disp0 'display
@@ -1909,9 +1909,9 @@
        '(89 90)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 8806400.0 :y 131072.0 :z -15564800.0 :w 3174400.0)
@@ -1932,7 +1932,7 @@
        :sound-banks '(citadel)
        :music-bank 'citadel
        :ambient-sounds
-       ()
+       '()
        :mood '*citadel-mood*
        :mood-func 'update-mood-citadel
        :ocean #f
@@ -1951,7 +1951,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9991 0.0 -0.0411 0.005 0.9925 -0.122 0.0408 -0.1221 -0.9916)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -1970,7 +1970,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9898 0.0 -0.1424 0.0173 0.9925 -0.1207 0.1413 -0.1219 -0.9824)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -1990,7 +1990,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.1989 0.0 -0.98 0.1179 0.9927 -0.0239 0.9728 -0.1203 -0.1974)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2009,7 +2009,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.5766 0.0 0.8169 -0.1125 0.9904 -0.0794 -0.8091 -0.1378 -0.5711)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2028,7 +2028,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9413 0.0 -0.3373 0.0481 0.9897 0.1343 0.3339 -0.1427 0.9317)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2047,7 +2047,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9999 0.0 0.0016 -0.0001 0.9926 -0.1207 -0.0015 -0.1207 -0.9926)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2066,7 +2066,7 @@
              :camera-rot
              (new 'static 'array float 9 0.9938 0.0 -0.1103 0.0134 0.9924 0.1215 0.1095 -0.1223 0.9864)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2085,7 +2085,7 @@
              :camera-rot
              (new 'static 'array float 9 0.0093 0.0 -0.9999 0.1678 0.9858 0.0015 0.9857 -0.1678 0.0092)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2104,7 +2104,7 @@
              :camera-rot
              (new 'static 'array float 9 0.7296 0.0 0.6838 -0.0851 0.9922 0.0908 -0.6785 -0.1245 0.7239)
              :load-commands
-             ()
+             '()
              :vis-nick #f
              :lev0 'citadel
              :disp0 'display
@@ -2123,7 +2123,7 @@
              :camera-rot
              (new 'static 'array float 9 -0.9932 0.0 0.1161 -0.017 0.9892 -0.1454 -0.1148 -0.1464 -0.9825)
              :load-commands
-             ()
+             '()
              :vis-nick 'cit
              :lev0 'citadel
              :disp0 'display
@@ -2133,9 +2133,9 @@
        '(70 71 72 73 91)
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 11436032.0 :y -462848.0 :z -19750912.0 :w 1228800.0)
@@ -2156,7 +2156,7 @@
        :sound-banks '(finalboss)
        :music-bank 'finalboss
        :ambient-sounds
-       ()
+       '()
        :mood '*finalboss-mood*
        :mood-func 'update-mood-finalboss
        :ocean #f
@@ -2202,12 +2202,12 @@
              :lev1 'citadel
              :disp1 'special))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x 11837440.0 :y 2129920.0 :z -19578880.0 :w 778240.0)
@@ -2226,23 +2226,23 @@
        :nickname 'int
        :packages '(intro)
        :sound-banks
-       ()
+       '()
        :music-bank #f
        :ambient-sounds
-       ()
+       '()
        :mood '*default-mood*
        :mood-func 'update-mood-default
        :ocean #f
        :sky #f
        :continues
-       ()
+       '()
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere (new 'static 'sphere)
        :bottom-height (meters -10000000)
@@ -2258,11 +2258,11 @@
        :visname 'demo-vis
        :nickname 'dem
        :packages
-       ()
+       '()
        :sound-banks '(village1)
        :music-bank 'village1
        :ambient-sounds
-       ()
+       '()
        :mood '*default-mood*
        :mood-func 'update-mood-default
        :ocean #f
@@ -2282,19 +2282,19 @@
              :camera-rot
              (new 'static 'array float 9 0.8743 0.0 0.4852 -0.2117 0.8997 0.3816 -0.4365 -0.4364 0.7866)
              :load-commands
-             ()
+             '()
              :vis-nick 'dem
              :lev0 'demo
              :disp0 'special
              :lev1 #f
              :disp1 #f))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere (new 'static 'sphere)
        :bottom-height (meters -10000000)
@@ -2310,12 +2310,12 @@
        :visname 'title-vis
        :nickname 'tit
        :packages
-       ()
+       '()
        :sound-banks
-       ()
+       '()
        :music-bank 'village1
        :ambient-sounds
-       ()
+       '()
        :mood '*village1-mood*
        :mood-func 'update-mood-village1
        :ocean #f
@@ -2335,19 +2335,19 @@
              :camera-rot
              (new 'static 'array float 9 0.8129 0.0 -0.5823 0.0958 0.9863 0.1337 0.5744 -0.1645 0.8018)
              :load-commands
-             ()
+             '()
              :vis-nick 'tit
              :lev0 'title
              :disp0 'special
              :lev1 'village1
              :disp1 #f))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :x -40960.0 :z 40960.0 :w 1126400.0)
@@ -2362,14 +2362,14 @@
        :index 25
        :name 'halfpipe
        :visname 'halfpipe-vis
-       :nickname none
+       :nickname 'none
        :packages
-       ()
+       '()
        :sound-banks
-       ()
+       '()
        :music-bank #f
        :ambient-sounds
-       ()
+       '()
        :mood '*default-mood*
        :mood-func 'update-mood-default
        :ocean #f
@@ -2389,25 +2389,25 @@
              :camera-rot
              (new 'static 'array float 9 -0.979 0.0 -0.2037 0.0545 0.9634 -0.2622 0.1963 -0.2678 -0.9432)
              :load-commands
-             ()
+             '()
              :vis-nick #f
              :lev0 'halfpipe
              :disp0 'display
              :lev1 #f
              :disp1 #f))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :w 167772160000.0)
        :bottom-height (meters -10000000)
        :run-packages
-       ()
+       '()
        :wait-for-load #t))
 
 (define default-level
@@ -2416,33 +2416,33 @@
        :index 26
        :name 'default-level
        :visname 'default-level-vis
-       :nickname none
+       :nickname 'none
        :packages
-       ()
+       '()
        :sound-banks
-       ()
+       '()
        :music-bank #f
        :ambient-sounds
-       ()
+       '()
        :mood '*default-mood*
        :mood-func 'update-mood-default
        :ocean #f
        :sky #t
        :continues
-       ()
+       '()
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :w 167772160000.0)
        :bottom-height (meters -20)
        :run-packages
-       ()
+       '()
        :wait-for-load #t))
 
 (define *level-load-list*
@@ -2483,12 +2483,12 @@
        :nickname 'tsz
        ;; nickname
        :packages
-       ()
+       '()
        :sound-banks
-       ()
+       '()
        :music-bank #f
        :ambient-sounds
-       ()
+       '()
        :mood '*default-mood*
        :mood-func 'update-mood-default
        :ocean #f
@@ -2507,25 +2507,25 @@
              :camera-rot
              (new 'static 'array float 9 1.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 1.0)
              :load-commands
-             ()
-             :vis-nick none
+             '()
+             :vis-nick 'none
              :lev0 'test-zone
              :disp0 'display
              :lev1 'village1
              :disp1 'display))
        :tasks
-       ()
+       '()
        :priority 100
        :load-commands
-       ()
+       '()
        :alt-load-commands
-       ()
+       '()
        :bsp-mask #xffffffffffffffff
        :bsphere
        (new 'static 'sphere :w 167772160000.0)
        :bottom-height (meters -20)
        :run-packages
-       ()
+       '()
        :wait-for-load #t))
 
 (cons! *level-load-list* 'test-zone)
diff --git a/goal_src/jak1/engine/level/level.gc b/goal_src/jak1/engine/level/level.gc
index c9fbf26ae6..feeb09138f 100644
--- a/goal_src/jak1/engine/level/level.gc
+++ b/goal_src/jak1/engine/level/level.gc
@@ -450,12 +450,12 @@
     ;;(.mfc0 current-timer Count)
     ;; this would quit the login function after some amount of time elapsed.
     #|
-                    (let ((elapsed-timer (- current-timer initial-timer)))
-                      (when (< #x186a0 elapsed-timer)
-                        (set! loaded-level loaded-level)
-                        (goto cfg-78)
-                        )
-                      )
+    (let ((elapsed-timer (- current-timer initial-timer)))
+      (when (< #x186a0 elapsed-timer)
+        (set! loaded-level loaded-level)
+        (goto cfg-78)
+        )
+      )
     |#
     (let ((current-login-pos (the-as int (-> level-login-state pos))))
       ;; Login state -1.
@@ -993,7 +993,7 @@
     (set! *display-profile* #f)
     (set! *cheat-mode* (if *debug-segment* 'debug #f))
     (set! *time-of-day-fast* #f)
-    (load-commands-set! *level* ())
+    (load-commands-set! *level* '())
     (when *time-of-day-proc*
       (set! (-> *time-of-day-proc* 0 time-ratio) (fsec 1.0))
       (set! (-> *time-of-day-proc* 0 hour) 7) ;; 7AM waking up in the morning
diff --git a/goal_src/jak1/engine/level/load-boundary.gc b/goal_src/jak1/engine/level/load-boundary.gc
index b4d8f93e6b..4f57657a14 100644
--- a/goal_src/jak1/engine/level/load-boundary.gc
+++ b/goal_src/jak1/engine/level/load-boundary.gc
@@ -1036,7 +1036,7 @@
   (set! (-> this want 1 display?) #f)
   (set! (-> this want 1 force-vis?) #f)
   (set! (-> this want 1 force-inside?) #f)
-  (set! (-> this command-list) ())
+  (set! (-> this command-list) '())
   (dotimes (v1-1 256)
     (set! (-> this object-name v1-1) #f)
     (set! (-> this object-status v1-1) (the-as basic 0)))
@@ -1117,7 +1117,7 @@
       (format 0 "WARNING: load state somehow aquired object command ~A~%" (-> this object-name s4-0))
       (set! (-> this object-name s4-0) #f)))
   (mem-copy! (&-> *backup-load-state* type) (&-> this type) 2092)
-  (set! (-> *backup-load-state* command-list) ())
+  (set! (-> *backup-load-state* command-list) '())
   (set! (-> this command-list) arg0)
   0)
 
@@ -1315,7 +1315,7 @@
                    (set! (-> *time-of-day-proc* 0 time-ratio) 0.0))))))
            ((= v1-4 'save)
             (mem-copy! (&-> *backup-load-state* type) (&-> this type) 2092)
-            (set! (-> *backup-load-state* command-list) ())
+            (set! (-> *backup-load-state* command-list) '())
             (dotimes (v1-112 256)
               (if (-> *backup-load-state* object-name v1-112) (set! (-> *backup-load-state* object-name v1-112) #f))))
            ((= v1-4 'setting-reset)
diff --git a/goal_src/jak1/engine/load/decomp.gc b/goal_src/jak1/engine/load/decomp.gc
index 5412380166..84d62309f4 100644
--- a/goal_src/jak1/engine/load/decomp.gc
+++ b/goal_src/jak1/engine/load/decomp.gc
@@ -23,7 +23,8 @@
   (local-vars (current-input int) (copy-length int))
   (nop!)
   (loop
-    (loop ;; read the input and see what kind it is, based on number.
+    (loop
+      ;; read the input and see what kind it is, based on number.
       (set! current-input (-> in 0))
       (set! in (&-> in 1))
       (b! (<= current-input 0) cfg-5 :delay (nop!))
diff --git a/goal_src/jak1/engine/load/load-dgo.gc b/goal_src/jak1/engine/load/load-dgo.gc
index e27ac8da8c..64eda626ec 100644
--- a/goal_src/jak1/engine/load/load-dgo.gc
+++ b/goal_src/jak1/engine/load/load-dgo.gc
@@ -99,9 +99,9 @@ struct DgoHeader {
   (define *load-str-rpc* (new 'global 'rpc-buffer-pair (the uint 64) (the uint 1) RPC-LOAD-STR))
   (define *play-str-rpc* (new 'global 'rpc-buffer-pair (the uint 64) (the uint 2) RPC-PLAY-STR))
   ;; we have separate locks for queuing and loading.
-  (define *load-str-lock* #f)
-  (define *que-str-lock* #f)
-  (define *dgo-name* (new 'global 'string 64 (the string #f))))
+  (define *load-str-lock* '#f)
+  (define *que-str-lock* '#f)
+  (define *dgo-name* (new 'global 'string 64 (the string '#f))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; STR LOAD
diff --git a/goal_src/jak1/engine/load/loader.gc b/goal_src/jak1/engine/load/loader.gc
index 245b4c7fc4..26f27cd570 100644
--- a/goal_src/jak1/engine/load/loader.gc
+++ b/goal_src/jak1/engine/load/loader.gc
@@ -94,10 +94,10 @@
   (cond
     ((type-type? (-> arg0 type) string)
      #|
-               (with-sp (protect sp
-                     (if (< sp *stack-top*)
-                       (set! sp (&+ *kernel-sp* -1024))
-                       )
+(with-sp (protect sp
+      (if (< sp *stack-top*)
+        (set! sp (&+ *kernel-sp* -1024))
+        )
      |#
      (let ((s5-1 (the-as drawable (loado (the-as string arg0) arg1))))
        (if (and s5-1 (type-type? (-> s5-1 type) drawable)) (login s5-1)))
@@ -108,10 +108,10 @@
 (defun art-load ((arg0 string) (arg1 kheap))
   "Load an art file. Unused."
   #|
-      (with-sp (protect sp
-          (if (< sp *stack-top*)
-            (set! sp (&+ *kernel-sp* -1024))
-            )
+(with-sp (protect sp
+    (if (< sp *stack-top*)
+      (set! sp (&+ *kernel-sp* -1024))
+      )
   |#
   (let ((s5-0 (the-as art (loado arg0 arg1)))) (if (type-type? (-> s5-0 type) art) (login s5-0) (the-as art #f)))
   ;;))
@@ -121,10 +121,10 @@
   "Load and check an art-group file. this only runs if we're using debug memory."
   (when *debug-segment*
     #|
-            (with-sp (protect sp
-                  (if (< sp *stack-top*)
-                    (set! sp (&+ *kernel-sp* -1024))
-                    )
+(with-sp (protect sp
+      (if (< sp *stack-top*)
+        (set! sp (&+ *kernel-sp* -1024))
+        )
     |#
     (let ((s3-1 (the-as art-group (loado (make-file-name (file-kind art-group) arg0 arg2 #f) arg1))))
       (cond
@@ -658,7 +658,7 @@
   (backup-load-state-and-set-cmds *load-state* (-> arg0 command-list))
   (set-setting! 'spooling (process->ppointer self) 0.0 0)
   (logior! (-> self skel status) (janim-status inited drawn done))
-  (kill-current-level-hint () () 'die)
+  (kill-current-level-hint '() '() 'die)
   (level-hint-surpress!)
   (apply-settings *setting-control*)
   (when (or (handle->process (-> *art-control* spool-lock)) (!= *master-mode* 'game))
diff --git a/goal_src/jak1/engine/math/matrix.gc b/goal_src/jak1/engine/math/matrix.gc
index 8d659738b8..b3f1deb216 100644
--- a/goal_src/jak1/engine/math/matrix.gc
+++ b/goal_src/jak1/engine/math/matrix.gc
@@ -105,7 +105,7 @@
       ((= (length regs) 2) (set! y (car regs)) (set! z (cadr regs)) (set! w (cadr regs)))
       ((>= (length regs) 3) (set! y (car regs)) (set! z (cadr regs)) (set! w (caddr regs)))
       (#t (set! y reg1) (set! z reg1) (set! w reg1)))
-    (cons x (cons y (cons z (cons w ()))))))
+    (cons x (cons y (cons z (cons w '()))))))
 
 (desfun .vf.x (vec)
   (car vec))
diff --git a/goal_src/jak1/engine/math/quaternion.gc b/goal_src/jak1/engine/math/quaternion.gc
index 717232b1c8..67a60c1b22 100644
--- a/goal_src/jak1/engine/math/quaternion.gc
+++ b/goal_src/jak1/engine/math/quaternion.gc
@@ -151,9 +151,7 @@
     (.svf (&-> arg0 vec quad) vf1)
     arg0))
 
-(defun quaternion-float /
-  !
-  ((arg0 quaternion) (arg1 quaternion) (arg2 float))
+(defun quaternion-float/! ((arg0 quaternion) (arg1 quaternion) (arg2 float))
   "Divide each element"
   (let ((f0-1 (/ 1.0 arg2))) (quaternion-float*! arg0 arg1 f0-1))
   arg0)
@@ -585,7 +583,7 @@
     (let ((s4-0 (new 'stack-no-clear 'vector))
           (gp-0 (new 'stack-no-clear 'vector))
           (s5-0 (new 'stack-no-clear 'vector)))
-      (vector-rad<-vector-deg / 2 ! s4-0 arg1)
+      (vector-rad<-vector-deg/2! s4-0 arg1)
       (vector-sincos-rad! gp-0 s5-0 s4-0)
       (.lvf vf1 (&-> gp-0 quad))
       (.lvf vf2 (&-> s5-0 quad)))
diff --git a/goal_src/jak1/engine/math/trigonometry-h.gc b/goal_src/jak1/engine/math/trigonometry-h.gc
index 3ea0faa95d..eecdad476b 100644
--- a/goal_src/jak1/engine/math/trigonometry-h.gc
+++ b/goal_src/jak1/engine/math/trigonometry-h.gc
@@ -29,7 +29,7 @@
 
 (defun-extern vector-sin-rad! vector vector vector)
 
-(defun-extern vector-rad<-vector-deg / 2 ! vector vector int)
+(defun-extern vector-rad<-vector-deg/2! vector vector int)
 
 (defun-extern vector-sincos-rad! vector vector vector int)
 
diff --git a/goal_src/jak1/engine/math/trigonometry.gc b/goal_src/jak1/engine/math/trigonometry.gc
index d7fd647c46..5ca3609d21 100644
--- a/goal_src/jak1/engine/math/trigonometry.gc
+++ b/goal_src/jak1/engine/math/trigonometry.gc
@@ -614,10 +614,7 @@
     (.mul.x.vf vf1 vf1 rot-to-rad)
     (.svf out vf1)))
 
-(defun vector-rad<-vector-deg /
-  2
-  !
-  ((out vector) (in vector))
+(defun vector-rad<-vector-deg/2! ((out vector) (in vector))
   "Divide the input by two, and then convert from rotation units to radians, unwrapping.
    Not sure why this really needs to be separate the from previous function..."
   (rlet ((temp :class vf)
diff --git a/goal_src/jak1/engine/math/vector.gc b/goal_src/jak1/engine/math/vector.gc
index 26afeccca2..f99101143d 100644
--- a/goal_src/jak1/engine/math/vector.gc
+++ b/goal_src/jak1/engine/math/vector.gc
@@ -88,9 +88,7 @@
     (.svf (&-> arg0 quad) vf6)
     arg0))
 
-(defun vector /
-  !
-  ((arg0 vector) (arg1 vector) (arg2 vector))
+(defun vector/! ((arg0 vector) (arg1 vector) (arg2 vector))
   "Set arg0 = arg1 / arg2. The w component will be set to 1.
    The implementation is kind of crazy."
   (rlet ((Q :class vf)
@@ -191,9 +189,7 @@
     (.svf (&-> arg0 quad) vf4)
     arg0))
 
-(defun vector-float /
-  !
-  ((arg0 vector) (arg1 vector) (arg2 float))
+(defun vector-float/! ((arg0 vector) (arg1 vector) (arg2 float))
   "Divide all components by arg2. The w component will be set to 1."
   (rlet ((Q :class vf)
          (vf0 :class vf)
diff --git a/goal_src/jak1/engine/ps2/pad.gc b/goal_src/jak1/engine/ps2/pad.gc
index f606a201de..61e7c85879 100644
--- a/goal_src/jak1/engine/ps2/pad.gc
+++ b/goal_src/jak1/engine/ps2/pad.gc
@@ -334,7 +334,7 @@
        (lambda (x i)
          `((,i)
           (if (cpad-pressed? ,pad-idx ,x)
-            ,(if (< i (- (length buttons) 1)) `(1 +! ,cheat-var) `(begin   ,@body   (set! ,cheat-var 0)))
+            ,(if (< i (- (length buttons) 1)) `(1+! ,cheat-var) `(begin   ,@body   (set! ,cheat-var 0)))
             (set! ,cheat-var 0))))
        buttons))))
 
diff --git a/goal_src/jak1/engine/ps2/timer-h.gc b/goal_src/jak1/engine/ps2/timer-h.gc
index 33017f1221..7f888037f5 100644
--- a/goal_src/jak1/engine/ps2/timer-h.gc
+++ b/goal_src/jak1/engine/ps2/timer-h.gc
@@ -29,9 +29,7 @@
   ;; it's a real timer.
   `(the uint (logand #xffffffff (__read-ee-timer))))
 
-(defmacro get-bus-clock /
-  256
-  ()
+(defmacro get-bus-clock/256 ()
   "Read the 150 MHz / 256 clock."
   ;; 300 MHz / (2^9)
   `(the uint (logand #xffffffff (shr (__read-ee-timer) 9))))
@@ -46,8 +44,8 @@
 (defenum timer-clock-selection
   :type uint8
   (busclk 0)
-  (busclk / 16 1)
-  (busclk / 256 2)
+  (busclk/16 1)
+  (busclk/256 2)
   (hblank 3))
 
 ;; DECOMP BEGINS
@@ -97,7 +95,7 @@
 
 ;; needs PS2 TIMER porting
 (#unless PC_PORT
-  (timer-init (the-as timer-bank TIMER1_BANK) (new 'static 'timer-mode :clks (timer-clock-selection busclk / 16) :cue 1)))
+  (timer-init (the-as timer-bank TIMER1_BANK) (new 'static 'timer-mode :clks (timer-clock-selection busclk/16) :cue 1)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Profiler
diff --git a/goal_src/jak1/engine/ps2/timer.gc b/goal_src/jak1/engine/ps2/timer.gc
index ed542b3351..0a5c46a30e 100644
--- a/goal_src/jak1/engine/ps2/timer.gc
+++ b/goal_src/jak1/engine/ps2/timer.gc
@@ -16,7 +16,7 @@
   "Reset a timer's counter to zero"
   (#when PC_PORT
     ;; just store the current offset.
-    (if (= timer TIMER1_BANK) (set! *timer-reset-value* (get-bus-clock / 256)) (format 0 "Unknown timer #x~X in timer-reset~%"))
+    (if (= timer TIMER1_BANK) (set! *timer-reset-value* (get-bus-clock/256)) (format 0 "Unknown timer #x~X in timer-reset~%"))
     (return (the uint 0)))
   (.sync.l)
   (set! (-> timer count) 0)
@@ -26,7 +26,7 @@
   "Return a timer's counter value"
   (#when PC_PORT
     (when (= timer TIMER1_BANK)
-      (return (- (get-bus-clock / 256) *timer-reset-value*)))
+      (return (- (get-bus-clock/256) *timer-reset-value*)))
     (format 0 "Unknown timer #x~X requested.~%" timer))
   (.sync.l)
   (let ((count (-> timer count))) (.sync.l) count))
diff --git a/goal_src/jak1/engine/ps2/vu1-macros.gc b/goal_src/jak1/engine/ps2/vu1-macros.gc
index 7185cb38cd..a7a7d20533 100644
--- a/goal_src/jak1/engine/ps2/vu1-macros.gc
+++ b/goal_src/jak1/engine/ps2/vu1-macros.gc
@@ -154,7 +154,7 @@
      'readwrite (or 'rw) means both
      #f means neither, turning this into a fancy macro around rlet."
   `(rlet (,@(apply (lambda (x) `(,x :class vf)) regs))
-    ,@(if (or (eq? rw 'read) (eq? rw 'readwrite) (eq? rw 'rw)) (apply (lambda (y) `(load-vf ,y)) regs) ())
+    ,@(if (or (eq? rw 'read) (eq? rw 'readwrite) (eq? rw 'rw)) (apply (lambda (y) `(load-vf ,y)) regs) '())
     ,@body
     ;; this will mess up the return value!
-    ,@(if (or (eq? rw 'write) (eq? rw 'readwrite) (eq? rw 'rw)) (apply (lambda (y) `(save-vf ,y)) regs) ())))
+    ,@(if (or (eq? rw 'write) (eq? rw 'readwrite) (eq? rw 'rw)) (apply (lambda (y) `(save-vf ,y)) regs) '())))
diff --git a/goal_src/jak1/engine/sound/gsound.gc b/goal_src/jak1/engine/sound/gsound.gc
index 10af4119b8..1099fe63ac 100644
--- a/goal_src/jak1/engine/sound/gsound.gc
+++ b/goal_src/jak1/engine/sound/gsound.gc
@@ -69,7 +69,7 @@
   `(zero? (-> *sound-iop-info* dirtycd)))
 
 (defun new-sound-id ()
-  (set! *current-sound-id* (the sound-id (1 + (the uint *current-sound-id*))))
+  (set! *current-sound-id* (the sound-id (1+ (the uint *current-sound-id*))))
   (if (< (the-as int *current-sound-id*) #x10000) (set! *current-sound-id* (the-as sound-id #x10000)))
   *current-sound-id*)
 
@@ -218,9 +218,9 @@
 
 (defun sound-trans-convert ((dest vector3w) (src vector))
   (let ((vec (if src src (ear-trans))))
-    (set! (-> dest x) (the int (* (1 / 16) (-> vec x))))
-    (set! (-> dest y) (the int (* (1 / 16) (-> vec y))))
-    (set! (-> dest z) (the int (* (1 / 16) (-> vec z)))))
+    (set! (-> dest x) (the int (* (1/ 16) (-> vec x))))
+    (set! (-> dest y) (the int (* (1/ 16) (-> vec y))))
+    (set! (-> dest z) (the int (* (1/ 16) (-> vec z)))))
   0)
 
 (defun sound-angle-convert ((deg float))
@@ -474,7 +474,7 @@
              (format #t "(~5D) effect sound ~A ~G " (-> *display* base-frame-counter) (-> pp name) (-> spec sound-name-char))
              (format #t
                      "volume: ~f  pitch-mod: ~f~%"
-                     (* (1 / 10.24) (the float (-> spec volume)))
+                     (* (1/ 10.24) (the float (-> spec volume)))
                      (* 0.000656168 (the float (-> spec pitch-mod))))))
          (let ((spec-volume (-> spec volume)))
            (set! (-> spec volume) (-> this volume))
@@ -641,10 +641,10 @@
       (set! (-> *flava-table* row (-> *flava-table* count) flava n) 0))
     ;; increase the music count
     ;; (this should probably be done after...)
-    (1 +! (-> *flava-table* count))
+    (1+! (-> *flava-table* count))
     ;; set the flavas or whatever they're called
     ,@(apply (lambda (x)
-             `(set! (-> *flava-table* row (1 - (-> *flava-table* count)) flava (music-flava ,(first x))) ,(second x)))
+             `(set! (-> *flava-table* row (1- (-> *flava-table* count)) flava (music-flava ,(first x))) ,(second x)))
            flavas)))
 
 (flava-table-add village1
diff --git a/goal_src/jak1/engine/target/logic-target.gc b/goal_src/jak1/engine/target/logic-target.gc
index 3ee775a7ce..31768385bf 100644
--- a/goal_src/jak1/engine/target/logic-target.gc
+++ b/goal_src/jak1/engine/target/logic-target.gc
@@ -359,7 +359,7 @@
         (+! gp-0 1)
         (+! v1-0 -1)
         (set! a1-6 (-> self control history-data (logand (+ (-> self control unknown-halfword00) v1-0) 127)))))
-    (vector-float / ! s5-0 s5-0 (the float gp-0))
+    (vector-float/! s5-0 s5-0 (the float gp-0))
     (let ((s4-0 (- 128 gp-0)))
       (while (< s4-0 128)
         (let ((v1-9 (-> self control history-data (logand (+ (-> self control unknown-halfword00) s4-0) 127))))
@@ -1243,7 +1243,7 @@
   (set! (-> self control unknown-surface01 name) 'current)
   (set! (-> self control unknown-surface01 active-hook) nothing)
   (set! (-> self control unknown-surface01 touch-hook) nothing)
-  (initialize-skeleton self *jchar-sg* ())
+  (initialize-skeleton self *jchar-sg* '())
   (set! (-> self draw origin-joint-index) (the-as uint 33))
   (set! (-> self draw shadow-joint-index) (the-as uint 33))
   (let ((v1-79 (-> self node-list data)))
@@ -1260,7 +1260,7 @@
   (set! (-> self neck) (new 'process 'joint-mod (joint-mod-handler-mode look-at) self 7))
   (set! (-> self fact)
         (new 'process 'fact-info-target self (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
-  (set! (-> self sound) (new 'process 'ambient-sound none (-> self control trans)))
+  (set! (-> self sound) (new 'process 'ambient-sound 'none (-> self control trans)))
   (set! (-> self control unknown-soundid00) (new-sound-id))
   (if *debug-segment* (add-connection *debug-engine* self target-print-stats self *stdcon0* #f))
   (activate-hud self)
diff --git a/goal_src/jak1/engine/target/sidekick.gc b/goal_src/jak1/engine/target/sidekick.gc
index e270d42b72..17297a867c 100644
--- a/goal_src/jak1/engine/target/sidekick.gc
+++ b/goal_src/jak1/engine/target/sidekick.gc
@@ -162,7 +162,7 @@
   (set! (-> self root) (new 'process 'trsqv))
   (vector-identity! (-> self root scale))
   (quaternion-identity! (-> self root quat))
-  (initialize-skeleton self *sidekick-sg* ())
+  (initialize-skeleton self *sidekick-sg* '())
   (set! (-> self draw origin-joint-index) (the-as uint 6))
   (set! (-> self draw shadow-joint-index) (the-as uint 6))
   (set! (-> self draw shadow-ctrl) *target-shadow-control*)
diff --git a/goal_src/jak1/engine/target/target-death.gc b/goal_src/jak1/engine/target/target-death.gc
index e39199f480..1085f84550 100644
--- a/goal_src/jak1/engine/target/target-death.gc
+++ b/goal_src/jak1/engine/target/target-death.gc
@@ -95,7 +95,7 @@
                      (not (logtest? (-> arg0 flags) (continue-flags sage-intro title))))
               (remove-setting! 'music-volume)))
           (suspend)))
-      (backup-load-state-and-set-cmds *load-state* ())
+      (backup-load-state-and-set-cmds *load-state* '())
       (execute-command *load-state* '(teleport))
       (let* ((s5-0 (-> arg0 load-commands))
              (a1-18 (car s5-0)))
@@ -623,17 +623,17 @@
        'boxed-array
        :type
        spool-anim
-       (new 'static 'spool-anim :name "death-0181" :index 3 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0182" :index 4 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0184" :index 5 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0186" :index 6 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0187" :index 7 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0191" :index 8 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0193" :index 9 :parts 2 :command-list ())
-       (new 'static 'spool-anim :name "death-0195" :index 10 :parts 1 :command-list ())
-       (new 'static 'spool-anim :name "death-0197" :index 11 :parts 2 :command-list ())
-       (new 'static 'spool-anim :name "death-0199" :index 12 :parts 2 :command-list ())
-       (new 'static 'spool-anim :name "death-0202" :index 13 :parts 1 :command-list ())))
+       (new 'static 'spool-anim :name "death-0181" :index 3 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0182" :index 4 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0184" :index 5 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0186" :index 6 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0187" :index 7 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0191" :index 8 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0193" :index 9 :parts 2 :command-list '())
+       (new 'static 'spool-anim :name "death-0195" :index 10 :parts 1 :command-list '())
+       (new 'static 'spool-anim :name "death-0197" :index 11 :parts 2 :command-list '())
+       (new 'static 'spool-anim :name "death-0199" :index 12 :parts 2 :command-list '())
+       (new 'static 'spool-anim :name "death-0202" :index 13 :parts 1 :command-list '())))
 
 (if (!= *kernel-boot-message* 'play) (set! (-> *death-spool-array* length) 3))
 
@@ -698,7 +698,7 @@
       (set! (-> self control transv quad) (the-as uint128 0))
       (logior! (-> self state-flags) (state-flags dying))
       (case arg0
-        ((none 'instant-death))
+        (('none 'instant-death))
         (('ogreboss-super-boulder)
          ;; og:preserve-this PAL patch here
          (process-spawn part-tracker
@@ -902,7 +902,7 @@
              (send-event (ppointer->process (-> self sidekick)) 'matrix 'play-anim)
              (send-event (ppointer->process (-> self sidekick)) 'shadow #f)
              (send-event self 'blend-shape #t)
-             (let ((s5-8 (ppointer->handle (process-spawn pov-camera (-> self control trans) *deathcam-sg* gp-18 4 self () :to *target-pool*))))
+             (let ((s5-8 (ppointer->handle (process-spawn pov-camera (-> self control trans) *deathcam-sg* gp-18 4 self '() :to *target-pool*))))
                (send-event (handle->process s5-8) 'music-movie-volume 0.0)
                (send-event (handle->process s5-8) 'sfx-movie-volume 50.0)
                (set! (-> self post-hook) target-no-ja-move-post)
diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc
index 54c859137d..d52cdb3998 100644
--- a/goal_src/jak1/engine/target/target2.gc
+++ b/goal_src/jak1/engine/target/target2.gc
@@ -64,16 +64,16 @@
         (cond
           ((zero? v1-2)
            (set! (-> self control unknown-uint20)
-                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-1" :index #xe7 :parts 1 :command-list ()))))
+                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-1" :index #xe7 :parts 1 :command-list '()))))
           ((= v1-2 1)
            (set! (-> self control unknown-uint20)
-                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-2" :index #xe8 :parts 1 :command-list ()))))
+                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-2" :index #xe8 :parts 1 :command-list '()))))
           ((= v1-2 2)
            (set! (-> self control unknown-uint20)
-                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-3" :index #xe9 :parts 1 :command-list ()))))
+                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-3" :index #xe9 :parts 1 :command-list '()))))
           (else
            (set! (-> self control unknown-uint20)
-                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-4" :index #xea :parts 1 :command-list ()))))))
+                 (the-as uint (new 'static 'spool-anim :name "eichar-ambient-4" :index #xea :parts 1 :command-list '()))))))
       (set-time! (-> self state-time)))
   :exit
     (behavior ()
diff --git a/goal_src/jak1/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc
index b60ae54b23..2d02528d5b 100644
--- a/goal_src/jak1/engine/ui/progress/progress.gc
+++ b/goal_src/jak1/engine/ui/progress/progress.gc
@@ -319,7 +319,7 @@
 (defmethod set-transition-progress! ((this progress) (arg0 int))
   (set! (-> this transition-offset) arg0)
   (set! (-> this transition-offset-invert) (- 512 arg0))
-  (set! (-> this transition-percentage) (* (1 / 512) (the float arg0)))
+  (set! (-> this transition-percentage) (* (1/ 512) (the float arg0)))
   (set! (-> this transition-percentage-invert) (- 1.0 (-> this transition-percentage)))
   0
   (none))
@@ -503,7 +503,7 @@
   (the-as progress ((method-of-type process relocate) this arg0)))
 
 (defmethod adjust-sprites ((this progress))
-  (let ((f0-1 (* (1 / METER_LENGTH) (the float (-> this in-out-position)))))
+  (let ((f0-1 (* (1/ METER_LENGTH) (the float (-> this in-out-position)))))
     (set! (-> this particles 2 init-pos x) (the float (+ (-> this right-x-offset) 409 (the int (* 301.5 f0-1)))))
     (set! (-> this particles 1 init-pos x) (the float (+ (-> this left-x-offset) 59)))
     (set! (-> this left-side-x-scale)
diff --git a/goal_src/jak1/engine/ui/text.gc b/goal_src/jak1/engine/ui/text.gc
index fe5a7d83c3..8395054d61 100644
--- a/goal_src/jak1/engine/ui/text.gc
+++ b/goal_src/jak1/engine/ui/text.gc
@@ -21,9 +21,9 @@
 ;; DECOMP BEGINS
 
 ;; State of text drawing.
-(define *game-text-word* (new 'global 'string 128 (the string #f)))
+(define *game-text-word* (new 'global 'string 128 (the string '#f)))
 
-(define *game-text-line* (new 'global 'string 256 (the string #f)))
+(define *game-text-line* (new 'global 'string 256 (the string '#f)))
 
 (define *level-text-file-load-flag* #t)
 
@@ -45,12 +45,12 @@
 
 (defmethod inspect ((this game-text-info))
   "Print a game text info, including all strings"
-  (format #t "[~8x] ~A~%" this (-> this type))
-  (format #t "~Tlength: ~D~%" (-> this length))
-  (format #t "~Tdata[~D]: @ #x~X~%" (-> this length) (-> this data))
+  (format '#t "[~8x] ~A~%" this (-> this type))
+  (format '#t "~Tlength: ~D~%" (-> this length))
+  (format '#t "~Tdata[~D]: @ #x~X~%" (-> this length) (-> this data))
   (let ((i 0))
     (while (< i (-> this length))
-      (format #t "~T  [~D] #x~X ~A~%" i (-> this data i id) (-> this data i text))
+      (format '#t "~T  [~D] #x~X ~A~%" i (-> this data i id) (-> this data i text))
       (+! i 1)))
   this)
 
diff --git a/goal_src/jak1/examples/debug-collide.gc b/goal_src/jak1/examples/debug-collide.gc
index b2c7bc2b61..5dfb738333 100644
--- a/goal_src/jak1/examples/debug-collide.gc
+++ b/goal_src/jak1/examples/debug-collide.gc
@@ -158,71 +158,71 @@
       (set! (-> origin z) (* (cos (* 3.0 (degrees dbg2))) (meters 100.)))
       (+! (-> origin x) (meters -50.)))
     #|
-            ;;; PROBE (at the frag finding level)
-        
-            ;; setup the collide work
-            (setup-collide-for-line-sphere origin line radius)
-        
-        
-        
-            ;; clear collide list
-            (set! (-> *collide-list* num-items) 0)
-        
-            ;; loop over active levels
-            (dotimes (lev-idx (-> *level* length))
-              (let ((lev (-> *level* level lev-idx)))
-                (when (= (-> lev status) 'active)
-                  ;; do the collision check!
-                  (collide-ray (-> lev bsp) 0 *collide-list*)
-                  )
-                )
-              )
-        
-            ;; print results
-            (format *stdcon* "got ~d in list~%" (-> *collide-list* num-items))
-            (format *stdcon* "cam at: ~`vector`P~%" (camera-pos))
-        
-            (let ((old-count 0))
-              ;; visualize results
-              (dotimes (i (-> *collide-list* num-items))
-                (let ((mesh (the collide-frag-mesh (-> *collide-list* items i mesh)))
-                      (inst (the instance-tie (-> *collide-list* items i inst))))
-                  (when inst
-                    (+! old-count 1)
-                    (add-debug-sphere #t (bucket-id debug-draw0) (-> inst bsphere) (-> inst bsphere w) (new 'static 'rgba :b #x80 :a #x80))
-                    )
-        
-                  (when (not inst)
-                    (+! old-count 1)
-                    ;;(format *stdcon* "NI: ~A~%" mesh)
-                    (add-debug-sphere #t (bucket-id debug-draw0) (vector-as-floats (-> mesh base-trans)) (meters 5.0) (new 'static 'rgba :g #x80 :a #x80))
-                    )
-                  ;
-                  )
-                )
-        
-              ;; now test the other one
-              (set! (-> *collide-list* num-items) 0)
-              (collide-probe-make-list (-> *level* level 0) *collide-list*)
-        
-              ;; these should come out the same, if we did it right.
-              (format *stdcon* "COMPARE: ~d ~d~%" (-> *collide-list* num-items) old-count)
-        
-              (dotimes (i (-> *collide-list* num-items))
-                (let ((mesh (the collide-frag-mesh (-> *collide-list* items i mesh)))
-                      (inst (the instance-tie (-> *collide-list* items i inst))))
-                  (when inst
-                    (add-debug-sphere #t (bucket-id debug-draw0) (-> inst bsphere) (* 0.95 (-> inst bsphere w)) (new 'static 'rgba :b #x80 :r #x80 :a #x80))
-                    )
-        
-                  (when (not inst)
-                    ;;(format *stdcon* "NI: ~A~%" mesh)
-                    (add-debug-sphere #t (bucket-id debug-draw0) (vector-as-floats (-> mesh base-trans)) (meters 6.0) (new 'static 'rgba :g #x30 :a #x80))
-                    )
-                  ;
-                  )
-                )
-              )
+    ;;; PROBE (at the frag finding level)
+
+    ;; setup the collide work
+    (setup-collide-for-line-sphere origin line radius)
+
+
+
+    ;; clear collide list
+    (set! (-> *collide-list* num-items) 0)
+
+    ;; loop over active levels
+    (dotimes (lev-idx (-> *level* length))
+      (let ((lev (-> *level* level lev-idx)))
+        (when (= (-> lev status) 'active)
+          ;; do the collision check!
+          (collide-ray (-> lev bsp) 0 *collide-list*)
+          )
+        )
+      )
+
+    ;; print results
+    (format *stdcon* "got ~d in list~%" (-> *collide-list* num-items))
+    (format *stdcon* "cam at: ~`vector`P~%" (camera-pos))
+
+    (let ((old-count 0))
+      ;; visualize results
+      (dotimes (i (-> *collide-list* num-items))
+        (let ((mesh (the collide-frag-mesh (-> *collide-list* items i mesh)))
+              (inst (the instance-tie (-> *collide-list* items i inst))))
+          (when inst
+            (+! old-count 1)
+            (add-debug-sphere #t (bucket-id debug-draw0) (-> inst bsphere) (-> inst bsphere w) (new 'static 'rgba :b #x80 :a #x80))
+            )
+
+          (when (not inst)
+            (+! old-count 1)
+            ;;(format *stdcon* "NI: ~A~%" mesh)
+            (add-debug-sphere #t (bucket-id debug-draw0) (vector-as-floats (-> mesh base-trans)) (meters 5.0) (new 'static 'rgba :g #x80 :a #x80))
+            )
+          ;
+          )
+        )
+
+      ;; now test the other one
+      (set! (-> *collide-list* num-items) 0)
+      (collide-probe-make-list (-> *level* level 0) *collide-list*)
+
+      ;; these should come out the same, if we did it right.
+      (format *stdcon* "COMPARE: ~d ~d~%" (-> *collide-list* num-items) old-count)
+
+      (dotimes (i (-> *collide-list* num-items))
+        (let ((mesh (the collide-frag-mesh (-> *collide-list* items i mesh)))
+              (inst (the instance-tie (-> *collide-list* items i inst))))
+          (when inst
+            (add-debug-sphere #t (bucket-id debug-draw0) (-> inst bsphere) (* 0.95 (-> inst bsphere w)) (new 'static 'rgba :b #x80 :r #x80 :a #x80))
+            )
+
+          (when (not inst)
+            ;;(format *stdcon* "NI: ~A~%" mesh)
+            (add-debug-sphere #t (bucket-id debug-draw0) (vector-as-floats (-> mesh base-trans)) (meters 6.0) (new 'static 'rgba :g #x30 :a #x80))
+            )
+          ;
+          )
+        )
+      )
     |#
     ;; CCACHE (fill from bounding box)
     (let ((bbox-fake (new 'stack 'bounding-box))
diff --git a/goal_src/jak1/kernel-defs.gc b/goal_src/jak1/kernel-defs.gc
index 94aecb0553..d9795e328c 100644
--- a/goal_src/jak1/kernel-defs.gc
+++ b/goal_src/jak1/kernel-defs.gc
@@ -351,7 +351,7 @@
   (actor-pause 5) ;; 32
   (sleep 6) ;; 64
   (sleep-code 7) ;; 128
-  (process-tree 8) ;; 256 not an actual process, just a "tree node" for organization
+  (process-tree 8) ;; 256        not an actual process, just a "tree node" for organization
   (heap-shrunk 9) ;; 512
   (going 10) ;; 1024
   (movie 11) ;; 2048
@@ -397,8 +397,8 @@
 
 (deftype stack-frame (basic)
   ((name symbol :offset 4)
-   ;; which way does this point?
-   (next stack-frame :offset 8))
+   (next stack-frame :offset 8) ;; which way does this point?
+   )
   :size-assert #xc
   :method-count-assert 9
   :flag-assert #x90000000c
@@ -408,7 +408,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; PC Port functions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 (defenum pc-renderer-tree-type
   (none 0)
   (tfrag3 1)
diff --git a/goal_src/jak1/kernel/gcommon.gc b/goal_src/jak1/kernel/gcommon.gc
index 01915a5275..744bb61a2a 100644
--- a/goal_src/jak1/kernel/gcommon.gc
+++ b/goal_src/jak1/kernel/gcommon.gc
@@ -81,8 +81,7 @@
    This will not preserve the upper 64-bits of a 128-bit value."
   x)
 
-(defun 1 /
-  ((x float))
+(defun 1/ ((x float))
   "Reciprocal floating point"
   (declare (inline))
   (/ 1. x))
@@ -177,11 +176,11 @@
 
 (defun false-func ()
   "Return false"
-  #f)
+  '#f)
 
 (defun true-func ()
   "Return true"
-  #t)
+  '#t)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; format
@@ -348,9 +347,9 @@
 
 (defun nmember ((this basic) (lst object))
   "Is this in the list lst? Check with the name= function."
-  (while (not (or (= lst ()) (name= (the-as basic (car lst)) this)))
+  (while (not (or (= lst '()) (name= (the-as basic (car lst)) this)))
     (set! lst (cdr lst)))
-  (if (!= lst ()) lst))
+  (if (!= lst '()) lst))
 
 (defun assoc ((item object) (alist object))
   "Is there an entry with key item in the association list alist?
@@ -749,7 +748,7 @@
   #f)
 
 ;; not sure what this is.
-(define *trace-list* ())
+(define *trace-list* '())
 
 (defun print-tree-bitmask ((bits int) (count int))
   "Print out a single entry for a process tree 'tree' diagram"
@@ -802,13 +801,13 @@
        ((nonzero? (logand (the-as int this) 3))
         ;; alignment is bad!
         (if name (format print-dest "ERROR: object #x~X ~S is not a valid object (misaligned)~%" this name))
-        #f)
+        '#f)
        ((not in-goal-mem)
         ;; address isn't within the memory we expect.
         (if name (format print-dest "ERROR: object #x~X ~S is not a valid object (bad address)~%" this name))
-        #f)
+        '#f)
        ;; otherwise, we're good!
-       (else #t))) ;; end (not expected-type) check
+       (else '#t))) ;; end (not expected-type) check
     ((and allow-false (not this))
      ;; we got a false, but its allowed!
      ;; note that we don't reject falses otherwise, as false is a perfectly valid symbol.
@@ -821,13 +820,13 @@
           ((nonzero? (logand (the-as int this) 15))
            (if name
              (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (misaligned)~%" this name expected-type))
-           #f)
+           '#f)
           ((or (not in-goal-mem) (< (the-as uint this) (end-of-symbol-table)))
            ;; structures should never be in the symbol table, they have a slightly stricter allowed memory range.
            (if name
              (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (bad address)~%" this name expected-type))
-           #f)
-          (else #t)) ;; end structure check
+           '#f)
+          (else '#t)) ;; end structure check
         )
        ((= expected-type pair)
         ;; pair alignment is 8 bytes + 2.
@@ -835,32 +834,32 @@
           ((!= (logand (the-as int this) 7) PAIR_OFFSET)
            (if name
              (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (misaligned)~%" this name expected-type))
-           #f)
+           '#f)
           ((not in-goal-mem)
            ;; the empty pair is in the symbol table, so we allow anything in GOAL memory.
            (if name
              (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (bad address)~%" this name expected-type))
-           #f)
+           '#f)
           ;; pass!
-          (else #t)))
+          (else '#t)))
        ((= expected-type binteger)
         (cond
           ;; binteger has 0 in the lower 3 bits.
-          ((zero? (logand (the-as int this) 7)) #t)
+          ((zero? (logand (the-as int this) 7)) '#t)
           (else
            (if name
              (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (misaligned)~%" this name expected-type))
-           #f)))
+           '#f)))
        ;; now we assume desired type is a basic.
        ((!= (logand (the-as int this) 7) BASIC_OFFSET)
         (if name
           (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (misaligned)~%" this name expected-type))
-        #f)
+        '#f)
        ;; basics can be in the symbol table (basics are symbols...)
        ((not in-goal-mem)
         (if name
           (format print-dest "ERROR: object #x~X ~S is not a valid object of type '~A' (bad address)~%" this name expected-type))
-        #f)
+        '#f)
        ((and (= expected-type type) (!= (rtype-of this) type))
         ;; special case for type, check the runtime type of the object and be done.
         (if name
@@ -870,13 +869,13 @@
                   name
                   expected-type
                   (rtype-of this)))
-        #f)
+        '#f)
        (else
         ;; otherwise... we want to check and see if the type is actually a type.
         ;; we use valid? to do this check.
         ;; avoid infinite recursion by skipping this check if the expected-type is type.
         (cond
-          ((and (!= expected-type type) (not (valid? (rtype-of this) type #f #t 0)))
+          ((and (!= expected-type type) (not (valid? (rtype-of this) type '#f '#t 0)))
            (if name
              ;; note: print the invalid type as an address in case it's unprintable.
              (format print-dest
@@ -885,7 +884,7 @@
                      name
                      expected-type
                      (rtype-of this)))
-           #f)
+           '#f)
           ((not (type-type? (rtype-of this) expected-type))
            ;; type check failed.
            (if name
@@ -895,7 +894,7 @@
                      name
                      expected-type
                      (rtype-of this)))
-           #f)
+           '#f)
           ((= expected-type symbol)
            ;; got a symbol, expecting to be in the symbol table.
            (cond
@@ -906,8 +905,8 @@
                         this
                         name
                         expected-type))
-              #f)
-             (else #t)))
+              '#f)
+             (else '#t)))
           ;; not a symbol, so expecting to be outside st.
           ((< (the-as uint this) (end-of-symbol-table))
            (if name
@@ -916,8 +915,8 @@
                      this
                      name
                      expected-type))
-           #f)
-          (else #t)))))))
+           '#f)
+          (else '#t)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;; PC Port asm macros
@@ -937,7 +936,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; inserted by the decompiler for assembly branches.
-(defmacro b! (pred destination &key (delay ()) &key (likely-delay ()))
+(defmacro b! (pred destination &key (delay '()) &key (likely-delay '()))
   "Branch!"
   ;; evaluate the predicate
   `(let ((should-branch ,pred))
diff --git a/goal_src/jak1/kernel/gkernel.gc b/goal_src/jak1/kernel/gkernel.gc
index aa3b27a412..021d4c10b0 100644
--- a/goal_src/jak1/kernel/gkernel.gc
+++ b/goal_src/jak1/kernel/gkernel.gc
@@ -74,7 +74,7 @@
 ;; Both the C Kernel and GOAL Kernel update the kernel-packages list.
 ;; The list is used to avoid loading the same package multiple times.
 
-(define *kernel-packages* ())
+(define *kernel-packages* '())
 
 (defun load-package ((package string) (allocation kheap))
   "Load a Package from a CGO/DGO"
@@ -1626,13 +1626,13 @@
           (when parent
             ;; make sure we aren't the only child.
             (set! child (-> parent 0 child))
-            (if (= child proc) (return #f))
+            (if (= child proc) (return '#f))
             ;; iterate, until we find the one.
             (while child
               (if (= (-> child 0 brother) proc) (return child))
               (set! child (-> child 0 brother)))
             ;; nope, didn't find it. bad tree.
-            #f)))
+            '#f)))
 
 (defun change-parent ((this process-tree) (new-parent process-tree))
   "Make this a child of new-parent"
@@ -1677,8 +1677,8 @@
     (set! a2-1 (-> arg0 parent))
     (when a2-1
       (set! t0-0 (-> a2-1 0 child))
-      (set! a3-1 #f)
-      (set! v1-4 #f)
+      (set! a3-1 '#f)
+      (set! v1-4 '#f)
       (set! t1-0 t0-0)
       (when (= (if t1-0 (-> t1-0 0 self)) arg0)
         (set! a3-1 a2-1)
@@ -1735,7 +1735,7 @@
       (nop!)
       (set! v1-4 (-> v1-4 0 brother)))
     (set! (-> v1-4 0 brother) (-> arg0 ppointer))
-    (set! (-> arg0 brother) #f))
+    (set! (-> arg0 brother) '#f))
   arg0)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/goal_src/jak1/kernel/gstate.gc b/goal_src/jak1/kernel/gstate.gc
index 5455186a27..5c00102e15 100644
--- a/goal_src/jak1/kernel/gstate.gc
+++ b/goal_src/jak1/kernel/gstate.gc
@@ -8,47 +8,47 @@
 ;; dgos: KERNEL
 
 #|
- Summary of state system:
- 
- A process can be put into a state, using enter-state, or the go macro.
- This will set up the process to run the appropriate handler functions defined by the state.
- The state handlers are:
- - enter : gets run before trans on the first time the state is used. Can be #f. Must return.
- - trans : gets run before code each time the code is run. Can be #f. Must return.
- - code  : main thread. Can suspend. If it returns, the process dies
- - exit  : gets run when leaving a state. must return.
- - event : not sure of the details here yet.
- 
- You can use "go" to change the state of a process.  This causes the process main thread execution to be abandoned.
- If the main thread has exits/protects on the stack frame, they will be run first to clean up.
- 
- There are several ways to "go"
- - go during init: when a process is being initialized with run-function-in-process, you can "go".
- this causes the run-function-in-process to return immediately, and the next time the process is dispatched
- it will go into the other state.  This will automatically set the process to waiting-to-run,
- and shrink the process heap, if appropriate
- 
- - go from outside the process. You can temporarily set pp to another process, and have that
- process go to another state. The actual go will occur the next time the process is scheduled.
- Use the go-process macro to do this.
- 
- - go from a non-main thread in the right process. You can do a go from a temporary thread, like trans or post.
- If you do it from post, the go returns and the rest of the post runs. If you do it from any other thread, the temporary thread
- is immediately abandonded. Like the previous two, it will defer the actual go until the next time the
- process runs.
- 
- - go from the main thread of the main process. This causes the (-> pp state) to change, the stack frames
- to be cleaned up, and the old state's exit to be called.  It will reset the stack, then run the code.
- Unlike the others, this means you "go" immediately.
- 
- The compiler has two special hooks related to states: go-hook and define-state-hook.
- These take care of doing a go and a state definition and properly checking types.
- 
- The define-state-hook takes a state object and handlers and defines a global symbol
- with the appropriate state type.
- 
- The go-hook calls enter state and sets (-> proc next-state) for the given process.
- It type checks the arguments for the entry function.
+Summary of state system:
+
+A process can be put into a state, using enter-state, or the go macro.
+This will set up the process to run the appropriate handler functions defined by the state.
+The state handlers are:
+- enter : gets run before trans on the first time the state is used. Can be #f. Must return.
+- trans : gets run before code each time the code is run. Can be #f. Must return.
+- code  : main thread. Can suspend. If it returns, the process dies
+- exit  : gets run when leaving a state. must return.
+- event : not sure of the details here yet.
+
+You can use "go" to change the state of a process.  This causes the process main thread execution to be abandoned.
+If the main thread has exits/protects on the stack frame, they will be run first to clean up.
+
+There are several ways to "go"
+- go during init: when a process is being initialized with run-function-in-process, you can "go".
+  this causes the run-function-in-process to return immediately, and the next time the process is dispatched
+  it will go into the other state.  This will automatically set the process to waiting-to-run,
+  and shrink the process heap, if appropriate
+
+- go from outside the process. You can temporarily set pp to another process, and have that
+  process go to another state. The actual go will occur the next time the process is scheduled.
+  Use the go-process macro to do this.
+
+- go from a non-main thread in the right process. You can do a go from a temporary thread, like trans or post.
+  If you do it from post, the go returns and the rest of the post runs. If you do it from any other thread, the temporary thread
+  is immediately abandonded. Like the previous two, it will defer the actual go until the next time the
+  process runs.
+
+- go from the main thread of the main process. This causes the (-> pp state) to change, the stack frames
+  to be cleaned up, and the old state's exit to be called.  It will reset the stack, then run the code.
+  Unlike the others, this means you "go" immediately.
+
+The compiler has two special hooks related to states: go-hook and define-state-hook.
+These take care of doing a go and a state definition and properly checking types.
+
+The define-state-hook takes a state object and handlers and defines a global symbol
+with the appropriate state type.
+
+The go-hook calls enter state and sets (-> proc next-state) for the given process.
+It type checks the arguments for the entry function.
 |#
 
 (defmacro go (next-state &rest args)
@@ -109,7 +109,7 @@
 
 ;; use a compile-time list to keep track of the type of an anonymous behavior.
 (seval
-  (define *defstate-type-stack* ()))
+  (define *defstate-type-stack* '()))
 
 (desfun def-state-check-behavior (beh-form beh-type)
   "check if code block is an anonymous behavior. needed for anonymous behaviors on defstate."
@@ -117,7 +117,7 @@
     (push! *defstate-type-stack* beh-type)))
 
 (defmacro clear-def-state-stack ()
-  (set! *defstate-type-stack* ())
+  (set! *defstate-type-stack* '())
   `(none))
 
 ;; set when inside a defstate.
@@ -139,7 +139,7 @@
         (fmt #t
              "*defstate-type-stack* leaked! An error probably happened in a previous defstate. stack is: {}"
              *defstate-type-stack*))
-      (set! *defstate-type-stack* ())
+      (set! *defstate-type-stack* '())
       (when virtual
         (set! *defstate-current-type* defstate-type)
         (set! *defstate-current-state-name* state-name))
@@ -223,7 +223,7 @@
 
 ;; set the default handler functions for a process's state handlers
 (seval
-  (define *default-state-handlers* ()))
+  (define *default-state-handlers* '()))
 
 (defmacro defstatehandler (proc &key (event #f) &key (enter #f) &key (trans #f) &key (exit #f) &key (code #f) &key (post #f))
   (let ((old (assoc proc *default-state-handlers*))
@@ -276,7 +276,7 @@
 
 (defmethod print ((this state))
   "Print a state."
-  (format #t "#<~A ~A @ #x~X>" (-> this type) (-> this name) this)
+  (format '#t "#<~A ~A @ #x~X>" (-> this type) (-> this name) this)
   this)
 
 (define-extern enter-state (function object object object object object object object))
diff --git a/goal_src/jak1/kernel/pskernel.gc b/goal_src/jak1/kernel/pskernel.gc
index 0f799c68b4..91c97413a7 100644
--- a/goal_src/jak1/kernel/pskernel.gc
+++ b/goal_src/jak1/kernel/pskernel.gc
@@ -8,20 +8,20 @@
 ;; dgos: KERNEL
 
 #|
- pskernel.gc contains a bunch of utilities for poking around the PS2's kernel.
- These are unused in the retail game, and wouldn't be "safe" to use on a retail console,
- as later console revisions may have different memory layout of the BIOS. I suspect this
- was used for the purposes of debugging and handling crashes.
- They took over syscall 102 to access memory inside the kernel.
- 
- There's an error message:
- "I CANNOT CONTINUE TO LOAD GOAL, BECAUSE THE KERNEL VERSION HAS CHANGED~%"
- "~%Alternatively, try removing pskernel.gc and debug-handlers.gc from project.cl, do an (lg) and then (:r) again~%"
- 
- My theory is that debug-handlers.gc held crash handlers, and on load would install them using functions defined in pskernel.gc.
- In the retail game, they removed debug-handlers, but not pskernel.
- 
- In the PC port, all of these functions are just stubs.
+pskernel.gc contains a bunch of utilities for poking around the PS2's kernel.
+These are unused in the retail game, and wouldn't be "safe" to use on a retail console,
+as later console revisions may have different memory layout of the BIOS. I suspect this
+was used for the purposes of debugging and handling crashes.
+They took over syscall 102 to access memory inside the kernel.
+
+There's an error message:
+"I CANNOT CONTINUE TO LOAD GOAL, BECAUSE THE KERNEL VERSION HAS CHANGED~%"
+"~%Alternatively, try removing pskernel.gc and debug-handlers.gc from project.cl, do an (lg) and then (:r) again~%"
+
+My theory is that debug-handlers.gc held crash handlers, and on load would install them using functions defined in pskernel.gc.
+In the retail game, they removed debug-handlers, but not pskernel.
+
+In the PC port, all of these functions are just stubs.
 |#
 
 ;; map of the kernel's memory.
diff --git a/goal_src/jak1/levels/beach/beach-obs.gc b/goal_src/jak1/levels/beach/beach-obs.gc
index d10261503f..96478186cc 100644
--- a/goal_src/jak1/levels/beach/beach-obs.gc
+++ b/goal_src/jak1/levels/beach/beach-obs.gc
@@ -88,7 +88,7 @@
     (set! (-> this root) s4-0))
   (set! (-> this root pause-adjust-distance) 409600.0)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *windmill-one-sg* ())
+  (initialize-skeleton this *windmill-one-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this sound-id) (new-sound-id))
@@ -308,7 +308,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *grottopole-sg* ())
+  (initialize-skeleton this *grottopole-sg* '())
   (set! (-> this speed) (res-lump-float arg0 'speed :default 81920.0))
   (set! (-> this distance) (res-lump-float arg0 'distance :default 3072.0))
   (set! (-> this position) 0)
@@ -535,7 +535,7 @@
                         (arg0 (the-as int #f))
                         (else
                          (ambient-hint-spawn "gamcam10" (the-as vector #f) *entity-pool* 'camera)
-                         (ppointer->handle (process-spawn pov-camera (-> self root trans) *beachcam-sg* (-> self name) 0 #f () :to self))))))
+                         (ppointer->handle (process-spawn pov-camera (-> self root trans) *beachcam-sg* (-> self name) 0 #f '() :to self))))))
             (process-drawable-birth-fuel-cell (the-as entity #f) (the-as vector #f) #f)
             (while (handle->process (the-as handle gp-1))
               (suspend)))
@@ -559,7 +559,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ecoventrock-sg* ())
+  (initialize-skeleton this *ecoventrock-sg* '())
   (set! (-> this link) (new 'process 'actor-link-info this))
   (transform-post)
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
@@ -664,7 +664,7 @@
     (vector-normalize! s5-1 1.0)
     (quaternion-vector-angle! (-> self tumble) s5-1 (rand-vu-float-range 0.0 1820.4445)))
   (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (rand-vu-float-range 0.0 65536.0))
-  (initialize-skeleton self *kickrock-sg* ())
+  (initialize-skeleton self *kickrock-sg* '())
   (set! (-> self root transv quad) (-> arg1 quad))
   (go flying-rock-rolling)
   (none))
@@ -719,7 +719,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *bladeassm-sg* ())
+  (initialize-skeleton this *bladeassm-sg* '())
   (set! (-> this skel prebind-function) (the-as (function pointer int process-drawable none) bladeassm-prebind-function))
   (logclear! (-> this mask) (process-mask actor-pause))
   (go bladeassm-idle)
@@ -978,7 +978,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *flutflutegg-sg* ())
+  (initialize-skeleton this *flutflutegg-sg* '())
   (vector-z-quaternion! (-> this dir) (-> this root quat))
   (set! (-> this start quad) (-> this root trans quad))
   (set! (-> this fall-dist) 20480.0)
@@ -1092,7 +1092,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *harvester-sg* ())
+  (initialize-skeleton this *harvester-sg* '())
   (set! (-> this alt-actor) (entity-actor-lookup (-> this entity) 'alt-actor 0))
   (go harvester-idle)
   (none))
@@ -1106,10 +1106,10 @@
         (let* ((gp-1 (ppointer->handle (process-spawn pov-camera
                                                       (-> gp-0 extra trans)
                                                       *beachcam-sg*
-                                                      (new 'static 'spool-anim :name "beachcam-cannon" :index 3 :parts 1 :command-list ())
+                                                      (new 'static 'spool-anim :name "beachcam-cannon" :index 3 :parts 1 :command-list '())
                                                       0
                                                       #f
-                                                      ()
+                                                      '()
                                                       :to
                                                       pp)))
                (s5-2 (ppointer->handle (process-spawn fuel-cell :init fuel-cell-init-as-clone gp-1 (-> pp entity extra perm task) :to pp))))
diff --git a/goal_src/jak1/levels/beach/beach-rocks.gc b/goal_src/jak1/levels/beach/beach-rocks.gc
index 37a5fa2eca..756233e5ec 100644
--- a/goal_src/jak1/levels/beach/beach-rocks.gc
+++ b/goal_src/jak1/levels/beach/beach-rocks.gc
@@ -393,6 +393,6 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lrocklrg-sg* ())
+  (initialize-skeleton this *lrocklrg-sg* '())
   ((method-of-type beach-rock init-from-entity!) this arg0)
   (none))
diff --git a/goal_src/jak1/levels/beach/bird-lady.gc b/goal_src/jak1/levels/beach/bird-lady.gc
index 89609813a3..2aaecd3d03 100644
--- a/goal_src/jak1/levels/beach/bird-lady.gc
+++ b/goal_src/jak1/levels/beach/bird-lady.gc
@@ -75,10 +75,10 @@
      (cond
        ((zero? (get-reminder (-> this tasks) 0))
         (if arg0 (save-reminder (-> this tasks) 1 0))
-        (new 'static 'spool-anim :name "bird-lady-reminder-1" :index 5 :parts 4 :command-list ()))
+        (new 'static 'spool-anim :name "bird-lady-reminder-1" :index 5 :parts 4 :command-list '()))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 0))
-        (new 'static 'spool-anim :name "bird-lady-reminder-2" :index 6 :parts 5 :command-list ()))))
+        (new 'static 'spool-anim :name "bird-lady-reminder-2" :index 6 :parts 5 :command-list '()))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/beach/lurkercrab.gc b/goal_src/jak1/levels/beach/lurkercrab.gc
index 7a13cb708c..2e1bca9b90 100644
--- a/goal_src/jak1/levels/beach/lurkercrab.gc
+++ b/goal_src/jak1/levels/beach/lurkercrab.gc
@@ -429,7 +429,7 @@ nav-enemy-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lurkercrab-sg* ())
+  (initialize-skeleton this *lurkercrab-sg* '())
   (init-defaults! this *lurkercrab-nav-enemy-info*)
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 159) this))
   (set! (-> this orient) #t)
diff --git a/goal_src/jak1/levels/beach/lurkerpuppy.gc b/goal_src/jak1/levels/beach/lurkerpuppy.gc
index 892d3d7543..31272e422c 100644
--- a/goal_src/jak1/levels/beach/lurkerpuppy.gc
+++ b/goal_src/jak1/levels/beach/lurkerpuppy.gc
@@ -214,7 +214,7 @@ nav-enemy-default-event-handler
   (none))
 
 (defmethod nav-enemy-method-48 ((this lurkerpuppy))
-  (initialize-skeleton this *lurkerpuppy-sg* ())
+  (initialize-skeleton this *lurkerpuppy-sg* '())
   (init-defaults! this *lurkerpuppy-nav-enemy-info*)
   (when (nonzero? (-> this neck))
     (set! (-> this neck up) (the-as uint 0))
diff --git a/goal_src/jak1/levels/beach/lurkerworm.gc b/goal_src/jak1/levels/beach/lurkerworm.gc
index 365cb1ffa0..ff1e18097d 100644
--- a/goal_src/jak1/levels/beach/lurkerworm.gc
+++ b/goal_src/jak1/levels/beach/lurkerworm.gc
@@ -439,7 +439,7 @@ lurkerworm-default-post-behavior
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lurkerworm-sg* ())
+  (initialize-skeleton this *lurkerworm-sg* '())
   (set! (-> this fact) (new 'process 'fact-info-enemy this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
   (set! (-> this angle) 0.0)
   (set! (-> this vulnerable) #f)
diff --git a/goal_src/jak1/levels/beach/mayor.gc b/goal_src/jak1/levels/beach/mayor.gc
index 8ac2391bf1..57b3be9604 100644
--- a/goal_src/jak1/levels/beach/mayor.gc
+++ b/goal_src/jak1/levels/beach/mayor.gc
@@ -67,7 +67,7 @@
        ((closed? (-> this tasks) (game-task jungle-lurkerm) (task-status need-reminder))
         (mayor-lurkerm-reward-speech this arg0))
        (else
-        (new 'static 'spool-anim :name "mayor-introduction" :index 4 :parts 16 :command-list ())
+        (new 'static 'spool-anim :name "mayor-introduction" :index 4 :parts 16 :command-list '())
         (new 'static
              'spool-anim
              :name "mayor-introduction"
diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc
index 5e13f86ef5..7f65aa575a 100644
--- a/goal_src/jak1/levels/beach/pelican.gc
+++ b/goal_src/jak1/levels/beach/pelican.gc
@@ -571,7 +571,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *pelican-sg* ())
+  (initialize-skeleton this *pelican-sg* '())
   (set! (-> this draw shadow-ctrl) (new 'process 'shadow-control -81920.0 4096.0 614400.0 (the-as float 25) 409600.0))
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this align) (new 'process 'align-control this))
diff --git a/goal_src/jak1/levels/beach/sculptor.gc b/goal_src/jak1/levels/beach/sculptor.gc
index 3abfe90c44..6e6ff7cdec 100644
--- a/goal_src/jak1/levels/beach/sculptor.gc
+++ b/goal_src/jak1/levels/beach/sculptor.gc
@@ -94,7 +94,7 @@
            (1433 joint "cameraB"))))
     (((task-status need-reminder))
      (set! (-> this skippable) #t)
-     (new 'static 'spool-anim :name "sculptor-reminder-1" :index 17 :parts 2 :command-list ()))
+     (new 'static 'spool-anim :name "sculptor-reminder-1" :index 17 :parts 2 :command-list '()))
     (((task-status need-reward-speech))
      (when arg0
        (set! (-> this cell-for-task) (current-task (-> this tasks)))
diff --git a/goal_src/jak1/levels/beach/seagull.gc b/goal_src/jak1/levels/beach/seagull.gc
index b23dddc56e..101b2f6814 100644
--- a/goal_src/jak1/levels/beach/seagull.gc
+++ b/goal_src/jak1/levels/beach/seagull.gc
@@ -781,7 +781,7 @@
     (backup-collide-with-as s3-0)
     (set! (-> self root) s3-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *seagull-sg* ())
+  (initialize-skeleton self *seagull-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self index) arg1)
   (set! (-> self flock) (the-as (pointer seagullflock) (process->ppointer arg2)))
diff --git a/goal_src/jak1/levels/citadel/assistant-citadel.gc b/goal_src/jak1/levels/citadel/assistant-citadel.gc
index eeeeec41c2..d1d79eba00 100644
--- a/goal_src/jak1/levels/citadel/assistant-citadel.gc
+++ b/goal_src/jak1/levels/citadel/assistant-citadel.gc
@@ -22,7 +22,7 @@
 (defmethod play-anim! ((this assistant-lavatube-end) (arg0 symbol))
   (case (current-status (-> this tasks))
     (((task-status unknown) (task-status need-hint))
-     (new 'static 'spool-anim :name "assistant-lavatube-end-resolution" :index 4 :parts 11 :command-list ()))
+     (new 'static 'spool-anim :name "assistant-lavatube-end-resolution" :index 4 :parts 11 :command-list '()))
     (((task-status need-reward-speech))
      (if arg0 (close-current! (-> this tasks)))
      (new 'static
diff --git a/goal_src/jak1/levels/citadel/citadel-obs.gc b/goal_src/jak1/levels/citadel/citadel-obs.gc
index c451e308fc..6bbcdd8f1b 100644
--- a/goal_src/jak1/levels/citadel/citadel-obs.gc
+++ b/goal_src/jak1/levels/citadel/citadel-obs.gc
@@ -186,41 +186,41 @@
 (deftype citb-arm-shoulder-b (citb-arm-shoulder) ())
 
 (defmethod setup-new-process! ((this citb-arm-a))
-  (initialize-skeleton this *citb-arm-a-sg* ())
+  (initialize-skeleton this *citb-arm-a-sg* '())
   (call-parent-method this)
   (set! (-> this root root-prim local-sphere z) -184320.0)
   0
   (none))
 
 (defmethod setup-new-process! ((this citb-arm-b))
-  (initialize-skeleton this *citb-arm-b-sg* ())
+  (initialize-skeleton this *citb-arm-b-sg* '())
   (call-parent-method this)
   (set! (-> this root root-prim local-sphere z) -225280.0)
   0
   (none))
 
 (defmethod setup-new-process! ((this citb-arm-c))
-  (initialize-skeleton this *citb-arm-c-sg* ())
+  (initialize-skeleton this *citb-arm-c-sg* '())
   (call-parent-method this)
   (set! (-> this root root-prim local-sphere z) -266240.0)
   0
   (none))
 
 (defmethod setup-new-process! ((this citb-arm-d))
-  (initialize-skeleton this *citb-arm-d-sg* ())
+  (initialize-skeleton this *citb-arm-d-sg* '())
   (call-parent-method this)
   (set! (-> this root root-prim local-sphere z) -307200.0)
   0
   (none))
 
 (defmethod setup-new-process! ((this citb-arm-shoulder-a))
-  (initialize-skeleton this *citb-arm-shoulder-a-sg* ())
+  (initialize-skeleton this *citb-arm-shoulder-a-sg* '())
   (call-parent-method this)
   0
   (none))
 
 (defmethod setup-new-process! ((this citb-arm-shoulder-b))
-  (initialize-skeleton this *citb-arm-shoulder-b-sg* ())
+  (initialize-skeleton this *citb-arm-shoulder-b-sg* '())
   (call-parent-method this)
   0
   (none))
@@ -334,22 +334,22 @@
 (deftype citb-disc-d (citb-disc) ())
 
 (defmethod citb-disc-method-21 ((this citb-disc-a))
-  (initialize-skeleton this *citb-disc-a-sg* ())
+  (initialize-skeleton this *citb-disc-a-sg* '())
   0
   (none))
 
 (defmethod citb-disc-method-21 ((this citb-disc-b))
-  (initialize-skeleton this *citb-disc-b-sg* ())
+  (initialize-skeleton this *citb-disc-b-sg* '())
   0
   (none))
 
 (defmethod citb-disc-method-21 ((this citb-disc-c))
-  (initialize-skeleton this *citb-disc-c-sg* ())
+  (initialize-skeleton this *citb-disc-c-sg* '())
   0
   (none))
 
 (defmethod citb-disc-method-21 ((this citb-disc-d))
-  (initialize-skeleton this *citb-disc-d-sg* ())
+  (initialize-skeleton this *citb-disc-d-sg* '())
   0
   (none))
 
@@ -379,7 +379,7 @@
   (none))
 
 (defmethod eco-door-method-25 ((this citb-iris-door))
-  (initialize-skeleton this *citb-iris-door-sg* ())
+  (initialize-skeleton this *citb-iris-door-sg* '())
   (set! (-> this open-distance) 32768.0)
   (set! (-> this close-distance) 49152.0)
   (set! (-> this auto-close) #t)
@@ -416,7 +416,7 @@
   (the-as collide-shape-moving 0))
 
 (defmethod basebutton-method-26 ((this citb-button))
-  (initialize-skeleton this *citb-button-sg* ())
+  (initialize-skeleton this *citb-button-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (cond
@@ -630,7 +630,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *citb-robotboss-sg* ())
+  (initialize-skeleton this *citb-robotboss-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 601) this))
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this shield-on) #t)
@@ -707,7 +707,7 @@
 (defmethod init-from-entity! ((this citb-coil) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *citb-coil-sg* ())
+  (initialize-skeleton this *citb-coil-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 596) this))
   (set! (-> this part-off) (create-launch-control (-> *part-group-id-table* 602) this))
   (let ((v1-9 (entity-actor-lookup (-> this entity) 'state-actor 0)))
@@ -772,7 +772,7 @@
 (defmethod init-from-entity! ((this citb-hose) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *citb-hose-sg* ())
+  (initialize-skeleton this *citb-hose-sg* '())
   (let ((v1-3 (entity-actor-lookup (-> this entity) 'state-actor 0)))
     (if (not v1-3) (set! v1-3 (-> this entity)))
     (if (logtest? (-> v1-3 extra perm status) (entity-perm-status complete)) (go citb-hose-die) (go citb-hose-idle)))
@@ -957,7 +957,7 @@
   (none))
 
 (defmethod citb-generator-method-21 ((this citb-generator))
-  (initialize-skeleton this *citb-generator-sg* ())
+  (initialize-skeleton this *citb-generator-sg* '())
   (setup-lods! (-> this normal-look) *citb-generator-sg* (-> this draw art-group) (-> this entity))
   (setup-lods! (-> this broken-look) *citb-generator-broken-sg* (-> this draw art-group) (-> this entity))
   (set! (-> this link) (new 'process 'actor-link-info this))
@@ -1033,7 +1033,7 @@
                 (entity-birth-no-kill s4-0)
                 (suspend)
                 (send-event (if s4-0 (-> s4-0 extra process)) 'trigger))))))
-      (let ((gp-2 (ppointer->handle (process-spawn pov-camera (-> self root trans) *citadelcam-sg* "citadelcam-stair-plats" 0 #f () :to self))))
+      (let ((gp-2 (ppointer->handle (process-spawn pov-camera (-> self root trans) *citadelcam-sg* "citadelcam-stair-plats" 0 #f '() :to self))))
         (while (handle->process (the-as handle gp-2))
           (suspend)))
       (level-hint-spawn (text-id citadel-plat) "sksp0387" (the-as entity #f) *entity-pool* (game-task none))
@@ -1060,7 +1060,7 @@
                                                    "citadel-bunnies"
                                                    0
                                                    #f
-                                                   ()
+                                                   '()
                                                    :to
                                                    self))))
         (send-event (handle->process (the-as handle gp-1)) 'mask 2048)
diff --git a/goal_src/jak1/levels/citadel/citadel-sages.gc b/goal_src/jak1/levels/citadel/citadel-sages.gc
index 9f83963183..f96b9c89c3 100644
--- a/goal_src/jak1/levels/citadel/citadel-sages.gc
+++ b/goal_src/jak1/levels/citadel/citadel-sages.gc
@@ -86,7 +86,7 @@
            (let ((gp-0 (ppointer->process (-> self parent-override))))
              (when gp-0
                (joint-control-copy! (-> self skel) (-> (the-as citb-sage gp-0) skel))
-               (joint-control-remap! (-> self skel) (-> self draw art-group) (-> (the-as citb-sage gp-0) draw art-group) () 0 ""))))
+               (joint-control-remap! (-> self skel) (-> self draw art-group) (-> (the-as citb-sage gp-0) draw art-group) '() 0 ""))))
           (else (ja :num! (loop!))))
         (suspend)))
   :post
@@ -117,7 +117,7 @@
   (none))
 
 (defmethod citb-sagecage-method-21 ((this citb-sagecage))
-  (initialize-skeleton this *citb-sagecage-sg* ())
+  (initialize-skeleton this *citb-sagecage-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this root pause-adjust-distance) 409600.0)
   (let ((f0-1 20766.72)
diff --git a/goal_src/jak1/levels/citadel/citb-bunny.gc b/goal_src/jak1/levels/citadel/citb-bunny.gc
index a2a4b2532c..30687c90b5 100644
--- a/goal_src/jak1/levels/citadel/citb-bunny.gc
+++ b/goal_src/jak1/levels/citadel/citb-bunny.gc
@@ -73,7 +73,7 @@
        :debug-draw-jump #f))
 
 (defmethod nav-enemy-method-60 ((this citb-bunny))
-  (initialize-skeleton this *citb-bunny-sg* ())
+  (initialize-skeleton this *citb-bunny-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   0
   (none))
diff --git a/goal_src/jak1/levels/citadel/citb-drop-plat.gc b/goal_src/jak1/levels/citadel/citb-drop-plat.gc
index 33f9dec804..220353a4e7 100644
--- a/goal_src/jak1/levels/citadel/citb-drop-plat.gc
+++ b/goal_src/jak1/levels/citadel/citb-drop-plat.gc
@@ -197,11 +197,11 @@
 
 (defmethod drop-plat-method-21 ((this drop-plat))
   (case (-> this color)
-    ((1) (initialize-skeleton this *citb-drop-plat-red-sg* ()))
-    ((2) (initialize-skeleton this *citb-drop-plat-green-sg* ()))
-    ((3) (initialize-skeleton this *citb-drop-plat-blue-sg* ()))
-    ((4) (initialize-skeleton this *citb-drop-plat-yellow-sg* ()))
-    (else (initialize-skeleton this *citb-drop-plat-sg* ())))
+    ((1) (initialize-skeleton this *citb-drop-plat-red-sg* '()))
+    ((2) (initialize-skeleton this *citb-drop-plat-green-sg* '()))
+    ((3) (initialize-skeleton this *citb-drop-plat-blue-sg* '()))
+    ((4) (initialize-skeleton this *citb-drop-plat-yellow-sg* '()))
+    (else (initialize-skeleton this *citb-drop-plat-sg* '())))
   (logclear! (-> this mask) (process-mask actor-pause))
   (let ((s3-0 (new 'stack-no-clear 'vector))
         (s5-0 (new 'stack-no-clear 'vector))
diff --git a/goal_src/jak1/levels/citadel/citb-plat.gc b/goal_src/jak1/levels/citadel/citb-plat.gc
index 19d37a2af1..c62e707df2 100644
--- a/goal_src/jak1/levels/citadel/citb-plat.gc
+++ b/goal_src/jak1/levels/citadel/citb-plat.gc
@@ -93,7 +93,7 @@
   (none))
 
 (defmethod citb-base-plat-method-22 ((this citb-base-plat))
-  (initialize-skeleton this *plat-citb-sg* ())
+  (initialize-skeleton this *plat-citb-sg* '())
   0
   (none))
 
@@ -256,7 +256,7 @@
   :post ja-post)
 
 (defmethod citb-base-plat-method-22 ((this citb-stair-plat))
-  (initialize-skeleton this *plat-citb-sg* ())
+  (initialize-skeleton this *plat-citb-sg* '())
   (set! (-> this rise-height) (-> this root trans y))
   (set! (-> this idle-height) (+ -409600.0 (-> this rise-height)))
   (set! (-> this root trans y) (-> this idle-height))
@@ -430,7 +430,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this citb-chain-plat))
-  (initialize-skeleton this *citb-chain-plat-sg* ())
+  (initialize-skeleton this *citb-chain-plat-sg* '())
   (set! (-> this orig-trans quad) (-> this root-overlay trans quad))
   (quaternion-copy! (-> this orig-quat) (-> this root-overlay quat))
   (set! (-> this beam-end quad) (-> this orig-trans quad))
@@ -496,7 +496,7 @@
   (none))
 
 (defmethod citb-base-plat-method-22 ((this citb-rotatebox))
-  (initialize-skeleton this *citb-rotatebox-sg* ())
+  (initialize-skeleton this *citb-rotatebox-sg* '())
   0
   (none))
 
@@ -539,7 +539,7 @@
   (none))
 
 (defmethod citb-base-plat-method-22 ((this citb-donut))
-  (initialize-skeleton this *citb-donut-sg* ())
+  (initialize-skeleton this *citb-donut-sg* '())
   (setup-params! (-> this sync) (the-as uint 9000) 0.0 0.15 0.15)
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "rotate-plat" :fo-max 20) (-> this root trans)))
   (logclear! (-> this mask) (process-mask actor-pause))
@@ -713,7 +713,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *citb-firehose-sg* ())
+  (initialize-skeleton this *citb-firehose-sg* '())
   (load-params! (-> this sync) this (the-as uint 900) 0.0 0.15 0.15)
   (set! (-> this idle-distance) 286720.0)
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 685) this))
@@ -807,7 +807,7 @@
   (not (movie?)))
 
 (defmethod plat-button-method-31 ((this citb-exit-plat))
-  (initialize-skeleton this *citb-exit-plat-sg* ())
+  (initialize-skeleton this *citb-exit-plat-sg* '())
   (none))
 
 (defmethod plat-button-method-32 ((this citb-exit-plat))
diff --git a/goal_src/jak1/levels/common/blocking-plane.gc b/goal_src/jak1/levels/common/blocking-plane.gc
index 9692d3f6e0..a850101aea 100644
--- a/goal_src/jak1/levels/common/blocking-plane.gc
+++ b/goal_src/jak1/levels/common/blocking-plane.gc
@@ -61,7 +61,7 @@
       (vector-cross! (-> s4-2 vector 2) (the-as vector (-> s4-2 vector)) (-> s4-2 vector 1))
       (vector-normalize! (-> s4-2 vector 2) 1.0)
       (matrix->quaternion (-> self root quat) s4-2)))
-  (initialize-skeleton self *ef-plane-sg* ())
+  (initialize-skeleton self *ef-plane-sg* '())
   (logior! (-> self draw status) (draw-status skip-bones))
   (go blocking-plane-idle)
   (none))
diff --git a/goal_src/jak1/levels/common/launcherdoor.gc b/goal_src/jak1/levels/common/launcherdoor.gc
index 83cfcba26d..22b8c89d49 100644
--- a/goal_src/jak1/levels/common/launcherdoor.gc
+++ b/goal_src/jak1/levels/common/launcherdoor.gc
@@ -108,13 +108,13 @@
   (cond
     ((= (-> (if (-> this entity) (-> this entity extra level) (-> *level* level-default)) name) 'maincave)
      (set! (-> this close-speed) 4.0)
-     (initialize-skeleton this *launcherdoor-maincave-sg* ())
+     (initialize-skeleton this *launcherdoor-maincave-sg* '())
      (ja-channel-set! 1)
      (let ((s5-1 (-> this skel root-channel 0)))
        (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim (-> this draw art-group data 3)) num-func-identity)
        (set! (-> s5-1 frame-num) 0.0)))
     (else
-     (initialize-skeleton this *launcherdoor-sg* ())
+     (initialize-skeleton this *launcherdoor-sg* '())
      (ja-channel-set! 1)
      (let ((s5-2 (-> this skel root-channel 0)))
        (joint-control-channel-group-eval! s5-2 (the-as art-joint-anim (-> this draw art-group data 3)) num-func-identity)
diff --git a/goal_src/jak1/levels/darkcave/darkcave-obs.gc b/goal_src/jak1/levels/darkcave/darkcave-obs.gc
index 58dbfc0e08..f916461036 100644
--- a/goal_src/jak1/levels/darkcave/darkcave-obs.gc
+++ b/goal_src/jak1/levels/darkcave/darkcave-obs.gc
@@ -168,7 +168,7 @@
   (set! (-> this start-fade-time)
         (the-as time-frame (the int (* 300.0 (res-lump-float (-> this entity) 'timeout :default 8.0)))))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *cavecrystal-sg* ())
+  (initialize-skeleton this *cavecrystal-sg* '())
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
   (set! (-> this draw color-mult quad) (-> this off-color-mult quad))
   (set! (-> this draw color-emissive quad) (-> this off-color-emissive quad))
diff --git a/goal_src/jak1/levels/finalboss/final-door.gc b/goal_src/jak1/levels/finalboss/final-door.gc
index 32112747d1..6ab6cd22f2 100644
--- a/goal_src/jak1/levels/finalboss/final-door.gc
+++ b/goal_src/jak1/levels/finalboss/final-door.gc
@@ -137,12 +137,12 @@
         (suspend))))
 
 (defmethod final-door-method-21 ((this power-left))
-  (initialize-skeleton this *power-left-sg* ())
+  (initialize-skeleton this *power-left-sg* '())
   0
   (none))
 
 (defmethod final-door-method-21 ((this power-right))
-  (initialize-skeleton this *power-right-sg* ())
+  (initialize-skeleton this *power-right-sg* '())
   0
   (none))
 
@@ -215,7 +215,7 @@
   (set! (-> self jump-pos quad) (-> arg2 quad))
   (set-vector! (-> self root scale) 0.5 0.5 0.5 1.0)
   (set! (-> self index) arg3)
-  (initialize-skeleton self *powercellalt-sg* ())
+  (initialize-skeleton self *powercellalt-sg* '())
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 63) self))
   enter-state
   (-> self root trans)
diff --git a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
index 259063e029..6bb5789d18 100644
--- a/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
+++ b/goal_src/jak1/levels/finalboss/green-eco-lurker.gc
@@ -583,7 +583,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this green-eco-lurker))
-  (initialize-skeleton this *green-eco-lurker-sg* ())
+  (initialize-skeleton this *green-eco-lurker-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (logclear! (-> this collide-info nav-flags) (nav-flags navf0))
   (init-defaults! this *green-eco-lurker-nav-enemy-info*)
diff --git a/goal_src/jak1/levels/finalboss/light-eco.gc b/goal_src/jak1/levels/finalboss/light-eco.gc
index a8fbd7b5e8..f364a5ba83 100644
--- a/goal_src/jak1/levels/finalboss/light-eco.gc
+++ b/goal_src/jak1/levels/finalboss/light-eco.gc
@@ -453,7 +453,7 @@
     (vector-normalize! s4-3 163840.0)
     (set! (-> s4-3 y) -122880.0))
   (logclear! (-> self mask) (process-mask actor-pause))
-  (initialize-skeleton self *light-eco-small-sg* ())
+  (initialize-skeleton self *light-eco-small-sg* '())
   (ja-channel-set! 1)
   (ja-no-eval :num! (seek!))
   (ja :group! light-eco-small-idle-ja :num! min)
@@ -588,7 +588,7 @@
   (vector-reset! (-> self root scale))
   (quaternion-identity! (-> self root quat))
   (logclear! (-> self mask) (process-mask actor-pause))
-  (initialize-skeleton self *light-eco-big-sg* ())
+  (initialize-skeleton self *light-eco-big-sg* '())
   (ja-channel-set! 1)
   (ja-no-eval :num! (seek!))
   (ja :group! light-eco-big-idle-ja :num! min)
diff --git a/goal_src/jak1/levels/finalboss/robotboss-misc.gc b/goal_src/jak1/levels/finalboss/robotboss-misc.gc
index 3b23ac04a9..90cdaf2656 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-misc.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-misc.gc
@@ -190,7 +190,7 @@
 (defmethod init-from-entity! ((this ecoclaw) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ecoclaw-sg* ())
+  (initialize-skeleton this *ecoclaw-sg* '())
   (dotimes (v1-3 3)
     (set! (-> this particles v1-3 kind) #f)
     (set! (-> this particles v1-3 tracker) (the-as handle #f)))
@@ -298,7 +298,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *silodoor-sg* ())
+  (initialize-skeleton this *silodoor-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this root pause-adjust-distance) 1228800.0)
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "silo-moves" :fo-max 80) (-> this root trans)))
@@ -338,7 +338,7 @@
                   (let ((v0-0 (create-launch-control (-> *part-group-id-table* 645) self))) (set! (-> self part) v0-0) v0-0)))
     (let ((v1-43 (handle->process (-> this robotboss))))
       (if v1-43 (set! (-> (the-as robotboss v1-43) draw bounds w) 327680.0))))
-  (the-as basic (new 'static 'spool-anim :name "finalbosscam-white-eco" :index 3 :parts 3 :command-list ())))
+  (the-as basic (new 'static 'spool-anim :name "finalbosscam-white-eco" :index 3 :parts 3 :command-list '())))
 
 (defmethod get-art-elem ((this finalbosscam))
   (-> this draw art-group data 2))
diff --git a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
index 16dcaba8de..a11eedbc9a 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-weapon.gc
@@ -330,7 +330,7 @@
     (backup-collide-with-as s1-0)
     (set! (-> self root) s1-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *darkecobomb-sg* ())
+  (initialize-skeleton self *darkecobomb-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 639) self))
   (arcing-shot-setup arg0 arg1 arg2)
@@ -386,7 +386,7 @@
     (backup-collide-with-as s2-0)
     (set! (-> self root) s2-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *greenshot-sg* ())
+  (initialize-skeleton self *greenshot-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (arcing-shot-setup arg0 arg1 arg2)
   (set! (-> self flight-time) arg3)
@@ -544,7 +544,7 @@
     (backup-collide-with-as s0-0)
     (set! (-> self root) s0-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *redring-sg* ())
+  (initialize-skeleton self *redring-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (arcing-shot-setup arg0 arg1 arg2)
   (set! (-> self flight-time) arg3)
@@ -604,7 +604,7 @@
     (backup-collide-with-as s2-0)
     (set! (-> self root) s2-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *redring-sg* ())
+  (initialize-skeleton self *redring-sg* '())
   (logior! (-> self draw status) (draw-status hidden))
   (arcing-shot-setup arg0 arg1 arg2)
   (set! (-> self flight-time) arg3)
diff --git a/goal_src/jak1/levels/finalboss/robotboss.gc b/goal_src/jak1/levels/finalboss/robotboss.gc
index 98dc72e4fa..d9b176557f 100644
--- a/goal_src/jak1/levels/finalboss/robotboss.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss.gc
@@ -1884,7 +1884,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *robotboss-sg* ())
+  (initialize-skeleton this *robotboss-sg* '())
   (aybabtu 2)
   (set! (-> this nav) (new 'process 'nav-control (-> this root) 16 (the-as float 40960.0)))
   (logior! (-> this nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7))
diff --git a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
index ebc9e21ac6..0bedeff272 100644
--- a/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
+++ b/goal_src/jak1/levels/firecanyon/assistant-firecanyon.gc
@@ -69,7 +69,7 @@
                       (not (and *cheat-mode* (cpad-hold? 0 l3)))
                       (not (time-elapsed? (-> self state-time) (seconds 10)))))
         (hide-hud)
-        (kill-current-level-hint () '(sidekick voicebox) 'exit)
+        (kill-current-level-hint '() '(sidekick voicebox) 'exit)
         (when (and (seen-text? *game-info* (text-id firecanyon-need-cells))
                    (hud-hidden?)
                    (can-grab-display? self)
diff --git a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
index 05cbbec9dc..8141caeed7 100644
--- a/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
+++ b/goal_src/jak1/levels/firecanyon/firecanyon-obs.gc
@@ -127,7 +127,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *balloon-sg* ())
+  (initialize-skeleton this *balloon-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 227) this))
   (go balloon-idle)
   (none))
@@ -263,7 +263,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *spike-sg* ())
+  (initialize-skeleton this *spike-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (set! (-> this num-alts) (entity-actor-count (-> this entity) 'alt-actor))
   (if (zero? (-> this num-alts)) (go spike-down) (go spike-idle))
@@ -510,6 +510,6 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *crate-darkeco-cluster-sg* ())
+  (initialize-skeleton this *crate-darkeco-cluster-sg* '())
   (go (method-of-object this idle))
   (none))
diff --git a/goal_src/jak1/levels/flut_common/flutflut.gc b/goal_src/jak1/levels/flut_common/flutflut.gc
index 5842082b9c..abad906460 100644
--- a/goal_src/jak1/levels/flut_common/flutflut.gc
+++ b/goal_src/jak1/levels/flut_common/flutflut.gc
@@ -150,7 +150,7 @@
                    (!= (-> self condition) 4))
           (hide-hud)
           (level-hint-surpress!)
-          (kill-current-level-hint () '(sidekick voicebox) 'exit)
+          (kill-current-level-hint '() '(sidekick voicebox) 'exit)
           (when (and (hud-hidden?) (can-grab-display? self))
             (let ((gp-0 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
               (let ((v1-34 gp-0)) (set! (-> v1-34 width) (the float 440)))
@@ -230,7 +230,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (set-yaw-angle-clear-roll-pitch! (-> this root) (res-lump-float arg0 'rotoffset))
-  (initialize-skeleton this *flutflut-sg* ())
+  (initialize-skeleton this *flutflut-sg* '())
   (logior! (-> this skel status) (janim-status eye))
   (set! (-> this draw shadow-ctrl) *flutflut-shadow-control*)
   (let ((v1-24 (-> this node-list data)))
diff --git a/goal_src/jak1/levels/flut_common/target-flut.gc b/goal_src/jak1/levels/flut_common/target-flut.gc
index 1bdbf57749..6392796b03 100644
--- a/goal_src/jak1/levels/flut_common/target-flut.gc
+++ b/goal_src/jak1/levels/flut_common/target-flut.gc
@@ -1156,7 +1156,7 @@
       (apply-settings *setting-control*)
       (set! (-> self control transv quad) (the-as uint128 0))
       (cond
-        ((or (= arg0 none) (= arg0 'water-vol) (= arg0 'sharkey)))
+        ((or (= arg0 'none) (= arg0 'water-vol) (= arg0 'sharkey)))
         ((= arg0 'endlessfall)
          (sound-play "death-fall")
          (sound-play "flut-hit" :vol 70 :pitch -1.4)
diff --git a/goal_src/jak1/levels/intro/evilbro.gc b/goal_src/jak1/levels/intro/evilbro.gc
index d6fcc30daf..543f8bea52 100644
--- a/goal_src/jak1/levels/intro/evilbro.gc
+++ b/goal_src/jak1/levels/intro/evilbro.gc
@@ -26,7 +26,7 @@
      (close-specific-task! (game-task leaving-misty) (task-status need-introduction))
      (send-event (-> this evilsis extra process) 'clone (process->handle this)))
     (else (set! (-> this will-talk) #t)))
-  (the-as basic (new 'static 'spool-anim :name "evilbro-misty-end" :index 5 :parts 9 :command-list ())))
+  (the-as basic (new 'static 'spool-anim :name "evilbro-misty-end" :index 5 :parts 9 :command-list '())))
 
 (defmethod get-art-elem ((this evilbro))
   (-> this draw art-group data 3))
diff --git a/goal_src/jak1/levels/jungle/bouncer.gc b/goal_src/jak1/levels/jungle/bouncer.gc
index bd787a1be1..eafdbcb360 100644
--- a/goal_src/jak1/levels/jungle/bouncer.gc
+++ b/goal_src/jak1/levels/jungle/bouncer.gc
@@ -103,7 +103,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *bouncer-sg* ())
+  (initialize-skeleton this *bouncer-sg* '())
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
   (set! (-> this spring-height) (res-lump-float arg0 'spring-height :default 45056.0))
   (go bouncer-wait)
diff --git a/goal_src/jak1/levels/jungle/darkvine.gc b/goal_src/jak1/levels/jungle/darkvine.gc
index d8a7ee0371..1d54543300 100644
--- a/goal_src/jak1/levels/jungle/darkvine.gc
+++ b/goal_src/jak1/levels/jungle/darkvine.gc
@@ -258,7 +258,7 @@
     (set! (-> this root) s4-0))
   (set! (-> this tip-index) 8)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *darkvine-sg* ())
+  (initialize-skeleton this *darkvine-sg* '())
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
   (set! (-> this hit-player) #f)
   (set! (-> this speed) (rand-vu-float-range 0.95 1.05))
diff --git a/goal_src/jak1/levels/jungle/fisher.gc b/goal_src/jak1/levels/jungle/fisher.gc
index c0e7da3425..c55aa2e252 100644
--- a/goal_src/jak1/levels/jungle/fisher.gc
+++ b/goal_src/jak1/levels/jungle/fisher.gc
@@ -913,7 +913,7 @@
                           (set-vector! (-> self root scale) 0.3 0.3 0.3 1.0)
                           (set! (-> self part) (create-launch-control (-> *part-group-id-table* 178) self))
                           *catch-fisha-sg*))
-                       ())
+                       '())
   (set! (-> self pos) 1.0)
   (set! (-> self offset) arg1)
   (set! (-> self vel) arg2)
@@ -985,7 +985,7 @@
     (((task-status need-reminder-a) (task-status need-reminder))
      (set! (-> this skippable) #t)
      (set! (-> this blend-on-exit) (the-as art-joint-anim #t))
-     (new 'static 'spool-anim :name "fisher-reminder-1" :index 10 :parts 1 :command-list ()))
+     (new 'static 'spool-anim :name "fisher-reminder-1" :index 10 :parts 1 :command-list '()))
     (((task-status need-reward-speech))
      (when arg0
        (set! (-> this cell-for-task) (current-task (-> this tasks)))
@@ -1024,7 +1024,7 @@
        '((0 send-event self emissive-on) (700 send-event self emissive-off))))
 
 (defmethod get-reject-anim ((this fisher) (arg0 symbol))
-  (new 'static 'spool-anim :name "fisher-reject" :index 11 :parts 2 :command-list ()))
+  (new 'static 'spool-anim :name "fisher-reject" :index 11 :parts 2 :command-list '()))
 
 (defstate fisher-done (fisher)
   :enter
diff --git a/goal_src/jak1/levels/jungle/hopper.gc b/goal_src/jak1/levels/jungle/hopper.gc
index b8db7499e7..ee5b03685d 100644
--- a/goal_src/jak1/levels/jungle/hopper.gc
+++ b/goal_src/jak1/levels/jungle/hopper.gc
@@ -282,7 +282,7 @@ nav-enemy-default-event-handler
   (none))
 
 (defmethod nav-enemy-method-48 ((this hopper))
-  (initialize-skeleton this *hopper-sg* ())
+  (initialize-skeleton this *hopper-sg* '())
   (init-defaults! this *hopper-nav-enemy-info*)
   (set! (-> this shadow-min-y) (+ (-> this collide-info trans y) (-> this nav-info shadow-min-y)))
   0
diff --git a/goal_src/jak1/levels/jungle/jungle-elevator.gc b/goal_src/jak1/levels/jungle/jungle-elevator.gc
index 55aeb9855c..9e2aa4d3b6 100644
--- a/goal_src/jak1/levels/jungle/jungle-elevator.gc
+++ b/goal_src/jak1/levels/jungle/jungle-elevator.gc
@@ -72,7 +72,7 @@
          (let ((a1-1 (res-lump-struct (-> self entity) 'continue-name structure)))
            (when a1-1
              (let ((v1-4 (set-continue! *game-info* (the-as basic a1-1)))) (load-commands-set! *level* (-> v1-4 load-commands))))))
-        (else (set! (-> self draw light-index) (the-as uint 255)) (load-commands-set! *level* ())))
+        (else (set! (-> self draw light-index) (the-as uint 255)) (load-commands-set! *level* '())))
       (let ((t9-4 (-> (method-of-type plat-button plat-button-at-end) code)))
         (if t9-4 ((the-as (function none :behavior plat-button) t9-4))))))
 
diff --git a/goal_src/jak1/levels/jungle/jungle-mirrors.gc b/goal_src/jak1/levels/jungle/jungle-mirrors.gc
index ebe21899d2..4bf160440e 100644
--- a/goal_src/jak1/levels/jungle/jungle-mirrors.gc
+++ b/goal_src/jak1/levels/jungle/jungle-mirrors.gc
@@ -653,7 +653,7 @@
     (backup-collide-with-as s5-0)
     (set! (-> self root) s5-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *periscope-mirror-sg* ())
+  (initialize-skeleton self *periscope-mirror-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (go reflector-idle)
   (none))
@@ -1064,7 +1064,7 @@
                 (set! (-> self player-touching-grips?) #f)
                 (hide-hud)
                 (level-hint-surpress!)
-                (kill-current-level-hint () '(sidekick voicebox) 'exit)
+                (kill-current-level-hint '() '(sidekick voicebox) 'exit)
                 (when (and (hud-hidden?) (can-grab-display? self))
                   (let ((s2-2 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
                     (let ((v1-43 s2-2)) (set! (-> v1-43 width) (the float 440)))
@@ -1314,7 +1314,7 @@
   (set! (-> this reflector) (process-spawn reflector (-> this reflector-trans) :to this))
   (set! (-> this link) (new 'process 'actor-link-info this))
   (periscope-find-next)
-  (initialize-skeleton this *periscope-base-sg* ())
+  (initialize-skeleton this *periscope-base-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 176) this))
   (set! (-> this part-aligned) (create-launch-control (-> *part-group-id-table* 689) this))
   (set! (-> this grips) (new 'process 'joint-mod-set-world this 4 #t))
@@ -1481,7 +1481,7 @@
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this link) (new 'process 'actor-link-info this))
-  (initialize-skeleton this *reflector-mirror-sg* ())
+  (initialize-skeleton this *reflector-mirror-sg* '())
   (set-vector! (-> this beam-end) 1805721.6 167936.0 -932659.2 1.0)
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "eco-beam" :fo-max 50) (-> this beam-end)))
   (if (and (-> this entity) (logtest? (-> this entity extra perm status) (entity-perm-status complete)))
diff --git a/goal_src/jak1/levels/jungle/jungle-obs.gc b/goal_src/jak1/levels/jungle/jungle-obs.gc
index 3b565d5b65..c3dfe1ffbd 100644
--- a/goal_src/jak1/levels/jungle/jungle-obs.gc
+++ b/goal_src/jak1/levels/jungle/jungle-obs.gc
@@ -79,7 +79,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *logtrap-sg* ())
+  (initialize-skeleton this *logtrap-sg* '())
   (set! (-> this draw shadow-ctrl) (new 'process 'shadow-control -5734.4 0.0 614400.0 (the-as float 1) 163840.0))
   (logclear! (-> this mask) (process-mask actor-pause))
   (update-transforms! (-> this root))
@@ -113,7 +113,7 @@
   (set! (-> this root-override) (new 'process 'trsq))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *towertop-sg* ())
+  (initialize-skeleton this *towertop-sg* '())
   (go towertop-idle)
   (none))
 
@@ -176,7 +176,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lurkerm-tall-sail-sg* ())
+  (initialize-skeleton this *lurkerm-tall-sail-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this alt-actor) (entity-actor-lookup (-> this entity) 'alt-actor 0))
@@ -257,7 +257,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lurkerm-short-sail-sg* ())
+  (initialize-skeleton this *lurkerm-short-sail-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this alt-actor) (entity-actor-lookup (-> this entity) 'alt-actor 0))
@@ -324,7 +324,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *lurkerm-piston-sg* ())
+  (initialize-skeleton this *lurkerm-piston-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this base quad) (-> this root trans quad))
@@ -380,7 +380,7 @@
 (defmethod init-from-entity! ((this accordian) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *accordian-sg* ())
+  (initialize-skeleton this *accordian-sg* '())
   (set! (-> this root pause-adjust-distance) 204800.0)
   (set! (-> this alt-actor) (entity-actor-lookup (-> this entity) 'alt-actor 0))
   (set! (-> this speed) 1.0)
@@ -468,7 +468,7 @@
                                  "precurbridgecam"
                                  0
                                  #f
-                                 ()
+                                 '()
                                  :to
                                  self))
                  (else (format #t "ERROR<GMJ>: position for precursor bridge camera not found~%") (go precurbridge-activate)))))
@@ -679,7 +679,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (set-vector! (-> this activation-point) 1765785.6 61440.0 -1279180.8 1.0)
-  (initialize-skeleton this *precurbridge-sg* ())
+  (initialize-skeleton this *precurbridge-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-post)
   (update-transforms! (-> this root))
@@ -760,7 +760,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *maindoor-sg* ())
+  (initialize-skeleton this *maindoor-sg* '())
   (update-transforms! (-> this root))
   (set! (-> this thresh w) 61440.0)
   (if (or (and (-> this entity) (logtest? (-> this entity extra perm status) (entity-perm-status complete)))
@@ -796,7 +796,7 @@
   (none))
 
 (defmethod eco-door-method-25 ((this sidedoor))
-  (initialize-skeleton this *sidedoor-sg* ())
+  (initialize-skeleton this *sidedoor-sg* '())
   (set! (-> this open-distance) 22528.0)
   (set! (-> this close-distance) 61440.0)
   (set! (-> this speed) 6.0)
@@ -873,7 +873,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *jngpusher-sg* ())
+  (initialize-skeleton this *jngpusher-sg* '())
   (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.15 0.15)
   (go jngpusher-idle)
   (none))
diff --git a/goal_src/jak1/levels/jungle/junglefish.gc b/goal_src/jak1/levels/jungle/junglefish.gc
index 27de1477ed..7d98fce167 100644
--- a/goal_src/jak1/levels/jungle/junglefish.gc
+++ b/goal_src/jak1/levels/jungle/junglefish.gc
@@ -200,7 +200,7 @@ nav-enemy-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *junglefish-sg* ())
+  (initialize-skeleton this *junglefish-sg* '())
   (init-defaults! this *junglefish-nav-enemy-info*)
   (set! (-> this water) (new 'process 'water-control this 7 0.0 8192.0 2048.0))
   (set! (-> this water flags) (water-flags wt01))
diff --git a/goal_src/jak1/levels/jungle/junglesnake.gc b/goal_src/jak1/levels/jungle/junglesnake.gc
index ed61a88371..74156b8e5b 100644
--- a/goal_src/jak1/levels/jungle/junglesnake.gc
+++ b/goal_src/jak1/levels/jungle/junglesnake.gc
@@ -545,7 +545,7 @@ junglesnake-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *junglesnake-sg* ())
+  (initialize-skeleton this *junglesnake-sg* '())
   (set! (-> this fact) (new 'process 'fact-info-enemy this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 173) this))
   (set! (-> this is-lethal?) #f)
diff --git a/goal_src/jak1/levels/jungleb/aphid.gc b/goal_src/jak1/levels/jungleb/aphid.gc
index 2b075d02be..41ca8aa7f0 100644
--- a/goal_src/jak1/levels/jungleb/aphid.gc
+++ b/goal_src/jak1/levels/jungleb/aphid.gc
@@ -215,7 +215,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this aphid))
-  (initialize-skeleton this *aphid-sg* ())
+  (initialize-skeleton this *aphid-sg* '())
   (init-defaults! this *aphid-nav-enemy-info*)
   (set! (-> this neck up) (the-as uint 0))
   (set! (-> this neck nose) (the-as uint 1))
diff --git a/goal_src/jak1/levels/jungleb/jungleb-obs.gc b/goal_src/jak1/levels/jungleb/jungleb-obs.gc
index 90cfc92b26..2bac29a63a 100644
--- a/goal_src/jak1/levels/jungleb/jungleb-obs.gc
+++ b/goal_src/jak1/levels/jungleb/jungleb-obs.gc
@@ -256,7 +256,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *eggtop-sg* ())
+  (initialize-skeleton this *eggtop-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 189) this))
@@ -299,7 +299,7 @@
   (none))
 
 (defmethod eco-door-method-25 ((this jng-iris-door))
-  (initialize-skeleton this *jng-iris-door-sg* ())
+  (initialize-skeleton this *jng-iris-door-sg* '())
   (set! (-> this open-distance) 32768.0)
   (set! (-> this close-distance) 49152.0)
   (update-transforms! (-> this root))
diff --git a/goal_src/jak1/levels/jungleb/plant-boss.gc b/goal_src/jak1/levels/jungleb/plant-boss.gc
index efe6c02f4a..4a76000827 100644
--- a/goal_src/jak1/levels/jungleb/plant-boss.gc
+++ b/goal_src/jak1/levels/jungleb/plant-boss.gc
@@ -437,7 +437,7 @@
   (set! (-> self root trans quad) (-> arg0 quad))
   (set-yaw-angle-clear-roll-pitch! (-> self root) arg1)
   (set! (-> self side) arg2)
-  (initialize-skeleton self *plant-boss-arm-sg* ())
+  (initialize-skeleton self *plant-boss-arm-sg* '())
   (set! (-> self draw shadow-ctrl) *plant-boss-shadow-control*)
   (go plant-boss-arm-idle)
   (none))
@@ -472,7 +472,7 @@
   (set! (-> self root trans quad) (-> arg0 quad))
   (set-yaw-angle-clear-roll-pitch! (-> self root) arg1)
   (set! (-> self side) arg2)
-  (initialize-skeleton self *plant-boss-back-arms-sg* ())
+  (initialize-skeleton self *plant-boss-back-arms-sg* '())
   (set! (-> self draw shadow-ctrl) *plant-boss-shadow-control*)
   (go plant-boss-back-arms-idle)
   (none))
@@ -484,7 +484,7 @@
   (set! (-> self root trans quad) (-> arg0 quad))
   (quaternion-zxy! (-> self root quat) arg1)
   (set! (-> self side) arg3)
-  (initialize-skeleton self *plant-boss-vine-sg* ())
+  (initialize-skeleton self *plant-boss-vine-sg* '())
   (go plant-boss-vine-idle)
   (none))
 
@@ -495,7 +495,7 @@
   (set! (-> self root trans quad) (-> arg0 quad))
   (quaternion-zxy! (-> self root quat) arg1)
   (set! (-> self side) arg3)
-  (initialize-skeleton self *plant-boss-root-sg* ())
+  (initialize-skeleton self *plant-boss-root-sg* '())
   (go plant-boss-root-idle)
   (none))
 
@@ -671,7 +671,7 @@
   (set! (-> self root trans quad) (-> arg0 quad))
   (set-yaw-angle-clear-roll-pitch! (-> self root) arg1)
   (set! (-> self side) arg2)
-  (initialize-skeleton self *plant-boss-leaf-sg* ())
+  (initialize-skeleton self *plant-boss-leaf-sg* '())
   (set! (-> self draw shadow-ctrl) *plant-boss-shadow-control*)
   (go plant-boss-leaf-idle #f)
   (none))
@@ -1293,7 +1293,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *plant-boss-sg* ())
+  (initialize-skeleton this *plant-boss-sg* '())
   (set! (-> this draw shadow-ctrl) *plant-boss-shadow-control*)
   (process-spawn plant-boss-arm
                  :init
diff --git a/goal_src/jak1/levels/jungleb/plat-flip.gc b/goal_src/jak1/levels/jungleb/plat-flip.gc
index cec4397dd7..a3fdf4db6c 100644
--- a/goal_src/jak1/levels/jungleb/plat-flip.gc
+++ b/goal_src/jak1/levels/jungleb/plat-flip.gc
@@ -99,7 +99,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (set! (-> this base-pos quad) (-> this root trans quad))
-  (initialize-skeleton this *plat-flip-sg* ())
+  (initialize-skeleton this *plat-flip-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (let ((f30-0 300.0))
     (set! sv-16 (new 'static 'res-tag))
diff --git a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
index 30f1525b76..82a08835c2 100644
--- a/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
+++ b/goal_src/jak1/levels/lavatube/assistant-lavatube.gc
@@ -55,7 +55,7 @@
                       (not (and *cheat-mode* (cpad-hold? 0 l3)))
                       (not (time-elapsed? (-> self state-time) (seconds 10)))))
         (hide-hud)
-        (kill-current-level-hint () '(sidekick voicebox) 'exit)
+        (kill-current-level-hint '() '(sidekick voicebox) 'exit)
         (when (and (seen-text? *game-info* (text-id assistant-lavatube-need-cells))
                    (hud-hidden?)
                    (can-grab-display? self)
diff --git a/goal_src/jak1/levels/lavatube/lavatube-energy.gc b/goal_src/jak1/levels/lavatube/lavatube-energy.gc
index eaa013628f..b1a2596da8 100644
--- a/goal_src/jak1/levels/lavatube/lavatube-energy.gc
+++ b/goal_src/jak1/levels/lavatube/lavatube-energy.gc
@@ -469,7 +469,7 @@
       (backup-collide-with-as s4-0)
       (set! (-> this root) s4-0))
     (process-drawable-from-entity! this arg0)
-    (initialize-skeleton this *energydoor-sg* ())
+    (initialize-skeleton this *energydoor-sg* '())
     (set! (-> this root pause-adjust-distance) 245760.0)
     (set! (-> this alt-actor) (entity-actor-lookup arg0 'alt-actor 0))
     (cond
@@ -540,7 +540,7 @@
 (defmethod init-from-entity! ((this energybase) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *energybase-sg* ())
+  (initialize-skeleton this *energybase-sg* '())
   (if (task-closed? (game-task lavatube-balls) (task-status need-resolution)) (go energybase-stopped) (go energybase-idle))
   (none))
 
@@ -661,7 +661,7 @@
 (defbehavior energyball-init-by-other energyball ((arg0 vector))
   (energyball-init self)
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *energyball-sg* ())
+  (initialize-skeleton self *energyball-sg* '())
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 545) self))
   (go energyball-idle)
   (none))
@@ -698,7 +698,7 @@
 (defstate energyarm-stop (energyarm)
   :enter
     (behavior ()
-      ())
+      '())
   :trans
     (behavior ()
       (update! (-> self x-rotation) 0.0)
@@ -838,7 +838,7 @@
          (s4-0 (if v1-0 (-> v1-0 0 self-override)))
          (a0-3 (if (and (nonzero? s4-0) (type-type? (-> s4-0 type) energyhub)) s4-0)))
     (if a0-3 (set! (-> self root trans quad) (-> a0-3 root trans quad))))
-  (initialize-skeleton self *energyarm-sg* ())
+  (initialize-skeleton self *energyarm-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self offset quad) (-> arg0 quad))
   (set! (-> self y-rotation) arg1)
@@ -998,7 +998,7 @@
 (defmethod init-from-entity! ((this energyhub) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *energyhub-sg* ())
+  (initialize-skeleton this *energyhub-sg* '())
   (set! (-> this sound) (new 'process 'ambient-sound arg0 (-> this root trans)))
   (let ((s5-1 (entity-actor-count (-> this entity) 'alt-actor)))
     (dotimes (s4-0 (min 3 s5-1))
@@ -1048,6 +1048,6 @@
 (defmethod init-from-entity! ((this energylava) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *energylava-sg* ())
+  (initialize-skeleton this *energylava-sg* '())
   (go energylava-idle)
   (none))
diff --git a/goal_src/jak1/levels/lavatube/lavatube-obs.gc b/goal_src/jak1/levels/lavatube/lavatube-obs.gc
index 734ae34be1..8a7af90e22 100644
--- a/goal_src/jak1/levels/lavatube/lavatube-obs.gc
+++ b/goal_src/jak1/levels/lavatube/lavatube-obs.gc
@@ -37,7 +37,7 @@
 (defmethod init-from-entity! ((this lavabase) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavabase-sg* ())
+  (initialize-skeleton this *lavabase-sg* '())
   (go lavabase-idle)
   (none))
 
@@ -66,7 +66,7 @@
 (defmethod init-from-entity! ((this lavafall) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavafall-sg* ())
+  (initialize-skeleton this *lavafall-sg* '())
   (go lavafall-idle)
   (none))
 
@@ -95,7 +95,7 @@
 (defmethod init-from-entity! ((this lavashortcut) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavashortcut-sg* ())
+  (initialize-skeleton this *lavashortcut-sg* '())
   (go lavashortcut-idle)
   (none))
 
@@ -361,7 +361,7 @@
 
 (defbehavior darkecobarrel-base-init darkecobarrel-base ((arg0 res-lump))
   (process-drawable-from-entity! self (the-as entity-actor arg0))
-  (initialize-skeleton self *darkecobarrel-sg* ())
+  (initialize-skeleton self *darkecobarrel-sg* '())
   (set! (-> self path) (new 'process 'path-control self 'path 0.0))
   (let ((v0-3 (logior (-> self path flags) (path-control-flag display draw-line draw-point draw-text))))
     (set! (-> self path flags) v0-3)
@@ -619,7 +619,7 @@
 (defmethod init-from-entity! ((this lavafallsewera) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavafallsewera-sg* ())
+  (initialize-skeleton this *lavafallsewera-sg* '())
   (go lavafallsewera-idle)
   (none))
 
@@ -647,7 +647,7 @@
 (defmethod init-from-entity! ((this lavafallsewerb) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavafallsewerb-sg* ())
+  (initialize-skeleton this *lavafallsewerb-sg* '())
   (go lavafallsewerb-idle)
   (none))
 
@@ -832,7 +832,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *chainmine-sg* ())
+  (initialize-skeleton this *chainmine-sg* '())
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "lava-mine-chain" :fo-max 30) (-> this root trans)))
   (go (method-of-object this idle))
   (none))
@@ -969,7 +969,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavaballoon-sg* ())
+  (initialize-skeleton this *lavaballoon-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 543) this))
   (set! (-> this root pause-adjust-distance) 122880.0)
   (set! (-> this path) (new 'process 'path-control this 'path 0.0))
@@ -1040,6 +1040,6 @@
 (defmethod init-from-entity! ((this lavayellowtarp) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lavayellowtarp-sg* ())
+  (initialize-skeleton this *lavayellowtarp-sg* '())
   (go lavayellowtarp-idle)
   (none))
diff --git a/goal_src/jak1/levels/maincave/baby-spider.gc b/goal_src/jak1/levels/maincave/baby-spider.gc
index edaeb707d5..501bc08a41 100644
--- a/goal_src/jak1/levels/maincave/baby-spider.gc
+++ b/goal_src/jak1/levels/maincave/baby-spider.gc
@@ -481,7 +481,7 @@ baby-spider-default-event-handler
 
 (defmethod nav-enemy-method-48 ((this baby-spider))
   (set-time! (-> this last-visible-time))
-  (initialize-skeleton this *baby-spider-sg* ())
+  (initialize-skeleton this *baby-spider-sg* '())
   (if (= (-> this parent 0 type) cave-trap)
     (init-defaults! this *baby-spider-nav-enemy-info-for-cave-trap*)
     (init-defaults! this *baby-spider-nav-enemy-info*))
diff --git a/goal_src/jak1/levels/maincave/dark-crystal.gc b/goal_src/jak1/levels/maincave/dark-crystal.gc
index addb46a743..083c90e066 100644
--- a/goal_src/jak1/levels/maincave/dark-crystal.gc
+++ b/goal_src/jak1/levels/maincave/dark-crystal.gc
@@ -546,7 +546,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *dark-crystal-sg* ())
+  (initialize-skeleton this *dark-crystal-sg* '())
   (logior! (-> this mask) (process-mask attackable))
   (set! (-> this draw color-mult quad) (-> this unlit-color-mult quad))
   (set! (-> this draw color-emissive quad) (-> this unlit-color-emissive quad))
diff --git a/goal_src/jak1/levels/maincave/driller-lurker.gc b/goal_src/jak1/levels/maincave/driller-lurker.gc
index 965b568214..2e90b55661 100644
--- a/goal_src/jak1/levels/maincave/driller-lurker.gc
+++ b/goal_src/jak1/levels/maincave/driller-lurker.gc
@@ -276,15 +276,15 @@
               (when s4-0
                 (let ((f0-7 (vector-vector-xz-distance s3-1 (-> this root-overeride trans))))
                   #|
-                                                        fix for higher framerate:
-                                    
-                                                        when the lurker changes directions, path-speed can get extremely close to 0
-                                                        when this happens, the change in u on a frame may be extremely small
-                                    
-                                                        so the vector-vector-xz-distance is very small (because you didn't move much
-                                                        on the path) and (set! (-> this path-units-per-meter) (* (/ (fabs f30-0) f0-7)
-                                                        (-> this path-units-per-meter))) makes things blow up because that division isn't
-                                                        accurate for tiny numbers
+                    fix for higher framerate:
+
+                    when the lurker changes directions, path-speed can get extremely close to 0
+                    when this happens, the change in u on a frame may be extremely small
+
+                    so the vector-vector-xz-distance is very small (because you didn't move much
+                    on the path) and (set! (-> this path-units-per-meter) (* (/ (fabs f30-0) f0-7)
+                    (-> this path-units-per-meter))) makes things blow up because that division isn't
+                    accurate for tiny numbers
                   |#
                   (when (> f0-7 0.00001)
                     (set! (-> this path-units-per-meter) (* (/ (fabs f30-0) f0-7) (-> this path-units-per-meter))))))))))
@@ -718,7 +718,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root-overeride) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *driller-lurker-sg* ())
+  (initialize-skeleton this *driller-lurker-sg* '())
   (set! (-> this path) (new 'process 'curve-control this 'path -1000000000.0))
   (logior! (-> this path flags) (path-control-flag display draw-line draw-point draw-text))
   (if (< (-> this path curve num-cverts) 2) (go process-drawable-art-error "bad path"))
diff --git a/goal_src/jak1/levels/maincave/gnawer.gc b/goal_src/jak1/levels/maincave/gnawer.gc
index 84955fbefd..cf36684029 100644
--- a/goal_src/jak1/levels/maincave/gnawer.gc
+++ b/goal_src/jak1/levels/maincave/gnawer.gc
@@ -333,7 +333,7 @@
                0.0
                (rand-vu-float-range 16384.0 36408.89)
                1.0)
-  (initialize-skeleton self *gnawer-segment-sg* ())
+  (initialize-skeleton self *gnawer-segment-sg* '())
   (go-virtual falling)
   (none))
 
@@ -872,10 +872,10 @@
                                                         pov-camera-init-by-other
                                                         gp-0
                                                         *maincavecam-sg*
-                                                        (new 'static 'spool-anim :name "maincavecam-gnawer-fuel-cell" :index 3 :parts 1 :command-list ())
+                                                        (new 'static 'spool-anim :name "maincavecam-gnawer-fuel-cell" :index 3 :parts 1 :command-list '())
                                                         0
                                                         self
-                                                        ())
+                                                        '())
                                     (-> s5-0 ppointer))
                                   0))
                       seq)
@@ -1028,7 +1028,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (quaternion-identity! (-> this root quat))
-  (initialize-skeleton this *gnawer-sg* ())
+  (initialize-skeleton this *gnawer-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 8))
   (set! (-> this post-trans quad) (-> this root trans quad))
   (let ((f0-40 (res-lump-float (-> this entity) 'rotoffset)))
diff --git a/goal_src/jak1/levels/maincave/maincave-obs.gc b/goal_src/jak1/levels/maincave/maincave-obs.gc
index cb6f26536b..95e7aaa9f2 100644
--- a/goal_src/jak1/levels/maincave/maincave-obs.gc
+++ b/goal_src/jak1/levels/maincave/maincave-obs.gc
@@ -41,7 +41,7 @@
                                                       (-> self entity extra perm task)
                                                       :to
                                                       (ppointer->process (-> self parent))))))
-           (ja-play-spooled-anim (new 'static 'spool-anim :name "maincavecam-gnawer-fuel-cell" :index 3 :parts 1 :command-list ())
+           (ja-play-spooled-anim (new 'static 'spool-anim :name "maincavecam-gnawer-fuel-cell" :index 3 :parts 1 :command-list '())
                                  (the-as art-joint-anim #f)
                                  (the-as art-joint-anim #f)
                                  (the-as (function process-drawable symbol) false-func))
@@ -127,7 +127,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *cavecrusher-sg* ())
+  (initialize-skeleton this *cavecrusher-sg* '())
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "crush-click" :fo-max 30) (-> this root trans)))
   (ja-channel-push! 1 0)
   (let ((s5-1 (-> this skel root-channel 0)))
@@ -237,7 +237,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *cavetrapdoor-sg* ())
+  (initialize-skeleton this *cavetrapdoor-sg* '())
   (ja-channel-push! 1 0)
   (let ((s4-1 (-> this skel root-channel 0)))
     (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim (-> this draw art-group data 4)) num-func-identity)
@@ -509,13 +509,13 @@
         (new 'process 'ambient-sound (static-sound-spec "spatula" :fo-min 25 :fo-max 50) (-> this root trans)))
   (case (-> (if (-> this entity) (-> this entity extra level) (-> *level* level-default)) name)
     (('darkcave)
-     (initialize-skeleton this *cavespatula-darkcave-sg* ())
+     (initialize-skeleton this *cavespatula-darkcave-sg* '())
      (ja-channel-push! 1 0)
      (let ((s5-1 (-> this skel root-channel 0)))
        (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim (-> this draw art-group data 3)) num-func-identity)
        (set! (-> s5-1 frame-num) 0.0)))
     (else
-     (initialize-skeleton this *cavespatula-sg* ())
+     (initialize-skeleton this *cavespatula-sg* '())
      (ja-channel-push! 1 0)
      (let ((s5-2 (-> this skel root-channel 0)))
        (joint-control-channel-group-eval! s5-2 (the-as art-joint-anim (-> this draw art-group data 3)) num-func-identity)
@@ -580,7 +580,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *cavespatulatwo-sg* ())
+  (initialize-skeleton this *cavespatulatwo-sg* '())
   (logclear! (-> this mask) (process-mask actor-pause))
   (logior! (-> this skel status) (janim-status inited))
   (load-params! (-> this sync) this (the-as uint 3000) 0.0 0.15 0.15)
@@ -826,7 +826,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *caveelevator-sg* ())
+  (initialize-skeleton this *caveelevator-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this skel postbind-function) caveelevator-joint-callback)
   (set! sv-16 (new 'static 'res-tag))
diff --git a/goal_src/jak1/levels/maincave/mother-spider-egg.gc b/goal_src/jak1/levels/maincave/mother-spider-egg.gc
index 38dff47dbc..b66daeaa16 100644
--- a/goal_src/jak1/levels/maincave/mother-spider-egg.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider-egg.gc
@@ -381,7 +381,7 @@
   (logior! (-> self mask) (process-mask actor-pause))
   (logior! (-> self mask) (process-mask enemy))
   (logior! (-> self mask) (process-mask attackable))
-  (initialize-skeleton self *mother-spider-egg-unbroken-sg* ())
+  (initialize-skeleton self *mother-spider-egg-unbroken-sg* '())
   (setup-lods! (-> self broken-look) *mother-spider-egg-broken-sg* (-> self draw art-group) (-> self entity))
   (set! (-> self draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0))
   (set! (-> self nav) (new 'process 'nav-control (-> self root) 16 40960.0))
diff --git a/goal_src/jak1/levels/maincave/mother-spider.gc b/goal_src/jak1/levels/maincave/mother-spider.gc
index e43a85b700..be81f010ef 100644
--- a/goal_src/jak1/levels/maincave/mother-spider.gc
+++ b/goal_src/jak1/levels/maincave/mother-spider.gc
@@ -169,7 +169,7 @@
                (rand-vu-float-range 16384.0 36408.89)
                1.0)
   (set! (-> self gravity) (rand-vu-float-range -266240.0 -163840.0))
-  (initialize-skeleton self *mother-spider-leg-sg* ())
+  (initialize-skeleton self *mother-spider-leg-sg* '())
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 614) self))
   (create-connection! *cavecrystal-light-control*
                       self
@@ -1175,7 +1175,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *mother-spider-sg* ())
+  (initialize-skeleton this *mother-spider-sg* '())
   (set! (-> this nav) (new 'process 'nav-control (-> this root) 16 40960.0))
   (logior! (-> this nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7))
   (set! (-> this nav nearest-y-threshold) 409600.0)
diff --git a/goal_src/jak1/levels/maincave/spiderwebs.gc b/goal_src/jak1/levels/maincave/spiderwebs.gc
index e3a9c78520..8c8c8e1805 100644
--- a/goal_src/jak1/levels/maincave/spiderwebs.gc
+++ b/goal_src/jak1/levels/maincave/spiderwebs.gc
@@ -115,7 +115,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *spiderwebs-sg* ())
+  (initialize-skeleton this *spiderwebs-sg* '())
   (set! (-> this spring-height) (res-lump-float arg0 'spring-height :default 45056.0))
   (ja-channel-set! 1)
   (let ((a0-11 (-> this skel root-channel 0)))
diff --git a/goal_src/jak1/levels/misty/balloonlurker.gc b/goal_src/jak1/levels/misty/balloonlurker.gc
index 53c3641fac..356425e470 100644
--- a/goal_src/jak1/levels/misty/balloonlurker.gc
+++ b/goal_src/jak1/levels/misty/balloonlurker.gc
@@ -686,7 +686,7 @@
   (none))
 
 (defmethod balloonlurker-pilot-method-21 ((this balloonlurker-pilot))
-  (initialize-skeleton this *balloonlurker-pilot-sg* ())
+  (initialize-skeleton this *balloonlurker-pilot-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 6))
   0
   (none))
@@ -751,7 +751,7 @@
 
 (defmethod rigid-body-platform-method-31 ((this balloonlurker))
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *balloonlurker-sg* ())
+  (initialize-skeleton this *balloonlurker-sg* '())
   (set! (-> this root-overlay pause-adjust-distance) 1228800.0)
   (set! (-> this fact) (new 'process 'fact-info-enemy this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
   (set! (-> this water-y) (-> this root-overlay trans y))
diff --git a/goal_src/jak1/levels/misty/bonelurker.gc b/goal_src/jak1/levels/misty/bonelurker.gc
index 53cfc9a46c..34c65091b8 100644
--- a/goal_src/jak1/levels/misty/bonelurker.gc
+++ b/goal_src/jak1/levels/misty/bonelurker.gc
@@ -392,7 +392,7 @@ nav-enemy-default-event-handler
   (none))
 
 (defmethod nav-enemy-method-48 ((this bonelurker))
-  (initialize-skeleton this *bonelurker-sg* ())
+  (initialize-skeleton this *bonelurker-sg* '())
   (init-defaults! this *bonelurker-nav-enemy-info*)
   (set! (-> this neck up) (the-as uint 0))
   (set! (-> this neck nose) (the-as uint 1))
diff --git a/goal_src/jak1/levels/misty/misty-conveyor.gc b/goal_src/jak1/levels/misty/misty-conveyor.gc
index 7362d73442..d7e6942779 100644
--- a/goal_src/jak1/levels/misty/misty-conveyor.gc
+++ b/goal_src/jak1/levels/misty/misty-conveyor.gc
@@ -309,7 +309,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> self root) s4-0))
   (set! (-> self root trans quad) (-> arg0 root trans quad))
-  (initialize-skeleton self *keg-sg* ())
+  (initialize-skeleton self *keg-sg* '())
   (set! (-> self draw shadow-ctrl) (new 'process 'shadow-control 0.0 0.0 614400.0 (the-as float 60) 245760.0))
   (let ((v1-25 (-> self draw shadow-ctrl))) (logior! (-> v1-25 settings flags) (shadow-flags disable-draw)))
   0
@@ -404,7 +404,7 @@
   (set! (-> self root trans quad) (-> arg0 root trans quad))
   (set! (-> self root quat vec quad) (-> arg0 root quat vec quad))
   (set! (-> self root scale quad) (-> arg0 root scale quad))
-  (initialize-skeleton self *keg-conveyor-paddle-sg* ())
+  (initialize-skeleton self *keg-conveyor-paddle-sg* '())
   (setup-params! (-> self sync) (the-as uint 4800) 0.0 0.15 0.15)
   (logclear! (-> self mask) (process-mask actor-pause enemy))
   (set! (-> self object-on-paddle) (the-as (pointer bouncing-float) #f))
@@ -420,7 +420,7 @@
   (logior! (-> this mask) (process-mask enemy death))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *keg-conveyor-sg* ())
+  (initialize-skeleton this *keg-conveyor-sg* '())
   (set! (-> this path) (new 'process 'curve-control this 'path -1000000000.0))
   (logior! (-> this path flags) (path-control-flag display draw-line draw-point draw-text))
   (when (logtest? (-> this path flags) (path-control-flag not-found))
diff --git a/goal_src/jak1/levels/misty/misty-obs.gc b/goal_src/jak1/levels/misty/misty-obs.gc
index be83207ffc..21b7884f19 100644
--- a/goal_src/jak1/levels/misty/misty-obs.gc
+++ b/goal_src/jak1/levels/misty/misty-obs.gc
@@ -980,7 +980,7 @@
           (let ((f30-0 1274.3112)
                 (f28-0 (the float s4-0)))
             ;; og:preserve-this
-            (set! s4-0 (/ -0-guard (the int (* 65536.0 (ja-frame-num 0))) (+ (-> (ja-group) data 0 length) -1)))
+            (set! s4-0 (/-0-guard (the int (* 65536.0 (ja-frame-num 0))) (+ (-> (ja-group) data 0 length) -1)))
             (set! (-> *part-id-table* 943 init-specs 17 initial-valuef)
                   (+ f30-0 (- f28-0 (* (the float (the int (/ (the float s4-0) 8192.0))) 8192.0)))))
           (spawn gp-0 s5-0))
@@ -991,7 +991,7 @@
   (logior! (-> this mask) (process-mask ambient))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *boatpaddle-sg* ())
+  (initialize-skeleton this *boatpaddle-sg* '())
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 196) this))
   (go boatpaddle-idle)
@@ -1030,7 +1030,7 @@
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this spawn-particle-enable) (= (res-lump-value arg0 'particle-select uint128) 1))
   (if (-> this spawn-particle-enable) (set! (-> this part) (create-launch-control (-> *part-group-id-table* 191) this)))
-  (initialize-skeleton this *windturbine-sg* ())
+  (initialize-skeleton this *windturbine-sg* '())
   (go windturbine-idle)
   (none))
 
@@ -1172,7 +1172,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *mis-bone-bridge-sg* ())
+  (initialize-skeleton this *mis-bone-bridge-sg* '())
   (let ((v1-40 (res-lump-value arg0 'animation-select uint128)))
     (cond
       ((= (the-as uint v1-40) 1)
@@ -1305,19 +1305,19 @@
 
 (defmethod init-from-entity! ((this breakaway-right) (arg0 entity-actor))
   (init! this arg0 3)
-  (initialize-skeleton this *breakaway-right-sg* ())
+  (initialize-skeleton this *breakaway-right-sg* '())
   (go-idle this)
   (none))
 
 (defmethod init-from-entity! ((this breakaway-mid) (arg0 entity-actor))
   (init! this arg0 3)
-  (initialize-skeleton this *breakaway-mid-sg* ())
+  (initialize-skeleton this *breakaway-mid-sg* '())
   (go-idle this)
   (none))
 
 (defmethod init-from-entity! ((this breakaway-left) (arg0 entity-actor))
   (init! this arg0 3)
-  (initialize-skeleton this *breakaway-left-sg* ())
+  (initialize-skeleton this *breakaway-left-sg* '())
   (go-idle this)
   (none))
 
@@ -1430,7 +1430,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this bone-platform))
-  (initialize-skeleton this *mis-bone-platform-sg* ())
+  (initialize-skeleton this *mis-bone-platform-sg* '())
   (rigid-body-platform-method-29 this *bone-platform-constants*)
   (set! (-> this float-height-offset) -4096.0)
   (if (name= (-> this name) "bone-platform-5") (set-vector! (-> this root-overlay scale) 0.8 1.0 0.8 1.0))
@@ -1462,10 +1462,10 @@
         (let* ((gp-1 (ppointer->handle (process-spawn pov-camera
                                                       (-> gp-0 extra trans)
                                                       *mistycam-sg*
-                                                      (new 'static 'spool-anim :name "mistycam-cannon" :index 5 :parts 1 :command-list ())
+                                                      (new 'static 'spool-anim :name "mistycam-cannon" :index 5 :parts 1 :command-list '())
                                                       0
                                                       #f
-                                                      ()
+                                                      '()
                                                       :to
                                                       pp)))
                (s5-2 (ppointer->handle (process-spawn fuel-cell :init fuel-cell-init-as-clone gp-1 (-> pp entity extra perm task) :to pp))))
@@ -1483,7 +1483,7 @@
   :virtual #t
   :code
     (behavior ()
-      (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *mistycam-sg* "lurkerattack" 0 #f () :to self))))
+      (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *mistycam-sg* "lurkerattack" 0 #f '() :to self))))
         (while (handle->process (the-as handle gp-1))
           (suspend)))
       (go-virtual battlecontroller-active)))
@@ -1553,7 +1553,7 @@
       (process-drawable-birth-fuel-cell (the-as entity #f) (the-as vector #f) #f)
       (when (and *target* (-> self play-cutscene?))
         (ambient-hint-spawn "gamcam02" (the-as vector #f) *entity-pool* 'camera)
-        (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *mistycam-sg* "mistycam-balloon-fuel-cell" 0 #f () :to self))))
+        (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *mistycam-sg* "mistycam-balloon-fuel-cell" 0 #f '() :to self))))
           (while (handle->process (the-as handle gp-1))
             (suspend))))
       (while (-> self child)
diff --git a/goal_src/jak1/levels/misty/misty-teetertotter.gc b/goal_src/jak1/levels/misty/misty-teetertotter.gc
index bac1784702..c0b8b88676 100644
--- a/goal_src/jak1/levels/misty/misty-teetertotter.gc
+++ b/goal_src/jak1/levels/misty/misty-teetertotter.gc
@@ -155,7 +155,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *teetertotter-sg* ())
+  (initialize-skeleton this *teetertotter-sg* '())
   (set! (-> this launched-player) #f)
   (set! (-> this in-launch-window) #f)
   (set! (-> this rock-is-dangerous) #f)
diff --git a/goal_src/jak1/levels/misty/misty-warehouse.gc b/goal_src/jak1/levels/misty/misty-warehouse.gc
index e0d4f4e917..f74d04fab3 100644
--- a/goal_src/jak1/levels/misty/misty-warehouse.gc
+++ b/goal_src/jak1/levels/misty/misty-warehouse.gc
@@ -110,7 +110,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *silostep-sg* ())
+  (initialize-skeleton this *silostep-sg* '())
   (set! (-> this anim-limit)
         (* (res-lump-float arg0 'distance :default 1.0)
            (the float (+ (-> (the-as art-joint-anim (-> this draw art-group data 2)) data 0 length) -1))))
@@ -146,7 +146,7 @@
   (none))
 
 (defmethod eco-door-method-25 ((this rounddoor))
-  (initialize-skeleton this *rounddoor-sg* ())
+  (initialize-skeleton this *rounddoor-sg* '())
   (set! (-> this open-distance) 69632.0)
   (set! (-> this close-distance) 81920.0)
   (set! (-> this open-sound) (static-sound-name "arenadoor-open"))
diff --git a/goal_src/jak1/levels/misty/mistycannon.gc b/goal_src/jak1/levels/misty/mistycannon.gc
index 0aab19ec95..389ad27226 100644
--- a/goal_src/jak1/levels/misty/mistycannon.gc
+++ b/goal_src/jak1/levels/misty/mistycannon.gc
@@ -779,7 +779,7 @@
   (quaternion-axis-angle! (-> self root quat) 0.0 1.0 0.0 (-> arg0 rotate))
   (let ((f0-13 (/ 655360.0 (the float (the int (* 300.0 (-> arg0 flight-time)))))))
     (quaternion-axis-angle! (-> self tumble-quat) 1.0 0.0 0.0 f0-13))
-  (initialize-skeleton self *mistycannon-missile-sg* ())
+  (initialize-skeleton self *mistycannon-missile-sg* '())
   (set! (-> self root transv quad) (-> arg0 vel quad))
   (set! (-> self blast-radius) (-> arg0 blast-radius))
   (set! (-> self water-height) (res-lump-float (-> self entity) 'water-height :default -4096000.0))
@@ -1112,7 +1112,7 @@
           (set! (-> self player-touching-grips?) #f)
           (hide-hud)
           (level-hint-surpress!)
-          (kill-current-level-hint () '(sidekick voicebox) 'exit)
+          (kill-current-level-hint '() '(sidekick voicebox) 'exit)
           (when (and (hud-hidden?) (can-grab-display? self))
             (let ((gp-0 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
               (let ((v1-15 gp-0)) (set! (-> v1-15 width) (the float 440)))
@@ -1264,7 +1264,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (quaternion-identity! (-> this root quat))
-  (initialize-skeleton this *mistycannon-sg* ())
+  (initialize-skeleton this *mistycannon-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (set! (-> this skel prebind-function) mistycannon-prebind-function)
diff --git a/goal_src/jak1/levels/misty/muse.gc b/goal_src/jak1/levels/misty/muse.gc
index 0a5b1b5577..f9a1e3da2c 100644
--- a/goal_src/jak1/levels/misty/muse.gc
+++ b/goal_src/jak1/levels/misty/muse.gc
@@ -293,7 +293,7 @@ nav-enemy-default-event-handler
     (behavior ()
       (nav-enemy-method-51 self)
       (level-hint-surpress!)
-      (kill-current-level-hint () () 'exit)
+      (kill-current-level-hint '() '() 'exit)
       (ja-post)))
 
 (define *muse-nav-enemy-info*
@@ -368,7 +368,7 @@ nav-enemy-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *muse-sg* ())
+  (initialize-skeleton this *muse-sg* '())
   (logclear! (-> this mask) (process-mask actor-pause))
   (init-defaults! this *muse-nav-enemy-info*)
   (set! (-> this max-path-index) (the float (+ (-> this path curve num-cverts) -1)))
diff --git a/goal_src/jak1/levels/misty/quicksandlurker.gc b/goal_src/jak1/levels/misty/quicksandlurker.gc
index e4e398e881..d0fb52dcac 100644
--- a/goal_src/jak1/levels/misty/quicksandlurker.gc
+++ b/goal_src/jak1/levels/misty/quicksandlurker.gc
@@ -720,7 +720,7 @@
   (set! (-> this radial-offset) 4096.0)
   (set! (-> this y-offset) -6553.6)
   (set-yaw-angle-clear-roll-pitch! (-> this root) (rand-vu-float-range 0.0 65536.0))
-  (initialize-skeleton this *quicksandlurker-sg* ())
+  (initialize-skeleton this *quicksandlurker-sg* '())
   (set! (-> this nav) (new 'process 'nav-control (-> this root) 16 40960.0))
   (logior! (-> this nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7))
   (set! (-> this fact) (new 'process 'fact-info-enemy this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
diff --git a/goal_src/jak1/levels/ogre/flying-lurker.gc b/goal_src/jak1/levels/ogre/flying-lurker.gc
index c7eb397a16..baf2d4414f 100644
--- a/goal_src/jak1/levels/ogre/flying-lurker.gc
+++ b/goal_src/jak1/levels/ogre/flying-lurker.gc
@@ -201,7 +201,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *plunger-lurker-sg* ())
+  (initialize-skeleton this *plunger-lurker-sg* '())
   (set! (-> this alt-actor) (entity-actor-lookup arg0 'alt-actor 0))
   (set! (-> this got-hit) #f)
   (quaternion-rotate-y! (-> this root quat) (-> this root quat) -16384.0)
@@ -571,14 +571,14 @@
     (suspend))
   (while (not (process-grab? *target*))
     (suspend))
-  (kill-current-level-hint '(notice) () 'exit)
+  (kill-current-level-hint '(notice) '() 'exit)
   (while (or (-> *setting-control* current talking)
              (-> *setting-control* current spooling)
              (-> *setting-control* current hint)
              (!= (-> *level* loading-level) (-> *level* level-default)))
     (suspend))
   (suspend)
-  (kill-current-level-hint () () 'die)
+  (kill-current-level-hint '() '() 'die)
   (suspend)
   (let ((gp-1 (ppointer->handle (manipy-spawn (-> self entity extra trans) (-> self entity) *ogrecam-sg* #f :to self))))
     (let ((s5-0 (the-as othercam (get-process *default-dead-pool* othercam #x4000))))
@@ -603,7 +603,7 @@
       (let ((t9-13 send-event-function)
             (v1-58 (-> self link next)))
         (t9-13 (if v1-58 (-> v1-58 extra process)) a1-12)))
-    (ja-play-spooled-anim (new 'static 'spool-anim :name "flying-lurker-intro" :index 7 :parts 2 :command-list ())
+    (ja-play-spooled-anim (new 'static 'spool-anim :name "flying-lurker-intro" :index 7 :parts 2 :command-list '())
                           (the-as art-joint-anim #f)
                           (the-as art-joint-anim #f)
                           (the-as (function process-drawable symbol) false-func))
@@ -785,7 +785,7 @@
   (stack-size-set! (-> this main-thread) 512)
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *flying-lurker-sg* ())
+  (initialize-skeleton this *flying-lurker-sg* '())
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this path) (new 'process 'curve-control this 'path -1000000000.0))
   (logior! (-> this path flags) (path-control-flag display draw-line draw-point draw-text))
diff --git a/goal_src/jak1/levels/ogre/ogre-obs.gc b/goal_src/jak1/levels/ogre/ogre-obs.gc
index 19ae178bee..c1ea421a27 100644
--- a/goal_src/jak1/levels/ogre/ogre-obs.gc
+++ b/goal_src/jak1/levels/ogre/ogre-obs.gc
@@ -342,7 +342,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *tntbarrel-sg* ())
+  (initialize-skeleton this *tntbarrel-sg* '())
   (set-vector! (-> this draw color-mult) 1.3 1.3 1.3 1.0)
   (go (method-of-object this idle))
   (none))
@@ -547,28 +547,28 @@
 
 (defmethod rigid-body-platform-method-31 ((this ogre-step-a))
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0)
-  (initialize-skeleton this *ogre-step-a-sg* ())
+  (initialize-skeleton this *ogre-step-a-sg* '())
   (call-parent-method this)
   0
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this ogre-step-b))
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0)
-  (initialize-skeleton this *ogre-step-b-sg* ())
+  (initialize-skeleton this *ogre-step-b-sg* '())
   (call-parent-method this)
   0
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this ogre-step-c))
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 12288.0 0.0 26624.0)
-  (initialize-skeleton this *ogre-step-c-sg* ())
+  (initialize-skeleton this *ogre-step-c-sg* '())
   (call-parent-method this)
   0
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this ogre-step-d))
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 12288.0 0.0 20480.0)
-  (initialize-skeleton this *ogre-step-b-sg* ())
+  (initialize-skeleton this *ogre-step-b-sg* '())
   (call-parent-method this)
   0
   (none))
@@ -620,7 +620,7 @@
 (defmethod rigid-body-platform-method-31 ((this ogre-isle-b))
   (+! (-> this root-overlay trans x) -8192.0)
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0)
-  (initialize-skeleton this *ogre-isle-b-sg* ())
+  (initialize-skeleton this *ogre-isle-b-sg* '())
   (call-parent-method this)
   0
   (none))
@@ -628,7 +628,7 @@
 (defmethod rigid-body-platform-method-31 ((this ogre-isle-c))
   (+! (-> this root-overlay trans x) -8192.0)
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 8192.0 0.0 24576.0)
-  (initialize-skeleton this *ogre-isle-b-sg* ())
+  (initialize-skeleton this *ogre-isle-b-sg* '())
   (call-parent-method this)
   0
   (none))
@@ -637,7 +637,7 @@
   (+! (-> this root-overlay trans x) -8192.0)
   (+! (-> this root-overlay trans z) -8192.0)
   (set-vector! (-> this root-overlay root-prim local-sphere) 0.0 8192.0 0.0 22528.0)
-  (initialize-skeleton this *ogre-isle-d-sg* ())
+  (initialize-skeleton this *ogre-isle-d-sg* '())
   (call-parent-method this)
   0
   (none))
@@ -898,7 +898,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *ogre-bridge-sg* ())
+  (initialize-skeleton this *ogre-bridge-sg* '())
   (logior! (-> this skel effect flags) 1)
   (dotimes (s5-1 8)
     (let ((v1-185 (new 'process 'joint-mod-set-local this (the-as int (-> *ogre-bridge-joint-array* s5-1)) #f #f #f)))
@@ -944,7 +944,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ogre-bridgeend-sg* ())
+  (initialize-skeleton this *ogre-bridgeend-sg* '())
   (go ogre-bridgeend-idle)
   (none))
 
@@ -1156,7 +1156,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *shortcut-boulder-whole-sg* ())
+  (initialize-skeleton this *shortcut-boulder-whole-sg* '())
   (setup-lods! (-> this broken-look) *shortcut-boulder-broken-sg* (-> this draw art-group) (-> this entity))
   (set-vector! (-> this draw color-emissive) 0.125 0.0625 0.0 0.0)
   (go shortcut-boulder-idle)
diff --git a/goal_src/jak1/levels/ogre/ogreboss.gc b/goal_src/jak1/levels/ogre/ogreboss.gc
index 17b713b6f1..253dbe4fc9 100644
--- a/goal_src/jak1/levels/ogre/ogreboss.gc
+++ b/goal_src/jak1/levels/ogre/ogreboss.gc
@@ -299,7 +299,7 @@
   (set! (-> self dest-pos quad) (-> arg0 dest quad))
   (set! (-> self root quat vec quad) (-> self parent-override 0 root quat vec quad))
   (vector-identity! (-> self root scale))
-  (initialize-skeleton self *ogreboss-shoot-boulder-sg* ())
+  (initialize-skeleton self *ogreboss-shoot-boulder-sg* '())
   (logior! (-> self mask) (process-mask enemy projectile))
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self draw shadow-ctrl) *ogreboss-missile-shadow-control*)
@@ -570,7 +570,7 @@
   (set! (-> self root trans quad) (-> self parent-override 0 root trans quad))
   (set! (-> self root quat vec quad) (-> self parent-override 0 root quat vec quad))
   (vector-identity! (-> self root scale))
-  (initialize-skeleton self *ogreboss-super-boulder-sg* ())
+  (initialize-skeleton self *ogreboss-super-boulder-sg* '())
   ;; og:preserve-this PAL patch here
   (logclear! (-> self mask) (process-mask actor-pause enemy))
   (set! (-> self lava) (entity-actor-lookup (-> self entity) 'water-actor 0))
@@ -678,7 +678,7 @@
                   ((= arg0 2) 20480.0)
                   (else 0.0))))
   (vector-x-quaternion! (-> self side-dir) (-> self root quat))
-  (initialize-skeleton self *ogreboss-bounce-boulder-sg* ())
+  (initialize-skeleton self *ogreboss-bounce-boulder-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self draw origin-joint-index) (the-as uint 3))
   (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0)
@@ -1453,7 +1453,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *ogreboss-sg* ())
+  (initialize-skeleton this *ogreboss-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 5))
   (ogreboss-get-targets)
   (set! (-> this try-count) (-> this entity extra perm user-uint8 0))
diff --git a/goal_src/jak1/levels/racer_common/racer.gc b/goal_src/jak1/levels/racer_common/racer.gc
index 2e39cd13a3..8b5d3d5a4b 100644
--- a/goal_src/jak1/levels/racer_common/racer.gc
+++ b/goal_src/jak1/levels/racer_common/racer.gc
@@ -173,7 +173,7 @@
                      (and (not (movie?)) (not (level-hint-displayed?))))
             (hide-hud)
             (level-hint-surpress!)
-            (kill-current-level-hint () '(sidekick voicebox) 'exit)
+            (kill-current-level-hint '() '(sidekick voicebox) 'exit)
             (when (and (hud-hidden?) (can-grab-display? self))
               (let ((gp-0 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
                 (let ((v1-24 gp-0)) (set! (-> v1-24 width) (the float 440)))
@@ -269,7 +269,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (set-yaw-angle-clear-roll-pitch! (-> this root) (res-lump-float arg0 'rotoffset))
-  (initialize-skeleton this *racer-sg* ())
+  (initialize-skeleton this *racer-sg* '())
   (set! (-> this shadow-backup) (-> this draw shadow))
   (set! (-> this draw shadow-ctrl) *racer-shadow-control*)
   (let ((v1-23 (-> this node-list data)))
diff --git a/goal_src/jak1/levels/robocave/spider-egg.gc b/goal_src/jak1/levels/robocave/spider-egg.gc
index 32c551ec5f..9d822860bb 100644
--- a/goal_src/jak1/levels/robocave/spider-egg.gc
+++ b/goal_src/jak1/levels/robocave/spider-egg.gc
@@ -171,7 +171,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *spider-egg-unbroken-sg* ())
+  (initialize-skeleton this *spider-egg-unbroken-sg* '())
   (setup-lods! (-> this broken-look) *spider-egg-broken-sg* (-> this draw art-group) (-> this entity))
   (set-vector! (-> this root scale) 0.4 0.4 0.4 1.0)
   (if (not (move-to-ground (-> this root) 12288.0 40960.0 #t (collide-kind background)))
diff --git a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
index 022f4fecf2..7136b27c83 100644
--- a/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
+++ b/goal_src/jak1/levels/rolling/rolling-lightning-mole.gc
@@ -710,7 +710,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lightning-mole-sg* ())
+  (initialize-skeleton this *lightning-mole-sg* '())
   (init-defaults! this *lightning-mole-nav-enemy-info*)
   (logclear! (-> this nav flags) (nav-control-flags navcf5 navcf6 navcf7))
   (set! (-> this draw origin-joint-index) (the-as uint 3))
@@ -983,7 +983,7 @@
 (defmethod init-from-entity! ((this peeper) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *lightning-mole-sg* ())
+  (initialize-skeleton this *lightning-mole-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 456) this))
   (set! (-> this sound) (new 'process 'ambient-sound arg0 (-> this root trans)))
   (go peeper-up)
diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc
index 4b04487690..c49f71363e 100644
--- a/goal_src/jak1/levels/rolling/rolling-obs.gc
+++ b/goal_src/jak1/levels/rolling/rolling-obs.gc
@@ -91,7 +91,7 @@
 (defmethod init-from-entity! ((this pusher) (arg0 entity-actor))
   (pusher-base-init)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *pusher-sg* ())
+  (initialize-skeleton this *pusher-sg* '())
   (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.15 0.15)
   (set! (-> this max-frame) (res-lump-float arg0 'max-frame :default (the float (ja-num-frames 0))))
   (set! (-> this cyl origin quad) (-> this root trans quad))
@@ -116,7 +116,7 @@
 (defmethod init-from-entity! ((this gorge-pusher) (arg0 entity-actor))
   (pusher-base-init)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *pusher-sg* ())
+  (initialize-skeleton this *pusher-sg* '())
   (set! (-> this max-frame) (res-lump-float arg0 'max-frame :default 1.0))
   (set! (-> this max-frame) (* (-> this max-frame) (the float (ja-num-frames 0))))
   (set! (-> this min-frame) (res-lump-float arg0 'min-frame))
@@ -325,7 +325,7 @@
 (defmethod init-from-entity! ((this dark-plant) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *dark-plant-sg* ())
+  (initialize-skeleton this *dark-plant-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 455) this))
   (set! (-> this num-alts) (min 4 (entity-actor-count (-> this entity) 'alt-actor)))
   (dotimes (s5-3 (-> this num-alts))
@@ -442,7 +442,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *happy-plant-sg* ())
+  (initialize-skeleton this *happy-plant-sg* '())
   (set! (-> this alt-actor) (entity-actor-lookup (-> this entity) 'alt-actor 0))
   (case (get-task-status (game-task rolling-plants))
     (((task-status invalid))
@@ -575,7 +575,7 @@
 (defbehavior rolling-start-init-by-other rolling-start ((arg0 vector) (arg1 float))
   (set! (-> self root) (new 'process 'trsqv))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *rolling-start-whole-sg* ())
+  (initialize-skeleton self *rolling-start-whole-sg* '())
   (setup-lods! (-> self whole-look) *rolling-start-whole-sg* (-> self draw art-group) (-> self entity))
   (setup-lods! (-> self broken-look) *rolling-start-broken-sg* (-> self draw art-group) (-> self entity))
   (let ((s5-1 (new 'stack-no-clear 'matrix))) (matrix-rotate-y! s5-1 arg1) (matrix->quaternion (-> self root quat) s5-1))
diff --git a/goal_src/jak1/levels/rolling/rolling-race-ring.gc b/goal_src/jak1/levels/rolling/rolling-race-ring.gc
index ad6534713a..4965c01e61 100644
--- a/goal_src/jak1/levels/rolling/rolling-race-ring.gc
+++ b/goal_src/jak1/levels/rolling/rolling-race-ring.gc
@@ -686,11 +686,11 @@
                    (logclear! (-> self draw status) (draw-status hidden))
                    (logior! (-> self draw status) (draw-status skip-bones))
                    (if (= (-> self entity extra perm task) (game-task rolling-ring-chase-2))
-                     (ja-play-spooled-anim (new 'static 'spool-anim :name "race-ring-second-anim" :index 4 :parts 2 :command-list ())
+                     (ja-play-spooled-anim (new 'static 'spool-anim :name "race-ring-second-anim" :index 4 :parts 2 :command-list '())
                                            (the-as art-joint-anim #f)
                                            (the-as art-joint-anim #f)
                                            (the-as (function process-drawable symbol) false-func))
-                     (ja-play-spooled-anim (new 'static 'spool-anim :name "race-ring-anim" :index 3 :parts 2 :command-list ())
+                     (ja-play-spooled-anim (new 'static 'spool-anim :name "race-ring-anim" :index 3 :parts 2 :command-list '())
                                            (the-as art-joint-anim #f)
                                            (the-as art-joint-anim #f)
                                            (the-as (function process-drawable symbol) false-func)))
@@ -739,7 +739,7 @@
   (let ((a0-1 arg0)) (if (not (entity-actor-lookup a0-1 'next-actor 0)) (stack-size-set! (-> this main-thread) 512)))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *race-ring-sg* ())
+  (initialize-skeleton this *race-ring-sg* '())
   (set! (-> this root pause-adjust-distance) 122880.0)
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this part-track) (the-as handle #f))
diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc
index a2c3a4ddc1..29d55cbd78 100644
--- a/goal_src/jak1/levels/rolling/rolling-robber.gc
+++ b/goal_src/jak1/levels/rolling/rolling-robber.gc
@@ -469,7 +469,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *robber-sg* ())
+  (initialize-skeleton this *robber-sg* '())
   (set! (-> this root pause-adjust-distance) 122880.0)
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this path) (new 'process 'curve-control this 'path -1000000000.0))
diff --git a/goal_src/jak1/levels/snow/ice-cube.gc b/goal_src/jak1/levels/snow/ice-cube.gc
index d27703d0ad..6674ba96d2 100644
--- a/goal_src/jak1/levels/snow/ice-cube.gc
+++ b/goal_src/jak1/levels/snow/ice-cube.gc
@@ -483,7 +483,7 @@
 
 (defmethod nav-enemy-method-48 ((this ice-cube))
   (process-drawable-from-entity! this (-> this entity))
-  (initialize-skeleton this *ice-cube-sg* ())
+  (initialize-skeleton this *ice-cube-sg* '())
   (init-defaults! this *ice-cube-nav-enemy-info*)
   (set! (-> this neck up) (the-as uint 0))
   (set! (-> this neck nose) (the-as uint 1))
diff --git a/goal_src/jak1/levels/snow/snow-ball.gc b/goal_src/jak1/levels/snow/snow-ball.gc
index c5c3622169..9567f9e0a3 100644
--- a/goal_src/jak1/levels/snow/snow-ball.gc
+++ b/goal_src/jak1/levels/snow/snow-ball.gc
@@ -109,7 +109,7 @@
   (set! (-> self root trans quad) (-> (the-as process-drawable (-> self parent 0)) root trans quad))
   (quaternion-identity! (-> self root quat))
   (vector-identity! (-> self root scale))
-  (initialize-skeleton self *snow-ball-shadow-sg* ())
+  (initialize-skeleton self *snow-ball-shadow-sg* '())
   (ja-channel-set! 1)
   (ja :group! snow-ball-shadow-idle-ja :num! min)
   (set! (-> self draw shadow-ctrl) *snow-ball-shadow-control*)
@@ -290,7 +290,7 @@
     (set! (-> self root) s4-1))
   (set-vector! (-> self root transv) 0.0 0.0 0.0 1.0)
   (process-drawable-from-entity! self arg0)
-  (initialize-skeleton self *snow-ball-sg* ())
+  (initialize-skeleton self *snow-ball-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self path) (new 'process 'curve-control self 'path (the float (+ arg3 1))))
   (logior! (-> self path flags) (path-control-flag display draw-line draw-point draw-text))
diff --git a/goal_src/jak1/levels/snow/snow-bumper.gc b/goal_src/jak1/levels/snow/snow-bumper.gc
index 8657dc0e6e..04803494f7 100644
--- a/goal_src/jak1/levels/snow/snow-bumper.gc
+++ b/goal_src/jak1/levels/snow/snow-bumper.gc
@@ -270,7 +270,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-bumper-sg* ())
+  (initialize-skeleton this *snow-bumper-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 519) this))
   (set! (-> this part2) (create-launch-control (-> *part-group-id-table* 520) this))
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
diff --git a/goal_src/jak1/levels/snow/snow-bunny.gc b/goal_src/jak1/levels/snow/snow-bunny.gc
index 20e77f61d9..9f94542327 100644
--- a/goal_src/jak1/levels/snow/snow-bunny.gc
+++ b/goal_src/jak1/levels/snow/snow-bunny.gc
@@ -163,7 +163,7 @@
   (none))
 
 (defmethod nav-enemy-method-60 ((this snow-bunny))
-  (initialize-skeleton this *snow-bunny-sg* ())
+  (initialize-skeleton this *snow-bunny-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (none))
 
diff --git a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
index c21082ced7..bbf9728dca 100644
--- a/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
+++ b/goal_src/jak1/levels/snow/snow-flutflut-obs.gc
@@ -337,7 +337,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (set! (-> this link) (new 'process 'actor-link-info this))
-  (initialize-skeleton this *snow-button-sg* ())
+  (initialize-skeleton this *snow-button-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this timeout) (the-as time-frame (the int (* 300.0 (res-lump-float arg0 'timeout :default 10.0)))))
   (set! (-> this delay-til-wiggle) (+ (-> this timeout) (seconds -0.4)))
diff --git a/goal_src/jak1/levels/snow/snow-obs.gc b/goal_src/jak1/levels/snow/snow-obs.gc
index a8fab872fc..a2e888d48e 100644
--- a/goal_src/jak1/levels/snow/snow-obs.gc
+++ b/goal_src/jak1/levels/snow/snow-obs.gc
@@ -343,7 +343,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-eggtop-sg* ())
+  (initialize-skeleton this *snow-eggtop-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this spawn-trans quad) (-> this root trans quad))
   (+! (-> this root trans y) -2662.4)
@@ -439,7 +439,7 @@
       (backup-collide-with-as s3-1)
       (set! (-> this root) s3-1)))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snowpusher-sg* ())
+  (initialize-skeleton this *snowpusher-sg* '())
   (let ((s4-2 (-> this skel root-channel 0)))
     (joint-control-channel-group-eval! s4-2 (the-as art-joint-anim (-> this draw art-group data 2)) num-func-identity)
     (set! (-> s4-2 frame-num) 0.0))
@@ -510,7 +510,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-spatula-sg* ())
+  (initialize-skeleton this *snow-spatula-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.15 0.15)
   (quaternion->matrix (-> this startmat) (-> this root quat))
@@ -791,7 +791,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-fort-gate-sg* ())
+  (initialize-skeleton this *snow-fort-gate-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 512) this))
   (set! (-> this part2) (create-launch-control (-> *part-group-id-table* 513) this))
   (set! (-> this part3) (create-launch-control (-> *part-group-id-table* 514) this))
@@ -969,7 +969,7 @@
 (defmethod init-from-entity! ((this snow-gears) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-gears-sg* ())
+  (initialize-skeleton this *snow-gears-sg* '())
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 515) this))
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "snow-engine" :fo-max 300) (-> this root trans)))
   (go snow-gears-idle)
@@ -1039,7 +1039,7 @@
                                                     "gearstart"
                                                     0
                                                     self
-                                                    ())
+                                                    '())
                                 (-> gp-1 ppointer))
                               0))
                   seq)
@@ -1091,7 +1091,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-switch-sg* ())
+  (initialize-skeleton this *snow-switch-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-push! 1 0)
   (let ((s5-1 (-> this skel root-channel 0)))
@@ -1241,7 +1241,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-log-sg* ())
+  (initialize-skeleton this *snow-log-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (logior! (-> this draw status) (draw-status hidden))
   (+! (-> this root trans x) -1024.0)
@@ -1342,7 +1342,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *snow-switch-sg* ())
+  (initialize-skeleton this *snow-switch-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-push! 1 0)
   (let ((s4-1 (-> this skel root-channel 0)))
diff --git a/goal_src/jak1/levels/snow/snow-ram-boss.gc b/goal_src/jak1/levels/snow/snow-ram-boss.gc
index 7ec25a86fb..90da5a93da 100644
--- a/goal_src/jak1/levels/snow/snow-ram-boss.gc
+++ b/goal_src/jak1/levels/snow/snow-ram-boss.gc
@@ -886,7 +886,7 @@
   (the-as symbol 0))
 
 (defmethod nav-enemy-method-48 ((this ram-boss))
-  (initialize-skeleton this *ram-boss-sg* ())
+  (initialize-skeleton this *ram-boss-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (init-defaults! this *ram-boss-nav-enemy-info*)
   (logclear! (-> this enemy-info options) (fact-options has-power-cell))
diff --git a/goal_src/jak1/levels/snow/snow-ram.gc b/goal_src/jak1/levels/snow/snow-ram.gc
index 0002a1b697..e1c8e2ce73 100644
--- a/goal_src/jak1/levels/snow/snow-ram.gc
+++ b/goal_src/jak1/levels/snow/snow-ram.gc
@@ -249,7 +249,7 @@
                                     (-> self give-fuel-cell-anim)
                                     0
                                     self
-                                    ()
+                                    '()
                                     :to
                                     self)))
           (set! (-> (the-as (pointer snowcam) v1-14) 0 seq) (the-as uint 1)))
@@ -309,7 +309,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ram-sg* ())
+  (initialize-skeleton this *ram-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-post)
   (update-transforms! (-> this root))
@@ -321,15 +321,15 @@
   (case (-> this ram-id)
     ((1)
      (set! (-> this give-fuel-cell-anim)
-           (new 'static 'spool-anim :name "snowcam-ram-boss-in-cave-fuel-cell" :index 7 :parts 1 :command-list ()))
+           (new 'static 'spool-anim :name "snowcam-ram-boss-in-cave-fuel-cell" :index 7 :parts 1 :command-list '()))
      (set-vector! (-> this fuel-cell-dest-pos) 3137396.8 803676.2 -13560558.0 1.0))
     ((2)
      (set! (-> this give-fuel-cell-anim)
-           (new 'static 'spool-anim :name "snowcam-ram-boss-ice-pond-fuel-cell" :index 8 :parts 1 :command-list ()))
+           (new 'static 'spool-anim :name "snowcam-ram-boss-ice-pond-fuel-cell" :index 8 :parts 1 :command-list '()))
      (set-vector! (-> this fuel-cell-dest-pos) 2790289.5 1058152.5 -13639766.0 1.0))
     ((3)
      (set! (-> this give-fuel-cell-anim)
-           (new 'static 'spool-anim :name "snowcam-ram-boss-snow-ball-fuel-cell" :index 9 :parts 1 :command-list ()))
+           (new 'static 'spool-anim :name "snowcam-ram-boss-snow-ball-fuel-cell" :index 9 :parts 1 :command-list '()))
      (set-vector! (-> this fuel-cell-dest-pos) 4208423.0 1037348.9 -13591491.0 1.0))
     (else (set! (-> this give-fuel-cell-anim) #f)))
   (let ((s4-1 #f))
diff --git a/goal_src/jak1/levels/snow/yeti.gc b/goal_src/jak1/levels/snow/yeti.gc
index b01b764af9..da92a238b0 100644
--- a/goal_src/jak1/levels/snow/yeti.gc
+++ b/goal_src/jak1/levels/snow/yeti.gc
@@ -425,7 +425,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this yeti-slave))
-  (initialize-skeleton this *yeti-sg* ())
+  (initialize-skeleton this *yeti-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (init-defaults! this *yeti-nav-enemy-info*)
   (set! (-> this neck up) (the-as uint 0))
diff --git a/goal_src/jak1/levels/sunken/bully.gc b/goal_src/jak1/levels/sunken/bully.gc
index 3fd7490992..8c92b678eb 100644
--- a/goal_src/jak1/levels/sunken/bully.gc
+++ b/goal_src/jak1/levels/sunken/bully.gc
@@ -218,7 +218,7 @@
   (set! (-> self root trans quad) (-> self parent-override 0 root trans quad))
   (quaternion-copy! (-> self root quat) (-> self parent-override 0 root quat))
   (set! (-> self root scale quad) (-> self parent-override 0 root scale quad))
-  (initialize-skeleton self *bully-broken-cage-sg* ())
+  (initialize-skeleton self *bully-broken-cage-sg* '())
   (go bully-broken-cage-explode)
   (none))
 
@@ -605,7 +605,7 @@
   (set! (-> this root event-self) 'touched)
   (set! (-> this root event-other) 'touch)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *bully-sg* ())
+  (initialize-skeleton this *bully-sg* '())
   (set! (-> this draw shadow-ctrl) *bully-shadow-control*)
   (set! (-> this nav) (new 'process 'nav-control (-> this root) 16 40960.0))
   (logior! (-> this nav flags) (nav-control-flags display-marks navcf3 navcf5 navcf6 navcf7))
diff --git a/goal_src/jak1/levels/sunken/double-lurker.gc b/goal_src/jak1/levels/sunken/double-lurker.gc
index bc640065cd..b289622c52 100644
--- a/goal_src/jak1/levels/sunken/double-lurker.gc
+++ b/goal_src/jak1/levels/sunken/double-lurker.gc
@@ -383,7 +383,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this double-lurker-top))
-  (initialize-skeleton this *double-lurker-top-sg* ())
+  (initialize-skeleton this *double-lurker-top-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (init-defaults! this *double-lurker-top-nav-enemy-info*)
   (let ((v1-5 (-> this parent-process)))
@@ -795,7 +795,7 @@
   (set! (-> this buddy-handle) (the-as handle #f))
   (process-drawable-from-entity! this (-> this entity))
   (set! (-> this align) (new 'process 'align-control this))
-  (initialize-skeleton this *double-lurker-sg* ())
+  (initialize-skeleton this *double-lurker-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (set! (-> this buddy-on-shoulders?) #t)
   (set! (-> this dead?) #f)
diff --git a/goal_src/jak1/levels/sunken/floating-launcher.gc b/goal_src/jak1/levels/sunken/floating-launcher.gc
index 6d008c8946..ce2c6ce32b 100644
--- a/goal_src/jak1/levels/sunken/floating-launcher.gc
+++ b/goal_src/jak1/levels/sunken/floating-launcher.gc
@@ -93,7 +93,7 @@
   (eval-path-curve-div! (-> this path) (-> this root trans) 1.0 'interp)
   (let ((f30-0 (res-lump-float arg0 'spring-height :default 163840.0)))
     (set! (-> this launcher) (process-spawn launcher (-> this root trans) f30-0 0 81920.0 :to this)))
-  (initialize-skeleton this *floating-launcher-sg* ())
+  (initialize-skeleton this *floating-launcher-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (baseplat-method-21 this)
diff --git a/goal_src/jak1/levels/sunken/helix-water.gc b/goal_src/jak1/levels/sunken/helix-water.gc
index 9150bb26c0..a4825e54a5 100644
--- a/goal_src/jak1/levels/sunken/helix-water.gc
+++ b/goal_src/jak1/levels/sunken/helix-water.gc
@@ -138,7 +138,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *helix-slide-door-sg* ())
+  (initialize-skeleton this *helix-slide-door-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (let ((s5-1 (-> this skel root-channel 0)))
@@ -199,7 +199,7 @@
                                   "qbert-show-door-open"
                                   0
                                   #f
-                                  ()
+                                  '()
                                   :to
                                   self)))
         (set! (-> (the-as (pointer sunkencam) v1-11) 0 seq) (the-as uint 2)))
@@ -348,7 +348,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *helix-button-sg* ())
+  (initialize-skeleton this *helix-button-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (let ((s5-1 (-> this skel root-channel 0)))
diff --git a/goal_src/jak1/levels/sunken/orbit-plat.gc b/goal_src/jak1/levels/sunken/orbit-plat.gc
index 3fac572068..188ddc63b4 100644
--- a/goal_src/jak1/levels/sunken/orbit-plat.gc
+++ b/goal_src/jak1/levels/sunken/orbit-plat.gc
@@ -198,7 +198,7 @@
   (+! (-> self root trans y) -5324.8)
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 440) self))
   (set! (-> self part2) (create-launch-control (-> *part-group-id-table* 107) self))
-  (initialize-skeleton self *orbit-plat-bottom-sg* ())
+  (initialize-skeleton self *orbit-plat-bottom-sg* '())
   (ja-channel-set! 1)
   (ja :group! orbit-plat-bottom-idle-ja :num! min)
   (go orbit-plat-bottom-idle)
@@ -501,7 +501,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *orbit-plat-sg* ())
+  (initialize-skeleton this *orbit-plat-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (let ((s4-1 (-> this skel root-channel 0)))
diff --git a/goal_src/jak1/levels/sunken/puffer.gc b/goal_src/jak1/levels/sunken/puffer.gc
index 377754bc8e..f12cdf02d4 100644
--- a/goal_src/jak1/levels/sunken/puffer.gc
+++ b/goal_src/jak1/levels/sunken/puffer.gc
@@ -667,7 +667,7 @@
   (set! (-> this travel-turn-speed) 16384.0)
   (puffer-method-21 this)
   (process-drawable-from-entity! this (-> this entity))
-  (initialize-skeleton this *puffer-sg* ())
+  (initialize-skeleton this *puffer-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (logclear! (-> this mask) (process-mask actor-pause))
   (logior! (-> this mask) (process-mask enemy))
diff --git a/goal_src/jak1/levels/sunken/qbert-plat.gc b/goal_src/jak1/levels/sunken/qbert-plat.gc
index 1ee2b2c621..2a977b01fd 100644
--- a/goal_src/jak1/levels/sunken/qbert-plat.gc
+++ b/goal_src/jak1/levels/sunken/qbert-plat.gc
@@ -105,7 +105,7 @@
 (defstate qbert-plat-on-die (qbert-plat)
   :code
     (behavior ()
-      ()))
+      '()))
 
 (defbehavior qbert-plat-on-init-by-other qbert-plat ((arg0 entity-actor) (arg1 qbert-plat))
   (set! (-> self entity) arg0)
@@ -114,7 +114,7 @@
   (set! (-> self root-overlay trans quad) (-> arg1 root-overlay trans quad))
   (quaternion-copy! (-> self root-overlay quat) (-> arg1 root-overlay quat))
   (set! (-> self root-overlay scale quad) (-> arg1 root-overlay scale quad))
-  (initialize-skeleton self *qbert-plat-on-sg* ())
+  (initialize-skeleton self *qbert-plat-on-sg* '())
   (logior! (-> self skel status) (janim-status inited))
   (ja-channel-set! 1)
   (ja :group! qbert-plat-idle-ja :num! min)
@@ -218,7 +218,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this qbert-plat))
-  (initialize-skeleton this *qbert-plat-sg* ())
+  (initialize-skeleton this *qbert-plat-sg* '())
   (set! (-> this anchor-point quad) (-> this root-overlay trans quad))
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root-overlay))
@@ -385,12 +385,12 @@
       (cond
         (arg0
          (ambient-hint-spawn "gamcam08" (the-as vector #f) *entity-pool* 'camera)
-         (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "qbert-show-door-open" 0 #f () :to self)
+         (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "qbert-show-door-open" 0 #f '() :to self)
          (until (time-elapsed? (-> self state-time) (seconds 1.4))
            (suspend)))
         (else
          (ambient-hint-spawn "gamcam07" (the-as vector #f) *entity-pool* 'camera)
-         (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "qbert-show-door-close" 0 #f () :to self)
+         (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "qbert-show-door-close" 0 #f '() :to self)
          (until (time-elapsed? (-> self state-time) (seconds 1))
            (suspend))))
       (cond
diff --git a/goal_src/jak1/levels/sunken/shover.gc b/goal_src/jak1/levels/sunken/shover.gc
index 6eadc4ca5f..b277618213 100644
--- a/goal_src/jak1/levels/sunken/shover.gc
+++ b/goal_src/jak1/levels/sunken/shover.gc
@@ -71,7 +71,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *shover-sg* ())
+  (initialize-skeleton this *shover-sg* '())
   (let ((v1-17 (new 'process 'path-control this 'path 0.0)))
     (set! (-> this path) v1-17)
     (logior! (-> v1-17 flags) (path-control-flag display draw-line draw-point draw-text))
diff --git a/goal_src/jak1/levels/sunken/square-platform.gc b/goal_src/jak1/levels/sunken/square-platform.gc
index b959b515f3..24033610fb 100644
--- a/goal_src/jak1/levels/sunken/square-platform.gc
+++ b/goal_src/jak1/levels/sunken/square-platform.gc
@@ -316,7 +316,7 @@
   (process-drawable-from-entity! this arg0)
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this plat-id) (actor-count-before (-> this link)))
-  (initialize-skeleton this *square-platform-sg* ())
+  (initialize-skeleton this *square-platform-sg* '())
   (baseplat-method-21 this)
   (ja-channel-set! 1)
   (let ((s4-1 (-> this skel root-channel 0)))
@@ -380,7 +380,7 @@
                                         "qbert-show-door-open"
                                         0
                                         #f
-                                        ()
+                                        '()
                                         :to
                                         self)))
                (set! (-> (the-as sunkencam (-> a0-4 0)) seq) (the-as uint 3))))
@@ -393,7 +393,7 @@
                                          "qbert-show-door-open"
                                          0
                                          #f
-                                         ()
+                                         '()
                                          :to
                                          self)))
                (set! (-> (the-as sunkencam (-> v1-13 0)) seq) (the-as uint 4)))
@@ -407,7 +407,7 @@
                                          "qbert-show-door-open"
                                          0
                                          #f
-                                         ()
+                                         '()
                                          :to
                                          self)))
                (set! (-> (the-as sunkencam (-> a0-17 0)) seq) (the-as uint 5))))
@@ -420,7 +420,7 @@
                                          "qbert-show-door-open"
                                          0
                                          #f
-                                         ()
+                                         '()
                                          :to
                                          self)))
                (set! (-> (the-as sunkencam (-> v1-24 0)) seq) (the-as uint 6)))
diff --git a/goal_src/jak1/levels/sunken/steam-cap.gc b/goal_src/jak1/levels/sunken/steam-cap.gc
index da819c2415..3141a29370 100644
--- a/goal_src/jak1/levels/sunken/steam-cap.gc
+++ b/goal_src/jak1/levels/sunken/steam-cap.gc
@@ -567,7 +567,7 @@
   (set! (-> this do-falling-sound?) #f)
   (set! (-> this do-landing-sound?) #f)
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *steam-cap-sg* ())
+  (initialize-skeleton this *steam-cap-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (let ((s4-1 (-> this skel root-channel 0)))
diff --git a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
index 41646b32d1..9b1060c68c 100644
--- a/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
+++ b/goal_src/jak1/levels/sunken/sun-exit-chamber.gc
@@ -240,7 +240,7 @@
   (set! (-> self root scale quad) (-> arg1 root scale quad))
   (+! (-> self root trans y) 14069.76)
   (set! (-> self rest-pos quad) (-> self root trans quad))
-  (initialize-skeleton self *blue-eco-charger-orb-sg* ())
+  (initialize-skeleton self *blue-eco-charger-orb-sg* '())
   (ja-channel-set! 1)
   (ja :group! blue-eco-charger-orb-idle-ja :num! min)
   (set-vector! (-> self orbit-rot) 0.0 0.0 0.0 1.0)
@@ -353,7 +353,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *blue-eco-charger-sg* ())
+  (initialize-skeleton this *blue-eco-charger-sg* '())
   (let ((f0-6 (res-lump-float (-> this entity) 'rotoffset)))
     (if (!= f0-6 0.0) (quaternion-rotate-y! (-> this root quat) (-> this root quat) f0-6)))
   (ja-channel-set! 1)
@@ -493,7 +493,7 @@
 (defstate exit-chamber-charger-puzzle-beaten (exit-chamber)
   :code
     (behavior ()
-      (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "exit-chamber-door-open" 0 #f () :to self)
+      (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "exit-chamber-door-open" 0 #f '() :to self)
       (set-time! (-> self state-time))
       (until (time-elapsed? (-> self state-time) (seconds 2.5))
         (suspend))
@@ -548,7 +548,7 @@
                           (-> (when gp-0
                                 (let ((t9-5 (method-of-type sunkencam activate)))
                                   (t9-5 (the-as sunkencam gp-0) self 'sunkencam (the-as pointer #x70004000)))
-                                (run-now-in-process gp-0 pov-camera-init-by-other (-> self root trans) *sunkencam-sg* "qbert-show-door-open" 0 #f ())
+                                (run-now-in-process gp-0 pov-camera-init-by-other (-> self root trans) *sunkencam-sg* "qbert-show-door-open" 0 #f '())
                                 (-> gp-0 ppointer))
                               0))
                   seq)
@@ -692,7 +692,7 @@
                                  "qbert-show-door-open"
                                  0
                                  #f
-                                 ()
+                                 '()
                                  :to
                                  self)))
         (set! (-> (the-as sunkencam (-> v1-1 0)) seq) (the-as uint 1)))
@@ -770,7 +770,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *exit-chamber-sg* ())
+  (initialize-skeleton this *exit-chamber-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 620) this))
diff --git a/goal_src/jak1/levels/sunken/sun-iris-door.gc b/goal_src/jak1/levels/sunken/sun-iris-door.gc
index f08daf52e8..011272a7cb 100644
--- a/goal_src/jak1/levels/sunken/sun-iris-door.gc
+++ b/goal_src/jak1/levels/sunken/sun-iris-door.gc
@@ -223,7 +223,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *sun-iris-door-sg* ())
+  (initialize-skeleton this *sun-iris-door-sg* '())
   (set! (-> this close-dist) 49152.0)
   (set! (-> this open-dist) 40960.0)
   (set! (-> this timeout) (res-lump-float arg0 'timeout))
@@ -271,7 +271,7 @@
     (set! (-> self root) s3-0))
   (set! (-> self root trans quad) (-> arg0 quad))
   (quaternion-copy! (-> self root quat) arg1)
-  (initialize-skeleton self *sun-iris-door-sg* ())
+  (initialize-skeleton self *sun-iris-door-sg* '())
   (set! (-> self close-dist) 49152.0)
   (set! (-> self open-dist) 40960.0)
   (set! (-> self timeout) 0.0)
diff --git a/goal_src/jak1/levels/sunken/sunken-fish.gc b/goal_src/jak1/levels/sunken/sunken-fish.gc
index 50547a4013..d73693f4f8 100644
--- a/goal_src/jak1/levels/sunken/sunken-fish.gc
+++ b/goal_src/jak1/levels/sunken/sunken-fish.gc
@@ -164,9 +164,9 @@
   (set-vector! (-> this root scale) 6.0 6.0 6.0 1.0)
   (let ((v1-3 (rand-vu-int-count 3)))
     (cond
-      ((zero? v1-3) (initialize-skeleton this *sunkenfisha-red-yellow-sg* ()))
-      ((= v1-3 1) (initialize-skeleton this *sunkenfisha-yellow-blue-sg* ()))
-      ((= v1-3 2) (initialize-skeleton this *sunkenfisha-yellow-eye-sg* ()))))
+      ((zero? v1-3) (initialize-skeleton this *sunkenfisha-red-yellow-sg* '()))
+      ((= v1-3 1) (initialize-skeleton this *sunkenfisha-yellow-blue-sg* '()))
+      ((= v1-3 2) (initialize-skeleton this *sunkenfisha-yellow-eye-sg* '()))))
   (ja-channel-set! 1)
   (let ((s5-0 (-> this skel root-channel 0)))
     (joint-control-channel-group-eval! s5-0 (the-as art-joint-anim (-> this draw art-group data 6)) num-func-identity)
diff --git a/goal_src/jak1/levels/sunken/sunken-obs.gc b/goal_src/jak1/levels/sunken/sunken-obs.gc
index 3b5d35b859..8ea4bfec5e 100644
--- a/goal_src/jak1/levels/sunken/sunken-obs.gc
+++ b/goal_src/jak1/levels/sunken/sunken-obs.gc
@@ -260,7 +260,7 @@
 (defmethod init-from-entity! ((this seaweed) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *seaweed-sg* ())
+  (initialize-skeleton this *seaweed-sg* '())
   (ja-channel-set! 1)
   (let ((s5-1 (-> this skel root-channel 0)))
     (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim (-> this draw art-group data 2)) num-func-identity)
diff --git a/goal_src/jak1/levels/sunken/sunken-pipegame.gc b/goal_src/jak1/levels/sunken/sunken-pipegame.gc
index 3c81122d5b..058028b4df 100644
--- a/goal_src/jak1/levels/sunken/sunken-pipegame.gc
+++ b/goal_src/jak1/levels/sunken/sunken-pipegame.gc
@@ -491,18 +491,18 @@
       (local-vars (v1-112 symbol))
       (let ((gp-0 (current-time)))
         (if (not (handle->process (-> self prize (-> self challenge) actor-handle))) (go sunken-pipegame-end-play))
-        (kill-current-level-hint '(camera) () 'exit)
+        (kill-current-level-hint '(camera) '() 'exit)
         (let ((v1-10 (-> self challenge)))
           (cond
             ((zero? v1-10)
              (ambient-hint-spawn "gamcam27" (the-as vector #f) *entity-pool* 'camera)
-             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-left" 0 #f () :to self))
+             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-left" 0 #f '() :to self))
             ((= v1-10 1)
              (ambient-hint-spawn "gamcam25" (the-as vector #f) *entity-pool* 'camera)
-             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-middle" 0 #f () :to self))
+             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-middle" 0 #f '() :to self))
             ((= v1-10 2)
              (ambient-hint-spawn "gamcam26" (the-as vector #f) *entity-pool* 'camera)
-             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-right" 0 #f () :to self))))
+             (process-spawn pov-camera (-> self root trans) *sunkencam-sg* "pipegame-right" 0 #f '() :to self))))
         (set-time! (-> self state-time))
         (let ((f30-0 0.0))
           (until (time-elapsed? (-> self state-time) (seconds 2))
@@ -583,7 +583,7 @@
       (close-specific-task! (-> self entity extra perm task) (task-status need-hint))
       (until (completed? (-> self ticker))
         (suspend))
-      (kill-current-level-hint '(camera) () 'exit)
+      (kill-current-level-hint '(camera) '() 'exit)
       (ambient-hint-spawn "gamcam26" (the-as vector #f) *entity-pool* 'camera)
       (set! (-> self abort-audio-if-beaten?) #t)
       (set-time! (-> self state-time))
@@ -667,7 +667,7 @@
   :code
     (behavior ()
       (logior! (-> self challenges-mask) (ash 1 (-> self challenge)))
-      (if (-> self abort-audio-if-beaten?) (kill-current-level-hint '(camera) () 'exit))
+      (if (-> self abort-audio-if-beaten?) (kill-current-level-hint '(camera) '() 'exit))
       (go sunken-pipegame-end-play)))
 
 (defstate sunken-pipegame-end-play (sunken-pipegame)
diff --git a/goal_src/jak1/levels/sunken/wall-plat.gc b/goal_src/jak1/levels/sunken/wall-plat.gc
index 3a4659da92..6e5bebf020 100644
--- a/goal_src/jak1/levels/sunken/wall-plat.gc
+++ b/goal_src/jak1/levels/sunken/wall-plat.gc
@@ -152,7 +152,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *wall-plat-sg* ())
+  (initialize-skeleton this *wall-plat-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (set! (-> this use-sync?) (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.2 0.2))
   (let ((f30-0 (quaternion-y-angle (-> this root quat)))
diff --git a/goal_src/jak1/levels/sunken/wedge-plats.gc b/goal_src/jak1/levels/sunken/wedge-plats.gc
index 845e5d330e..88a9111bd2 100644
--- a/goal_src/jak1/levels/sunken/wedge-plats.gc
+++ b/goal_src/jak1/levels/sunken/wedge-plats.gc
@@ -141,7 +141,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *wedge-plat-sg* ())
+  (initialize-skeleton this *wedge-plat-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (baseplat-method-21 this)
@@ -244,7 +244,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *wedge-plat-sg* ())
+  (initialize-skeleton this *wedge-plat-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (update-transforms! (-> this root))
   (baseplat-method-21 this)
diff --git a/goal_src/jak1/levels/sunken/whirlpool.gc b/goal_src/jak1/levels/sunken/whirlpool.gc
index 81815652f5..c030f69e7f 100644
--- a/goal_src/jak1/levels/sunken/whirlpool.gc
+++ b/goal_src/jak1/levels/sunken/whirlpool.gc
@@ -334,7 +334,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *whirlpool-sg* ())
+  (initialize-skeleton this *whirlpool-sg* '())
   (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.15 0.15)
   (let ((f30-0 32768.0)
         (f28-0 145635.56))
diff --git a/goal_src/jak1/levels/swamp/billy.gc b/goal_src/jak1/levels/swamp/billy.gc
index aed62b4243..c48bd86e9e 100644
--- a/goal_src/jak1/levels/swamp/billy.gc
+++ b/goal_src/jak1/levels/swamp/billy.gc
@@ -79,7 +79,7 @@
 (defbehavior billy-snack-init-by-other billy-snack ((arg0 vector))
   (set! (-> self root) (new 'process 'trsqv))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *farthy-snack-sg* ())
+  (initialize-skeleton self *farthy-snack-sg* '())
   (set! (-> self num-rats) 0)
   (go billy-snack-idle)
   (none))
@@ -354,10 +354,10 @@
 
 (defmethod get-accept-anim ((this billy) (arg0 symbol))
   (if arg0 (close-current! (-> this tasks)))
-  (new 'static 'spool-anim :name "billy-accept" :index 6 :parts 3 :command-list ()))
+  (new 'static 'spool-anim :name "billy-accept" :index 6 :parts 3 :command-list '()))
 
 (defmethod get-reject-anim ((this billy) (arg0 symbol))
-  (new 'static 'spool-anim :name "billy-reject" :index 7 :parts 3 :command-list ()))
+  (new 'static 'spool-anim :name "billy-reject" :index 7 :parts 3 :command-list '()))
 
 (defstate billy-done (billy)
   :event
@@ -622,7 +622,7 @@
         (dotimes (s5-1 (+ (the int (the float (+ (-> self path-snacks curve num-cverts) -1))) 1))
           (eval-path-curve-div! (-> self path-snacks) gp-1 (the float s5-1) 'exact)
           (if (process-spawn billy-snack gp-1 :to self) (+! (-> self num-snacks) 1))))
-      (backup-load-state-and-set-cmds *load-state* ())
+      (backup-load-state-and-set-cmds *load-state* '())
       (let* ((gp-2 '((kill "swamp-blimp-3")
                     (kill "swamp-tetherrock-14")
                     (kill "swamp-tetherrock-15")
diff --git a/goal_src/jak1/levels/swamp/kermit.gc b/goal_src/jak1/levels/swamp/kermit.gc
index d0491267dd..e617d1b0da 100644
--- a/goal_src/jak1/levels/swamp/kermit.gc
+++ b/goal_src/jak1/levels/swamp/kermit.gc
@@ -1044,7 +1044,7 @@ nav-enemy-default-event-handler
     (backup-collide-with-as s4-0)
     (set! (-> this collide-info) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *kermit-sg* ())
+  (initialize-skeleton this *kermit-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (set! (-> this airborne) #f)
   (init-defaults! this *kermit-nav-enemy-info*)
diff --git a/goal_src/jak1/levels/swamp/swamp-bat.gc b/goal_src/jak1/levels/swamp/swamp-bat.gc
index 1fe7ca43fa..c51bcc65ba 100644
--- a/goal_src/jak1/levels/swamp/swamp-bat.gc
+++ b/goal_src/jak1/levels/swamp/swamp-bat.gc
@@ -310,7 +310,7 @@ swamp-bat-slave-event-handler
   (swamp-bat-slave-get-new-path)
   (set! (-> self root trans quad) (-> self idle-position quad))
   (setup-params! (-> self sync) (the-as uint 1200) 0.0 0.15 0.15)
-  (initialize-skeleton self *swamp-bat-slave-sg* ())
+  (initialize-skeleton self *swamp-bat-slave-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (go swamp-bat-slave-idle)
   (none))
diff --git a/goal_src/jak1/levels/swamp/swamp-obs.gc b/goal_src/jak1/levels/swamp/swamp-obs.gc
index 9e75cc98c0..4e71699755 100644
--- a/goal_src/jak1/levels/swamp/swamp-obs.gc
+++ b/goal_src/jak1/levels/swamp/swamp-obs.gc
@@ -288,7 +288,7 @@
     (backup-collide-with-as s5-0)
     (set! (-> this root) s5-0))
   (process-drawable-from-entity! this (-> this entity))
-  (initialize-skeleton this *swamp-spike-sg* ())
+  (initialize-skeleton this *swamp-spike-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (load-params! (-> this sync) this (the-as uint 1500) 0.0 0.15 0.15)
   (set! (-> this open-gate) #f)
@@ -336,7 +336,8 @@
   :trans rider-trans
   :code
     (behavior ()
-      (loop ;; og:preserve-this modified for high fps
+      (loop
+        ;; og:preserve-this modified for high fps
         (let ((f30-0 (* -0.025 (+ (-> self y-offset) (-> self y-travel))))
               (f28-0 (* -0.025 (- (-> self y-offset) (-> self y-travel)))))
           (cond
@@ -392,7 +393,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *balance-plat-sg* ())
+  (initialize-skeleton this *balance-plat-sg* '())
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this y-accel) 0.0)
   (set! (-> this y-vel) 0.0)
@@ -537,7 +538,7 @@
       (set! (-> this root) (the-as collide-shape-moving s4-0)))
     (process-drawable-from-entity! this arg0)
     (vector-float*! (-> this root scale) *identity-vector* f30-0))
-  (initialize-skeleton this *swamp-rock-sg* ())
+  (initialize-skeleton this *swamp-rock-sg* '())
   (nav-mesh-connect this (-> this root) (the-as nav-control #f))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 291) this))
   (go swamp-rock-idle)
@@ -562,7 +563,7 @@
     (backup-collide-with-as s5-0)
     (set! (-> self root) s5-0))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *swamp-rock-sg* ())
+  (initialize-skeleton self *swamp-rock-sg* '())
   (nav-mesh-connect self (-> self root) (the-as nav-control #f))
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 291) self))
   (go swamp-rock-idle)
@@ -670,7 +671,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this tar-plat))
-  (initialize-skeleton this *tar-plat-sg* ())
+  (initialize-skeleton this *tar-plat-sg* '())
   (rigid-body-platform-method-29 this *tar-plat-constants*)
   (set! (-> this float-height) (-> this entity extra trans y))
   (set! (-> this float-height-offset) -2048.0)
@@ -708,7 +709,7 @@
     (behavior ()
       (suspend)
       (process-drawable-delay-player (seconds 1))
-      (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *swampcam-sg* "swamp-ambush" 0 #f () :to self))))
+      (let ((gp-1 (ppointer->handle (process-spawn pov-camera (-> self root trans) *swampcam-sg* "swamp-ambush" 0 #f '() :to self))))
         (while (handle->process (the-as handle gp-1))
           (suspend)))
       (go-virtual battlecontroller-active)))
diff --git a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
index 03c593b43e..197b59e7b0 100644
--- a/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
+++ b/goal_src/jak1/levels/swamp/swamp-rat-nest.gc
@@ -894,7 +894,7 @@ swamp-rat-nest-default-event-handler
     (set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
     (backup-collide-with-as s5-0)
     (set! (-> this root) s5-0))
-  (initialize-skeleton this *swamp-rat-nest-dummy-a-sg* ())
+  (initialize-skeleton this *swamp-rat-nest-dummy-a-sg* '())
   (none))
 
 (defmethod swamp-rat-nest-dummy-method-20 ((this swamp-rat-nest-dummy-b))
@@ -910,7 +910,7 @@ swamp-rat-nest-default-event-handler
     (set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
     (backup-collide-with-as s5-0)
     (set! (-> this root) s5-0))
-  (initialize-skeleton this *swamp-rat-nest-dummy-b-sg* ())
+  (initialize-skeleton this *swamp-rat-nest-dummy-b-sg* '())
   (none))
 
 (defmethod swamp-rat-nest-dummy-method-20 ((this swamp-rat-nest-dummy-c))
@@ -926,7 +926,7 @@ swamp-rat-nest-default-event-handler
     (set! (-> s5-0 nav-radius) (* 0.75 (-> s5-0 root-prim local-sphere w)))
     (backup-collide-with-as s5-0)
     (set! (-> this root) s5-0))
-  (initialize-skeleton this *swamp-rat-nest-dummy-c-sg* ())
+  (initialize-skeleton this *swamp-rat-nest-dummy-c-sg* '())
   (none))
 
 (defmethod swamp-rat-nest-dummy-method-21 ((this swamp-rat-nest-dummy-a))
diff --git a/goal_src/jak1/levels/swamp/swamp-rat.gc b/goal_src/jak1/levels/swamp/swamp-rat.gc
index 3e4e02c372..7df78f90e2 100644
--- a/goal_src/jak1/levels/swamp/swamp-rat.gc
+++ b/goal_src/jak1/levels/swamp/swamp-rat.gc
@@ -347,7 +347,7 @@ swamp-rat-default-event-handler
   (none))
 
 (defmethod nav-enemy-method-48 ((this swamp-rat))
-  (initialize-skeleton this *swamp-rat-sg* ())
+  (initialize-skeleton this *swamp-rat-sg* '())
   (init-defaults! this *swamp-rat-nav-enemy-info*)
   (vector-float*! (-> this collide-info scale) *identity-vector* 1.5)
   (set! (-> this neck up) (the-as uint 1))
diff --git a/goal_src/jak1/levels/test-zone/test-zone-obs.gc b/goal_src/jak1/levels/test-zone/test-zone-obs.gc
index 6715ff573d..da8fb84a4b 100644
--- a/goal_src/jak1/levels/test-zone/test-zone-obs.gc
+++ b/goal_src/jak1/levels/test-zone/test-zone-obs.gc
@@ -1,35 +1,33 @@
 ;;-*-Lisp-*-
 (in-package goal)
-
 (deftype test-actor (process-drawable)
-  ((root collide-shape-moving :override)
+  ((root       collide-shape-moving :override)
    (birth-time time-frame)
-   (base vector :inline)
-   (old-base vector :inline)
+   (base       vector :inline)
+   (old-base   vector :inline)
    (bob-offset int64)
-   (bob-amount float)
-   )
-  (:methods (init-collision! (_type_) none))
-  (:state-methods idle)
-  )
+   (bob-amount float))
+  (:methods
+   (init-collision! (_type_) none))
+  (:state-methods
+   idle))
 
 (def-art-elt test-actor-ag test-actor-lod0-jg 0)
 (def-art-elt test-actor-ag test-actor-lod0-mg 1)
 (def-art-elt test-actor-ag test-actor-idle-ja 2)
-
-(defskelgroup *test-actor-sg* test-actor test-actor-lod0-jg test-actor-idle-ja
-              ((test-actor-lod0-mg (meters 9999999)))
-              :bounds (static-spherem 0 0 0 4.5)
-              :texture-level 2
-              )
+(defskelgroup *test-actor-sg*
+  test-actor
+  test-actor-lod0-jg
+  test-actor-idle-ja
+  ((test-actor-lod0-mg (meters 9999999)))
+  :bounds (static-spherem 0 0 0 4.5)
+  :texture-level 2)
 
 (defmethod init-collision! ((this test-actor))
   (let ((cshape (new 'process 'collide-shape-moving this (collide-list-enum hit-by-player))))
     (set! (-> cshape dynam) (copy *standard-dynamics* 'process))
     (set! (-> cshape reaction) default-collision-reaction)
-    (set! (-> cshape no-reaction)
-          (the (function collide-shape-moving collide-shape-intersect vector vector none) nothing)
-          )
+    (set! (-> cshape no-reaction) (the (function collide-shape-moving collide-shape-intersect vector vector none) nothing))
     ;; (let ((mesh (new 'process 'collide-shape-prim-mesh cshape (the uint 0) (the uint 0))))
     ;;   (set! (-> mesh prim-core collide-as) (collide-kind enemy))
     ;;   (set! (-> mesh collide-with) (collide-kind target))
@@ -43,21 +41,19 @@
       (set! (-> sphere prim-core action) (collide-action solid))
       (set! (-> sphere prim-core offense) (collide-offense normal-attack))
       (set-vector! (-> sphere local-sphere) 0.0 0.0 0.0 (meters 2))
-      (set-root-prim! cshape sphere)
-      )
+      (set-root-prim! cshape sphere))
     (set! (-> cshape nav-radius) (* 0.75 (-> cshape root-prim local-sphere w)))
     (backup-collide-with-as cshape)
-    (set! (-> this root) cshape)
-    )
-  (none)
-  )
+    (set! (-> this root) cshape))
+  (none))
 
 (defmethod init-from-entity! ((this test-actor) (e entity-actor))
   (logior! (-> this mask) (process-mask enemy))
   (init-collision! this)
   (process-drawable-from-entity! this e)
   (set! (-> this bob-amount) 1024.0)
-  (set! (-> this bob-offset) (+ (the int (-> this root trans x)) (the int (-> this root trans y)) (the int (-> this root trans z))))
+  (set! (-> this bob-offset)
+        (+ (the int (-> this root trans x)) (the int (-> this root trans y)) (the int (-> this root trans z))))
   (set-time! (-> this birth-time))
   (vector-copy! (-> this base) (-> this root trans))
   (vector-copy! (-> this old-base) (-> this root trans))
@@ -65,9 +61,7 @@
   (logclear! (-> this mask) (process-mask actor-pause))
   (transform-post)
   (go-virtual idle :proc this)
-  (none)
-  )
-
+  (none))
 
 (defbehavior test-actor-init-by-other test-actor ((pos vector))
   (logior! (-> self mask) (process-mask enemy))
@@ -77,47 +71,39 @@
   (quaternion-identity! (-> self root quat))
   (vector-identity! (-> self root scale))
   (set! (-> self bob-amount) 1024.0)
-  (set! (-> self bob-offset) (+ (the int (-> self root trans x)) (the int (-> self root trans y)) (the int (-> self root trans z))))
+  (set! (-> self bob-offset)
+        (+ (the int (-> self root trans x)) (the int (-> self root trans y)) (the int (-> self root trans z))))
   (set-time! (-> self birth-time))
   (vector-copy! (-> self base) (-> self root trans))
   (vector-copy! (-> self old-base) (-> self root trans))
   (logclear! (-> self mask) (process-mask actor-pause))
   (transform-post)
-  (go-virtual idle)
-  )
+  (go-virtual idle))
 
 (defstate idle (test-actor)
   :virtual #t
-  :event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
-    (case message
-      (('attack 'touch)
-       (if (= (-> proc type) target)
-         (send-event proc 'attack #f (static-attack-info ((shove-up (meters 2.5)) (shove-back (meters 7.5)))))
-         )
-       )
-      )
-    )
-  :code (behavior ()
-    (loop
-      (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (degrees 45) (seconds-per-frame)))
-      (let ((bob (-> self bob-amount)))
-        (when (< 0.0 bob)
-          (set! (-> self root trans y)
-                (+ (-> self base y)
-                   (* bob (sin (* 109.22667 (the float (mod (+ (- (current-time) (-> self birth-time)) (-> self bob-offset)) (seconds 2))))))
-                   )
-                )
-          (update-transforms! (-> self root))
-          )
-        )
-      ; (dotimes (i (-> self node-list length))
-      ;   (let* ((joint (-> self node-list data i)) (jpos (vector<-cspace! (new-stack-vector0) joint)))
-      ;     (add-debug-sphere #t (bucket-id debug) jpos (meters 0.1) (static-rgba 0 #xff 0 #x40))
-      ;     (add-debug-text-sphere (!= (-> joint joint) #f) (bucket-id debug) jpos (meters 0.1) (-> joint joint name) (static-rgba 0 #xff 0 #x40))
-      ;     )
-      ;   )
-      (suspend)
-      )
-    )
-  :post transform-post
-  )
\ No newline at end of file
+  :event
+    (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
+      (case message
+        (('attack 'touch)
+         (if (= (-> proc type) target)
+           (send-event proc 'attack #f (static-attack-info ((shove-up (meters 2.5)) (shove-back (meters 7.5)))))))))
+  :code
+    (behavior ()
+      (loop
+        (quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (degrees 45) (seconds-per-frame)))
+        (let ((bob (-> self bob-amount)))
+          (when (< 0.0 bob)
+            (set! (-> self root trans y)
+                  (+ (-> self base y)
+                     (* bob
+                        (sin (* 109.22667 (the float (mod (+ (- (current-time) (-> self birth-time)) (-> self bob-offset)) (seconds 2))))))))
+            (update-transforms! (-> self root))))
+        ; (dotimes (i (-> self node-list length))
+        ;   (let* ((joint (-> self node-list data i)) (jpos (vector<-cspace! (new-stack-vector0) joint)))
+        ;     (add-debug-sphere #t (bucket-id debug) jpos (meters 0.1) (static-rgba 0 #xff 0 #x40))
+        ;     (add-debug-text-sphere (!= (-> joint joint) #f) (bucket-id debug) jpos (meters 0.1) (-> joint joint name) (static-rgba 0 #xff 0 #x40))
+        ;     )
+        ;   )
+        (suspend)))
+  :post transform-post)
diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc
index a7167a829e..1cbe8ddaea 100644
--- a/goal_src/jak1/levels/title/title-obs.gc
+++ b/goal_src/jak1/levels/title/title-obs.gc
@@ -136,7 +136,7 @@
 (defbehavior logo-slave-init-by-other logo-slave ((arg0 entity-actor) (arg1 skeleton-group))
   (set! (-> self entity) arg0)
   (set! (-> self root) (new 'process 'trsqv))
-  (initialize-skeleton self arg1 ())
+  (initialize-skeleton self arg1 '())
   (logior! (-> self skel status) (janim-status inited))
   (set! (-> self draw origin-joint-index) (the-as uint 3))
   (set! (-> self draw shadow-mask) (the-as uint 255))
@@ -393,7 +393,7 @@
       (send-event (handle->process (-> self sidekick)) 'blend-shape #t)
       (send-event (handle->process (-> self sidekick)) 'origin-joint-index 6)
       (set! (-> self anim) (-> self next-anim))
-      (set! (-> self next-anim) (new 'static 'spool-anim :name "logo-intro" :index 5 :parts 3 :command-list ()))
+      (set! (-> self next-anim) (new 'static 'spool-anim :name "logo-intro" :index 5 :parts 3 :command-list '()))
       ;; og:preserve-this
       (#cond
         (PC_PORT
@@ -429,11 +429,11 @@
      ;; og:preserve-this check language instead of territory here
      (#if PC_PORT
        (if (= (-> *setting-control* default language) (language-enum japanese))
-         (initialize-skeleton self *logo-japan-sg* ())
-         (initialize-skeleton self *logo-sg* ()))
+         (initialize-skeleton self *logo-japan-sg* '())
+         (initialize-skeleton self *logo-sg* '()))
        (case (scf-get-territory)
-         ((GAME_TERRITORY_SCEI) (initialize-skeleton self *logo-japan-sg* ()))
-         (else (initialize-skeleton self *logo-sg* ()))))
+         ((GAME_TERRITORY_SCEI) (initialize-skeleton self *logo-japan-sg* '()))
+         (else (initialize-skeleton self *logo-sg* '()))))
      (set! (-> self main-joint) (new 'process 'joint-mod (joint-mod-handler-mode joint-set*) self 3))
      (set! (-> self main-joint max-dist) (the-as meters #t))
      (set! (-> self next-anim)
@@ -468,7 +468,7 @@
     (('ndi)
      (set! (-> *time-of-day-context* title-light-group dir1 levels x) 1.0)
      (set! (-> *time-of-day-context* title-light-group ambi levels x) 1.0)
-     (initialize-skeleton self *ndi-sg* ())
+     (initialize-skeleton self *ndi-sg* '())
      (set! (-> self draw origin-joint-index) (the-as uint 3))
      (set! (-> self next-anim)
            (new 'static
diff --git a/goal_src/jak1/levels/training/training-obs.gc b/goal_src/jak1/levels/training/training-obs.gc
index 6c9db9b55c..5c5475427c 100644
--- a/goal_src/jak1/levels/training/training-obs.gc
+++ b/goal_src/jak1/levels/training/training-obs.gc
@@ -109,22 +109,22 @@
               (cond
                 ((zero? v1-61)
                  (level-hint-spawn (text-id training-money) "asstvb41" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "orbcam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "orbcam" 0 #f '() :to self))
                 ((= v1-61 1)
                  (level-hint-spawn (text-id training-fuel-cell) "asstvb42" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "fuelcellcam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "fuelcellcam" 0 #f '() :to self))
                 ((= v1-61 2)
                  (level-hint-spawn (text-id training-eco-blue) "sagevb22" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "ecocam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "ecocam" 0 #f '() :to self))
                 ((= v1-61 3)
                  (level-hint-spawn (text-id training-precursor-door) "sagevb24" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "precursordoorcam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "precursordoorcam" 0 #f '() :to self))
                 ((= v1-61 4)
                  (level-hint-spawn (text-id training-blue-eco-vent) "asstvb48" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "ecoventcam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "ecoventcam" 0 #f '() :to self))
                 ((= v1-61 5)
                  (level-hint-spawn (text-id training-eco-green) "sagevb21" (the-as entity #f) *entity-pool* (game-task none))
-                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "greenecocam" 0 #f () :to self))
+                 (process-spawn pov-camera (-> self entity extra trans) *training-cam-sg* "greenecocam" 0 #f '() :to self))
                 ((= v1-61 6)
                  (when (not (task-complete? *game-info* (game-task training-climb)))
                    (clear-text-seen! *game-info* (text-id training-double-jump))
@@ -227,7 +227,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this tra-pontoon))
-  (initialize-skeleton this *tra-pontoon-sg* ())
+  (initialize-skeleton this *tra-pontoon-sg* '())
   (rigid-body-platform-method-29 this *tra-pontoon-constants*)
   (set! (-> this float-height-offset) 6144.0)
   (set! (-> this root-overlay nav-radius) 20480.0)
@@ -282,7 +282,7 @@
   (none))
 
 (defmethod eco-door-method-25 ((this tra-iris-door))
-  (initialize-skeleton this *tra-iris-door-sg* ())
+  (initialize-skeleton this *tra-iris-door-sg* '())
   (set! (-> this open-distance) 32768.0)
   (set! (-> this close-distance) 49152.0)
   (update-transforms! (-> this root))
@@ -614,7 +614,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *scarecrow-a-sg* ())
+  (initialize-skeleton this *scarecrow-a-sg* '())
   (go (method-of-object this idle))
   (none))
 
@@ -749,6 +749,6 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *scarecrow-b-sg* ())
+  (initialize-skeleton this *scarecrow-b-sg* '())
   (go (method-of-object this idle))
   (none))
diff --git a/goal_src/jak1/levels/village1/assistant.gc b/goal_src/jak1/levels/village1/assistant.gc
index acc482e0ce..6fb316b03e 100644
--- a/goal_src/jak1/levels/village1/assistant.gc
+++ b/goal_src/jak1/levels/village1/assistant.gc
@@ -96,18 +96,18 @@
      (set! (-> this skippable) #t)
      (cond
        ((= (current-task (-> this tasks)) (game-task none))
-        (new 'static 'spool-anim :name "assistant-reminder-1-generic" :index 14 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "assistant-reminder-1-generic" :index 14 :parts 2 :command-list '()))
        ((closed? (-> this tasks) (game-task jungle-eggtop) (task-status need-resolution))
-        (new 'static 'spool-anim :name "assistant-reminder-1-race-bike" :index 13 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "assistant-reminder-1-race-bike" :index 13 :parts 3 :command-list '()))
        ((or (closed? (-> this tasks) (game-task misty-bike) (task-status need-resolution))
             (not (closed? (-> this tasks) (game-task misty-bike) (task-status need-introduction))))
-        (new 'static 'spool-anim :name "assistant-reminder-1-blue-eco-switch" :index 11 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "assistant-reminder-1-blue-eco-switch" :index 11 :parts 3 :command-list '()))
        ((zero? (get-reminder (-> this tasks) 2))
         (if arg0 (save-reminder (-> this tasks) 1 2))
-        (new 'static 'spool-anim :name "assistant-reminder-1-race-bike" :index 13 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "assistant-reminder-1-race-bike" :index 13 :parts 3 :command-list '()))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 2))
-        (new 'static 'spool-anim :name "assistant-reminder-1-blue-eco-switch" :index 11 :parts 3 :command-list ()))))
+        (new 'static 'spool-anim :name "assistant-reminder-1-blue-eco-switch" :index 11 :parts 3 :command-list '()))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village1/explorer.gc b/goal_src/jak1/levels/village1/explorer.gc
index c9697a4f69..e834a7affb 100644
--- a/goal_src/jak1/levels/village1/explorer.gc
+++ b/goal_src/jak1/levels/village1/explorer.gc
@@ -71,7 +71,7 @@
               (505 send-event target draw #t))))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 0))
-        (new 'static 'spool-anim :name "explorer-reminder-2" :index 11 :parts 3 :command-list ()))))
+        (new 'static 'spool-anim :name "explorer-reminder-2" :index 11 :parts 3 :command-list '()))))
     (((task-status need-reward-speech))
      (cond
        (arg0
diff --git a/goal_src/jak1/levels/village1/farmer.gc b/goal_src/jak1/levels/village1/farmer.gc
index 606d84226e..b7d6cbe7bc 100644
--- a/goal_src/jak1/levels/village1/farmer.gc
+++ b/goal_src/jak1/levels/village1/farmer.gc
@@ -23,21 +23,21 @@
   (case (current-status (-> this tasks))
     (((task-status need-hint) (task-status need-introduction))
      (if arg0 (close-status! (-> this tasks) (task-status need-introduction)))
-     (new 'static 'spool-anim :name "farmer-introduction" :index 6 :parts 5 :command-list ()))
+     (new 'static 'spool-anim :name "farmer-introduction" :index 6 :parts 5 :command-list '()))
     (((task-status need-reminder))
      (set! (-> this skippable) #t)
      (cond
        ((zero? (get-reminder (-> this tasks) 0))
         (if arg0 (save-reminder (-> this tasks) 1 0))
-        (new 'static 'spool-anim :name "farmer-reminder-1" :index 7 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "farmer-reminder-1" :index 7 :parts 2 :command-list '()))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 0))
-        (new 'static 'spool-anim :name "farmer-reminder-2" :index 8 :parts 2 :command-list ()))))
+        (new 'static 'spool-anim :name "farmer-reminder-2" :index 8 :parts 2 :command-list '()))))
     (((task-status need-reward-speech))
      (when arg0
        (set! (-> this cell-for-task) (current-task (-> this tasks)))
        (close-current! (-> this tasks)))
-     (new 'static 'spool-anim :name "farmer-resolution" :index 9 :parts 4 :command-list ()))
+     (new 'static 'spool-anim :name "farmer-resolution" :index 9 :parts 4 :command-list '()))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village1/fishermans-boat.gc b/goal_src/jak1/levels/village1/fishermans-boat.gc
index 023ccd6683..df71329ab2 100644
--- a/goal_src/jak1/levels/village1/fishermans-boat.gc
+++ b/goal_src/jak1/levels/village1/fishermans-boat.gc
@@ -643,7 +643,7 @@
                (file-status *art-control* (-> self anim name) 0))
       (hide-hud)
       (level-hint-surpress!)
-      (kill-current-level-hint () '(sidekick voicebox) 'exit)
+      (kill-current-level-hint '() '(sidekick voicebox) 'exit)
       (when (and (hud-hidden?) (can-grab-display? self) (= *kernel-boot-message* 'play))
         (let ((s5-1 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
           (let ((v1-17 s5-1)) (set! (-> v1-17 width) (the float 440)))
@@ -745,7 +745,7 @@
         (when #t
           (set! (-> *camera* cam-entity) (the-as entity #t))
           (send-event *camera* 'clear-entity)
-          (load-commands-set! *level* ())
+          (load-commands-set! *level* '())
           (load-state-want-display-level 'village1 'display)
           (load-state-want-force-vis 'village1 #f)
           (go fishermans-boat-docked-village)))
@@ -973,7 +973,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this fishermans-boat))
-  (initialize-skeleton this *fishermans-boat-sg* ())
+  (initialize-skeleton this *fishermans-boat-sg* '())
   (logclear! (-> this mask) (process-mask actor-pause movie))
   (logior! (-> this skel status) (janim-status inited))
   (process-entity-status! this (entity-perm-status bit-3) #t)
diff --git a/goal_src/jak1/levels/village1/sage.gc b/goal_src/jak1/levels/village1/sage.gc
index 5234631022..658bdd333f 100644
--- a/goal_src/jak1/levels/village1/sage.gc
+++ b/goal_src/jak1/levels/village1/sage.gc
@@ -166,8 +166,8 @@
      (set! (-> this skippable) #t)
      (if arg0 (set! (-> this reminder-played) #t))
      (case (get-reminder (-> this tasks) 0)
-       ((3) (new 'static 'spool-anim :name "sage-reminder-2-generic" :index 13 :parts 4 :command-list ()))
-       ((2) (new 'static 'spool-anim :name "sage-reminder-1-generic" :index 12 :parts 3 :command-list ()))
+       ((3) (new 'static 'spool-anim :name "sage-reminder-2-generic" :index 13 :parts 4 :command-list '()))
+       ((2) (new 'static 'spool-anim :name "sage-reminder-1-generic" :index 12 :parts 3 :command-list '()))
        ((1)
         (new 'static
              'spool-anim
diff --git a/goal_src/jak1/levels/village1/village-obs.gc b/goal_src/jak1/levels/village1/village-obs.gc
index 84543080ab..b7f7681fa0 100644
--- a/goal_src/jak1/levels/village1/village-obs.gc
+++ b/goal_src/jak1/levels/village1/village-obs.gc
@@ -283,7 +283,7 @@
   (set! (-> this root-override) (new 'process 'trsq))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *windmill-sail-sg* ())
+  (initialize-skeleton this *windmill-sail-sg* '())
   (quaternion-copy! (-> this orig-quat) (-> this root-override quat))
   (vector-x-quaternion! (-> this blade-normal) (-> this root-override quat))
   (vector-normalize! (-> this blade-normal) 1.0)
@@ -329,7 +329,7 @@
   (set! (-> this root-override) (new 'process 'trsq))
   (process-drawable-from-entity! this arg0)
   (logclear! (-> this mask) (process-mask actor-pause))
-  (initialize-skeleton this *sagesail-sg* ())
+  (initialize-skeleton this *sagesail-sg* '())
   (quaternion-copy! (-> this orig-quat) (-> this root-override quat))
   (vector-z-quaternion! (-> this blade-normal) (-> this root-override quat))
   (vector-normalize! (-> this blade-normal) 1.0)
@@ -390,7 +390,7 @@
   (set! (-> this angle-vel) 145.63556)
   (set! (-> this root) (the-as trsqv (new 'process 'trsq)))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *windspinner-sg* ())
+  (initialize-skeleton this *windspinner-sg* '())
   (set! (-> this root pause-adjust-distance) 819200.0)
   (quaternion-copy! (-> this orig-quat) (-> this root quat))
   (vector-y-quaternion! (-> this blade-normal) (-> this root quat))
@@ -422,7 +422,7 @@
   (logior! (-> this mask) (process-mask ambient))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *mayorgears-sg* ())
+  (initialize-skeleton this *mayorgears-sg* '())
   (set! (-> this draw shadow-mask) (the-as uint 255))
   (go mayorgears-idle)
   (none))
@@ -457,7 +457,7 @@
 (defmethod init-from-entity! ((obj evilplant) (arg0 entity-actor))
   (set! (-> obj root) (new 'process 'trsqv))
   (process-drawable-from-entity! obj arg0)
-  (initialize-skeleton obj *evilplant-sg* ())
+  (initialize-skeleton obj *evilplant-sg* '())
   (go (method-of-object obj idle))
   (none))
 
@@ -486,7 +486,7 @@
 (defmethod init-from-entity! ((this reflector-middle) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *reflector-middle-sg* ())
+  (initialize-skeleton this *reflector-middle-sg* '())
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this reflector-trans quad) (-> this root trans quad))
@@ -639,7 +639,7 @@
   (none))
 
 (defmethod nav-enemy-method-48 ((this starfish))
-  (initialize-skeleton this *starfish-sg* ())
+  (initialize-skeleton this *starfish-sg* '())
   (init-defaults! this *starfish-nav-enemy-info*)
   0
   (none))
@@ -751,7 +751,7 @@
 (defmethod init-from-entity! ((this hutlamp) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *hutlamp-sg* ())
+  (initialize-skeleton this *hutlamp-sg* '())
   (set! (-> this pivot) (new 'process 'joint-mod-set-local this 3 #f #t #f))
   (set-period (-> this clock) 900)
   (set! (-> this clock output) (rand-vu))
@@ -777,7 +777,7 @@
 (defmethod init-from-entity! ((this revcycleprop) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *revcycleprop-sg* ())
+  (initialize-skeleton this *revcycleprop-sg* '())
   (set! (-> this draw light-index) (the-as uint 1))
   (go (method-of-object this idle))
   (none))
@@ -801,7 +801,7 @@
 (defmethod init-from-entity! ((this revcycle) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *revcycle-sg* ())
+  (initialize-skeleton this *revcycle-sg* '())
   (set! (-> this draw light-index) (the-as uint 1))
   (go (method-of-object this idle))
   (none))
diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc
index c48292f719..7a1d7516c0 100644
--- a/goal_src/jak1/levels/village1/yakow.gc
+++ b/goal_src/jak1/levels/village1/yakow.gc
@@ -28,7 +28,7 @@
 (defun yakow-cam ()
   (with-pp
     (let ((gp-0 (entity-actor-lookup (-> pp entity) 'alt-actor 0)))
-      (if gp-0 (process-spawn pov-camera (-> gp-0 extra trans) *village1cam-sg* "anim" 0 #f () :to pp)))
+      (if gp-0 (process-spawn pov-camera (-> gp-0 extra trans) *village1cam-sg* "anim" 0 #f '() :to pp)))
     (none)))
 
 (deftype yakow-bank (basic)
@@ -455,7 +455,7 @@ yakow-default-event-handler
                   (-> *YAKOW-bank* run-speed))))
   :exit
     (behavior ()
-      ())
+      '())
   :trans
     (behavior ()
       (if (time-elapsed? (-> self state-time) (seconds 0.2))
@@ -522,7 +522,7 @@ yakow-default-event-handler
   (set! (-> this nav nearest-y-threshold) 409600.0)
   (set! (-> this fact) (new 'process 'fact-info-enemy this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
   (set! (-> this fact idle-distance) (-> *YAKOW-bank* default-idle-distance))
-  (initialize-skeleton this *yakow-sg* ())
+  (initialize-skeleton this *yakow-sg* '())
   (set! (-> this draw shadow-ctrl) (new 'process 'shadow-control -4096.0 4096.0 614400.0 (the-as float 24) 245760.0))
   (set! (-> this link) (new 'process 'actor-link-info this))
   (set! (-> this water) (new 'process 'water-control this 6 0.0 8192.0 2048.0))
diff --git a/goal_src/jak1/levels/village2/assistant-village2.gc b/goal_src/jak1/levels/village2/assistant-village2.gc
index a252df817d..28342535f6 100644
--- a/goal_src/jak1/levels/village2/assistant-village2.gc
+++ b/goal_src/jak1/levels/village2/assistant-village2.gc
@@ -297,9 +297,9 @@
              (else (if (!= (get-task-status (game-task swamp-flutflut)) (task-status need-reminder)) (set! s4-2 0))))))
        (if arg0 (save-reminder (-> this tasks) s4-2 2))
        (cond
-         ((zero? s4-2) (new 'static 'spool-anim :name "assistant-village2-reminder-1-room" :index 22 :parts 3 :command-list ()))
-         ((= s4-2 1) (new 'static 'spool-anim :name "assistant-village2-reminder-1-robbers" :index 18 :parts 3 :command-list ()))
-         (else (new 'static 'spool-anim :name "assistant-village2-reminder-1-flutflut" :index 20 :parts 3 :command-list ())))))
+         ((zero? s4-2) (new 'static 'spool-anim :name "assistant-village2-reminder-1-room" :index 22 :parts 3 :command-list '()))
+         ((= s4-2 1) (new 'static 'spool-anim :name "assistant-village2-reminder-1-robbers" :index 18 :parts 3 :command-list '()))
+         (else (new 'static 'spool-anim :name "assistant-village2-reminder-1-flutflut" :index 20 :parts 3 :command-list '())))))
     (else
      (if arg0
        (format 0
@@ -426,7 +426,7 @@
       (close-specific-task! (game-task village2-levitator) (task-status need-reminder-a)))
   :trans
     (behavior ()
-      ()))
+      '()))
 
 (defmethod should-display? ((this assistant-bluehut))
   (cond
@@ -1068,7 +1068,7 @@
                       (not (and *cheat-mode* (cpad-hold? 0 l3)))
                       (not (time-elapsed? (-> self state-time) (seconds 10)))))
         (hide-hud)
-        (kill-current-level-hint () '(sidekick voicebox) 'exit)
+        (kill-current-level-hint '() '(sidekick voicebox) 'exit)
         (when (and (seen-text? *game-info* (text-id village2-levitator-need-cells))
                    (hud-hidden?)
                    (can-grab-display? self)
diff --git a/goal_src/jak1/levels/village2/gambler.gc b/goal_src/jak1/levels/village2/gambler.gc
index e9cb4197bc..d509f309b7 100644
--- a/goal_src/jak1/levels/village2/gambler.gc
+++ b/goal_src/jak1/levels/village2/gambler.gc
@@ -53,15 +53,15 @@
      (set! (-> this skippable) #t)
      (cond
        ((closed? (-> this tasks) (game-task rolling-race) (task-status need-reward-speech))
-        (new 'static 'spool-anim :name "gambler-reminder-money" :index 13 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "gambler-reminder-money" :index 13 :parts 2 :command-list '()))
        ((closed? (-> this tasks) (game-task village2-gambler-money) (task-status need-reward-speech))
-        (new 'static 'spool-anim :name "gambler-reminder-race" :index 12 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "gambler-reminder-race" :index 12 :parts 2 :command-list '()))
        ((zero? (get-reminder (-> this tasks) 5))
         (if arg0 (save-reminder (-> this tasks) 1 5))
-        (new 'static 'spool-anim :name "gambler-reminder-race" :index 12 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "gambler-reminder-race" :index 12 :parts 2 :command-list '()))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 5))
-        (new 'static 'spool-anim :name "gambler-reminder-money" :index 13 :parts 2 :command-list ()))))
+        (new 'static 'spool-anim :name "gambler-reminder-money" :index 13 :parts 2 :command-list '()))))
     (((task-status need-reward-speech))
      (if (not arg0) (set! (-> this will-talk) #t))
      (case (current-task (-> this tasks))
@@ -69,7 +69,7 @@
         (when arg0
           (set! (-> this cell-for-task) (current-task (-> this tasks)))
           (close-current! (-> this tasks)))
-        (new 'static 'spool-anim :name "gambler-resolution-race" :index 14 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "gambler-resolution-race" :index 14 :parts 3 :command-list '()))
        (else
         (cond
           (arg0
@@ -77,7 +77,7 @@
            (close-current! (-> this tasks))
            (send-event *target* 'get-pickup 5 (- (-> *GAME-bank* money-task-inc))))
           (else (set! (-> this talk-message) (text-id press-to-trade-money))))
-        (new 'static 'spool-anim :name "gambler-resolution-money" :index 15 :parts 2 :command-list ()))))
+        (new 'static 'spool-anim :name "gambler-resolution-money" :index 15 :parts 2 :command-list '()))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village2/geologist.gc b/goal_src/jak1/levels/village2/geologist.gc
index 4baaf92f0d..9c22975824 100644
--- a/goal_src/jak1/levels/village2/geologist.gc
+++ b/goal_src/jak1/levels/village2/geologist.gc
@@ -45,15 +45,15 @@
      (set! (-> this skippable) #t)
      (cond
        ((closed? (-> this tasks) (game-task rolling-moles) (task-status need-reward-speech))
-        (new 'static 'spool-anim :name "geologist-reminder-money" :index 8 :parts 2 :command-list ()))
+        (new 'static 'spool-anim :name "geologist-reminder-money" :index 8 :parts 2 :command-list '()))
        ((closed? (-> this tasks) (game-task village2-geologist-money) (task-status need-reward-speech))
-        (new 'static 'spool-anim :name "geologist-reminder-moles" :index 7 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "geologist-reminder-moles" :index 7 :parts 3 :command-list '()))
        ((zero? (get-reminder (-> this tasks) 0))
         (if arg0 (save-reminder (-> this tasks) 1 0))
-        (new 'static 'spool-anim :name "geologist-reminder-moles" :index 7 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "geologist-reminder-moles" :index 7 :parts 3 :command-list '()))
        (else
         (if arg0 (save-reminder (-> this tasks) 0 0))
-        (new 'static 'spool-anim :name "geologist-reminder-money" :index 8 :parts 2 :command-list ()))))
+        (new 'static 'spool-anim :name "geologist-reminder-money" :index 8 :parts 2 :command-list '()))))
     (((task-status need-reward-speech))
      (if (not arg0) (set! (-> this will-talk) #t))
      (case (current-task (-> this tasks))
@@ -61,7 +61,7 @@
         (when arg0
           (set! (-> this cell-for-task) (current-task (-> this tasks)))
           (close-current! (-> this tasks)))
-        (new 'static 'spool-anim :name "geologist-resolution-moles" :index 9 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "geologist-resolution-moles" :index 9 :parts 3 :command-list '()))
        (else
         (cond
           (arg0
@@ -69,7 +69,7 @@
            (close-current! (-> this tasks))
            (send-event *target* 'get-pickup 5 (- (-> *GAME-bank* money-task-inc))))
           (else (set! (-> this talk-message) (text-id press-to-trade-money))))
-        (new 'static 'spool-anim :name "geologist-resolution-money" :index 10 :parts 2 :command-list ()))))
+        (new 'static 'spool-anim :name "geologist-resolution-money" :index 10 :parts 2 :command-list '()))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village2/sage-bluehut.gc b/goal_src/jak1/levels/village2/sage-bluehut.gc
index 04346d14fd..2b630a3c74 100644
--- a/goal_src/jak1/levels/village2/sage-bluehut.gc
+++ b/goal_src/jak1/levels/village2/sage-bluehut.gc
@@ -73,7 +73,7 @@
      (if arg0 (set! (-> this reminder-played) #t))
      (cond
        ((zero? (get-reminder (-> this tasks) 0))
-        (new 'static 'spool-anim :name "sage-bluehut-reminder-1-crop-dusting" :index 9 :parts 3 :command-list ()))
+        (new 'static 'spool-anim :name "sage-bluehut-reminder-1-crop-dusting" :index 9 :parts 3 :command-list '()))
        (else
         (if arg0 (set! (-> this draw bounds w) 40960.0))
         (new 'static
diff --git a/goal_src/jak1/levels/village2/sunken-elevator.gc b/goal_src/jak1/levels/village2/sunken-elevator.gc
index cc9cbc4b6a..63820d3b43 100644
--- a/goal_src/jak1/levels/village2/sunken-elevator.gc
+++ b/goal_src/jak1/levels/village2/sunken-elevator.gc
@@ -49,7 +49,7 @@
                                                        "elevator-at-top-going-down"
                                                        0
                                                        #f
-                                                       ())
+                                                       '())
                                    (-> gp-0 ppointer))
                                  0))
                      seq)
@@ -64,7 +64,7 @@
                                      "elevator-at-top-going-down"
                                      0
                                      #f
-                                     ()
+                                     '()
                                      :to
                                      self)))
            (set! (-> (the-as village2cam (-> v1-10 0)) seq) (the-as uint 1)))))))
@@ -90,7 +90,7 @@
                                    "elevator-at-top-going-down"
                                    0
                                    #f
-                                   ()
+                                   '()
                                    :to
                                    self)))
           (set! (-> (the-as village2cam (-> v1-8 0)) seq) (the-as uint 2))))))
@@ -134,6 +134,6 @@
   (none))
 
 (defmethod plat-button-method-31 ((this sunken-elevator))
-  (initialize-skeleton this *sunken-elevator-sg* ())
+  (initialize-skeleton this *sunken-elevator-sg* '())
   0
   (none))
diff --git a/goal_src/jak1/levels/village2/swamp-blimp.gc b/goal_src/jak1/levels/village2/swamp-blimp.gc
index 0e221c81ee..3507cb858f 100644
--- a/goal_src/jak1/levels/village2/swamp-blimp.gc
+++ b/goal_src/jak1/levels/village2/swamp-blimp.gc
@@ -658,7 +658,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *swamp-tetherrock-sg* ())
+  (initialize-skeleton this *swamp-tetherrock-sg* '())
   (set! (-> this fact) (new 'process 'fact-info this (pickup-type eco-pill-random) (-> *FACT-bank* default-pill-inc)))
   (set! (-> this blimp) (entity-actor-lookup arg0 'alt-actor 0))
   (set! (-> this tension) 0.0)
@@ -783,7 +783,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *precursor-arm-sg* ())
+  (initialize-skeleton this *precursor-arm-sg* '())
   (set! (-> this rot-speed) 0.0)
   (set! (-> this rot-dist) 0.0)
   (set! (-> this rot-base) 0.0)
@@ -944,7 +944,7 @@
 (defbehavior swamp-rope-init-by-other swamp-rope ((arg0 vector) (arg1 entity-actor))
   (set! (-> self root) (new 'process 'trsqv))
   (set! (-> self root trans quad) (-> arg0 quad))
-  (initialize-skeleton self *swamp-rope-sg* ())
+  (initialize-skeleton self *swamp-rope-sg* '())
   (logclear! (-> self mask) (process-mask actor-pause))
   (set! (-> self other-entity) arg1)
   (when (-> self other-entity)
@@ -1121,7 +1121,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *swamp-blimp-sg* ())
+  (initialize-skeleton this *swamp-blimp-sg* '())
   (quaternion-copy! (-> this rot-at-init) (-> this root quat))
   (set! (-> this arm-timer) 0)
   (set! (-> this trans-at-init quad) (-> this root trans quad))
diff --git a/goal_src/jak1/levels/village2/village2-obs.gc b/goal_src/jak1/levels/village2/village2-obs.gc
index b9752eecae..1c1d32fe3d 100644
--- a/goal_src/jak1/levels/village2/village2-obs.gc
+++ b/goal_src/jak1/levels/village2/village2-obs.gc
@@ -236,7 +236,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this pontoonfive))
-  (initialize-skeleton this *pontoonfive-sg* ())
+  (initialize-skeleton this *pontoonfive-sg* '())
   (rigid-body-platform-method-29 this *pontoonfive-constants*)
   (set! (-> this float-height-offset) 6144.0)
   (set! (-> this root-overlay nav-radius) 12288.0)
@@ -286,7 +286,7 @@
   (none))
 
 (defmethod rigid-body-platform-method-31 ((this pontoonten))
-  (initialize-skeleton this *pontoonten-sg* ())
+  (initialize-skeleton this *pontoonten-sg* '())
   (rigid-body-platform-method-29 this *pontoonten-constants*)
   (set! (-> this float-height-offset) 6144.0)
   (set! (-> this root-overlay nav-radius) 20480.0)
@@ -433,7 +433,7 @@
 (defmethod init-from-entity! ((this allpontoons) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *allpontoons-sg* ())
+  (initialize-skeleton this *allpontoons-sg* '())
   (set! (-> this task) (the-as uint (-> arg0 extra perm task)))
   (set! (-> this part) (create-launch-control (-> *part-group-id-table* 563) this))
   (go allpontoons-idle)
@@ -611,7 +611,7 @@
      (quaternion-axis-angle! (-> this root quat) 0.0 1.0 0.0 16384.0)
      (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "rock-hover" :fo-max 30) (-> this root trans))))
     (else (fireboulder-disable-blocking-collision)))
-  (initialize-skeleton this *fireboulder-sg* ())
+  (initialize-skeleton this *fireboulder-sg* '())
   (set! (-> this tracker) (the-as handle #f))
   (set-vector! (-> this draw color-emissive) 0.125 0.0625 0.0 0.0)
   (set! (-> this task) (the-as uint (-> arg0 extra perm task)))
@@ -645,7 +645,7 @@
 (defmethod init-from-entity! ((this ceilingflag) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ceilingflag-sg* ())
+  (initialize-skeleton this *ceilingflag-sg* '())
   (go ceilingflag-idle)
   (none))
 
@@ -712,7 +712,7 @@
   (logclear! (-> this mask) (process-mask actor-pause))
   (+! (-> this root trans y) 24576.0)
   (set! (-> this orig-trans quad) (-> this root trans quad))
-  (initialize-skeleton this *exit-chamber-dummy-sg* ())
+  (initialize-skeleton this *exit-chamber-dummy-sg* '())
   (ja-channel-set! 1)
   (let ((s5-1 (-> this skel root-channel 0)))
     (joint-control-channel-group-eval! s5-1 (the-as art-joint-anim (-> this draw art-group data 2)) num-func-identity)
@@ -1109,7 +1109,7 @@
     (backup-collide-with-as s4-0)
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *ogreboss-village2-sg* ())
+  (initialize-skeleton this *ogreboss-village2-sg* '())
   (set-vector! (-> this root scale) 0.65 0.65 0.65 1.0)
   (transform-post)
   (set! (-> this root pause-adjust-distance) 122880.0)
diff --git a/goal_src/jak1/levels/village2/warrior.gc b/goal_src/jak1/levels/village2/warrior.gc
index 1ae8fefd43..8fca83116e 100644
--- a/goal_src/jak1/levels/village2/warrior.gc
+++ b/goal_src/jak1/levels/village2/warrior.gc
@@ -65,7 +65,7 @@
              (2560 joint "cameraB"))))
       (((task-status need-reminder))
        (set! (-> this skippable) #t)
-       (new 'static 'spool-anim :name "warrior-reminder-1" :index 7 :parts 3 :command-list ()))
+       (new 'static 'spool-anim :name "warrior-reminder-1" :index 7 :parts 3 :command-list '()))
       (((task-status need-reward-speech))
        (cond
          (arg0
diff --git a/goal_src/jak1/levels/village3/assistant-village3.gc b/goal_src/jak1/levels/village3/assistant-village3.gc
index 8b49bb326a..39013b2fdf 100644
--- a/goal_src/jak1/levels/village3/assistant-village3.gc
+++ b/goal_src/jak1/levels/village3/assistant-village3.gc
@@ -49,7 +49,7 @@
                (-> this name)
                (task-status->string (current-status (-> this tasks)))))
      (get-art-elem this))
-    (else (new 'static 'spool-anim :name "assistant-village3-reminder" :index 4 :parts 3 :command-list ()))))
+    (else (new 'static 'spool-anim :name "assistant-village3-reminder" :index 4 :parts 3 :command-list '()))))
 
 (defmethod get-art-elem ((this assistant-villagec))
   (-> this draw art-group data 3))
diff --git a/goal_src/jak1/levels/village3/minecart.gc b/goal_src/jak1/levels/village3/minecart.gc
index 02b6589187..ec432be911 100644
--- a/goal_src/jak1/levels/village3/minecart.gc
+++ b/goal_src/jak1/levels/village3/minecart.gc
@@ -71,7 +71,7 @@
   (process-drawable-from-entity! self arg0)
   (logclear! (-> self mask) (process-mask actor-pause))
   (quaternion-identity! (-> self root quat))
-  (initialize-skeleton self *minecartsteel-sg* ())
+  (initialize-skeleton self *minecartsteel-sg* '())
   (set! (-> self draw origin-joint-index) (the-as uint 3))
   (logior! (-> self skel status) (janim-status inited))
   (load-params! (-> self sync) self (the-as uint 9000) arg1 0.15 0.15)
diff --git a/goal_src/jak1/levels/village3/miners.gc b/goal_src/jak1/levels/village3/miners.gc
index 0c9d9c5f93..597f984a7b 100644
--- a/goal_src/jak1/levels/village3/miners.gc
+++ b/goal_src/jak1/levels/village3/miners.gc
@@ -281,13 +281,13 @@
              (else (if (!= (get-task-status (game-task snow-eggtop)) (task-status need-reminder)) (set! s4-2 0))))))
        (if arg0 (save-reminder (-> this tasks) s4-2 0))
        (cond
-         ((zero? s4-2) (new 'static 'spool-anim :name "minershort-reminder-1-orbs" :index 5 :parts 3 :command-list ()))
+         ((zero? s4-2) (new 'static 'spool-anim :name "minershort-reminder-1-orbs" :index 5 :parts 3 :command-list '()))
          ((= s4-2 1)
           (if arg0 (send-event (-> this other-miner ppointer 3) 'clone (process->handle this)))
-          (new 'static 'spool-anim :name "minershort-reminder-1-gnawers" :index 10 :parts 3 :command-list ()))
+          (new 'static 'spool-anim :name "minershort-reminder-1-gnawers" :index 10 :parts 3 :command-list '()))
          ((= s4-2 2)
           (if arg0 (send-event (-> this other-miner ppointer 3) 'clone (process->handle this)))
-          (new 'static 'spool-anim :name "minershort-reminder-2-orbs" :index 6 :parts 2 :command-list ()))
+          (new 'static 'spool-anim :name "minershort-reminder-2-orbs" :index 6 :parts 2 :command-list '()))
          (else
           (if arg0 (send-event (-> this other-miner ppointer 3) 'clone (process->handle this)))
           (new 'static
@@ -308,7 +308,7 @@
           (save-reminder (-> this tasks) (+ s4-3 1) 2))
          (else (set! (-> this will-talk) #t) (set! (-> this talk-message) (text-id press-to-trade-money))))
        (if (< (the-as uint s4-3) (the-as uint 3))
-         (new 'static 'spool-anim :name "minershort-resolution-1-orbs" :index 7 :parts 2 :command-list ())
+         (new 'static 'spool-anim :name "minershort-resolution-1-orbs" :index 7 :parts 2 :command-list '())
          (new 'static
               'spool-anim
               :name "minershort-resolution-2-orbs"
@@ -408,6 +408,6 @@
 (defmethod init-from-entity! ((this cavegem) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *cavegem-sg* ())
+  (initialize-skeleton this *cavegem-sg* '())
   (go (method-of-object this idle))
   (none))
diff --git a/goal_src/jak1/levels/village3/sage-village3.gc b/goal_src/jak1/levels/village3/sage-village3.gc
index 23fa37a32f..538aab838c 100644
--- a/goal_src/jak1/levels/village3/sage-village3.gc
+++ b/goal_src/jak1/levels/village3/sage-village3.gc
@@ -130,8 +130,8 @@
               (set! s4-1 0)))))
        (if arg0 (save-reminder (-> this tasks) s4-1 0))
        (if (zero? s4-1)
-         (new 'static 'spool-anim :name "sage-village3-reminder-1-dark-eco" :index 5 :parts 2 :command-list ())
-         (new 'static 'spool-anim :name "sage-village3-reminder-1-rams" :index 7 :parts 3 :command-list ()))))
+         (new 'static 'spool-anim :name "sage-village3-reminder-1-dark-eco" :index 5 :parts 2 :command-list '())
+         (new 'static 'spool-anim :name "sage-village3-reminder-1-rams" :index 7 :parts 3 :command-list '()))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village3/village3-obs.gc b/goal_src/jak1/levels/village3/village3-obs.gc
index f96e157be5..6a37e6bc3e 100644
--- a/goal_src/jak1/levels/village3/village3-obs.gc
+++ b/goal_src/jak1/levels/village3/village3-obs.gc
@@ -179,7 +179,7 @@
                                     (begin
                                       (hide-hud)
                                       (level-hint-surpress!)
-                                      (kill-current-level-hint () '(sidekick voicebox) 'exit)
+                                      (kill-current-level-hint '() '(sidekick voicebox) 'exit)
                                       (hud-hidden?))
                                     (can-grab-display? self))))
                  (let ((s5-2 (new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))))
@@ -282,7 +282,7 @@
     (set! (-> this root) s4-0))
   (process-drawable-from-entity! this arg0)
   (quaternion-identity! (-> this root quat))
-  (initialize-skeleton this *gondola-sg* ())
+  (initialize-skeleton this *gondola-sg* '())
   (set! (-> this draw origin-joint-index) (the-as uint 3))
   (logclear! (-> this mask) (process-mask actor-pause))
   (set! (-> this draw shadow-joint-index) (the-as uint 3))
@@ -297,7 +297,7 @@
   (cond
     ((< (-> (target-pos 0) y) (+ 204800.0 (-> this root trans y))) (go (method-of-object this idle) #f))
     (else
-     (set! (-> this anim) (new 'static 'spool-anim :name "gondola-ride-down" :index 6 :parts 3 :command-list ()))
+     (set! (-> this anim) (new 'static 'spool-anim :name "gondola-ride-down" :index 6 :parts 3 :command-list '()))
      (go (method-of-object this idle) #t)))
   (none))
 
@@ -345,7 +345,7 @@
 (defmethod init-from-entity! ((this pistons) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *pistons-sg* ())
+  (initialize-skeleton this *pistons-sg* '())
   (set! (-> this sound) (new 'process 'ambient-sound (static-sound-spec "gdl-gen-loop" :fo-max 100) (-> this root trans)))
   (if (and (-> this entity) (logtest? (-> this entity extra perm status) (entity-perm-status complete)))
     (go (method-of-object this active) (the-as handle #f) #t)
@@ -383,7 +383,7 @@
 (defmethod init-from-entity! ((this gondolacables) (arg0 entity-actor))
   (set! (-> this root) (new 'process 'trsqv))
   (process-drawable-from-entity! this arg0)
-  (initialize-skeleton this *gondolacables-sg* ())
+  (initialize-skeleton this *gondolacables-sg* '())
   (set! (-> this draw mgeo effect 0 effect-bits)
         (the-as uint
                 (if (and (-> this entity) (logtest? (-> this entity extra perm status) (entity-perm-status complete))) 1 0)))
diff --git a/goal_src/jak1/levels/village_common/oracle.gc b/goal_src/jak1/levels/village_common/oracle.gc
index d4175042c9..0a21e84262 100644
--- a/goal_src/jak1/levels/village_common/oracle.gc
+++ b/goal_src/jak1/levels/village_common/oracle.gc
@@ -30,7 +30,7 @@
        (close-specific-task! (the-as game-task (-> this first-task)) (task-status need-introduction))
        (close-specific-task! (the-as game-task (-> this second-task)) (task-status need-introduction)))
      (case (-> (level-get-target-inside *level*) name)
-       (('village1) (new 'static 'spool-anim :name "oracle-intro-1" :index 9 :parts 5 :command-list ()))
+       (('village1) (new 'static 'spool-anim :name "oracle-intro-1" :index 9 :parts 5 :command-list '()))
        (('village2)
         (new 'static
              'spool-anim
@@ -120,13 +120,13 @@
               (0 kill "orb-cache-top-14")
               (0 setting-reset ocean-off near)
               (399 setting-unset ocean-off))))
-       (('village3) (new 'static 'spool-anim :name "oracle-intro-3" :index 13 :parts 4 :command-list ()))))
+       (('village3) (new 'static 'spool-anim :name "oracle-intro-3" :index 13 :parts 4 :command-list '()))))
     (((task-status need-reminder))
      (set! (-> this skippable) #t)
      (case (-> (level-get-target-inside *level*) name)
-       (('village1) (new 'static 'spool-anim :name "oracle-reminder-1" :index 10 :parts 4 :command-list ()))
-       (('village2) (new 'static 'spool-anim :name "oracle-reminder-2" :index 12 :parts 2 :command-list ()))
-       (('village3) (new 'static 'spool-anim :name "oracle-reminder-3" :index 14 :parts 2 :command-list ()))))
+       (('village1) (new 'static 'spool-anim :name "oracle-reminder-1" :index 10 :parts 4 :command-list '()))
+       (('village2) (new 'static 'spool-anim :name "oracle-reminder-2" :index 12 :parts 2 :command-list '()))
+       (('village3) (new 'static 'spool-anim :name "oracle-reminder-3" :index 14 :parts 2 :command-list '()))))
     (((task-status need-reward-speech))
      (cond
        (arg0
@@ -141,14 +141,14 @@
      (cond
        ((= (current-task (-> this tasks)) (-> this first-task))
         (case (-> (level-get-target-inside *level*) name)
-          (('village1) (new 'static 'spool-anim :name "oracle-right-eye-1" :index 3 :parts 2 :command-list ()))
-          (('village2) (new 'static 'spool-anim :name "oracle-right-eye-2" :index 5 :parts 2 :command-list ()))
-          (('village3) (new 'static 'spool-anim :name "oracle-right-eye-3" :index 7 :parts 2 :command-list ()))))
+          (('village1) (new 'static 'spool-anim :name "oracle-right-eye-1" :index 3 :parts 2 :command-list '()))
+          (('village2) (new 'static 'spool-anim :name "oracle-right-eye-2" :index 5 :parts 2 :command-list '()))
+          (('village3) (new 'static 'spool-anim :name "oracle-right-eye-3" :index 7 :parts 2 :command-list '()))))
        (else
         (case (-> (level-get-target-inside *level*) name)
-          (('village1) (new 'static 'spool-anim :name "oracle-left-eye-1" :index 4 :parts 2 :command-list ()))
-          (('village2) (new 'static 'spool-anim :name "oracle-left-eye-2" :index 6 :parts 2 :command-list ()))
-          (('village3) (new 'static 'spool-anim :name "oracle-left-eye-3" :index 8 :parts 2 :command-list ()))))))
+          (('village1) (new 'static 'spool-anim :name "oracle-left-eye-1" :index 4 :parts 2 :command-list '()))
+          (('village2) (new 'static 'spool-anim :name "oracle-left-eye-2" :index 6 :parts 2 :command-list '()))
+          (('village3) (new 'static 'spool-anim :name "oracle-left-eye-3" :index 8 :parts 2 :command-list '()))))))
     (else
      (if arg0
        (format 0
diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc
index b4c3f45b4e..3539849ef8 100644
--- a/goal_src/jak1/levels/village_common/villagep-obs.gc
+++ b/goal_src/jak1/levels/village_common/villagep-obs.gc
@@ -88,7 +88,7 @@
                           (or (!= (-> self level-slot) 3) (and (< f0-1 -9102.223) (< -32768.0 f0-1))))))
           (hide-hud)
           (level-hint-surpress!)
-          (kill-current-level-hint () '(sidekick voicebox) 'exit)
+          (kill-current-level-hint '() '(sidekick voicebox) 'exit)
           (when (and (hud-hidden?)
                      (can-grab-display? self)
                      (cond
@@ -334,7 +334,7 @@
       (else
        (if (or (= v1-2 (game-task none)) (task-closed? (-> this entity extra perm task) (task-status need-hint)))
          (set! (-> this down?) #t)))))
-  (initialize-skeleton this *warp-gate-switch-sg* ())
+  (initialize-skeleton this *warp-gate-switch-sg* '())
   (logior! (-> this skel status) (janim-status inited))
   (ja-channel-set! 1)
   (cond
@@ -532,7 +532,7 @@
             (set-time! (-> self state-time))
             (process-grab? *target*)
             (process-entity-status! self (entity-perm-status bit-3) #t)
-            (kill-current-level-hint '(ambient) () 'exit)
+            (kill-current-level-hint '(ambient) '() 'exit)
             (until (not (or (-> *setting-control* current talking)
                             (or (-> *setting-control* current spooling)
                                 (-> *setting-control* current hint)
@@ -556,9 +556,9 @@
                 (suspend))
               (while (not (time-elapsed? (-> self state-time) (seconds 1)))
                 (suspend))
-              (kill-current-level-hint () () 'die)
+              (kill-current-level-hint '() '() 'die)
               (suspend)
-              (kill-current-level-hint () () 'die)
+              (kill-current-level-hint '() '() 'die)
               (process-release? *target*)
               (remove-setting! 'movie)
               (apply-settings *setting-control*)
@@ -616,11 +616,11 @@
                 ((= v1-79 2)
                  (when (not (task-closed? (game-task village2-levitator) (task-status need-hint)))
                    (level-hint-spawn (text-id village2-button-reminder2) "asstvb29" (the-as entity #f) *entity-pool* (game-task none))
-                   (process-spawn pov-camera (-> self entity extra trans) *village-cam-sg* "vi2-button-cam" 0 #f () :to self)))
+                   (process-spawn pov-camera (-> self entity extra trans) *village-cam-sg* "vi2-button-cam" 0 #f '() :to self)))
                 ((= v1-79 3)
                  (when (not (task-closed? (game-task village3-button) (task-status need-hint)))
                    (level-hint-spawn (text-id village2-button-reminder3) "asstvb30" (the-as entity #f) *entity-pool* (game-task none))
-                   (process-spawn pov-camera (-> self entity extra trans) *village-cam-sg* "vi3-button-cam" 0 #f () :to self)))))
+                   (process-spawn pov-camera (-> self entity extra trans) *village-cam-sg* "vi3-button-cam" 0 #f '() :to self)))))
             (while (-> self child)
               (suspend))
             (let ((a0-66 (-> self entity)))
diff --git a/goal_src/jak1/old/cavegeyserrock.gc b/goal_src/jak1/old/cavegeyserrock.gc
index 23c77801ed..287fd708c7 100644
--- a/goal_src/jak1/old/cavegeyserrock.gc
+++ b/goal_src/jak1/old/cavegeyserrock.gc
@@ -803,7 +803,7 @@
   (set! (-> obj do-falling-sound?) #f)
   (set! (-> obj do-landing-sound?) #f)
   (process-drawable-from-entity! obj arg0)
-  (initialize-skeleton obj *cavegeyserrock-sg* ())
+  (initialize-skeleton obj *cavegeyserrock-sg* '())
   (logior! (-> obj skel status) 1)
   (ja-channel-set! 1)
   (let ((s4-1 (-> obj skel root-channel 0)))
diff --git a/goal_src/jak1/pc/debug/anim-tester-x.gc b/goal_src/jak1/pc/debug/anim-tester-x.gc
index f51f74b240..90a19c76d1 100644
--- a/goal_src/jak1/pc/debug/anim-tester-x.gc
+++ b/goal_src/jak1/pc/debug/anim-tester-x.gc
@@ -5,8 +5,8 @@
 (require "engine/anim/aligner.gc")
 
 #|
- Code for the PC port anim tester. It's like their original anim tester tool, but actually functional, and with
- different features.
+  Code for the PC port anim tester. It's like their original anim tester tool, but actually functional, and with
+  different features.
 |#
 
 ;; debug-only file!
diff --git a/goal_src/jak1/pc/debug/default-menu-pc.gc b/goal_src/jak1/pc/debug/default-menu-pc.gc
index 55266492f0..f7a13331e9 100644
--- a/goal_src/jak1/pc/debug/default-menu-pc.gc
+++ b/goal_src/jak1/pc/debug/default-menu-pc.gc
@@ -220,7 +220,7 @@
   `(lambda (arg (msg debug-menu-msg) (newval float))
     (cond
       ((= msg (debug-menu-msg press)) (set! ,val (meters newval)))
-      (else (* (1 / METER_LENGTH) ,val)))))
+      (else (* (1/ METER_LENGTH) ,val)))))
 
 (defun dm-toggle-collision-pick-func ((arg symbol) (msg debug-menu-msg))
   (when (= msg (debug-menu-msg press))
diff --git a/goal_src/jak1/pc/pckernel-common.gc b/goal_src/jak1/pc/pckernel-common.gc
index 8056343e61..48d466aadc 100644
--- a/goal_src/jak1/pc/pckernel-common.gc
+++ b/goal_src/jak1/pc/pckernel-common.gc
@@ -3,22 +3,22 @@
 (require "engine/gfx/sprite/sparticle/sparticle-launcher.gc")
 
 #|
- This file contains new code that we need for the PC port of the game specifically.
- It should be included as part of the game engine package (engine.cgo).
- 
- This file contains various types and functions to store PC-specific information
- and also to communicate between the game (GOAL) and the operating system.
- This way we can poll, change and display information about the system the game
- is running on, such as:
- - display devices and their settings, such as fullscreen, DPI, refresh rate, etc.
- - audio devices and their settings, such as audio latency, channel number, etc.
- - graphics devices and their settings, such as resolution, FPS, anisotropy, shaders, etc.
- - input devices and their settings, such as controllers, keyboards, mice, etc.
- - information about the game window (position, size)
- - PC-specific goodies, enhancements, fixes and settings.
- - whatever else.
- 
- If you do not want to include these PC things, you should exclude it from the build system.
+  This file contains new code that we need for the PC port of the game specifically.
+  It should be included as part of the game engine package (engine.cgo).
+
+  This file contains various types and functions to store PC-specific information
+  and also to communicate between the game (GOAL) and the operating system.
+  This way we can poll, change and display information about the system the game
+  is running on, such as:
+  - display devices and their settings, such as fullscreen, DPI, refresh rate, etc.
+  - audio devices and their settings, such as audio latency, channel number, etc.
+  - graphics devices and their settings, such as resolution, FPS, anisotropy, shaders, etc.
+  - input devices and their settings, such as controllers, keyboards, mice, etc.
+  - information about the game window (position, size)
+  - PC-specific goodies, enhancements, fixes and settings.
+  - whatever else.
+
+  If you do not want to include these PC things, you should exclude it from the build system.
 |#
 
 (format 0 "pckernel version: ~D.~D~%" PC_KERNEL_VER_MAJOR PC_KERNEL_VER_MINOR)
diff --git a/goal_src/jak1/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc
index b026a73897..26fa7e89b9 100644
--- a/goal_src/jak1/pc/pckernel-h.gc
+++ b/goal_src/jak1/pc/pckernel-h.gc
@@ -3,22 +3,22 @@
 (require "engine/ps2/pad.gc")
 
 #|
- This file contains code that we need for the PC port of the game specifically.
- It should be included as part of the game engine package (engine.cgo).
- 
- This file contains various types and functions to store PC-specific information
- and also to communicate between the game (GOAL) and the operating system.
- This way we can poll, change and display information about the system the game
- is running on, such as:
- - display devices and their settings, such as fullscreen, DPI, refresh rate, etc.
- - audio devices and their settings, such as audio latency, channel number, etc.
- - graphics devices and their settings, such as resolution, FPS, anisotropy, shaders, etc.
- - input devices and their settings, such as controllers, keyboards, mice, etc.
- - information about the game window (position, size)
- - PC-specific goodies, enhancements, fixes and settings.
- - whatever else.
- 
- If you do not want to include these PC things, you should exclude it from the build system.
+  This file contains code that we need for the PC port of the game specifically.
+  It should be included as part of the game engine package (engine.cgo).
+
+  This file contains various types and functions to store PC-specific information
+  and also to communicate between the game (GOAL) and the operating system.
+  This way we can poll, change and display information about the system the game
+  is running on, such as:
+  - display devices and their settings, such as fullscreen, DPI, refresh rate, etc.
+  - audio devices and their settings, such as audio latency, channel number, etc.
+  - graphics devices and their settings, such as resolution, FPS, anisotropy, shaders, etc.
+  - input devices and their settings, such as controllers, keyboards, mice, etc.
+  - information about the game window (position, size)
+  - PC-specific goodies, enhancements, fixes and settings.
+  - whatever else.
+
+  If you do not want to include these PC things, you should exclude it from the build system.
 |#
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -461,7 +461,7 @@
 
 (desfun pc-cheat-encode (word extra)
   "turn a cheat word into input names."
-  (let ((out ())
+  (let ((out '())
         (word-str (symbol->string word)))
     (dotimes (i (string-length word-str))
       (let ((char-to-inputs (assoc (string-ref word-str i) *pc-cheat-map*)))
diff --git a/goal_src/jak1/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc
index 0a50ed50c1..c5a4d20544 100644
--- a/goal_src/jak1/pc/pckernel.gc
+++ b/goal_src/jak1/pc/pckernel.gc
@@ -467,25 +467,25 @@
   (format file "  (subtitle-language ~D)~%" (-> obj subtitle-language))
   (format file "  (text-language ~D)~%" (-> obj text-language))
   #|
-      (format file "  (scenes-seen")
-      (dotimes (i PC_SPOOL_LOG_LENGTH)
-        (if (zero? (mod i 16))
-          (format file "~%   ")
-          )
-        (format file " ~D" (-> obj scenes-seen i))
-        )
-      (format file "~%    )~%")
+  (format file "  (scenes-seen")
+  (dotimes (i PC_SPOOL_LOG_LENGTH)
+    (if (zero? (mod i 16))
+      (format file "~%   ")
+      )
+    (format file " ~D" (-> obj scenes-seen i))
+    )
+  (format file "~%    )~%")
   |#
   (format file "  (secrets~%")
   #|
-      (format file "    (art #x~X)~%" (-> obj secrets art))
-      (format file "    (hard-rats? ~A)~%" (-> obj secrets hard-rats?))
-      (format file "    (hero-mode? ~A)~%" (-> obj secrets hero-mode?))
-      (format file "    (hud-map? ~A)~%" (-> obj secrets hud-map?))
-      (format file "    (hud-counters? ~A)~%" (-> obj secrets hud-counters?))
-      (format file "    (hard-fish-hiscore ~D)~%" (-> obj secrets hard-fish-hiscore))
-      (format file "    (hard-rats-hiscore ~D)~%" (-> obj secrets hard-rats-hiscore))
-      (format file "    (hard-rats-hiwave ~D)~%" (-> obj secrets hard-rats-hiwave))
+  (format file "    (art #x~X)~%" (-> obj secrets art))
+  (format file "    (hard-rats? ~A)~%" (-> obj secrets hard-rats?))
+  (format file "    (hero-mode? ~A)~%" (-> obj secrets hero-mode?))
+  (format file "    (hud-map? ~A)~%" (-> obj secrets hud-map?))
+  (format file "    (hud-counters? ~A)~%" (-> obj secrets hud-counters?))
+  (format file "    (hard-fish-hiscore ~D)~%" (-> obj secrets hard-fish-hiscore))
+  (format file "    (hard-rats-hiscore ~D)~%" (-> obj secrets hard-rats-hiscore))
+  (format file "    (hard-rats-hiwave ~D)~%" (-> obj secrets hard-rats-hiwave))
   |#
   (format file "    (cheats #x~x #x~x)~%" (-> obj cheats-known) (-> obj cheats))
   (format file "    (music~%")
diff --git a/goal_src/jak1/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc
index 3542b49a80..abad192f8d 100644
--- a/goal_src/jak1/pc/subtitle.gc
+++ b/goal_src/jak1/pc/subtitle.gc
@@ -4,15 +4,15 @@
 (require "pc/pckernel.gc")
 
 #|
- Code for subtitles for the PC port. A PC actor pool is provided, and the subtitle process lives there.
- It automatically detects the currently playing cutscene and plays the subtitles for it on channel 0.
- The other two channels are for hints, first checked automatically by name, then by text ID.
- There is a hack in ambient.gc to store the name of the last ambient hint vag played to aid in this.
- 
- Similarly to the generic text file, only one subtitles text file is loaded at once, stored in a specific
- heap.
- 
- In Jak 2, the subtitles are stored directly within the .STR files. We don't have that luxury here, unfortunately.
+  Code for subtitles for the PC port. A PC actor pool is provided, and the subtitle process lives there.
+  It automatically detects the currently playing cutscene and plays the subtitles for it on channel 0.
+  The other two channels are for hints, first checked automatically by name, then by text ID.
+  There is a hack in ambient.gc to store the name of the last ambient hint vag played to aid in this.
+
+  Similarly to the generic text file, only one subtitles text file is loaded at once, stored in a specific
+  heap.
+
+  In Jak 2, the subtitles are stored directly within the .STR files. We don't have that luxury here, unfortunately.
 |#
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/goal_src/jak1/pc/util/pc-anim-util.gc b/goal_src/jak1/pc/util/pc-anim-util.gc
index a728348c23..ca33612b4c 100644
--- a/goal_src/jak1/pc/util/pc-anim-util.gc
+++ b/goal_src/jak1/pc/util/pc-anim-util.gc
@@ -6,9 +6,9 @@
 (require "engine/target/target-h.gc")
 
 #|
- A random assortment of functions used for manipulating various animations and skeletons in the pc port.
- 
- This is used for funny cheat codes and the like.
+A random assortment of functions used for manipulating various animations and skeletons in the pc port.
+
+This is used for funny cheat codes and the like.
 |#
 
 (define *cheat-big-head-scale* (new 'static 'vector :x 1.5 :y 1.5 :z 1.5 :w 1.0))
diff --git a/out/jak1/obj_before/.gitignore b/out/jak1/obj_before/.gitignore
new file mode 100644
index 0000000000..268b9c8dd5
--- /dev/null
+++ b/out/jak1/obj_before/.gitignore
@@ -0,0 +1,3 @@
+*
+!.gitignore
+!hash.md5
diff --git a/test/common/formatter/corpus/functions.test.gc b/test/common/formatter/corpus/functions.test.gc
index 0d0ba7fc42..458b5fdcaa 100644
--- a/test/common/formatter/corpus/functions.test.gc
+++ b/test/common/formatter/corpus/functions.test.gc
@@ -116,4 +116,20 @@ Methods - long arg list
 
 (defmethod fill-and-probe-using-line-sphere ((obj collide-cache) (arg0 vector) (arg1 vector) (arg2 float) (arg3 collide-kind) (arg4 process) (arg5 collide-tri-result) (arg6 pat-surface))
   (fill-using-line-sphere obj arg0 arg1 arg2 arg3 (the-as process-drawable arg4) arg6)
-  (probe-using-line-sphere obj arg0 arg1 arg2 arg3 arg5 arg6))
\ No newline at end of file
+  (probe-using-line-sphere obj arg0 arg1 arg2 arg3 arg5 arg6))
+
+===
+Don't split apart function names that begin with numbers
+===
+
+(defun 1/ ((x float))
+  "Reciprocal floating point"
+  (declare (inline))
+  (/ 1. x))
+
+---
+
+(defun 1/ ((x float))
+  "Reciprocal floating point"
+  (declare (inline))
+  (/ 1. x))
\ No newline at end of file
diff --git a/test/common/formatter/corpus/lists.test.gc b/test/common/formatter/corpus/lists.test.gc
index 7ddff71c63..ca97026ea7 100644
--- a/test/common/formatter/corpus/lists.test.gc
+++ b/test/common/formatter/corpus/lists.test.gc
@@ -90,4 +90,14 @@ Another list of lists
  (:timer (seconds 2))
  (:flags (bit2 bit3 left-multiply-quat))
  (:next-time (seconds 0.5))
- (:next-launcher 109))
\ No newline at end of file
+ (:next-launcher 109))
+
+===
+Retain quoted empty lists
+===
+
+(or (= '() lst))
+
+---
+
+(or (= '() lst))
\ No newline at end of file
diff --git a/test/common/formatter/corpus/symbols.test.gc b/test/common/formatter/corpus/symbols.test.gc
index ea38c863e9..2931e91ff8 100644
--- a/test/common/formatter/corpus/symbols.test.gc
+++ b/test/common/formatter/corpus/symbols.test.gc
@@ -26,4 +26,14 @@ Numbers at the start of symbols
 
 ---
 
-(4x3 #x12a)
\ No newline at end of file
+(4x3 #x12a)
+
+===
+Numbers and operators in symbol
+===
+
+vector-rad<-vector-deg/2!
+
+---
+
+vector-rad<-vector-deg/2!
\ No newline at end of file
diff --git a/third-party/tree-sitter/tree-sitter-opengoal/grammar.js b/third-party/tree-sitter/tree-sitter-opengoal/grammar.js
index 880b7890bd..3e92cebed2 100644
--- a/third-party/tree-sitter/tree-sitter-opengoal/grammar.js
+++ b/third-party/tree-sitter/tree-sitter-opengoal/grammar.js
@@ -117,11 +117,11 @@ const CHARACTER =
 // \u205f => <medium mathematical space>
 // \u3000 => <ideographic space>
 const SYMBOL_HEAD =
-  /[^\f\n\r\t \/()\[\]{}"@~^;`\\,:'0-9\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
+  /[^\f\n\r\t ()\[\]{}"@~^;`\\,:'0-9\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
 
 const SYMBOL_BODY =
   choice(SYMBOL_HEAD,
-    /[:#~'0-9]/);
+    /[:#~'0-9\/]/);
 
 const SYMBOL =
   token(seq(SYMBOL_HEAD,
diff --git a/third-party/tree-sitter/tree-sitter-opengoal/grammar.json b/third-party/tree-sitter/tree-sitter-opengoal/grammar.json
index 16568b2f00..270c861b26 100644
--- a/third-party/tree-sitter/tree-sitter-opengoal/grammar.json
+++ b/third-party/tree-sitter/tree-sitter-opengoal/grammar.json
@@ -845,11 +845,11 @@
                 "members": [
                   {
                     "type": "PATTERN",
-                    "value": "[^\\f\\n\\r\\t \\/()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
+                    "value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
                   },
                   {
                     "type": "PATTERN",
-                    "value": "[:#~'0-9]"
+                    "value": "[:#~'0-9\\/]"
                   }
                 ]
               },
@@ -860,11 +860,11 @@
                   "members": [
                     {
                       "type": "PATTERN",
-                      "value": "[^\\f\\n\\r\\t \\/()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
+                      "value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
                     },
                     {
                       "type": "PATTERN",
-                      "value": "[:#~'0-9]"
+                      "value": "[:#~'0-9\\/]"
                     }
                   ]
                 }
@@ -895,7 +895,7 @@
                 "members": [
                   {
                     "type": "PATTERN",
-                    "value": "[^\\f\\n\\r\\t \\/()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
+                    "value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
                   },
                   {
                     "type": "REPEAT",
@@ -904,11 +904,11 @@
                       "members": [
                         {
                           "type": "PATTERN",
-                          "value": "[^\\f\\n\\r\\t \\/()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
+                          "value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:'0-9\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
                         },
                         {
                           "type": "PATTERN",
-                          "value": "[:#~'0-9]"
+                          "value": "[:#~'0-9\\/]"
                         }
                       ]
                     }
diff --git a/third-party/tree-sitter/tree-sitter-opengoal/parser.c b/third-party/tree-sitter/tree-sitter-opengoal/parser.c
index e3c90235e5..0fbc8eb754 100644
--- a/third-party/tree-sitter/tree-sitter-opengoal/parser.c
+++ b/third-party/tree-sitter/tree-sitter-opengoal/parser.c
@@ -689,21 +689,19 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
 };
 
 static inline bool sym_block_comment_character_set_1(int32_t c) {
-  return (c < '['
+  return (c < '`'
     ? (c < ','
       ? (c < '"'
         ? (c < 28
           ? (c >= '\t' && c <= '\r')
           : c <= ' ')
         : (c <= '"' || (c >= '(' && c <= ')')))
-      : (c <= ',' || (c < ';'
-        ? c == '/'
-        : (c <= ';' || c == '@'))))
-    : (c <= '^' || (c < 8200
+      : (c <= ',' || (c < '@'
+        ? c == ';'
+        : (c <= '@' || (c >= '[' && c <= '^')))))
+    : (c <= '`' || (c < 8200
       ? (c < 5760
-        ? (c < '{'
-          ? c == '`'
-          : c <= '}')
+        ? (c >= '{' && c <= '}')
         : (c <= 5760 || (c >= 8192 && c <= 8198)))
       : (c <= 8202 || (c < 8287
         ? (c >= 8232 && c <= 8233)
@@ -719,9 +717,7 @@ static inline bool sym_block_comment_character_set_2(int32_t c) {
           : c <= ' ')
         : (c <= '"' || (c >= '(' && c <= ')')))
       : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
+        ? c == ';'
         : (c <= '@' || (c >= '[' && c <= '^')))))
     : (c <= '`' || (c < 8200
       ? (c < 5760
@@ -804,7 +800,7 @@ static inline bool aux_sym_format_directive_type_token11_character_set_1(int32_t
         : c <= 'z')))));
 }
 
-static inline bool aux_sym__sym_unqualified_token1_character_set_1(int32_t c) {
+static inline bool aux_sym__digit_sym_token1_character_set_1(int32_t c) {
   return (c < '['
     ? (c < '('
       ? (c < 28
@@ -813,9 +809,9 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_1(int32_t c) {
           : c <= '\r')
         : (c <= ' ' || c == '"'))
       : (c <= ')' || (c < ';'
-        ? (c < '/'
+        ? (c < '0'
           ? c == ','
-          : c <= '/')
+          : c <= '9')
         : (c <= ';' || c == '@'))))
     : (c <= '^' || (c < 8192
       ? (c < '}'
@@ -830,6 +826,30 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_1(int32_t c) {
         : (c <= 8287 || c == 12288))))));
 }
 
+static inline bool aux_sym__sym_unqualified_token1_character_set_1(int32_t c) {
+  return (c < '`'
+    ? (c < '('
+      ? (c < 28
+        ? (c < '\t'
+          ? c == 0
+          : c <= '\r')
+        : (c <= ' ' || c == '"'))
+      : (c <= ')' || (c < '@'
+        ? (c < ';'
+          ? c == ','
+          : c <= ';')
+        : (c <= '@' || (c >= '[' && c <= '^')))))
+    : (c <= '`' || (c < 8200
+      ? (c < 5760
+        ? (c < '}'
+          ? c == '{'
+          : c <= '}')
+        : (c <= 5760 || (c >= 8192 && c <= 8198)))
+      : (c <= 8202 || (c < 8287
+        ? (c >= 8232 && c <= 8233)
+        : (c <= 8287 || c == 12288))))));
+}
+
 static inline bool aux_sym__sym_unqualified_token1_character_set_2(int32_t c) {
   return (c < '['
     ? (c < '('
@@ -839,7 +859,7 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_2(int32_t c) {
           : c <= '\r')
         : (c <= ' ' || c == '"'))
       : (c <= ')' || (c < ';'
-        ? (c < '/'
+        ? (c < '0'
           ? c == ','
           : c <= '9')
         : (c <= ';' || (c >= '@' && c <= 'F')))))
@@ -865,9 +885,9 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_3(int32_t c) {
           : c <= '\r')
         : (c <= ' ' || c == '"'))
       : (c <= ')' || (c < ';'
-        ? (c < '.'
+        ? (c < '0'
           ? c == ','
-          : c <= '9')
+          : c <= '1')
         : (c <= ';' || c == '@'))))
     : (c <= '^' || (c < 8192
       ? (c < '}'
@@ -891,61 +911,7 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_4(int32_t c) {
           : c <= '\r')
         : (c <= ' ' || c == '"'))
       : (c <= ')' || (c < ';'
-        ? (c < '/'
-          ? c == ','
-          : c <= '9')
-        : (c <= ';' || c == '@'))))
-    : (c <= '^' || (c < 8192
-      ? (c < '}'
-        ? (c < '{'
-          ? c == '`'
-          : c <= '{')
-        : (c <= '}' || c == 5760))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_5(int32_t c) {
-  return (c < '['
-    ? (c < '('
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || c == '"'))
-      : (c <= ')' || (c < ';'
-        ? (c < '/'
-          ? c == ','
-          : c <= '1')
-        : (c <= ';' || c == '@'))))
-    : (c <= '^' || (c < 8192
-      ? (c < '}'
-        ? (c < '{'
-          ? c == '`'
-          : c <= '{')
-        : (c <= '}' || c == 5760))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_6(int32_t c) {
-  return (c < '['
-    ? (c < '('
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || c == '"'))
-      : (c <= ')' || (c < ';'
-        ? (c < '/'
-          ? c == ','
-          : c <= '/')
+        ? c == ','
         : (c <= ';' || c == '@'))))
     : (c <= '^' || (c < 8200
       ? (c < 5760
@@ -958,152 +924,6 @@ static inline bool aux_sym__sym_unqualified_token1_character_set_6(int32_t c) {
         : (c <= 8287 || c == 12288))))));
 }
 
-static inline bool aux_sym__sym_unqualified_token1_character_set_7(int32_t c) {
-  return (c < 'b'
-    ? (c < ','
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || (c < '('
-          ? c == '"'
-          : c <= ')')))
-      : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
-        : (c <= '@' || (c < '`'
-          ? (c >= '[' && c <= '^')
-          : c <= '`')))))
-    : (c <= 'b' || (c < 8192
-      ? (c < 'x'
-        ? (c < 't'
-          ? c == 'f'
-          : c <= 't')
-        : (c <= 'x' || (c < 5760
-          ? (c >= '{' && c <= '}')
-          : c <= 5760)))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_8(int32_t c) {
-  return (c < '`'
-    ? (c < ','
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || (c < '('
-          ? c == '"'
-          : c <= ')')))
-      : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
-        : (c <= '@' || (c >= '[' && c <= '^')))))
-    : (c <= '`' || (c < 8192
-      ? (c < '{'
-        ? (c < 'x'
-          ? c == 'b'
-          : c <= 'x')
-        : (c <= '{' || (c < 5760
-          ? c == '}'
-          : c <= 5760)))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_9(int32_t c) {
-  return (c < '`'
-    ? (c < ','
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || (c < '('
-          ? c == '"'
-          : c <= ')')))
-      : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
-        : (c <= '@' || (c >= '[' && c <= '^')))))
-    : (c <= '`' || (c < 8192
-      ? (c < '}'
-        ? (c < '{'
-          ? c == 'e'
-          : c <= '{')
-        : (c <= '}' || c == 5760))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_10(int32_t c) {
-  return (c < '`'
-    ? (c < ','
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || (c < '('
-          ? c == '"'
-          : c <= ')')))
-      : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
-        : (c <= '@' || (c >= '[' && c <= '^')))))
-    : (c <= '`' || (c < 8192
-      ? (c < '}'
-        ? (c < '{'
-          ? c == 'n'
-          : c <= '{')
-        : (c <= '}' || c == 5760))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
-static inline bool aux_sym__sym_unqualified_token1_character_set_11(int32_t c) {
-  return (c < '`'
-    ? (c < ','
-      ? (c < 28
-        ? (c < '\t'
-          ? c == 0
-          : c <= '\r')
-        : (c <= ' ' || (c < '('
-          ? c == '"'
-          : c <= ')')))
-      : (c <= ',' || (c < '@'
-        ? (c < ';'
-          ? c == '/'
-          : c <= ';')
-        : (c <= '@' || (c >= '[' && c <= '^')))))
-    : (c <= '`' || (c < 8192
-      ? (c < '}'
-        ? (c < '{'
-          ? c == 'o'
-          : c <= '{')
-        : (c <= '}' || c == 5760))
-      : (c <= 8198 || (c < 8287
-        ? (c < 8232
-          ? (c >= 8200 && c <= 8202)
-          : c <= 8233)
-        : (c <= 8287 || c == 12288))))));
-}
-
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
   START_LEXER();
   eof = lexer->eof(lexer);
@@ -1195,7 +1015,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (('{' <= lookahead && lookahead <= '}')) ADVANCE(63);
       if (lookahead == '(' ||
           lookahead == ')') ADVANCE(62);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(28);
       if (lookahead == '$' ||
           ('B' <= lookahead && lookahead <= 'O') ||
           ('R' <= lookahead && lookahead <= 'T') ||
@@ -1240,7 +1060,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (('{' <= lookahead && lookahead <= '}')) ADVANCE(63);
       if (lookahead == '(' ||
           lookahead == ')') ADVANCE(62);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(28);
       if (lookahead == '$' ||
           ('B' <= lookahead && lookahead <= 'O') ||
           ('R' <= lookahead && lookahead <= 'T') ||
@@ -1276,12 +1096,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '|') ADVANCE(52);
       if (lookahead == '~') ADVANCE(49);
       if (('+' <= lookahead && lookahead <= '-')) ADVANCE(7);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(28);
       if (aux_sym_format_directive_type_token11_character_set_1(lookahead)) ADVANCE(71);
       END_STATE();
     case 7:
       if (lookahead == '#') ADVANCE(8);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(28);
       END_STATE();
     case 8:
       if (lookahead == 'b') ADVANCE(14);
@@ -1304,12 +1124,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 14:
       if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(28);
+          lookahead == '1') ADVANCE(30);
       END_STATE();
     case 15:
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(30);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(32);
       END_STATE();
     case 16:
       if (!sym_kwd_lit_character_set_1(lookahead)) ADVANCE(37);
@@ -1334,7 +1154,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 21:
       if (eof) ADVANCE(22);
       if (lookahead == '"') ADVANCE(73);
-      if (lookahead == '#') ADVANCE(86);
+      if (lookahead == '#') ADVANCE(85);
       if (lookahead == '\'') ADVANCE(38);
       if (lookahead == '(') ADVANCE(94);
       if (lookahead == ')') ADVANCE(95);
@@ -1343,9 +1163,9 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == ':') ADVANCE(16);
       if (lookahead == ';') ADVANCE(24);
       if (lookahead == '`') ADVANCE(67);
-      if (lookahead == 'n') ADVANCE(91);
+      if (lookahead == 'n') ADVANCE(89);
       if (('+' <= lookahead && lookahead <= '-')) ADVANCE(82);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(33);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
       if (('\t' <= lookahead && lookahead <= '\r') ||
           (28 <= lookahead && lookahead <= ' ') ||
           lookahead == 5760 ||
@@ -1391,56 +1211,56 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 27:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (lookahead == '.') ADVANCE(29);
+      if (lookahead == '.') ADVANCE(35);
+      if (!aux_sym__digit_sym_token1_character_set_1(lookahead)) ADVANCE(80);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(27);
       END_STATE();
     case 28:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(28);
+      if (lookahead == '.') ADVANCE(31);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(28);
       END_STATE();
     case 29:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
+      if (lookahead == '.') ADVANCE(34);
+      if (!aux_sym__digit_sym_token1_character_set_1(lookahead)) ADVANCE(93);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(29);
       END_STATE();
     case 30:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(30);
+      if (lookahead == '0' ||
+          lookahead == '1') ADVANCE(30);
       END_STATE();
     case 31:
+      ACCEPT_TOKEN(aux_sym_num_lit_token1);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(31);
+      END_STATE();
+    case 32:
+      ACCEPT_TOKEN(aux_sym_num_lit_token1);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(32);
+      END_STATE();
+    case 33:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
       if (!aux_sym__sym_unqualified_token1_character_set_2(lookahead)) ADVANCE(93);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(31);
-      END_STATE();
-    case 32:
-      ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_3(lookahead)) ADVANCE(93);
-      if (lookahead == '.') ADVANCE(34);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(32);
-      END_STATE();
-    case 33:
-      ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_3(lookahead)) ADVANCE(80);
-      if (lookahead == '.') ADVANCE(35);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(33);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(33);
       END_STATE();
     case 34:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(93);
+      if (!aux_sym__digit_sym_token1_character_set_1(lookahead)) ADVANCE(93);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(34);
       END_STATE();
     case 35:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(80);
+      if (!aux_sym__digit_sym_token1_character_set_1(lookahead)) ADVANCE(80);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(35);
       END_STATE();
     case 36:
       ACCEPT_TOKEN(aux_sym_num_lit_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_5(lookahead)) ADVANCE(93);
+      if (!aux_sym__sym_unqualified_token1_character_set_3(lookahead)) ADVANCE(93);
       if (lookahead == '0' ||
           lookahead == '1') ADVANCE(36);
       END_STATE();
@@ -1595,18 +1415,19 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 81:
       ACCEPT_TOKEN(anon_sym_SLASH);
+      if (!aux_sym__sym_unqualified_token1_character_set_1(lookahead)) ADVANCE(93);
       END_STATE();
     case 82:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (lookahead == '#') ADVANCE(88);
-      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(93);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(32);
+      if (lookahead == '#') ADVANCE(86);
+      if (!aux_sym__digit_sym_token1_character_set_1(lookahead)) ADVANCE(93);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(29);
       END_STATE();
     case 83:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (lookahead == '#') ADVANCE(92);
+      if (lookahead == '#') ADVANCE(90);
+      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(83);
       if (lookahead == '|') ADVANCE(84);
-      if (!aux_sym__sym_unqualified_token1_character_set_6(lookahead)) ADVANCE(83);
       if (sym_block_comment_character_set_1(lookahead)) ADVANCE(4);
       END_STATE();
     case 84:
@@ -1617,53 +1438,53 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 85:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_2(lookahead)) ADVANCE(93);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(31);
+      if (lookahead == '\\') ADVANCE(19);
+      if (lookahead == 'b') ADVANCE(92);
+      if (lookahead == 'f' ||
+          lookahead == 't') ADVANCE(79);
+      if (lookahead == 'x') ADVANCE(91);
+      if (lookahead == '|') ADVANCE(83);
+      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(93);
       END_STATE();
     case 86:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_7(lookahead)) ADVANCE(93);
-      if (lookahead == '\\') ADVANCE(19);
-      if (lookahead == 'b') ADVANCE(87);
-      if (lookahead == 'f' ||
-          lookahead == 't') ADVANCE(79);
-      if (lookahead == 'x') ADVANCE(85);
-      if (lookahead == '|') ADVANCE(83);
+      if (lookahead == 'b') ADVANCE(92);
+      if (lookahead == 'x') ADVANCE(91);
+      if (!aux_sym__sym_unqualified_token1_character_set_1(lookahead)) ADVANCE(93);
       END_STATE();
     case 87:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_5(lookahead)) ADVANCE(93);
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(36);
+      if (lookahead == 'e') ADVANCE(78);
+      if (!aux_sym__sym_unqualified_token1_character_set_1(lookahead)) ADVANCE(93);
       END_STATE();
     case 88:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_8(lookahead)) ADVANCE(93);
-      if (lookahead == 'b') ADVANCE(87);
-      if (lookahead == 'x') ADVANCE(85);
+      if (lookahead == 'n') ADVANCE(87);
+      if (!aux_sym__sym_unqualified_token1_character_set_1(lookahead)) ADVANCE(93);
       END_STATE();
     case 89:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_9(lookahead)) ADVANCE(93);
-      if (lookahead == 'e') ADVANCE(78);
+      if (lookahead == 'o') ADVANCE(88);
+      if (!aux_sym__sym_unqualified_token1_character_set_1(lookahead)) ADVANCE(93);
       END_STATE();
     case 90:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_10(lookahead)) ADVANCE(93);
-      if (lookahead == 'n') ADVANCE(89);
+      if (lookahead == '|') ADVANCE(93);
+      if (!aux_sym__sym_unqualified_token1_character_set_4(lookahead)) ADVANCE(83);
+      if (sym_block_comment_character_set_1(lookahead)) ADVANCE(4);
       END_STATE();
     case 91:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_11(lookahead)) ADVANCE(93);
-      if (lookahead == 'o') ADVANCE(90);
+      if (!aux_sym__sym_unqualified_token1_character_set_2(lookahead)) ADVANCE(93);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(33);
       END_STATE();
     case 92:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
-      if (!aux_sym__sym_unqualified_token1_character_set_6(lookahead)) ADVANCE(83);
-      if (lookahead == '|') ADVANCE(93);
-      if (sym_block_comment_character_set_1(lookahead)) ADVANCE(4);
+      if (!aux_sym__sym_unqualified_token1_character_set_3(lookahead)) ADVANCE(93);
+      if (lookahead == '0' ||
+          lookahead == '1') ADVANCE(36);
       END_STATE();
     case 93:
       ACCEPT_TOKEN(aux_sym__sym_unqualified_token1);
@@ -1818,9 +1639,9 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_bool_lit] = ACTIONS(7),
     [aux_sym__digit_sym_token1] = ACTIONS(19),
     [anon_sym_SLASH] = ACTIONS(21),
-    [aux_sym__sym_unqualified_token1] = ACTIONS(23),
-    [anon_sym_LPAREN] = ACTIONS(25),
-    [anon_sym_COMMA_AT] = ACTIONS(27),
+    [aux_sym__sym_unqualified_token1] = ACTIONS(21),
+    [anon_sym_LPAREN] = ACTIONS(23),
+    [anon_sym_COMMA_AT] = ACTIONS(25),
   },
   [2] = {
     [sym__format_token] = STATE(44),
@@ -1828,39 +1649,39 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_format_modifiers] = STATE(20),
     [sym_format_directive_type] = STATE(53),
     [aux_sym_format_modifiers_repeat1] = STATE(47),
-    [aux_sym_num_lit_token1] = ACTIONS(29),
-    [anon_sym_SQUOTE] = ACTIONS(31),
-    [anon_sym_v] = ACTIONS(33),
-    [anon_sym_V] = ACTIONS(33),
-    [anon_sym_POUND] = ACTIONS(35),
-    [anon_sym_COMMA] = ACTIONS(37),
-    [anon_sym_AT] = ACTIONS(39),
-    [anon_sym_AT_COLON] = ACTIONS(41),
-    [anon_sym_COLON] = ACTIONS(39),
-    [anon_sym_COLON_AT] = ACTIONS(41),
-    [anon_sym_TILDE] = ACTIONS(43),
-    [anon_sym_PERCENT] = ACTIONS(43),
-    [anon_sym_AMP] = ACTIONS(43),
-    [anon_sym_PIPE] = ACTIONS(43),
-    [aux_sym_format_directive_type_token1] = ACTIONS(43),
-    [aux_sym_format_directive_type_token2] = ACTIONS(43),
-    [anon_sym_LF] = ACTIONS(43),
-    [anon_sym_CR] = ACTIONS(43),
-    [aux_sym_format_directive_type_token3] = ACTIONS(43),
-    [aux_sym_format_directive_type_token4] = ACTIONS(43),
-    [aux_sym_format_directive_type_token5] = ACTIONS(43),
-    [aux_sym_format_directive_type_token6] = ACTIONS(43),
-    [anon_sym__] = ACTIONS(43),
-    [aux_sym_format_directive_type_token7] = ACTIONS(43),
-    [aux_sym_format_directive_type_token8] = ACTIONS(43),
-    [aux_sym_format_directive_type_token9] = ACTIONS(43),
-    [aux_sym_format_directive_type_token10] = ACTIONS(43),
-    [anon_sym_SEMI] = ACTIONS(43),
-    [anon_sym_BQUOTE] = ACTIONS(43),
-    [anon_sym_QMARK] = ACTIONS(43),
-    [anon_sym_Newline] = ACTIONS(43),
-    [aux_sym_format_directive_type_token11] = ACTIONS(45),
-    [anon_sym_DQUOTE] = ACTIONS(47),
+    [aux_sym_num_lit_token1] = ACTIONS(27),
+    [anon_sym_SQUOTE] = ACTIONS(29),
+    [anon_sym_v] = ACTIONS(31),
+    [anon_sym_V] = ACTIONS(31),
+    [anon_sym_POUND] = ACTIONS(33),
+    [anon_sym_COMMA] = ACTIONS(35),
+    [anon_sym_AT] = ACTIONS(37),
+    [anon_sym_AT_COLON] = ACTIONS(39),
+    [anon_sym_COLON] = ACTIONS(37),
+    [anon_sym_COLON_AT] = ACTIONS(39),
+    [anon_sym_TILDE] = ACTIONS(41),
+    [anon_sym_PERCENT] = ACTIONS(41),
+    [anon_sym_AMP] = ACTIONS(41),
+    [anon_sym_PIPE] = ACTIONS(41),
+    [aux_sym_format_directive_type_token1] = ACTIONS(41),
+    [aux_sym_format_directive_type_token2] = ACTIONS(41),
+    [anon_sym_LF] = ACTIONS(41),
+    [anon_sym_CR] = ACTIONS(41),
+    [aux_sym_format_directive_type_token3] = ACTIONS(41),
+    [aux_sym_format_directive_type_token4] = ACTIONS(41),
+    [aux_sym_format_directive_type_token5] = ACTIONS(41),
+    [aux_sym_format_directive_type_token6] = ACTIONS(41),
+    [anon_sym__] = ACTIONS(41),
+    [aux_sym_format_directive_type_token7] = ACTIONS(41),
+    [aux_sym_format_directive_type_token8] = ACTIONS(41),
+    [aux_sym_format_directive_type_token9] = ACTIONS(41),
+    [aux_sym_format_directive_type_token10] = ACTIONS(41),
+    [anon_sym_SEMI] = ACTIONS(41),
+    [anon_sym_BQUOTE] = ACTIONS(41),
+    [anon_sym_QMARK] = ACTIONS(41),
+    [anon_sym_Newline] = ACTIONS(41),
+    [aux_sym_format_directive_type_token11] = ACTIONS(43),
+    [anon_sym_DQUOTE] = ACTIONS(45),
   },
   [3] = {
     [sym__format_token] = STATE(44),
@@ -1868,53 +1689,53 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_format_modifiers] = STATE(20),
     [sym_format_directive_type] = STATE(53),
     [aux_sym_format_modifiers_repeat1] = STATE(47),
-    [aux_sym_num_lit_token1] = ACTIONS(29),
-    [anon_sym_SQUOTE] = ACTIONS(31),
-    [anon_sym_v] = ACTIONS(33),
-    [anon_sym_V] = ACTIONS(33),
-    [anon_sym_POUND] = ACTIONS(35),
-    [anon_sym_COMMA] = ACTIONS(37),
-    [anon_sym_AT] = ACTIONS(39),
-    [anon_sym_AT_COLON] = ACTIONS(41),
-    [anon_sym_COLON] = ACTIONS(39),
-    [anon_sym_COLON_AT] = ACTIONS(41),
-    [anon_sym_TILDE] = ACTIONS(43),
-    [anon_sym_PERCENT] = ACTIONS(43),
-    [anon_sym_AMP] = ACTIONS(43),
-    [anon_sym_PIPE] = ACTIONS(43),
-    [aux_sym_format_directive_type_token1] = ACTIONS(43),
-    [aux_sym_format_directive_type_token2] = ACTIONS(43),
-    [anon_sym_LF] = ACTIONS(43),
-    [anon_sym_CR] = ACTIONS(43),
-    [aux_sym_format_directive_type_token3] = ACTIONS(43),
-    [aux_sym_format_directive_type_token4] = ACTIONS(43),
-    [aux_sym_format_directive_type_token5] = ACTIONS(43),
-    [aux_sym_format_directive_type_token6] = ACTIONS(43),
-    [anon_sym__] = ACTIONS(43),
-    [aux_sym_format_directive_type_token7] = ACTIONS(43),
-    [aux_sym_format_directive_type_token8] = ACTIONS(43),
-    [aux_sym_format_directive_type_token9] = ACTIONS(43),
-    [aux_sym_format_directive_type_token10] = ACTIONS(43),
-    [anon_sym_SEMI] = ACTIONS(43),
-    [anon_sym_BQUOTE] = ACTIONS(43),
-    [anon_sym_QMARK] = ACTIONS(43),
-    [anon_sym_Newline] = ACTIONS(43),
-    [aux_sym_format_directive_type_token11] = ACTIONS(45),
-    [anon_sym_DQUOTE] = ACTIONS(49),
+    [aux_sym_num_lit_token1] = ACTIONS(27),
+    [anon_sym_SQUOTE] = ACTIONS(29),
+    [anon_sym_v] = ACTIONS(31),
+    [anon_sym_V] = ACTIONS(31),
+    [anon_sym_POUND] = ACTIONS(33),
+    [anon_sym_COMMA] = ACTIONS(35),
+    [anon_sym_AT] = ACTIONS(37),
+    [anon_sym_AT_COLON] = ACTIONS(39),
+    [anon_sym_COLON] = ACTIONS(37),
+    [anon_sym_COLON_AT] = ACTIONS(39),
+    [anon_sym_TILDE] = ACTIONS(41),
+    [anon_sym_PERCENT] = ACTIONS(41),
+    [anon_sym_AMP] = ACTIONS(41),
+    [anon_sym_PIPE] = ACTIONS(41),
+    [aux_sym_format_directive_type_token1] = ACTIONS(41),
+    [aux_sym_format_directive_type_token2] = ACTIONS(41),
+    [anon_sym_LF] = ACTIONS(41),
+    [anon_sym_CR] = ACTIONS(41),
+    [aux_sym_format_directive_type_token3] = ACTIONS(41),
+    [aux_sym_format_directive_type_token4] = ACTIONS(41),
+    [aux_sym_format_directive_type_token5] = ACTIONS(41),
+    [aux_sym_format_directive_type_token6] = ACTIONS(41),
+    [anon_sym__] = ACTIONS(41),
+    [aux_sym_format_directive_type_token7] = ACTIONS(41),
+    [aux_sym_format_directive_type_token8] = ACTIONS(41),
+    [aux_sym_format_directive_type_token9] = ACTIONS(41),
+    [aux_sym_format_directive_type_token10] = ACTIONS(41),
+    [anon_sym_SEMI] = ACTIONS(41),
+    [anon_sym_BQUOTE] = ACTIONS(41),
+    [anon_sym_QMARK] = ACTIONS(41),
+    [anon_sym_Newline] = ACTIONS(41),
+    [aux_sym_format_directive_type_token11] = ACTIONS(43),
+    [anon_sym_DQUOTE] = ACTIONS(47),
   },
 };
 
 static const uint16_t ts_small_parse_table[] = {
   [0] = 14,
-    ACTIONS(29), 1,
+    ACTIONS(27), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
+    ACTIONS(29), 1,
       anon_sym_SQUOTE,
-    ACTIONS(35), 1,
+    ACTIONS(33), 1,
       anon_sym_POUND,
-    ACTIONS(37), 1,
+    ACTIONS(35), 1,
       anon_sym_COMMA,
-    ACTIONS(45), 1,
+    ACTIONS(43), 1,
       aux_sym_format_directive_type_token11,
     STATE(5), 1,
       sym_format_prefix_parameters,
@@ -1926,16 +1747,16 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_format_modifiers_repeat1,
     STATE(53), 1,
       sym_format_directive_type,
-    ACTIONS(33), 2,
+    ACTIONS(31), 2,
       anon_sym_v,
       anon_sym_V,
-    ACTIONS(39), 2,
+    ACTIONS(37), 2,
       anon_sym_AT,
       anon_sym_COLON,
-    ACTIONS(41), 2,
+    ACTIONS(39), 2,
       anon_sym_AT_COLON,
       anon_sym_COLON_AT,
-    ACTIONS(43), 21,
+    ACTIONS(41), 21,
       anon_sym_TILDE,
       anon_sym_PERCENT,
       anon_sym_AMP,
@@ -1958,13 +1779,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_QMARK,
       anon_sym_Newline,
   [66] = 11,
-    ACTIONS(29), 1,
+    ACTIONS(27), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
+    ACTIONS(29), 1,
       anon_sym_SQUOTE,
-    ACTIONS(37), 1,
+    ACTIONS(35), 1,
       anon_sym_COMMA,
-    ACTIONS(45), 1,
+    ACTIONS(43), 1,
       aux_sym_format_directive_type_token11,
     STATE(21), 1,
       sym_format_modifiers,
@@ -1974,13 +1795,13 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_format_modifiers_repeat1,
     STATE(54), 1,
       sym_format_directive_type,
-    ACTIONS(39), 2,
+    ACTIONS(37), 2,
       anon_sym_AT,
       anon_sym_COLON,
-    ACTIONS(41), 2,
+    ACTIONS(39), 2,
       anon_sym_AT_COLON,
       anon_sym_COLON_AT,
-    ACTIONS(43), 21,
+    ACTIONS(41), 21,
       anon_sym_TILDE,
       anon_sym_PERCENT,
       anon_sym_AMP,
@@ -2002,7 +1823,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [122] = 19,
+  [122] = 18,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2015,29 +1836,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(53), 1,
+    ACTIONS(51), 1,
       sym_block_comment,
-    ACTIONS(59), 1,
+    ACTIONS(57), 1,
       anon_sym_RPAREN,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(51), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(49), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(55), 2,
+    ACTIONS(53), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(57), 2,
+    ACTIONS(55), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(7), 2,
@@ -2053,44 +1873,43 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [192] = 19,
-    ACTIONS(64), 1,
+  [190] = 18,
+    ACTIONS(62), 1,
       sym_block_comment,
-    ACTIONS(67), 1,
+    ACTIONS(65), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(73), 1,
+    ACTIONS(71), 1,
       anon_sym_SQUOTE,
-    ACTIONS(76), 1,
+    ACTIONS(74), 1,
       anon_sym_COMMA,
-    ACTIONS(79), 1,
+    ACTIONS(77), 1,
       anon_sym_BQUOTE,
-    ACTIONS(82), 1,
+    ACTIONS(80), 1,
       anon_sym_DQUOTE,
-    ACTIONS(88), 1,
+    ACTIONS(86), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(91), 1,
-      anon_sym_SLASH,
-    ACTIONS(94), 1,
-      aux_sym__sym_unqualified_token1,
+    ACTIONS(92), 1,
+      anon_sym_LPAREN,
+    ACTIONS(95), 1,
+      anon_sym_RPAREN,
     ACTIONS(97), 1,
-      anon_sym_LPAREN,
-    ACTIONS(100), 1,
-      anon_sym_RPAREN,
-    ACTIONS(102), 1,
       anon_sym_COMMA_AT,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(61), 2,
+    ACTIONS(59), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(70), 2,
+    ACTIONS(68), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(85), 2,
+    ACTIONS(83), 2,
       sym_null_lit,
       sym_bool_lit,
+    ACTIONS(89), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
     STATE(7), 2,
       sym__gap,
       aux_sym__bare_list_lit_repeat1,
@@ -2104,7 +1923,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [262] = 19,
+  [258] = 18,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2117,29 +1936,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(107), 1,
+    ACTIONS(102), 1,
       sym_block_comment,
-    ACTIONS(109), 1,
+    ACTIONS(104), 1,
       anon_sym_RPAREN,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(55), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(53), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(57), 2,
+    ACTIONS(55), 2,
       sym_null_lit,
       sym_bool_lit,
-    ACTIONS(105), 2,
+    ACTIONS(100), 2,
       sym__ws,
       sym_comment,
     STATE(6), 2,
@@ -2155,7 +1973,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [332] = 16,
+  [326] = 15,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2168,25 +1986,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(111), 1,
+    ACTIONS(106), 1,
       ts_builtin_sym_end,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(115), 3,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(110), 3,
       sym_block_comment,
       sym_null_lit,
       sym_bool_lit,
-    ACTIONS(113), 4,
+    ACTIONS(108), 4,
       sym__ws,
       sym_comment,
       sym_kwd_lit,
@@ -2203,88 +2020,86 @@ static const uint16_t ts_small_parse_table[] = {
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
       aux_sym_source_repeat1,
-  [396] = 16,
-    ACTIONS(117), 1,
+  [388] = 15,
+    ACTIONS(112), 1,
       ts_builtin_sym_end,
-    ACTIONS(125), 1,
+    ACTIONS(120), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(128), 1,
+    ACTIONS(123), 1,
       anon_sym_SQUOTE,
-    ACTIONS(131), 1,
+    ACTIONS(126), 1,
       anon_sym_COMMA,
-    ACTIONS(134), 1,
+    ACTIONS(129), 1,
       anon_sym_BQUOTE,
-    ACTIONS(137), 1,
+    ACTIONS(132), 1,
       anon_sym_DQUOTE,
-    ACTIONS(140), 1,
+    ACTIONS(135), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(143), 1,
+    ACTIONS(141), 1,
+      anon_sym_LPAREN,
+    ACTIONS(144), 1,
+      anon_sym_COMMA_AT,
+    STATE(39), 1,
+      sym__digit_sym,
+    STATE(42), 1,
+      sym__bare_list_lit,
+    ACTIONS(138), 2,
       anon_sym_SLASH,
-    ACTIONS(146), 1,
       aux_sym__sym_unqualified_token1,
+    ACTIONS(117), 3,
+      sym_block_comment,
+      sym_null_lit,
+      sym_bool_lit,
+    ACTIONS(114), 4,
+      sym__ws,
+      sym_comment,
+      sym_kwd_lit,
+      sym_char_lit,
+    STATE(10), 11,
+      sym__gap,
+      sym__form,
+      sym_num_lit,
+      sym_str_lit,
+      sym_sym_lit,
+      sym_list_lit,
+      sym_quoting_lit,
+      sym_quasi_quoting_lit,
+      sym_unquote_splicing_lit,
+      sym_unquoting_lit,
+      aux_sym_source_repeat1,
+  [450] = 17,
+    ACTIONS(9), 1,
+      aux_sym_num_lit_token1,
+    ACTIONS(11), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(13), 1,
+      anon_sym_COMMA,
+    ACTIONS(15), 1,
+      anon_sym_BQUOTE,
+    ACTIONS(17), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(19), 1,
+      aux_sym__digit_sym_token1,
+    ACTIONS(23), 1,
+      anon_sym_LPAREN,
+    ACTIONS(25), 1,
+      anon_sym_COMMA_AT,
     ACTIONS(149), 1,
-      anon_sym_LPAREN,
-    ACTIONS(152), 1,
-      anon_sym_COMMA_AT,
+      sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(122), 3,
-      sym_block_comment,
-      sym_null_lit,
-      sym_bool_lit,
-    ACTIONS(119), 4,
-      sym__ws,
-      sym_comment,
-      sym_kwd_lit,
-      sym_char_lit,
-    STATE(10), 11,
-      sym__gap,
-      sym__form,
-      sym_num_lit,
-      sym_str_lit,
-      sym_sym_lit,
-      sym_list_lit,
-      sym_quoting_lit,
-      sym_quasi_quoting_lit,
-      sym_unquote_splicing_lit,
-      sym_unquoting_lit,
-      aux_sym_source_repeat1,
-  [460] = 18,
-    ACTIONS(9), 1,
-      aux_sym_num_lit_token1,
-    ACTIONS(11), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(13), 1,
-      anon_sym_COMMA,
-    ACTIONS(15), 1,
-      anon_sym_BQUOTE,
-    ACTIONS(17), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(19), 1,
-      aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
+    ACTIONS(21), 2,
       anon_sym_SLASH,
-    ACTIONS(23), 1,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
-      anon_sym_LPAREN,
-    ACTIONS(27), 1,
-      anon_sym_COMMA_AT,
-    ACTIONS(157), 1,
-      sym_block_comment,
-    STATE(39), 1,
-      sym__digit_sym,
-    STATE(42), 1,
-      sym__bare_list_lit,
-    ACTIONS(155), 2,
+    ACTIONS(147), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(159), 2,
+    ACTIONS(151), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(161), 2,
+    ACTIONS(153), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(16), 2,
@@ -2300,7 +2115,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [527] = 18,
+  [515] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2313,27 +2128,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(165), 1,
+    ACTIONS(157), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(163), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(155), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(167), 2,
+    ACTIONS(159), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(169), 2,
+    ACTIONS(161), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(17), 2,
@@ -2349,7 +2163,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [594] = 18,
+  [580] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2362,27 +2176,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(173), 1,
+    ACTIONS(165), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(171), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(163), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(175), 2,
+    ACTIONS(167), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(177), 2,
+    ACTIONS(169), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(18), 2,
@@ -2398,7 +2211,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [661] = 18,
+  [645] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2411,27 +2224,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(181), 1,
+    ACTIONS(173), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(179), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(171), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(183), 2,
+    ACTIONS(175), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(185), 2,
+    ACTIONS(177), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(15), 2,
@@ -2447,7 +2259,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [728] = 18,
+  [710] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2460,27 +2272,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(189), 1,
+    ACTIONS(181), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(187), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(179), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(191), 2,
+    ACTIONS(183), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(193), 2,
+    ACTIONS(185), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(31), 2,
@@ -2496,7 +2307,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [795] = 18,
+  [775] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2509,27 +2320,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(189), 1,
+    ACTIONS(181), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(187), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(179), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(195), 2,
+    ACTIONS(187), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(197), 2,
+    ACTIONS(189), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(31), 2,
@@ -2545,7 +2355,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [862] = 18,
+  [840] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2558,27 +2368,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(189), 1,
+    ACTIONS(181), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(187), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(179), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(199), 2,
+    ACTIONS(191), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(201), 2,
+    ACTIONS(193), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(31), 2,
@@ -2594,7 +2403,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [929] = 18,
+  [905] = 17,
     ACTIONS(9), 1,
       aux_sym_num_lit_token1,
     ACTIONS(11), 1,
@@ -2607,27 +2416,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DQUOTE,
     ACTIONS(19), 1,
       aux_sym__digit_sym_token1,
-    ACTIONS(21), 1,
-      anon_sym_SLASH,
     ACTIONS(23), 1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(25), 1,
       anon_sym_LPAREN,
-    ACTIONS(27), 1,
+    ACTIONS(25), 1,
       anon_sym_COMMA_AT,
-    ACTIONS(189), 1,
+    ACTIONS(181), 1,
       sym_block_comment,
     STATE(39), 1,
       sym__digit_sym,
     STATE(42), 1,
       sym__bare_list_lit,
-    ACTIONS(187), 2,
+    ACTIONS(21), 2,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(179), 2,
       sym__ws,
       sym_comment,
-    ACTIONS(203), 2,
+    ACTIONS(195), 2,
       sym_kwd_lit,
       sym_char_lit,
-    ACTIONS(205), 2,
+    ACTIONS(197), 2,
       sym_null_lit,
       sym_bool_lit,
     STATE(31), 2,
@@ -2643,12 +2451,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_quasi_quoting_lit,
       sym_unquote_splicing_lit,
       sym_unquoting_lit,
-  [996] = 2,
-    ACTIONS(209), 3,
+  [970] = 2,
+    ACTIONS(201), 3,
       anon_sym_AT,
       anon_sym_COLON,
       aux_sym_format_directive_type_token11,
-    ACTIONS(207), 26,
+    ACTIONS(199), 26,
       aux_sym_num_lit_token1,
       anon_sym_SQUOTE,
       anon_sym_COMMA,
@@ -2675,14 +2483,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [1030] = 8,
-    ACTIONS(29), 1,
+  [1004] = 8,
+    ACTIONS(27), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
+    ACTIONS(29), 1,
       anon_sym_SQUOTE,
-    ACTIONS(45), 1,
+    ACTIONS(43), 1,
       aux_sym_format_directive_type_token11,
-    ACTIONS(211), 1,
+    ACTIONS(203), 1,
       anon_sym_COMMA,
     STATE(44), 1,
       sym__format_token,
@@ -2690,7 +2498,7 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_format_modifiers_repeat1,
     STATE(54), 1,
       sym_format_directive_type,
-    ACTIONS(43), 21,
+    ACTIONS(41), 21,
       anon_sym_TILDE,
       anon_sym_PERCENT,
       anon_sym_AMP,
@@ -2712,14 +2520,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [1075] = 8,
-    ACTIONS(29), 1,
+  [1049] = 8,
+    ACTIONS(27), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
+    ACTIONS(29), 1,
       anon_sym_SQUOTE,
-    ACTIONS(45), 1,
+    ACTIONS(43), 1,
       aux_sym_format_directive_type_token11,
-    ACTIONS(211), 1,
+    ACTIONS(203), 1,
       anon_sym_COMMA,
     STATE(44), 1,
       sym__format_token,
@@ -2727,7 +2535,7 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_format_modifiers_repeat1,
     STATE(59), 1,
       sym_format_directive_type,
-    ACTIONS(43), 21,
+    ACTIONS(41), 21,
       anon_sym_TILDE,
       anon_sym_PERCENT,
       anon_sym_AMP,
@@ -2749,10 +2557,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [1120] = 2,
-    ACTIONS(215), 1,
+  [1094] = 2,
+    ACTIONS(207), 1,
       aux_sym_format_directive_type_token11,
-    ACTIONS(213), 24,
+    ACTIONS(205), 24,
       aux_sym_num_lit_token1,
       anon_sym_SQUOTE,
       anon_sym_COMMA,
@@ -2777,10 +2585,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [1150] = 2,
-    ACTIONS(219), 1,
+  [1124] = 2,
+    ACTIONS(211), 1,
       aux_sym_format_directive_type_token11,
-    ACTIONS(217), 24,
+    ACTIONS(209), 24,
       aux_sym_num_lit_token1,
       anon_sym_SQUOTE,
       anon_sym_COMMA,
@@ -2805,16 +2613,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_QMARK,
       anon_sym_Newline,
-  [1180] = 2,
-    ACTIONS(223), 7,
+  [1154] = 2,
+    ACTIONS(215), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(221), 12,
+    ACTIONS(213), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2823,20 +2632,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1204] = 2,
-    ACTIONS(227), 7,
+  [1178] = 2,
+    ACTIONS(219), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(225), 12,
+    ACTIONS(217), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2845,20 +2654,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1228] = 2,
-    ACTIONS(231), 7,
+  [1202] = 2,
+    ACTIONS(223), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(229), 12,
+    ACTIONS(221), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2867,20 +2676,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1252] = 2,
-    ACTIONS(235), 7,
+  [1226] = 2,
+    ACTIONS(227), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(233), 12,
+    ACTIONS(225), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2889,20 +2698,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1276] = 2,
-    ACTIONS(239), 7,
+  [1250] = 2,
+    ACTIONS(231), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(237), 12,
+    ACTIONS(229), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2911,20 +2720,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1300] = 2,
-    ACTIONS(243), 7,
+  [1274] = 2,
+    ACTIONS(235), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(241), 12,
+    ACTIONS(233), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2933,20 +2742,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1324] = 2,
-    ACTIONS(247), 7,
+  [1298] = 2,
+    ACTIONS(239), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(245), 12,
+    ACTIONS(237), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -2955,45 +2764,67 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1348] = 5,
-    ACTIONS(252), 1,
+  [1322] = 5,
+    ACTIONS(244), 1,
       sym_block_comment,
-    ACTIONS(249), 2,
+    ACTIONS(241), 2,
       sym__ws,
       sym_comment,
     STATE(31), 2,
       sym__gap,
       aux_sym_quoting_lit_repeat1,
-    ACTIONS(255), 6,
+    ACTIONS(247), 7,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
+    ACTIONS(249), 7,
+      sym_kwd_lit,
+      anon_sym_SQUOTE,
+      anon_sym_BQUOTE,
+      anon_sym_DQUOTE,
+      sym_char_lit,
+      anon_sym_LPAREN,
+      anon_sym_COMMA_AT,
+  [1352] = 2,
+    ACTIONS(253), 8,
+      sym_block_comment,
+      aux_sym_num_lit_token1,
+      anon_sym_COMMA,
+      sym_null_lit,
+      sym_bool_lit,
+      aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
+      aux_sym__sym_unqualified_token1,
+    ACTIONS(251), 11,
+      ts_builtin_sym_end,
+      sym__ws,
+      sym_comment,
+      sym_kwd_lit,
+      anon_sym_SQUOTE,
+      anon_sym_BQUOTE,
+      anon_sym_DQUOTE,
+      sym_char_lit,
+      anon_sym_LPAREN,
+      anon_sym_RPAREN,
+      anon_sym_COMMA_AT,
+  [1376] = 2,
     ACTIONS(257), 8,
-      sym_kwd_lit,
-      anon_sym_SQUOTE,
-      anon_sym_BQUOTE,
-      anon_sym_DQUOTE,
-      sym_char_lit,
-      anon_sym_SLASH,
-      anon_sym_LPAREN,
-      anon_sym_COMMA_AT,
-  [1378] = 2,
-    ACTIONS(261), 7,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(259), 12,
+    ACTIONS(255), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3002,20 +2833,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1402] = 2,
-    ACTIONS(265), 7,
+  [1400] = 2,
+    ACTIONS(261), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(263), 12,
+    ACTIONS(259), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3024,20 +2855,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1426] = 2,
-    ACTIONS(269), 7,
+  [1424] = 2,
+    ACTIONS(265), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(267), 12,
+    ACTIONS(263), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3046,20 +2877,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1450] = 2,
-    ACTIONS(273), 7,
+  [1448] = 2,
+    ACTIONS(269), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(271), 12,
+    ACTIONS(267), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3068,20 +2899,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1474] = 2,
-    ACTIONS(277), 7,
+  [1472] = 2,
+    ACTIONS(273), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(275), 12,
+    ACTIONS(271), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3090,20 +2921,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1498] = 2,
-    ACTIONS(281), 7,
+  [1496] = 2,
+    ACTIONS(277), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(279), 12,
+    ACTIONS(275), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3112,20 +2943,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1522] = 2,
-    ACTIONS(285), 7,
+  [1520] = 2,
+    ACTIONS(281), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(283), 12,
+    ACTIONS(279), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3134,20 +2965,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1546] = 2,
-    ACTIONS(289), 7,
+  [1544] = 2,
+    ACTIONS(285), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(287), 12,
+    ACTIONS(283), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3156,20 +2987,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1570] = 2,
-    ACTIONS(293), 7,
+  [1568] = 2,
+    ACTIONS(289), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(291), 12,
+    ACTIONS(287), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3178,20 +3009,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1594] = 2,
-    ACTIONS(297), 7,
+  [1592] = 2,
+    ACTIONS(293), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(295), 12,
+    ACTIONS(291), 11,
       ts_builtin_sym_end,
       sym__ws,
       sym_comment,
@@ -3200,21 +3031,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1618] = 2,
-    ACTIONS(301), 7,
+  [1616] = 2,
+    ACTIONS(297), 8,
       sym_block_comment,
       aux_sym_num_lit_token1,
       anon_sym_COMMA,
       sym_null_lit,
       sym_bool_lit,
       aux_sym__digit_sym_token1,
+      anon_sym_SLASH,
       aux_sym__sym_unqualified_token1,
-    ACTIONS(299), 12,
-      ts_builtin_sym_end,
+    ACTIONS(295), 10,
       sym__ws,
       sym_comment,
       sym_kwd_lit,
@@ -3222,208 +3052,186 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BQUOTE,
       anon_sym_DQUOTE,
       sym_char_lit,
-      anon_sym_SLASH,
       anon_sym_LPAREN,
       anon_sym_RPAREN,
       anon_sym_COMMA_AT,
-  [1642] = 2,
-    ACTIONS(305), 7,
-      sym_block_comment,
-      aux_sym_num_lit_token1,
-      anon_sym_COMMA,
-      sym_null_lit,
-      sym_bool_lit,
-      aux_sym__digit_sym_token1,
-      aux_sym__sym_unqualified_token1,
-    ACTIONS(303), 11,
-      sym__ws,
-      sym_comment,
-      sym_kwd_lit,
-      anon_sym_SQUOTE,
-      anon_sym_BQUOTE,
-      anon_sym_DQUOTE,
-      sym_char_lit,
-      anon_sym_SLASH,
-      anon_sym_LPAREN,
-      anon_sym_RPAREN,
-      anon_sym_COMMA_AT,
-  [1665] = 4,
-    ACTIONS(313), 1,
+  [1639] = 4,
+    ACTIONS(305), 1,
       anon_sym_STAR,
+    ACTIONS(301), 2,
+      anon_sym_AT,
+      anon_sym_COLON,
+    ACTIONS(303), 4,
+      anon_sym_TILDE,
+      anon_sym_PERCENT,
+      anon_sym_AMP,
+      anon_sym_PIPE,
+    ACTIONS(299), 6,
+      aux_sym_num_lit_token1,
+      anon_sym_SQUOTE,
+      anon_sym_COMMA,
+      anon_sym_AT_COLON,
+      anon_sym_COLON_AT,
+      aux_sym_format_directive_type_token11,
+  [1661] = 2,
     ACTIONS(309), 2,
       anon_sym_AT,
       anon_sym_COLON,
-    ACTIONS(311), 4,
-      anon_sym_TILDE,
-      anon_sym_PERCENT,
-      anon_sym_AMP,
-      anon_sym_PIPE,
-    ACTIONS(307), 6,
+    ACTIONS(307), 11,
       aux_sym_num_lit_token1,
       anon_sym_SQUOTE,
       anon_sym_COMMA,
       anon_sym_AT_COLON,
       anon_sym_COLON_AT,
+      anon_sym_TILDE,
+      anon_sym_PERCENT,
+      anon_sym_AMP,
+      anon_sym_PIPE,
+      anon_sym_STAR,
+      aux_sym_format_directive_type_token11,
+  [1679] = 2,
+    ACTIONS(313), 2,
+      anon_sym_AT,
+      anon_sym_COLON,
+    ACTIONS(311), 11,
+      aux_sym_num_lit_token1,
+      anon_sym_SQUOTE,
+      anon_sym_COMMA,
+      anon_sym_AT_COLON,
+      anon_sym_COLON_AT,
+      anon_sym_TILDE,
+      anon_sym_PERCENT,
+      anon_sym_AMP,
+      anon_sym_PIPE,
+      anon_sym_STAR,
+      aux_sym_format_directive_type_token11,
+  [1697] = 7,
+    ACTIONS(27), 1,
+      aux_sym_num_lit_token1,
+    ACTIONS(29), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(315), 1,
+      anon_sym_COMMA,
+    ACTIONS(321), 1,
       aux_sym_format_directive_type_token11,
-  [1687] = 2,
     ACTIONS(317), 2,
       anon_sym_AT,
       anon_sym_COLON,
-    ACTIONS(315), 11,
-      aux_sym_num_lit_token1,
-      anon_sym_SQUOTE,
-      anon_sym_COMMA,
+    ACTIONS(319), 2,
       anon_sym_AT_COLON,
       anon_sym_COLON_AT,
-      anon_sym_TILDE,
-      anon_sym_PERCENT,
-      anon_sym_AMP,
-      anon_sym_PIPE,
-      anon_sym_STAR,
-      aux_sym_format_directive_type_token11,
-  [1705] = 2,
-    ACTIONS(321), 2,
-      anon_sym_AT,
-      anon_sym_COLON,
-    ACTIONS(319), 11,
-      aux_sym_num_lit_token1,
-      anon_sym_SQUOTE,
-      anon_sym_COMMA,
-      anon_sym_AT_COLON,
-      anon_sym_COLON_AT,
-      anon_sym_TILDE,
-      anon_sym_PERCENT,
-      anon_sym_AMP,
-      anon_sym_PIPE,
-      anon_sym_STAR,
-      aux_sym_format_directive_type_token11,
-  [1723] = 7,
-    ACTIONS(29), 1,
-      aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
-      anon_sym_SQUOTE,
+    STATE(48), 2,
+      sym__format_token,
+      aux_sym_format_modifiers_repeat1,
+  [1722] = 6,
     ACTIONS(323), 1,
-      anon_sym_COMMA,
-    ACTIONS(329), 1,
-      aux_sym_format_directive_type_token11,
-    ACTIONS(325), 2,
-      anon_sym_AT,
-      anon_sym_COLON,
-    ACTIONS(327), 2,
-      anon_sym_AT_COLON,
-      anon_sym_COLON_AT,
-    STATE(48), 2,
-      sym__format_token,
-      aux_sym_format_modifiers_repeat1,
-  [1748] = 6,
-    ACTIONS(331), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(334), 1,
+    ACTIONS(326), 1,
       anon_sym_SQUOTE,
-    ACTIONS(337), 1,
+    ACTIONS(329), 1,
       anon_sym_COMMA,
-    ACTIONS(340), 2,
+    ACTIONS(332), 2,
       anon_sym_AT,
       anon_sym_COLON,
     STATE(48), 2,
       sym__format_token,
       aux_sym_format_modifiers_repeat1,
-    ACTIONS(342), 3,
+    ACTIONS(334), 3,
       anon_sym_AT_COLON,
       anon_sym_COLON_AT,
       aux_sym_format_directive_type_token11,
-  [1771] = 4,
-    ACTIONS(344), 1,
+  [1745] = 4,
+    ACTIONS(336), 1,
       anon_sym_TILDE,
-    ACTIONS(347), 1,
+    ACTIONS(339), 1,
       anon_sym_DQUOTE,
-    ACTIONS(349), 2,
+    ACTIONS(341), 2,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
     STATE(49), 2,
       sym_format_specifier,
       aux_sym_str_lit_repeat1,
-  [1786] = 4,
-    ACTIONS(352), 1,
+  [1760] = 4,
+    ACTIONS(344), 1,
       anon_sym_TILDE,
-    ACTIONS(354), 1,
+    ACTIONS(346), 1,
       anon_sym_DQUOTE,
-    ACTIONS(356), 2,
+    ACTIONS(348), 2,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
     STATE(52), 2,
       sym_format_specifier,
       aux_sym_str_lit_repeat1,
-  [1801] = 5,
-    ACTIONS(29), 1,
+  [1775] = 5,
+    ACTIONS(27), 1,
       aux_sym_num_lit_token1,
-    ACTIONS(31), 1,
+    ACTIONS(29), 1,
       anon_sym_SQUOTE,
-    ACTIONS(323), 1,
+    ACTIONS(315), 1,
       anon_sym_COMMA,
-    ACTIONS(329), 1,
+    ACTIONS(321), 1,
       aux_sym_format_directive_type_token11,
     STATE(48), 2,
       sym__format_token,
       aux_sym_format_modifiers_repeat1,
-  [1818] = 4,
-    ACTIONS(47), 1,
+  [1792] = 4,
+    ACTIONS(45), 1,
       anon_sym_DQUOTE,
-    ACTIONS(358), 1,
+    ACTIONS(350), 1,
       anon_sym_TILDE,
-    ACTIONS(360), 2,
+    ACTIONS(352), 2,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
     STATE(49), 2,
       sym_format_specifier,
       aux_sym_str_lit_repeat1,
-  [1833] = 1,
+  [1807] = 1,
+    ACTIONS(354), 4,
+      anon_sym_TILDE,
+      anon_sym_DQUOTE,
+      aux_sym_str_lit_token1,
+      aux_sym_str_lit_token2,
+  [1814] = 1,
+    ACTIONS(356), 4,
+      anon_sym_TILDE,
+      anon_sym_DQUOTE,
+      aux_sym_str_lit_token1,
+      aux_sym_str_lit_token2,
+  [1821] = 1,
+    ACTIONS(358), 4,
+      anon_sym_TILDE,
+      anon_sym_DQUOTE,
+      aux_sym_str_lit_token1,
+      aux_sym_str_lit_token2,
+  [1828] = 1,
+    ACTIONS(360), 4,
+      anon_sym_TILDE,
+      anon_sym_DQUOTE,
+      aux_sym_str_lit_token1,
+      aux_sym_str_lit_token2,
+  [1835] = 1,
     ACTIONS(362), 4,
       anon_sym_TILDE,
       anon_sym_DQUOTE,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
-  [1840] = 1,
+  [1842] = 1,
     ACTIONS(364), 4,
       anon_sym_TILDE,
       anon_sym_DQUOTE,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
-  [1847] = 1,
+  [1849] = 1,
     ACTIONS(366), 4,
       anon_sym_TILDE,
       anon_sym_DQUOTE,
       aux_sym_str_lit_token1,
       aux_sym_str_lit_token2,
-  [1854] = 1,
-    ACTIONS(368), 4,
-      anon_sym_TILDE,
-      anon_sym_DQUOTE,
-      aux_sym_str_lit_token1,
-      aux_sym_str_lit_token2,
-  [1861] = 1,
-    ACTIONS(370), 4,
-      anon_sym_TILDE,
-      anon_sym_DQUOTE,
-      aux_sym_str_lit_token1,
-      aux_sym_str_lit_token2,
-  [1868] = 1,
-    ACTIONS(372), 4,
-      anon_sym_TILDE,
-      anon_sym_DQUOTE,
-      aux_sym_str_lit_token1,
-      aux_sym_str_lit_token2,
-  [1875] = 1,
-    ACTIONS(374), 4,
-      anon_sym_TILDE,
-      anon_sym_DQUOTE,
-      aux_sym_str_lit_token1,
-      aux_sym_str_lit_token2,
-  [1882] = 1,
-    ACTIONS(376), 1,
+  [1856] = 1,
+    ACTIONS(368), 1,
       ts_builtin_sym_end,
-  [1886] = 1,
-    ACTIONS(378), 1,
+  [1860] = 1,
+    ACTIONS(370), 1,
       aux_sym__format_token_token1,
 };
 
@@ -3431,61 +3239,61 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(4)] = 0,
   [SMALL_STATE(5)] = 66,
   [SMALL_STATE(6)] = 122,
-  [SMALL_STATE(7)] = 192,
-  [SMALL_STATE(8)] = 262,
-  [SMALL_STATE(9)] = 332,
-  [SMALL_STATE(10)] = 396,
-  [SMALL_STATE(11)] = 460,
-  [SMALL_STATE(12)] = 527,
-  [SMALL_STATE(13)] = 594,
-  [SMALL_STATE(14)] = 661,
-  [SMALL_STATE(15)] = 728,
-  [SMALL_STATE(16)] = 795,
-  [SMALL_STATE(17)] = 862,
-  [SMALL_STATE(18)] = 929,
-  [SMALL_STATE(19)] = 996,
-  [SMALL_STATE(20)] = 1030,
-  [SMALL_STATE(21)] = 1075,
-  [SMALL_STATE(22)] = 1120,
-  [SMALL_STATE(23)] = 1150,
-  [SMALL_STATE(24)] = 1180,
-  [SMALL_STATE(25)] = 1204,
-  [SMALL_STATE(26)] = 1228,
-  [SMALL_STATE(27)] = 1252,
-  [SMALL_STATE(28)] = 1276,
-  [SMALL_STATE(29)] = 1300,
-  [SMALL_STATE(30)] = 1324,
-  [SMALL_STATE(31)] = 1348,
-  [SMALL_STATE(32)] = 1378,
-  [SMALL_STATE(33)] = 1402,
-  [SMALL_STATE(34)] = 1426,
-  [SMALL_STATE(35)] = 1450,
-  [SMALL_STATE(36)] = 1474,
-  [SMALL_STATE(37)] = 1498,
-  [SMALL_STATE(38)] = 1522,
-  [SMALL_STATE(39)] = 1546,
-  [SMALL_STATE(40)] = 1570,
-  [SMALL_STATE(41)] = 1594,
-  [SMALL_STATE(42)] = 1618,
-  [SMALL_STATE(43)] = 1642,
-  [SMALL_STATE(44)] = 1665,
-  [SMALL_STATE(45)] = 1687,
-  [SMALL_STATE(46)] = 1705,
-  [SMALL_STATE(47)] = 1723,
-  [SMALL_STATE(48)] = 1748,
-  [SMALL_STATE(49)] = 1771,
-  [SMALL_STATE(50)] = 1786,
-  [SMALL_STATE(51)] = 1801,
-  [SMALL_STATE(52)] = 1818,
-  [SMALL_STATE(53)] = 1833,
-  [SMALL_STATE(54)] = 1840,
-  [SMALL_STATE(55)] = 1847,
-  [SMALL_STATE(56)] = 1854,
-  [SMALL_STATE(57)] = 1861,
-  [SMALL_STATE(58)] = 1868,
-  [SMALL_STATE(59)] = 1875,
-  [SMALL_STATE(60)] = 1882,
-  [SMALL_STATE(61)] = 1886,
+  [SMALL_STATE(7)] = 190,
+  [SMALL_STATE(8)] = 258,
+  [SMALL_STATE(9)] = 326,
+  [SMALL_STATE(10)] = 388,
+  [SMALL_STATE(11)] = 450,
+  [SMALL_STATE(12)] = 515,
+  [SMALL_STATE(13)] = 580,
+  [SMALL_STATE(14)] = 645,
+  [SMALL_STATE(15)] = 710,
+  [SMALL_STATE(16)] = 775,
+  [SMALL_STATE(17)] = 840,
+  [SMALL_STATE(18)] = 905,
+  [SMALL_STATE(19)] = 970,
+  [SMALL_STATE(20)] = 1004,
+  [SMALL_STATE(21)] = 1049,
+  [SMALL_STATE(22)] = 1094,
+  [SMALL_STATE(23)] = 1124,
+  [SMALL_STATE(24)] = 1154,
+  [SMALL_STATE(25)] = 1178,
+  [SMALL_STATE(26)] = 1202,
+  [SMALL_STATE(27)] = 1226,
+  [SMALL_STATE(28)] = 1250,
+  [SMALL_STATE(29)] = 1274,
+  [SMALL_STATE(30)] = 1298,
+  [SMALL_STATE(31)] = 1322,
+  [SMALL_STATE(32)] = 1352,
+  [SMALL_STATE(33)] = 1376,
+  [SMALL_STATE(34)] = 1400,
+  [SMALL_STATE(35)] = 1424,
+  [SMALL_STATE(36)] = 1448,
+  [SMALL_STATE(37)] = 1472,
+  [SMALL_STATE(38)] = 1496,
+  [SMALL_STATE(39)] = 1520,
+  [SMALL_STATE(40)] = 1544,
+  [SMALL_STATE(41)] = 1568,
+  [SMALL_STATE(42)] = 1592,
+  [SMALL_STATE(43)] = 1616,
+  [SMALL_STATE(44)] = 1639,
+  [SMALL_STATE(45)] = 1661,
+  [SMALL_STATE(46)] = 1679,
+  [SMALL_STATE(47)] = 1697,
+  [SMALL_STATE(48)] = 1722,
+  [SMALL_STATE(49)] = 1745,
+  [SMALL_STATE(50)] = 1760,
+  [SMALL_STATE(51)] = 1775,
+  [SMALL_STATE(52)] = 1792,
+  [SMALL_STATE(53)] = 1807,
+  [SMALL_STATE(54)] = 1814,
+  [SMALL_STATE(55)] = 1821,
+  [SMALL_STATE(56)] = 1828,
+  [SMALL_STATE(57)] = 1835,
+  [SMALL_STATE(58)] = 1842,
+  [SMALL_STATE(59)] = 1849,
+  [SMALL_STATE(60)] = 1856,
+  [SMALL_STATE(61)] = 1860,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -3500,169 +3308,166 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
   [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
   [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(27),
-  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(29),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
-  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(19),
-  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(22),
-  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(58),
-  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [53] = {.entry = {.count = 1, .reusable = false}}, SHIFT(7),
-  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [57] = {.entry = {.count = 1, .reusable = false}}, SHIFT(43),
-  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [61] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(7),
-  [64] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(7),
-  [67] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(36),
-  [70] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(43),
-  [73] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(11),
-  [76] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(12),
-  [79] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(13),
-  [82] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(50),
-  [85] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(43),
-  [88] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(27),
-  [91] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(29),
-  [94] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(29),
-  [97] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(8),
-  [100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10),
-  [102] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(14),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [107] = {.entry = {.count = 1, .reusable = false}}, SHIFT(6),
-  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [111] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 1),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [115] = {.entry = {.count = 1, .reusable = false}}, SHIFT(10),
-  [117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2),
-  [119] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(10),
-  [122] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(10),
-  [125] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(36),
-  [128] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(11),
-  [131] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(12),
-  [134] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(13),
-  [137] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(50),
-  [140] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(27),
-  [143] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(29),
-  [146] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(29),
-  [149] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(8),
-  [152] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(14),
-  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [157] = {.entry = {.count = 1, .reusable = false}}, SHIFT(16),
-  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [161] = {.entry = {.count = 1, .reusable = false}}, SHIFT(41),
-  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [165] = {.entry = {.count = 1, .reusable = false}}, SHIFT(17),
-  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [169] = {.entry = {.count = 1, .reusable = false}}, SHIFT(37),
-  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [173] = {.entry = {.count = 1, .reusable = false}}, SHIFT(18),
-  [175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [177] = {.entry = {.count = 1, .reusable = false}}, SHIFT(40),
-  [179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [181] = {.entry = {.count = 1, .reusable = false}}, SHIFT(15),
-  [183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [185] = {.entry = {.count = 1, .reusable = false}}, SHIFT(30),
-  [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [189] = {.entry = {.count = 1, .reusable = false}}, SHIFT(31),
-  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [193] = {.entry = {.count = 1, .reusable = false}}, SHIFT(34),
-  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [197] = {.entry = {.count = 1, .reusable = false}}, SHIFT(24),
-  [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [201] = {.entry = {.count = 1, .reusable = false}}, SHIFT(32),
-  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [205] = {.entry = {.count = 1, .reusable = false}}, SHIFT(33),
-  [207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_prefix_parameters, 1),
-  [209] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_prefix_parameters, 1),
-  [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_modifiers, 1),
-  [215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_modifiers, 1),
-  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_modifiers, 2),
-  [219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_modifiers, 2),
-  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quoting_lit, 3, .production_id = 7),
-  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quoting_lit, 3, .production_id = 7),
-  [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 3),
-  [227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 3),
-  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 2),
-  [231] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 2),
-  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__digit_sym, 1, .production_id = 1),
-  [235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__digit_sym, 1, .production_id = 1),
-  [237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__bare_list_lit, 2, .production_id = 5),
-  [239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__bare_list_lit, 2, .production_id = 5),
-  [241] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sym_lit, 1, .production_id = 1),
-  [243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sym_lit, 1, .production_id = 1),
-  [245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquote_splicing_lit, 2, .production_id = 4),
-  [247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquote_splicing_lit, 2, .production_id = 4),
-  [249] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_quoting_lit_repeat1, 2), SHIFT_REPEAT(31),
-  [252] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_quoting_lit_repeat1, 2), SHIFT_REPEAT(31),
-  [255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_quoting_lit_repeat1, 2),
-  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_quoting_lit_repeat1, 2),
-  [259] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquoting_lit, 3, .production_id = 7),
-  [261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquoting_lit, 3, .production_id = 7),
-  [263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quasi_quoting_lit, 3, .production_id = 7),
-  [265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quasi_quoting_lit, 3, .production_id = 7),
-  [267] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquote_splicing_lit, 3, .production_id = 7),
-  [269] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquote_splicing_lit, 3, .production_id = 7),
-  [271] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__bare_list_lit, 3, .production_id = 9),
-  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__bare_list_lit, 3, .production_id = 9),
-  [275] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_num_lit, 1),
-  [277] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_num_lit, 1),
-  [279] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquoting_lit, 2, .production_id = 4),
-  [281] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquoting_lit, 2, .production_id = 4),
-  [283] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 4),
-  [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 4),
-  [287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sym_lit, 1, .production_id = 2),
-  [289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sym_lit, 1, .production_id = 2),
-  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quasi_quoting_lit, 2, .production_id = 4),
-  [293] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quasi_quoting_lit, 2, .production_id = 4),
-  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quoting_lit, 2, .production_id = 4),
-  [297] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quoting_lit, 2, .production_id = 4),
-  [299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_lit, 1, .production_id = 3),
-  [301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_lit, 1, .production_id = 3),
-  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 6),
-  [305] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 6),
-  [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 1),
-  [309] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_modifiers_repeat1, 1),
-  [311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [315] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__format_token, 1, .production_id = 8),
-  [317] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__format_token, 1, .production_id = 8),
-  [319] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__format_token, 2),
-  [321] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__format_token, 2),
-  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [325] = {.entry = {.count = 1, .reusable = false}}, SHIFT(23),
-  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [329] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [331] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(45),
-  [334] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(61),
-  [337] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(48),
-  [340] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_modifiers_repeat1, 2),
-  [342] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2),
-  [344] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2), SHIFT_REPEAT(4),
-  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2),
-  [349] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2), SHIFT_REPEAT(49),
-  [352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [354] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 2),
-  [364] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 3),
-  [366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2, .production_id = 11),
-  [368] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2, .production_id = 12),
-  [370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2),
-  [372] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 1),
-  [374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 4),
-  [376] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(29),
+  [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(19),
+  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(22),
+  [39] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [43] = {.entry = {.count = 1, .reusable = false}}, SHIFT(58),
+  [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [51] = {.entry = {.count = 1, .reusable = false}}, SHIFT(7),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(43),
+  [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [59] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(7),
+  [62] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(7),
+  [65] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(36),
+  [68] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(43),
+  [71] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(11),
+  [74] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(12),
+  [77] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(13),
+  [80] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(50),
+  [83] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(43),
+  [86] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(27),
+  [89] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(29),
+  [92] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(8),
+  [95] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10),
+  [97] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 2, .production_id = 10), SHIFT_REPEAT(14),
+  [100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [102] = {.entry = {.count = 1, .reusable = false}}, SHIFT(6),
+  [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [106] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 1),
+  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [110] = {.entry = {.count = 1, .reusable = false}}, SHIFT(10),
+  [112] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2),
+  [114] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(10),
+  [117] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(10),
+  [120] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(36),
+  [123] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(11),
+  [126] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(12),
+  [129] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(13),
+  [132] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(50),
+  [135] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(27),
+  [138] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(29),
+  [141] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(8),
+  [144] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(14),
+  [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(16),
+  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [153] = {.entry = {.count = 1, .reusable = false}}, SHIFT(41),
+  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [157] = {.entry = {.count = 1, .reusable = false}}, SHIFT(17),
+  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [161] = {.entry = {.count = 1, .reusable = false}}, SHIFT(37),
+  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [165] = {.entry = {.count = 1, .reusable = false}}, SHIFT(18),
+  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [169] = {.entry = {.count = 1, .reusable = false}}, SHIFT(40),
+  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [173] = {.entry = {.count = 1, .reusable = false}}, SHIFT(15),
+  [175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [177] = {.entry = {.count = 1, .reusable = false}}, SHIFT(30),
+  [179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [181] = {.entry = {.count = 1, .reusable = false}}, SHIFT(31),
+  [183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [185] = {.entry = {.count = 1, .reusable = false}}, SHIFT(34),
+  [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [189] = {.entry = {.count = 1, .reusable = false}}, SHIFT(24),
+  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [193] = {.entry = {.count = 1, .reusable = false}}, SHIFT(32),
+  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [197] = {.entry = {.count = 1, .reusable = false}}, SHIFT(33),
+  [199] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_prefix_parameters, 1),
+  [201] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_prefix_parameters, 1),
+  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_modifiers, 1),
+  [207] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_modifiers, 1),
+  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_modifiers, 2),
+  [211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_format_modifiers, 2),
+  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quoting_lit, 3, .production_id = 7),
+  [215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quoting_lit, 3, .production_id = 7),
+  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 3),
+  [219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 3),
+  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 2),
+  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 2),
+  [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__digit_sym, 1, .production_id = 1),
+  [227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__digit_sym, 1, .production_id = 1),
+  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__bare_list_lit, 2, .production_id = 5),
+  [231] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__bare_list_lit, 2, .production_id = 5),
+  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sym_lit, 1, .production_id = 1),
+  [235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sym_lit, 1, .production_id = 1),
+  [237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquote_splicing_lit, 2, .production_id = 4),
+  [239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquote_splicing_lit, 2, .production_id = 4),
+  [241] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_quoting_lit_repeat1, 2), SHIFT_REPEAT(31),
+  [244] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_quoting_lit_repeat1, 2), SHIFT_REPEAT(31),
+  [247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_quoting_lit_repeat1, 2),
+  [249] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_quoting_lit_repeat1, 2),
+  [251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquoting_lit, 3, .production_id = 7),
+  [253] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquoting_lit, 3, .production_id = 7),
+  [255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quasi_quoting_lit, 3, .production_id = 7),
+  [257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quasi_quoting_lit, 3, .production_id = 7),
+  [259] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquote_splicing_lit, 3, .production_id = 7),
+  [261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquote_splicing_lit, 3, .production_id = 7),
+  [263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__bare_list_lit, 3, .production_id = 9),
+  [265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__bare_list_lit, 3, .production_id = 9),
+  [267] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_num_lit, 1),
+  [269] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_num_lit, 1),
+  [271] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unquoting_lit, 2, .production_id = 4),
+  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unquoting_lit, 2, .production_id = 4),
+  [275] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_str_lit, 4),
+  [277] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_str_lit, 4),
+  [279] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sym_lit, 1, .production_id = 2),
+  [281] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sym_lit, 1, .production_id = 2),
+  [283] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quasi_quoting_lit, 2, .production_id = 4),
+  [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quasi_quoting_lit, 2, .production_id = 4),
+  [287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quoting_lit, 2, .production_id = 4),
+  [289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_quoting_lit, 2, .production_id = 4),
+  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_lit, 1, .production_id = 3),
+  [293] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_list_lit, 1, .production_id = 3),
+  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 6),
+  [297] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__bare_list_lit_repeat1, 1, .production_id = 6),
+  [299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 1),
+  [301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_modifiers_repeat1, 1),
+  [303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__format_token, 1, .production_id = 8),
+  [309] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__format_token, 1, .production_id = 8),
+  [311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__format_token, 2),
+  [313] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__format_token, 2),
+  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [317] = {.entry = {.count = 1, .reusable = false}}, SHIFT(23),
+  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [321] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [323] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(45),
+  [326] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(61),
+  [329] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2), SHIFT_REPEAT(48),
+  [332] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_format_modifiers_repeat1, 2),
+  [334] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_format_modifiers_repeat1, 2),
+  [336] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2), SHIFT_REPEAT(4),
+  [339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2),
+  [341] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_str_lit_repeat1, 2), SHIFT_REPEAT(49),
+  [344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [354] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 2),
+  [356] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 3),
+  [358] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2, .production_id = 11),
+  [360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2, .production_id = 12),
+  [362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 2),
+  [364] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_directive_type, 1),
+  [366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_format_specifier, 4),
+  [368] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
 };
 
 #ifdef __cplusplus