diff --git a/common/goos/PrettyPrinter2.cpp b/common/goos/PrettyPrinter2.cpp
index a3e06fc1aa..8a0d12cadc 100644
--- a/common/goos/PrettyPrinter2.cpp
+++ b/common/goos/PrettyPrinter2.cpp
@@ -214,7 +214,8 @@ void break_list(Node* node) {
       // things with 4 things in the top line: (defmethod <method> <type> <args>
       node->top_line_count = 4;
     } else if (name == "until" || name == "while" || name == "dotimes" || name == "countdown" ||
-               name == "when" || name == "behavior" || name == "lambda" || name == "defpart") {
+               name == "when" || name == "behavior" || name == "lambda" || name == "defpart" ||
+               name == "define") {
       node->top_line_count = 2;
     } else if (name == "let" || name == "let*" || name == "rlet") {
       // special case for things like let.
diff --git a/goal_src/engine/target/target-util.gc b/goal_src/engine/target/target-util.gc
index bba79ef3ad..22b9f19da0 100644
--- a/goal_src/engine/target/target-util.gc
+++ b/goal_src/engine/target/target-util.gc
@@ -7,9 +7,6 @@
 
 (define-extern target-collide-set! (function symbol float int :behavior target))
 
-;; note: this file has a modification to let us run with an incompletely constructed target.
-;; if you update the decompilation, you will need to restore this hack.
-
 ;; DECOMP BEGINS
 
 (defskelgroup *jchar-sg* eichar
diff --git a/test/decompiler/reference/engine/ambient/mood-tables_REF.gc b/test/decompiler/reference/engine/ambient/mood-tables_REF.gc
index 3d8d27ea38..b2c3e44678 100644
--- a/test/decompiler/reference/engine/ambient/mood-tables_REF.gc
+++ b/test/decompiler/reference/engine/ambient/mood-tables_REF.gc
@@ -318,8 +318,7 @@
   )
 
 ;; definition for symbol *default-interp-table*, type sky-color-day
-(define
-  *default-interp-table*
+(define *default-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -352,8 +351,7 @@
   )
 
 ;; definition for symbol *village1-palette-interp-table*, type sky-color-day
-(define
-  *village1-palette-interp-table*
+(define *village1-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -386,8 +384,7 @@
   )
 
 ;; definition for symbol *misty-palette-interp-table*, type sky-color-day
-(define
-  *misty-palette-interp-table*
+(define *misty-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -420,8 +417,7 @@
   )
 
 ;; definition for symbol *firecanyon-palette-interp-table*, type sky-color-day
-(define
-  *firecanyon-palette-interp-table*
+(define *firecanyon-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -454,8 +450,7 @@
   )
 
 ;; definition for symbol *rolling-palette-interp-table*, type sky-color-day
-(define
-  *rolling-palette-interp-table*
+(define *rolling-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -488,8 +483,7 @@
   )
 
 ;; definition for symbol *village2-sky-texture-table*, type sky-color-day
-(define
-  *village2-sky-texture-table*
+(define *village2-sky-texture-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -522,8 +516,7 @@
   )
 
 ;; definition for symbol *finalboss-interp-table*, type sky-color-day
-(define
-  *finalboss-interp-table*
+(define *finalboss-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -556,8 +549,7 @@
   )
 
 ;; definition for symbol *village1-mood-fog-table*, type mood-fog-table
-(define
-  *village1-mood-fog-table*
+(define *village1-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -619,8 +611,7 @@
   )
 
 ;; definition for symbol *village1-mood-lights-table*, type mood-lights-table
-(define
-  *village1-mood-lights-table*
+(define *village1-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -738,8 +729,7 @@
 (update-mood-shadow-direction (-> *village1-mood-lights-table* data 7))
 
 ;; definition for symbol *village1-mood-sun-table*, type mood-sun-table
-(define
-  *village1-mood-sun-table*
+(define *village1-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -794,8 +784,7 @@
   )
 
 ;; definition for symbol *training-mood-fog-table*, type mood-fog-table
-(define
-  *training-mood-fog-table*
+(define *training-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -857,8 +846,7 @@
   )
 
 ;; definition for symbol *snow-mood-fog-table*, type mood-fog-table
-(define
-  *snow-mood-fog-table*
+(define *snow-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -921,8 +909,7 @@
   )
 
 ;; definition for symbol *snow-mood-lights-table*, type mood-lights-table
-(define
-  *snow-mood-lights-table*
+(define *snow-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -1095,8 +1082,7 @@
   )
 
 ;; definition for symbol *snow-mood-sun-table*, type mood-sun-table
-(define
-  *snow-mood-sun-table*
+(define *snow-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1145,8 +1131,7 @@
   )
 
 ;; definition for symbol *jungleb-mood-fog-table*, type mood-fog-table
-(define
-  *jungleb-mood-fog-table*
+(define *jungleb-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color (new 'static 'vector :w 128.0)
@@ -1166,8 +1151,7 @@
   )
 
 ;; definition for symbol *jungleb-mood-lights-table*, type mood-lights-table
-(define
-  *jungleb-mood-lights-table*
+(define *jungleb-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 1.0)
@@ -1190,8 +1174,7 @@
   )
 
 ;; definition for symbol *jungleb-mood-sun-table*, type mood-sun-table
-(define
-  *jungleb-mood-sun-table*
+(define *jungleb-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1211,8 +1194,7 @@
   )
 
 ;; definition for symbol *maincave-mood-fog-table*, type mood-fog-table
-(define
-  *maincave-mood-fog-table*
+(define *maincave-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -1233,8 +1215,7 @@
   )
 
 ;; definition for symbol *maincave-mood-lights-table*, type mood-lights-table
-(define
-  *maincave-mood-lights-table*
+(define *maincave-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 1.0)
@@ -1257,8 +1238,7 @@
   )
 
 ;; definition for symbol *maincave-mood-sun-table*, type mood-sun-table
-(define
-  *maincave-mood-sun-table*
+(define *maincave-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1278,8 +1258,7 @@
   )
 
 ;; definition for symbol *robocave-mood-fog-table*, type mood-fog-table
-(define
-  *robocave-mood-fog-table*
+(define *robocave-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color (new 'static 'vector :w 128.0)
@@ -1299,8 +1278,7 @@
   )
 
 ;; definition for symbol *darkcave-mood-fog-table*, type mood-fog-table
-(define
-  *darkcave-mood-fog-table*
+(define *darkcave-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color (new 'static 'vector :w 128.0)
@@ -1320,8 +1298,7 @@
   )
 
 ;; definition for symbol *darkcave-mood-lights-table*, type mood-lights-table
-(define
-  *darkcave-mood-lights-table*
+(define *darkcave-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y -1.0)
@@ -1344,8 +1321,7 @@
   )
 
 ;; definition for symbol *darkcave-mood-sun-table*, type mood-sun-table
-(define
-  *darkcave-mood-sun-table*
+(define *darkcave-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1365,8 +1341,7 @@
   )
 
 ;; definition for symbol *misty-mood-fog-table*, type mood-fog-table
-(define
-  *misty-mood-fog-table*
+(define *misty-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -1429,8 +1404,7 @@
   )
 
 ;; definition for symbol *misty-mood-lights-table*, type mood-lights-table
-(define
-  *misty-mood-lights-table*
+(define *misty-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -1471,8 +1445,7 @@
 (update-mood-shadow-direction (-> *misty-mood-lights-table* data 1))
 
 ;; definition for symbol *misty-mood-sun-table*, type mood-sun-table
-(define
-  *misty-mood-sun-table*
+(define *misty-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1527,8 +1500,7 @@
   )
 
 ;; definition for symbol *village2-mood-fog-table*, type mood-fog-table
-(define
-  *village2-mood-fog-table*
+(define *village2-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -1591,8 +1563,7 @@
   )
 
 ;; definition for symbol *village2-mood-lights-table*, type mood-lights-table
-(define
-  *village2-mood-lights-table*
+(define *village2-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -1657,8 +1628,7 @@
 (update-mood-shadow-direction (-> *village2-mood-lights-table* data 3))
 
 ;; definition for symbol *village2-mood-sun-table*, type mood-sun-table
-(define
-  *village2-mood-sun-table*
+(define *village2-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -1705,8 +1675,7 @@
   )
 
 ;; definition for symbol *swamp-mood-fog-table*, type mood-fog-table
-(define
-  *swamp-mood-fog-table*
+(define *swamp-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -1769,8 +1738,7 @@
   )
 
 ;; definition for symbol *swamp-mood-lights-table*, type mood-lights-table
-(define
-  *swamp-mood-lights-table*
+(define *swamp-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -1835,8 +1803,7 @@
 (update-mood-shadow-direction (-> *swamp-mood-lights-table* data 3))
 
 ;; definition for symbol *swamp-mood-sun-table*, type mood-sun-table
-(define
-  *swamp-mood-sun-table*
+(define *swamp-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -1883,8 +1850,7 @@
   )
 
 ;; definition for symbol *sunken-mood-fog-table*, type mood-fog-table
-(define
-  *sunken-mood-fog-table*
+(define *sunken-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -1913,8 +1879,7 @@
   )
 
 ;; definition for symbol *sunken-mood-lights-table*, type mood-lights-table
-(define
-  *sunken-mood-lights-table*
+(define *sunken-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 1.0)
@@ -1951,8 +1916,7 @@
 (update-mood-shadow-direction (-> *sunken-mood-lights-table* data 1))
 
 ;; definition for symbol *sunken-mood-sun-table*, type mood-sun-table
-(define
-  *sunken-mood-sun-table*
+(define *sunken-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -1977,8 +1941,7 @@
   )
 
 ;; definition for symbol *rolling-mood-fog-table*, type mood-fog-table
-(define
-  *rolling-mood-fog-table*
+(define *rolling-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2041,8 +2004,7 @@
   )
 
 ;; definition for symbol *rolling-mood-lights-table*, type mood-lights-table
-(define
-  *rolling-mood-lights-table*
+(define *rolling-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -2109,8 +2071,7 @@
 (update-mood-shadow-direction (-> *rolling-mood-lights-table* data 3))
 
 ;; definition for symbol *rolling-mood-sun-table*, type mood-sun-table
-(define
-  *rolling-mood-sun-table*
+(define *rolling-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -2157,8 +2118,7 @@
   )
 
 ;; definition for symbol *firecanyon-mood-fog-table*, type mood-fog-table
-(define
-  *firecanyon-mood-fog-table*
+(define *firecanyon-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2221,8 +2181,7 @@
   )
 
 ;; definition for symbol *firecanyon-mood-lights-table*, type mood-lights-table
-(define
-  *firecanyon-mood-lights-table*
+(define *firecanyon-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -2295,8 +2254,7 @@
 (update-mood-shadow-direction (-> *firecanyon-mood-lights-table* data 3))
 
 ;; definition for symbol *firecanyon-mood-sun-table*, type mood-sun-table
-(define
-  *firecanyon-mood-sun-table*
+(define *firecanyon-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -2351,8 +2309,7 @@
   )
 
 ;; definition for symbol *ogre-mood-fog-table*, type mood-fog-table
-(define
-  *ogre-mood-fog-table*
+(define *ogre-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2415,8 +2372,7 @@
   )
 
 ;; definition for symbol *ogre-mood-lights-table*, type mood-lights-table
-(define
-  *ogre-mood-lights-table*
+(define *ogre-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -2507,8 +2463,7 @@
 (update-mood-shadow-direction (-> *ogre-mood-lights-table* data 5))
 
 ;; definition for symbol *ogre2-mood-lights-table*, type mood-lights-table
-(define
-  *ogre2-mood-lights-table*
+(define *ogre2-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -2599,8 +2554,7 @@
 (update-mood-shadow-direction (-> *ogre2-mood-lights-table* data 5))
 
 ;; definition for symbol *ogre3-mood-fog-table*, type mood-fog-table
-(define
-  *ogre3-mood-fog-table*
+(define *ogre3-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2621,8 +2575,7 @@
   )
 
 ;; definition for symbol *ogre3-mood-lights-table*, type mood-lights-table
-(define
-  *ogre3-mood-lights-table*
+(define *ogre3-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 0.666 :z 0.745)
@@ -2649,8 +2602,7 @@
 (update-mood-shadow-direction (the-as mood-lights (-> *ogre3-mood-lights-table* data)))
 
 ;; definition for symbol *village3-mood-fog-table*, type mood-fog-table
-(define
-  *village3-mood-fog-table*
+(define *village3-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2713,8 +2665,7 @@
   )
 
 ;; definition for symbol *village3-mood-lights-table*, type mood-lights-table
-(define
-  *village3-mood-lights-table*
+(define *village3-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction
@@ -2763,8 +2714,7 @@
   )
 
 ;; definition for symbol *lavatube-mood-fog-table*, type mood-fog-table
-(define
-  *lavatube-mood-fog-table*
+(define *lavatube-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -2785,8 +2735,7 @@
   )
 
 ;; definition for symbol *lavatube-mood-lights-table*, type mood-lights-table
-(define
-  *lavatube-mood-lights-table*
+(define *lavatube-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 1.0)
@@ -2854,8 +2803,7 @@
 (update-mood-shadow-direction (the-as mood-lights (-> *lavatube-mood-lights-table* data)))
 
 ;; definition for symbol *lavatube-mood-sun-table*, type mood-sun-table
-(define
-  *lavatube-mood-sun-table*
+(define *lavatube-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -2875,8 +2823,7 @@
   )
 
 ;; definition for symbol *finalboss-mood-sun-table*, type mood-sun-table
-(define
-  *finalboss-mood-sun-table*
+(define *finalboss-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color
@@ -2931,8 +2878,7 @@
   )
 
 ;; definition for symbol *finalboss-mood-fog-table*, type mood-fog-table
-(define
-  *finalboss-mood-fog-table*
+(define *finalboss-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color
@@ -3090,8 +3036,7 @@
   )
 
 ;; definition for symbol *citadel-mood-fog-table*, type mood-fog-table
-(define
-  *citadel-mood-fog-table*
+(define *citadel-mood-fog-table*
   (new 'static 'mood-fog-table :data (new 'static 'inline-array mood-fog 8
                                        (new 'static 'mood-fog
                                          :fog-color (new 'static 'vector :w 128.0)
@@ -3111,8 +3056,7 @@
   )
 
 ;; definition for symbol *citadel-mood-lights-table*, type mood-lights-table
-(define
-  *citadel-mood-lights-table*
+(define *citadel-mood-lights-table*
   (new 'static 'mood-lights-table :data (new 'static 'inline-array mood-lights 8
                                           (new 'static 'mood-lights
                                             :direction (new 'static 'vector :y 1.0)
@@ -3135,8 +3079,7 @@
   )
 
 ;; definition for symbol *citadel-mood-sun-table*, type mood-sun-table
-(define
-  *citadel-mood-sun-table*
+(define *citadel-mood-sun-table*
   (new 'static 'mood-sun-table :data (new 'static 'inline-array mood-sun 8
                                        (new 'static 'mood-sun
                                          :sun-color (new 'static 'vector :w 128.0)
diff --git a/test/decompiler/reference/engine/ambient/mood_REF.gc b/test/decompiler/reference/engine/ambient/mood_REF.gc
index bc0d032d9d..c0211556f7 100644
--- a/test/decompiler/reference/engine/ambient/mood_REF.gc
+++ b/test/decompiler/reference/engine/ambient/mood_REF.gc
@@ -531,16 +531,14 @@
         )
 
 ;; definition for symbol *flash1*, type (array float)
-(define
-  *flash1*
+(define *flash1*
   (the-as (array float)
     (new 'static 'boxed-array :type float :length 9 :allocated-length 9 1.0 0.8 0.0 1.0 0.5 1.0 0.4 0.2 0.1)
     )
   )
 
 ;; definition for symbol *flash2*, type (array float)
-(define
-  *flash2*
+(define *flash2*
   (the-as (array float)
     (new 'static 'boxed-array :type float :length 10 :allocated-length 10 1.0 0.9 0.8 0.7 0.0 0.0 1.0 0.0 1.0 0.5)
     )
@@ -1874,8 +1872,7 @@
         )
 
 ;; definition for symbol *rolling-spheres-light2*, type light-ellipse
-(define
-  *rolling-spheres-light2*
+(define *rolling-spheres-light2*
   (new 'static 'light-ellipse
     :matrix
     (new 'static 'matrix :vector (new 'static 'inline-array vector 4
diff --git a/test/decompiler/reference/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/engine/camera/cam-layout_REF.gc
index 45885cb7bf..094c80c371 100644
--- a/test/decompiler/reference/engine/camera/cam-layout_REF.gc
+++ b/test/decompiler/reference/engine/camera/cam-layout_REF.gc
@@ -2748,8 +2748,7 @@
   )
 
 ;; definition for symbol *clm-focalpull-attr*, type clm
-(define
-  *clm-focalpull-attr*
+(define *clm-focalpull-attr*
   (new 'static 'clm
     :title "---focalpull attributes--"
     :items
@@ -2819,8 +2818,7 @@
   )
 
 ;; definition for symbol *clm-index-attr*, type clm
-(define
-  *clm-index-attr*
+(define *clm-index-attr*
   (new 'static 'clm
     :title "---index attributes--"
     :items
@@ -2890,8 +2888,7 @@
   )
 
 ;; definition for symbol *clm-intro-attr*, type clm
-(define
-  *clm-intro-attr*
+(define *clm-intro-attr*
   (new 'static 'clm
     :title "---intro attributes--"
     :items
@@ -2958,8 +2955,7 @@
   )
 
 ;; definition for symbol *clm-spline-attr*, type clm
-(define
-  *clm-spline-attr*
+(define *clm-spline-attr*
   (new 'static 'clm
     :title "---spline attributes--"
     :items
@@ -3008,8 +3004,7 @@
   )
 
 ;; definition for symbol *clm-vol-attr*, type clm
-(define
-  *clm-vol-attr*
+(define *clm-vol-attr*
   (new 'static 'clm
     :title "---volume attributes--"
     :items
@@ -3059,8 +3054,7 @@
   )
 
 ;; definition for symbol *clm-cam-attr*, type clm
-(define
-  *clm-cam-attr*
+(define *clm-cam-attr*
   (new 'static 'clm
     :title "---camera attributes--"
     :items
@@ -3418,8 +3412,7 @@
   )
 
 ;; definition for symbol *clm-cam-lookthrough*, type clm
-(define
-  *clm-cam-lookthrough*
+(define *clm-cam-lookthrough*
   (new 'static 'clm
     :title "---cam-lookthrough---"
     :items
@@ -3486,8 +3479,7 @@
   )
 
 ;; definition for symbol *clm-edit*, type clm
-(define
-  *clm-edit*
+(define *clm-edit*
   (new 'static 'clm
     :title "---edit---"
     :items
@@ -3684,8 +3676,7 @@
   )
 
 ;; definition for symbol *clm-save-all*, type clm
-(define
-  *clm-save-all*
+(define *clm-save-all*
   (new 'static 'clm
     :title "---save all?---"
     :items
@@ -3716,8 +3707,7 @@
   )
 
 ;; definition for symbol *clm-save-one*, type clm
-(define
-  *clm-save-one*
+(define *clm-save-one*
   (new 'static 'clm
     :title "---single save?---"
     :items
@@ -3748,8 +3738,7 @@
   )
 
 ;; definition for symbol *clm-select*, type clm
-(define
-  *clm-select*
+(define *clm-select*
   (new 'static 'clm
     :title "---camera---"
     :items
diff --git a/test/decompiler/reference/engine/camera/cam-states_REF.gc b/test/decompiler/reference/engine/camera/cam-states_REF.gc
index 7d405dab19..d3417d2e15 100644
--- a/test/decompiler/reference/engine/camera/cam-states_REF.gc
+++ b/test/decompiler/reference/engine/camera/cam-states_REF.gc
@@ -441,8 +441,7 @@
   )
 
 ;; definition for symbol *CAM_EYE-bank*, type cam-eye-bank
-(define
-  *CAM_EYE-bank*
+(define *CAM_EYE-bank*
   (new 'static 'cam-eye-bank :rot-speed 364.0889 :max-degrees 12743.111 :max-fov 11650.845 :min-fov 6189.511)
   )
 
@@ -3118,8 +3117,7 @@
   )
 
 ;; definition for symbol *CAM_STICK-bank*, type cam-stick-bank
-(define
-  *CAM_STICK-bank*
+(define *CAM_STICK-bank*
   (new 'static 'cam-stick-bank :max-z (meters 30) :min-z (meters 5) :max-y (meters 15) :min-y (meters 2))
   )
 
@@ -3365,8 +3363,7 @@
   )
 
 ;; definition for symbol *CAM_BIKE-bank*, type cam-bike-bank
-(define
-  *CAM_BIKE-bank*
+(define *CAM_BIKE-bank*
   (new 'static 'cam-bike-bank :max-z (meters 6) :min-z (meters 10) :max-y (meters 3) :min-y (meters 5))
   )
 
diff --git a/test/decompiler/reference/engine/dma/dma-disasm_REF.gc b/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
index b7f36c07c4..06a6df7f22 100644
--- a/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
+++ b/test/decompiler/reference/engine/dma/dma-disasm_REF.gc
@@ -31,8 +31,7 @@
   )
 
 ;; definition for symbol *vif-disasm-table*, type (array vif-disasm-element)
-(define
-  *vif-disasm-table*
+(define *vif-disasm-table*
   (the-as (array vif-disasm-element)
     (new
       'static
diff --git a/test/decompiler/reference/engine/game/crates_REF.gc b/test/decompiler/reference/engine/game/crates_REF.gc
index 0368af49d5..dfbd4b2c8a 100644
--- a/test/decompiler/reference/engine/game/crates_REF.gc
+++ b/test/decompiler/reference/engine/game/crates_REF.gc
@@ -82,8 +82,7 @@
   )
 
 ;; definition for symbol *CRATE-bank*, type crate-bank
-(define
-  *CRATE-bank*
+(define *CRATE-bank*
   (new 'static 'crate-bank :COLLIDE_YOFF 4096.0 :COLLIDE_RADIUS 4915.2 :DARKECO_EXPLODE_RADIUS 16384.0)
   )
 
diff --git a/test/decompiler/reference/engine/game/main_REF.gc b/test/decompiler/reference/engine/game/main_REF.gc
index 91e5d42913..b6a0bc64a0 100644
--- a/test/decompiler/reference/engine/game/main_REF.gc
+++ b/test/decompiler/reference/engine/game/main_REF.gc
@@ -245,8 +245,7 @@
   )
 
 ;; definition for symbol *screen-filter*, type screen-filter
-(define
-  *screen-filter*
+(define *screen-filter*
   (new 'static 'screen-filter :draw? #f :color (new 'static 'rgba :g #x20 :b #x40 :a #x50))
   )
 
diff --git a/test/decompiler/reference/engine/game/task/task-control_REF.gc b/test/decompiler/reference/engine/game/task/task-control_REF.gc
index 9c9221b76f..72529719b2 100644
--- a/test/decompiler/reference/engine/game/task/task-control_REF.gc
+++ b/test/decompiler/reference/engine/game/task/task-control_REF.gc
@@ -284,8 +284,7 @@
   )
 
 ;; definition for symbol *assistant-tasks*, type task-control
-(define
-  *assistant-tasks*
+(define *assistant-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -414,8 +413,7 @@
   )
 
 ;; definition for symbol *assistant-village2-tasks*, type task-control
-(define
-  *assistant-village2-tasks*
+(define *assistant-village2-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -693,8 +691,7 @@
   )
 
 ;; definition for symbol *gambler-tasks*, type task-control
-(define
-  *gambler-tasks*
+(define *gambler-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -807,8 +804,7 @@
   )
 
 ;; definition for symbol *geologist-tasks*, type task-control
-(define
-  *geologist-tasks*
+(define *geologist-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -921,8 +917,7 @@
   )
 
 ;; definition for symbol *mayor-tasks*, type task-control
-(define
-  *mayor-tasks*
+(define *mayor-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1044,8 +1039,7 @@
   )
 
 ;; definition for symbol *sage-tasks*, type task-control
-(define
-  *sage-tasks*
+(define *sage-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1190,8 +1184,7 @@
   )
 
 ;; definition for symbol *sage-bluehut-tasks*, type task-control
-(define
-  *sage-bluehut-tasks*
+(define *sage-bluehut-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1305,8 +1298,7 @@
   )
 
 ;; definition for symbol *oracle-village1-tasks*, type task-control
-(define
-  *oracle-village1-tasks*
+(define *oracle-village1-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1425,8 +1417,7 @@
   )
 
 ;; definition for symbol *oracle-village2-tasks*, type task-control
-(define
-  *oracle-village2-tasks*
+(define *oracle-village2-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1545,8 +1536,7 @@
   )
 
 ;; definition for symbol *oracle-village3-tasks*, type task-control
-(define
-  *oracle-village3-tasks*
+(define *oracle-village3-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1665,8 +1655,7 @@
   )
 
 ;; definition for symbol *miners-tasks*, type task-control
-(define
-  *miners-tasks*
+(define *miners-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -2056,8 +2045,7 @@
   )
 
 ;; definition for symbol *sage-villagec-tasks*, type task-control
-(define
-  *sage-villagec-tasks*
+(define *sage-villagec-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -2308,8 +2296,7 @@
         )
 
 ;; definition for symbol *task-controls*, type (array task-control)
-(define
-  *task-controls*
+(define *task-controls*
   (the-as (array task-control)
     (new
       'static
diff --git a/test/decompiler/reference/engine/gfx/depth-cue_REF.gc b/test/decompiler/reference/engine/gfx/depth-cue_REF.gc
index d05494f760..6b33d934ee 100644
--- a/test/decompiler/reference/engine/gfx/depth-cue_REF.gc
+++ b/test/decompiler/reference/engine/gfx/depth-cue_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol *depth-cue-work*, type depth-cue-work
-(define
-  *depth-cue-work*
+(define *depth-cue-work*
   (new 'static 'depth-cue-work
     :texture-strip-tmpl
     (new 'static 'dma-gif-packet
diff --git a/test/decompiler/reference/engine/gfx/font-h_REF.gc b/test/decompiler/reference/engine/gfx/font-h_REF.gc
index 5c2f43c7eb..a8f29efb5b 100644
--- a/test/decompiler/reference/engine/gfx/font-h_REF.gc
+++ b/test/decompiler/reference/engine/gfx/font-h_REF.gc
@@ -300,8 +300,7 @@
   )
 
 ;; definition for symbol *font-work*, type font-work
-(define
-  *font-work*
+(define *font-work*
   (new 'static 'font-work
     :font-tmpl
     (new 'static 'dma-gif-packet
diff --git a/test/decompiler/reference/engine/gfx/generic/generic_REF.gc b/test/decompiler/reference/engine/gfx/generic/generic_REF.gc
index 5e18f60849..9f40c3c7cd 100644
--- a/test/decompiler/reference/engine/gfx/generic/generic_REF.gc
+++ b/test/decompiler/reference/engine/gfx/generic/generic_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol *generic-foreground-sinks*, type (array generic-dma-foreground-sink)
-(define
-  *generic-foreground-sinks*
+(define *generic-foreground-sinks*
   (the-as (array generic-dma-foreground-sink)
     (new 'static 'boxed-array :type generic-dma-foreground-sink :length 0 :allocated-length 9)
     )
diff --git a/test/decompiler/reference/engine/gfx/hw/display_REF.gc b/test/decompiler/reference/engine/gfx/hw/display_REF.gc
index e8a6b0f684..2d46b9f275 100644
--- a/test/decompiler/reference/engine/gfx/hw/display_REF.gc
+++ b/test/decompiler/reference/engine/gfx/hw/display_REF.gc
@@ -195,8 +195,7 @@
   )
 
 ;; definition for symbol *font-context*, type font-context
-(define
-  *font-context*
+(define *font-context*
   (new 'global 'font-context *font-default-matrix* 0 24 0.0 (font-color default) (font-flags shadow kerning))
   )
 
diff --git a/test/decompiler/reference/engine/gfx/merc/merc-death_REF.gc b/test/decompiler/reference/engine/gfx/merc/merc-death_REF.gc
index aef0b0be45..11fb68fd9e 100644
--- a/test/decompiler/reference/engine/gfx/merc/merc-death_REF.gc
+++ b/test/decompiler/reference/engine/gfx/merc/merc-death_REF.gc
@@ -36,32 +36,27 @@
   )
 
 ;; definition for symbol death-beach-puppy, type death-info
-(define
-  death-beach-puppy
+(define death-beach-puppy
   (new 'static 'death-info :vertex-skip #x82 :timer #x4b :overlap #x4 :effect #x29 :sound 'temp-enemy-die)
   )
 
 ;; definition for symbol death-jungle-snake, type death-info
-(define
-  death-jungle-snake
+(define death-jungle-snake
   (new 'static 'death-info :vertex-skip #xa :timer #x4b :overlap #x4 :effect #x29 :sound 'temp-enemy-die)
   )
 
 ;; definition for symbol death-default, type death-info
-(define
-  death-default
+(define death-default
   (new 'static 'death-info :vertex-skip #x50 :timer #x4b :overlap #x4 :effect #x29 :sound 'temp-enemy-die)
   )
 
 ;; definition for symbol death-warp-in, type death-info
-(define
-  death-warp-in
+(define death-warp-in
   (new 'static 'death-info :vertex-skip #x96 :timer #x4b :effect #x29 :sound 'warpgate-tele)
   )
 
 ;; definition for symbol death-warp-out, type death-info
-(define
-  death-warp-out
+(define death-warp-out
   (new 'static 'death-info :vertex-skip #x96 :timer #x96 :effect #x29 :sound 'warpgate-tele)
   )
 
diff --git a/test/decompiler/reference/engine/gfx/ocean/ocean-tables_REF.gc b/test/decompiler/reference/engine/gfx/ocean/ocean-tables_REF.gc
index 83d0052755..811293eea5 100644
--- a/test/decompiler/reference/engine/gfx/ocean/ocean-tables_REF.gc
+++ b/test/decompiler/reference/engine/gfx/ocean/ocean-tables_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol *ocean-spheres-village1*, type ocean-spheres
-(define
-  *ocean-spheres-village1*
+(define *ocean-spheres-village1*
   (new 'static 'ocean-spheres :spheres (new 'static 'inline-array sphere 36
                                          (new 'static 'sphere :x -7864320.0 :z -7864320.0 :w 2224365.5)
                                          (new 'static 'sphere :x -4718592.0 :z -7864320.0 :w 2224365.5)
@@ -46,8 +45,7 @@
   )
 
 ;; definition for symbol *ocean-colors-village1*, type ocean-colors
-(define
-  *ocean-colors-village1*
+(define *ocean-colors-village1*
   (new 'static 'ocean-colors :colors (new 'static 'array rgba 2548
                                        (new 'static 'rgba :r #x1 :g #x2d :b #x38 :a #x80)
                                        (new 'static 'rgba :r #x1 :g #x2c :b #x38 :a #x80)
@@ -2602,8 +2600,7 @@
   )
 
 ;; definition for symbol *ocean-near-indices-village1*, type ocean-near-indices
-(define
-  *ocean-near-indices-village1*
+(define *ocean-near-indices-village1*
   (new 'static 'ocean-near-indices
     :data
     (new 'static 'inline-array ocean-near-index 68
@@ -3493,8 +3490,7 @@
   )
 
 ;; definition for symbol *ocean-trans-indices-village1*, type ocean-trans-indices
-(define
-  *ocean-trans-indices-village1*
+(define *ocean-trans-indices-village1*
   (new 'static 'ocean-trans-indices :data (new 'static 'inline-array ocean-trans-index 2304
                                             (new 'static 'ocean-trans-index :parent -1 :child -1)
                                             (new 'static 'ocean-trans-index :parent -1 :child -1)
@@ -5847,8 +5843,7 @@
         )
 
 ;; definition for symbol *ocean-mid-masks-village1*, type ocean-mid-masks
-(define
-  *ocean-mid-masks-village1*
+(define *ocean-mid-masks-village1*
   (new 'static 'ocean-mid-masks
     :data
     (new 'static 'inline-array ocean-mid-mask 322
@@ -6179,8 +6174,7 @@
   )
 
 ;; definition for symbol *ocean-spheres-village2*, type ocean-spheres
-(define
-  *ocean-spheres-village2*
+(define *ocean-spheres-village2*
   (new 'static 'ocean-spheres :spheres (new 'static 'inline-array sphere 36
                                          (new 'static 'sphere :x -6320128.0 :z -14385152.0 :w 2224365.5)
                                          (new 'static 'sphere :x -3174400.0 :z -14385152.0 :w 2224365.5)
@@ -6223,8 +6217,7 @@
   )
 
 ;; definition for symbol *ocean-colors-village2*, type ocean-colors
-(define
-  *ocean-colors-village2*
+(define *ocean-colors-village2*
   (new 'static 'ocean-colors :colors (new 'static 'array rgba 2548
                                        (new 'static 'rgba :r #x1f :g #x32 :b #x42 :a #x80)
                                        (new 'static 'rgba :r #x1f :g #x32 :b #x42 :a #x80)
@@ -8779,8 +8772,7 @@
   )
 
 ;; definition for symbol *ocean-near-indices-village2*, type ocean-near-indices
-(define
-  *ocean-near-indices-village2*
+(define *ocean-near-indices-village2*
   (new 'static 'ocean-near-indices
     :data
     (new 'static 'inline-array ocean-near-index 23
@@ -9014,8 +9006,7 @@
   )
 
 ;; definition for symbol *ocean-trans-indices-village2*, type ocean-trans-indices
-(define
-  *ocean-trans-indices-village2*
+(define *ocean-trans-indices-village2*
   (new 'static 'ocean-trans-indices :data (new 'static 'inline-array ocean-trans-index 2304
                                             (new 'static 'ocean-trans-index :parent -1 :child -1)
                                             (new 'static 'ocean-trans-index :parent -1 :child -1)
@@ -11368,8 +11359,7 @@
         )
 
 ;; definition for symbol *ocean-mid-masks-village2*, type ocean-mid-masks
-(define
-  *ocean-mid-masks-village2*
+(define *ocean-mid-masks-village2*
   (new 'static 'ocean-mid-masks
     :data
     (new 'static 'inline-array ocean-mid-mask 102
@@ -11480,8 +11470,7 @@
   )
 
 ;; definition for symbol *ocean-near-indices-sunken*, type ocean-near-indices
-(define
-  *ocean-near-indices-sunken*
+(define *ocean-near-indices-sunken*
   (new 'static 'ocean-near-indices
     :data
     (new 'static 'inline-array ocean-near-index 1 (new 'static 'ocean-near-index))
@@ -11495,8 +11484,7 @@
 (define *ocean-mid-indices-sunken* (new 'static 'ocean-mid-indices))
 
 ;; definition for symbol *ocean-mid-masks-sunken*, type ocean-mid-masks
-(define
-  *ocean-mid-masks-sunken*
+(define *ocean-mid-masks-sunken*
   (new 'static 'ocean-mid-masks
     :data
     (new 'static 'inline-array ocean-mid-mask 2 (new 'static 'ocean-mid-mask) (new 'static 'ocean-mid-mask))
@@ -11583,7 +11571,3 @@
 
 ;; failed to figure out what this is:
 (set! (-> *ocean-map-sunken* ocean-near-indices) *ocean-near-indices-sunken*)
-
-
-
-
diff --git a/test/decompiler/reference/engine/gfx/shrub/shrub-work_REF.gc b/test/decompiler/reference/engine/gfx/shrub/shrub-work_REF.gc
index 7f4ff5f4ed..da86f8f213 100644
--- a/test/decompiler/reference/engine/gfx/shrub/shrub-work_REF.gc
+++ b/test/decompiler/reference/engine/gfx/shrub/shrub-work_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol *instance-shrub-work*, type instance-shrub-work
-(define
-  *instance-shrub-work*
+(define *instance-shrub-work*
   (new 'static 'instance-shrub-work
     :matrix-tmpl
     (new 'static 'inline-array qword 20
diff --git a/test/decompiler/reference/engine/level/level-info_REF.gc b/test/decompiler/reference/engine/level/level-info_REF.gc
index 63b41bcea5..b783b3a0f8 100644
--- a/test/decompiler/reference/engine/level/level-info_REF.gc
+++ b/test/decompiler/reference/engine/level/level-info_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol training, type level-load-info
-(define
-  training
+(define training
   (new 'static 'level-load-info
     :index 1
     :name 'training
@@ -124,8 +123,7 @@
   )
 
 ;; definition for symbol village1, type level-load-info
-(define
-  village1
+(define village1
   (new 'static 'level-load-info
     :index 2
     :name 'village1
@@ -265,8 +263,7 @@
   )
 
 ;; definition for symbol beach, type level-load-info
-(define
-  beach
+(define beach
   (new 'static 'level-load-info
     :index 3
     :name 'beach
@@ -316,8 +313,7 @@
   )
 
 ;; definition for symbol jungle, type level-load-info
-(define
-  jungle
+(define jungle
   (new 'static 'level-load-info
     :index 4
     :name 'jungle
@@ -368,8 +364,7 @@
   )
 
 ;; definition for symbol jungleb, type level-load-info
-(define
-  jungleb
+(define jungleb
   (new 'static 'level-load-info
     :index 5
     :name 'jungleb
@@ -417,8 +412,7 @@
   )
 
 ;; definition for symbol misty, type level-load-info
-(define
-  misty
+(define misty
   (new 'static 'level-load-info
     :index 6
     :name 'misty
@@ -605,8 +599,7 @@
   )
 
 ;; definition for symbol firecanyon, type level-load-info
-(define
-  firecanyon
+(define firecanyon
   (new 'static 'level-load-info
     :index 7
     :name 'firecanyon
@@ -673,8 +666,7 @@
   )
 
 ;; definition for symbol village2, type level-load-info
-(define
-  village2
+(define village2
   (new 'static 'level-load-info
     :index 8
     :name 'village2
@@ -760,8 +752,7 @@
   )
 
 ;; definition for symbol sunken, type level-load-info
-(define
-  sunken
+(define sunken
   (new 'static 'level-load-info
     :index 9
     :name 'sunken
@@ -864,8 +855,7 @@
   )
 
 ;; definition for symbol sunkenb, type level-load-info
-(define
-  sunkenb
+(define sunkenb
   (new 'static 'level-load-info
     :index 10
     :name 'sunkenb
@@ -932,8 +922,7 @@
   )
 
 ;; definition for symbol swamp, type level-load-info
-(define
-  swamp
+(define swamp
   (new 'static 'level-load-info
     :index 11
     :name 'swamp
@@ -1139,8 +1128,7 @@
   )
 
 ;; definition for symbol rolling, type level-load-info
-(define
-  rolling
+(define rolling
   (new 'static 'level-load-info
     :index 12
     :name 'rolling
@@ -1189,8 +1177,7 @@
   )
 
 ;; definition for symbol ogre, type level-load-info
-(define
-  ogre
+(define ogre
   (new 'static 'level-load-info
     :index 13
     :name 'ogre
@@ -1275,8 +1262,7 @@
   )
 
 ;; definition for symbol village3, type level-load-info
-(define
-  village3
+(define village3
   (new 'static 'level-load-info
     :index 14
     :name 'village3
@@ -1362,8 +1348,7 @@
   )
 
 ;; definition for symbol snow, type level-load-info
-(define
-  snow
+(define snow
   (new 'static 'level-load-info
     :index 15
     :name 'snow
@@ -1557,8 +1542,7 @@
   )
 
 ;; definition for symbol maincave, type level-load-info
-(define
-  maincave
+(define maincave
   (new 'static 'level-load-info
     :index 16
     :name 'maincave
@@ -1643,8 +1627,7 @@
   )
 
 ;; definition for symbol darkcave, type level-load-info
-(define
-  darkcave
+(define darkcave
   (new 'static 'level-load-info
     :index 17
     :name 'darkcave
@@ -1693,8 +1676,7 @@
   )
 
 ;; definition for symbol robocave, type level-load-info
-(define
-  robocave
+(define robocave
   (new 'static 'level-load-info
     :index 18
     :name 'robocave
@@ -1761,8 +1743,7 @@
   )
 
 ;; definition for symbol lavatube, type level-load-info
-(define
-  lavatube
+(define lavatube
   (new 'static 'level-load-info
     :index 19
     :name 'lavatube
@@ -1865,8 +1846,7 @@
   )
 
 ;; definition for symbol citadel, type level-load-info
-(define
-  citadel
+(define citadel
   (new 'static 'level-load-info
     :index 20
     :name 'citadel
@@ -2078,8 +2058,7 @@
   )
 
 ;; definition for symbol finalboss, type level-load-info
-(define
-  finalboss
+(define finalboss
   (new 'static 'level-load-info
     :index 21
     :name 'finalboss
@@ -2176,8 +2155,7 @@
         )
 
 ;; definition for symbol demo, type level-load-info
-(define
-  demo
+(define demo
   (new 'static 'level-load-info
     :index 23
     :name 'demo
@@ -2224,8 +2202,7 @@
   )
 
 ;; definition for symbol title, type level-load-info
-(define
-  title
+(define title
   (new 'static 'level-load-info
     :index 24
     :name 'title
@@ -2274,8 +2251,7 @@
   )
 
 ;; definition for symbol halfpipe, type level-load-info
-(define
-  halfpipe
+(define halfpipe
   (new 'static 'level-load-info
     :index 25
     :name 'halfpipe
diff --git a/test/decompiler/reference/engine/math/euler-h_REF.gc b/test/decompiler/reference/engine/math/euler-h_REF.gc
index ffb8842332..986d377870 100644
--- a/test/decompiler/reference/engine/math/euler-h_REF.gc
+++ b/test/decompiler/reference/engine/math/euler-h_REF.gc
@@ -2,14 +2,12 @@
 (in-package goal)
 
 ;; definition for symbol EulSafe, type (array int32)
-(define
-  EulSafe
+(define EulSafe
   (the-as (array int32) (new 'static 'boxed-array :type int32 :length 4 :allocated-length 4 0 1 2 0))
   )
 
 ;; definition for symbol EulNext, type (array int32)
-(define
-  EulNext
+(define EulNext
   (the-as (array int32) (new 'static 'boxed-array :type int32 :length 4 :allocated-length 4 1 2 0 1))
   )
 
diff --git a/test/decompiler/reference/engine/math/trigonometry_REF.gc b/test/decompiler/reference/engine/math/trigonometry_REF.gc
index 62e7c065ed..d5cfe22ab7 100644
--- a/test/decompiler/reference/engine/math/trigonometry_REF.gc
+++ b/test/decompiler/reference/engine/math/trigonometry_REF.gc
@@ -211,8 +211,7 @@
   )
 
 ;; definition for symbol *sin-poly-vec*, type vector
-(define
-  *sin-poly-vec*
+(define *sin-poly-vec*
   (new 'static 'vector :x -0.16666014 :y 0.008326521 :z -0.0001956241 :w 0.0000023042373)
   )
 
diff --git a/test/decompiler/reference/engine/nav/navigate_REF.gc b/test/decompiler/reference/engine/nav/navigate_REF.gc
index 851df7c3ad..c42da1d900 100644
--- a/test/decompiler/reference/engine/nav/navigate_REF.gc
+++ b/test/decompiler/reference/engine/nav/navigate_REF.gc
@@ -288,20 +288,17 @@
   )
 
 ;; definition for symbol *edge-vert0-table*, type (array int8)
-(define
-  *edge-vert0-table*
+(define *edge-vert0-table*
   (the-as (array int8) (new 'static 'boxed-array :type int8 :length 3 :allocated-length 3 1 2 0))
   )
 
 ;; definition for symbol *edge-vert1-table*, type (array int8)
-(define
-  *edge-vert1-table*
+(define *edge-vert1-table*
   (the-as (array int8) (new 'static 'boxed-array :type int8 :length 3 :allocated-length 3 2 0 1))
   )
 
 ;; definition for symbol *edge-mask-table*, type (array int8)
-(define
-  *edge-mask-table*
+(define *edge-mask-table*
   (the-as (array int8) (new 'static 'boxed-array :type int8 :length 3 :allocated-length 3 1 2 4))
   )
 
diff --git a/test/decompiler/reference/engine/sparticle/sparticle-launcher_REF.gc b/test/decompiler/reference/engine/sparticle/sparticle-launcher_REF.gc
index 26fa91aab3..d4d67e2776 100644
--- a/test/decompiler/reference/engine/sparticle/sparticle-launcher_REF.gc
+++ b/test/decompiler/reference/engine/sparticle/sparticle-launcher_REF.gc
@@ -273,14 +273,12 @@
   )
 
 ;; definition for symbol *part-id-table*, type (array sparticle-launcher)
-(define
-  *part-id-table*
+(define *part-id-table*
   (the-as (array sparticle-launcher) (new 'global 'boxed-array sparticle-launcher 3584))
   )
 
 ;; definition for symbol *part-group-id-table*, type (array sparticle-launch-group)
-(define
-  *part-group-id-table*
+(define *part-group-id-table*
   (the-as (array sparticle-launch-group) (new 'global 'boxed-array sparticle-launch-group 1024))
   )
 
diff --git a/test/decompiler/reference/engine/sparticle/sparticle_REF.gc b/test/decompiler/reference/engine/sparticle/sparticle_REF.gc
index 5f1ba5c726..182115b287 100644
--- a/test/decompiler/reference/engine/sparticle/sparticle_REF.gc
+++ b/test/decompiler/reference/engine/sparticle/sparticle_REF.gc
@@ -86,14 +86,12 @@
   )
 
 ;; definition for symbol *sp-particle-system-2d*, type sparticle-system
-(define
-  *sp-particle-system-2d*
+(define *sp-particle-system-2d*
   (new 'global 'sparticle-system 1920 128 #f (-> *sprite-array-2d* vec-data) (-> *sprite-array-2d* adgif-data))
   )
 
 ;; definition for symbol *sp-particle-system-3d*, type sparticle-system
-(define
-  *sp-particle-system-3d*
+(define *sp-particle-system-3d*
   (new 'global 'sparticle-system 256 0 #t (-> *sprite-array-3d* vec-data) (-> *sprite-array-3d* adgif-data))
   )
 
diff --git a/test/decompiler/reference/engine/target/target-death_REF.gc b/test/decompiler/reference/engine/target/target-death_REF.gc
index d2f223569e..0eaad026b4 100644
--- a/test/decompiler/reference/engine/target/target-death_REF.gc
+++ b/test/decompiler/reference/engine/target/target-death_REF.gc
@@ -526,8 +526,7 @@
         )
 
 ;; definition for symbol *smack-up-mods*, type surface
-(define
-  *smack-up-mods*
+(define *smack-up-mods*
   (new 'static 'surface
     :name 'jump
     :turnv 131072.0
@@ -1099,8 +1098,7 @@
   )
 
 ;; definition for symbol *death-spool-array*, type (array spool-anim)
-(define
-  *death-spool-array*
+(define *death-spool-array*
   (the-as (array spool-anim)
     (new
       'static
diff --git a/test/decompiler/reference/engine/target/target-util_REF.gc b/test/decompiler/reference/engine/target/target-util_REF.gc
index e487227bf4..4bbea07c94 100644
--- a/test/decompiler/reference/engine/target/target-util_REF.gc
+++ b/test/decompiler/reference/engine/target/target-util_REF.gc
@@ -14,8 +14,7 @@
   )
 
 ;; definition for symbol *target-shadow-control*, type shadow-control
-(define
-  *target-shadow-control*
+(define *target-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #x2))
diff --git a/test/decompiler/reference/engine/ui/credits_REF.gc b/test/decompiler/reference/engine/ui/credits_REF.gc
index 51b5b7b1a2..441dcc5c5c 100644
--- a/test/decompiler/reference/engine/ui/credits_REF.gc
+++ b/test/decompiler/reference/engine/ui/credits_REF.gc
@@ -30,16 +30,14 @@
   )
 
 ;; definition for symbol *title-credits-scale*, type (array float)
-(define
-  *title-credits-scale*
+(define *title-credits-scale*
   (the-as (array float)
     (new 'static 'boxed-array :type float :length 8 :allocated-length 8 0.9 0.9 0.6 0.6 1.0 0.9 1.1 0.9)
     )
   )
 
 ;; definition for symbol *title-credits-spacing*, type (array int32)
-(define
-  *title-credits-spacing*
+(define *title-credits-spacing*
   (the-as (array int32)
     (new 'static 'boxed-array :type int32 :length 8 :allocated-length 8 15 20 15 15 20 15 20 15)
     )
diff --git a/test/decompiler/reference/engine/ui/progress/progress-static_REF.gc b/test/decompiler/reference/engine/ui/progress/progress-static_REF.gc
index c023341824..0d1fd2c2b9 100644
--- a/test/decompiler/reference/engine/ui/progress/progress-static_REF.gc
+++ b/test/decompiler/reference/engine/ui/progress/progress-static_REF.gc
@@ -2,8 +2,7 @@
 (in-package goal)
 
 ;; definition for symbol *main-options*, type (array game-option)
-(define
-  *main-options*
+(define *main-options*
   (new
     'static
     'boxed-array
@@ -49,8 +48,7 @@
   )
 
 ;; definition for symbol *title*, type (array game-option)
-(define
-  *title*
+(define *title*
   (new
     'static
     'boxed-array
@@ -78,8 +76,7 @@
   )
 
 ;; definition for symbol *options*, type (array game-option)
-(define
-  *options*
+(define *options*
   (new
     'static
     'boxed-array
@@ -107,8 +104,7 @@
   )
 
 ;; definition for symbol *main-options-demo*, type (array game-option)
-(define
-  *main-options-demo*
+(define *main-options-demo*
   (new
     'static
     'boxed-array
@@ -136,8 +132,7 @@
   )
 
 ;; definition for symbol *main-options-demo-shared*, type (array game-option)
-(define
-  *main-options-demo-shared*
+(define *main-options-demo-shared*
   (new
     'static
     'boxed-array
@@ -166,8 +161,7 @@
   )
 
 ;; definition for symbol *game-options*, type (array game-option)
-(define
-  *game-options*
+(define *game-options*
   (new
     'static
     'boxed-array
@@ -180,8 +174,7 @@
   )
 
 ;; definition for symbol *game-options-japan*, type (array game-option)
-(define
-  *game-options-japan*
+(define *game-options-japan*
   (new
     'static
     'boxed-array
@@ -193,8 +186,7 @@
   )
 
 ;; definition for symbol *game-options-demo*, type (array game-option)
-(define
-  *game-options-demo*
+(define *game-options-demo*
   (new
     'static
     'boxed-array
@@ -206,8 +198,7 @@
   )
 
 ;; definition for symbol *graphic-options*, type (array game-option)
-(define
-  *graphic-options*
+(define *graphic-options*
   (new
     'static
     'boxed-array
@@ -227,8 +218,7 @@
   )
 
 ;; definition for symbol *graphic-title-options-pal*, type (array game-option)
-(define
-  *graphic-title-options-pal*
+(define *graphic-title-options-pal*
   (new
     'static
     'boxed-array
@@ -253,8 +243,7 @@
   )
 
 ;; definition for symbol *sound-options*, type (array game-option)
-(define
-  *sound-options*
+(define *sound-options*
   (new
     'static
     'boxed-array
@@ -276,8 +265,7 @@
         )
 
 ;; definition for symbol *ok-options*, type (array game-option)
-(define
-  *ok-options*
+(define *ok-options*
   (new
     'static
     'boxed-array
@@ -287,8 +275,7 @@
   )
 
 ;; definition for symbol *load-options*, type (array game-option)
-(define
-  *load-options*
+(define *load-options*
   (new
     'static
     'boxed-array
@@ -302,8 +289,7 @@
   )
 
 ;; definition for symbol *save-options*, type (array game-option)
-(define
-  *save-options*
+(define *save-options*
   (new
     'static
     'boxed-array
@@ -317,8 +303,7 @@
   )
 
 ;; definition for symbol *save-options-title*, type (array game-option)
-(define
-  *save-options-title*
+(define *save-options-title*
   (new
     'static
     'boxed-array
@@ -1549,8 +1534,7 @@
         )
 
 ;; definition for symbol *task-egg-starting-x*, type (array int32)
-(define
-  *task-egg-starting-x*
+(define *task-egg-starting-x*
   (new 'static 'boxed-array :type int32 :length 9 :allocated-length 9 #xda #xc2 #xab #x93 #x7c 100 77 53 30)
   )
 
diff --git a/test/decompiler/reference/engine/ui/text-h_REF.gc b/test/decompiler/reference/engine/ui/text-h_REF.gc
index c8de1a6002..5376b030ca 100644
--- a/test/decompiler/reference/engine/ui/text-h_REF.gc
+++ b/test/decompiler/reference/engine/ui/text-h_REF.gc
@@ -47,8 +47,7 @@
   )
 
 ;; definition for symbol *text-group-names*, type (array string)
-(define
-  *text-group-names*
+(define *text-group-names*
   (the-as (array string) (new 'static 'boxed-array :type string :length 1 :allocated-length 1 "common"))
   )
 
diff --git a/test/decompiler/reference/levels/beach/beach-part_REF.gc b/test/decompiler/reference/levels/beach/beach-part_REF.gc
index 643d9df7dd..1e0501b312 100644
--- a/test/decompiler/reference/levels/beach/beach-part_REF.gc
+++ b/test/decompiler/reference/levels/beach/beach-part_REF.gc
@@ -658,8 +658,7 @@
   )
 
 ;; definition for symbol sound-beach-waterfall, type sound-spec
-(define
-  sound-beach-waterfall
+(define sound-beach-waterfall
   (new 'static 'sound-spec :num 1.0 :group #x1 :sound-name (static-sound-name "waterfall") :volume #x400)
   )
 
diff --git a/test/decompiler/reference/levels/beach/seagull_REF.gc b/test/decompiler/reference/levels/beach/seagull_REF.gc
index 1ed9cf861a..9752790f3c 100644
--- a/test/decompiler/reference/levels/beach/seagull_REF.gc
+++ b/test/decompiler/reference/levels/beach/seagull_REF.gc
@@ -27,8 +27,7 @@
   )
 
 ;; definition for symbol sound-seagull-squall, type sound-spec
-(define
-  sound-seagull-squall
+(define sound-seagull-squall
   (new 'static 'sound-spec :num 1.0 :group #x1 :sound-name (static-sound-name "seagulls-2") :volume #x400)
   )
 
@@ -175,8 +174,7 @@
   )
 
 ;; definition for symbol *seagull-boxes*, type (inline-array air-box)
-(define
-  *seagull-boxes*
+(define *seagull-boxes*
   (new 'static 'inline-array air-box 10
     (new 'static 'air-box :vecs (new 'static 'inline-array vector 2
                                   (new 'static 'vector :x -1146880.0 :y 143360.0 :z -1638400.0 :w -0.6427)
diff --git a/test/decompiler/reference/levels/common/dark-eco-pool_REF.gc b/test/decompiler/reference/levels/common/dark-eco-pool_REF.gc
index d3e4969b14..1c8c4ccc65 100644
--- a/test/decompiler/reference/levels/common/dark-eco-pool_REF.gc
+++ b/test/decompiler/reference/levels/common/dark-eco-pool_REF.gc
@@ -34,8 +34,7 @@
         )
 
 ;; definition for symbol ripple-for-maincave-dark-eco-pool, type ripple-wave-set
-(define
-  ripple-for-maincave-dark-eco-pool
+(define ripple-for-maincave-dark-eco-pool
   (new 'static 'ripple-wave-set
     :count 3
     :converted #f
@@ -51,8 +50,7 @@
   )
 
 ;; definition for symbol ripple-for-finalboss-dark-eco-pool, type ripple-wave-set
-(define
-  ripple-for-finalboss-dark-eco-pool
+(define ripple-for-finalboss-dark-eco-pool
   (new 'static 'ripple-wave-set
     :count 3
     :converted #f
@@ -83,8 +81,7 @@
         )
 
 ;; definition for symbol ripple-for-sunken-dark-eco-helix-room, type ripple-wave-set
-(define
-  ripple-for-sunken-dark-eco-helix-room
+(define ripple-for-sunken-dark-eco-helix-room
   (new 'static 'ripple-wave-set
     :count 3
     :converted #f
diff --git a/test/decompiler/reference/levels/common/nav-enemy_REF.gc b/test/decompiler/reference/levels/common/nav-enemy_REF.gc
index 5cbc13f78a..14798f73ed 100644
--- a/test/decompiler/reference/levels/common/nav-enemy_REF.gc
+++ b/test/decompiler/reference/levels/common/nav-enemy_REF.gc
@@ -2205,8 +2205,7 @@ nav-enemy-default-event-handler
   )
 
 ;; definition for symbol *nav-enemy-dummy-shadow-control*, type shadow-control
-(define
-  *nav-enemy-dummy-shadow-control*
+(define *nav-enemy-dummy-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #x28))
diff --git a/test/decompiler/reference/levels/common/ropebridge_REF.gc b/test/decompiler/reference/levels/common/ropebridge_REF.gc
index c853354dcd..246acc7165 100644
--- a/test/decompiler/reference/levels/common/ropebridge_REF.gc
+++ b/test/decompiler/reference/levels/common/ropebridge_REF.gc
@@ -169,8 +169,7 @@
         )
 
 ;; definition for symbol *ropebridge-tunings*, type (inline-array ropebridge-tuning)
-(define
-  *ropebridge-tunings*
+(define *ropebridge-tunings*
   (new 'static 'inline-array ropebridge-tuning 6
     (new 'static 'ropebridge-tuning
       :num-springs 16
diff --git a/test/decompiler/reference/levels/common/water-anim_REF.gc b/test/decompiler/reference/levels/common/water-anim_REF.gc
index afcc0eb497..92b7b5e0b3 100644
--- a/test/decompiler/reference/levels/common/water-anim_REF.gc
+++ b/test/decompiler/reference/levels/common/water-anim_REF.gc
@@ -476,8 +476,7 @@
   )
 
 ;; definition for symbol *water-anim-look*, type (array water-anim-look)
-(define
-  *water-anim-look*
+(define *water-anim-look*
   (the-as (array water-anim-look)
     (new
       'static
diff --git a/test/decompiler/reference/levels/flut_common/flutflut_REF.gc b/test/decompiler/reference/levels/flut_common/flutflut_REF.gc
index b8f442bb63..c6d9ceb643 100644
--- a/test/decompiler/reference/levels/flut_common/flutflut_REF.gc
+++ b/test/decompiler/reference/levels/flut_common/flutflut_REF.gc
@@ -60,8 +60,7 @@
   )
 
 ;; definition for symbol *flutflut-shadow-control*, type shadow-control
-(define
-  *flutflut-shadow-control*
+(define *flutflut-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #xa))
diff --git a/test/decompiler/reference/levels/jungle/fisher_REF.gc b/test/decompiler/reference/levels/jungle/fisher_REF.gc
index 6a3f2f2dfe..9a1b757ade 100644
--- a/test/decompiler/reference/levels/jungle/fisher_REF.gc
+++ b/test/decompiler/reference/levels/jungle/fisher_REF.gc
@@ -24,8 +24,7 @@
   )
 
 ;; definition for symbol *FISHER-bank*, type fisher-bank
-(define
-  *FISHER-bank*
+(define *FISHER-bank*
   (new 'static 'fisher-bank :width (meters 3.3) :net-radius (meters 0.7) :max-caught #xc8 :max-missed 20)
   )
 
diff --git a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc
index e81ba3cfe2..a4fe5cc028 100644
--- a/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc
+++ b/test/decompiler/reference/levels/jungleb/plant-boss_REF.gc
@@ -219,8 +219,7 @@
   )
 
 ;; definition for symbol *plant-boss-shadow-control*, type shadow-control
-(define
-  *plant-boss-shadow-control*
+(define *plant-boss-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #x2))
diff --git a/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc b/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc
index f83b223ed9..45bdf107ca 100644
--- a/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc
+++ b/test/decompiler/reference/levels/maincave/dark-crystal_REF.gc
@@ -62,16 +62,14 @@
   )
 
 ;; definition for symbol *dark-crystal-flash-delays*, type (array int32)
-(define
-  *dark-crystal-flash-delays*
+(define *dark-crystal-flash-delays*
   (the-as (array int32)
     (new 'static 'boxed-array :type int32 :length 9 :allocated-length 9 #xb4 #x96 #x78 90 60 30 15 7 3)
     )
   )
 
 ;; definition for symbol *dark-crystal-exploder-params*, type joint-exploder-static-params
-(define
-  *dark-crystal-exploder-params*
+(define *dark-crystal-exploder-params*
   (new 'static 'joint-exploder-static-params
     :joints
     (new
diff --git a/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc b/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc
index 6b923248c4..5739939c31 100644
--- a/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc
+++ b/test/decompiler/reference/levels/maincave/driller-lurker_REF.gc
@@ -98,8 +98,7 @@
   )
 
 ;; definition for symbol *driller-lurker-shadow-control*, type shadow-control
-(define
-  *driller-lurker-shadow-control*
+(define *driller-lurker-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #x9))
diff --git a/test/decompiler/reference/levels/maincave/gnawer_REF.gc b/test/decompiler/reference/levels/maincave/gnawer_REF.gc
index f3cb2e0684..19bee75f8b 100644
--- a/test/decompiler/reference/levels/maincave/gnawer_REF.gc
+++ b/test/decompiler/reference/levels/maincave/gnawer_REF.gc
@@ -197,8 +197,7 @@
   )
 
 ;; definition for symbol *gnawer-segment-infos*, type (inline-array gnawer-segment-info)
-(define
-  *gnawer-segment-infos*
+(define *gnawer-segment-infos*
   (new 'static 'inline-array gnawer-segment-info 10
     (new 'static 'gnawer-segment-info
       :num-joints 8
diff --git a/test/decompiler/reference/levels/maincave/mother-spider_REF.gc b/test/decompiler/reference/levels/maincave/mother-spider_REF.gc
index b03c6e6835..967c78b05f 100644
--- a/test/decompiler/reference/levels/maincave/mother-spider_REF.gc
+++ b/test/decompiler/reference/levels/maincave/mother-spider_REF.gc
@@ -21,8 +21,7 @@
   )
 
 ;; definition for symbol *mother-spider-threads*, type (inline-array mother-spider-thread)
-(define
-  *mother-spider-threads*
+(define *mother-spider-threads*
   (new 'static 'inline-array mother-spider-thread 9
     (new 'static 'mother-spider-thread :joint-index 27)
     (new 'static 'mother-spider-thread :trans-u (the-as float #x1a) :swing-arc-u 0.35)
@@ -37,8 +36,7 @@
   )
 
 ;; definition for symbol *mother-spider-leg-infos*, type (inline-array mother-spider-leg-info)
-(define
-  *mother-spider-leg-infos*
+(define *mother-spider-leg-infos*
   (new 'static 'inline-array mother-spider-leg-info 8
     (new 'static 'mother-spider-leg-info :joint-index0 13 :joint-index1 14 :cprim-index 8)
     (new 'static 'mother-spider-leg-info :joint-index0 7 :joint-index1 8 :cprim-index 5)
diff --git a/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc b/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc
index c27f9d330f..31c2b5f15f 100644
--- a/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc
+++ b/test/decompiler/reference/levels/misty/misty-conveyor_REF.gc
@@ -584,8 +584,7 @@
   )
 
 ;; definition for symbol *keg-conveyor-keg-spawn-table*, type (array int8)
-(define
-  *keg-conveyor-keg-spawn-table*
+(define *keg-conveyor-keg-spawn-table*
   (the-as (array int8) (new 'static 'boxed-array :type int8 :length 6 :allocated-length 6 1 2 1 1 2 1))
   )
 
diff --git a/test/decompiler/reference/levels/misty/sidekick-human_REF.gc b/test/decompiler/reference/levels/misty/sidekick-human_REF.gc
index 740289266f..ae37b32085 100644
--- a/test/decompiler/reference/levels/misty/sidekick-human_REF.gc
+++ b/test/decompiler/reference/levels/misty/sidekick-human_REF.gc
@@ -1307,8 +1307,7 @@
   )
 
 ;; definition for symbol *lurker-army*, type (array army-info)
-(define
-  *lurker-army*
+(define *lurker-army*
   (the-as (array army-info) (new
                               'static
                               'boxed-array
diff --git a/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc b/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc
index d971ac5507..ddf2a5f969 100644
--- a/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc
+++ b/test/decompiler/reference/levels/ogre/ogre-obs_REF.gc
@@ -1286,8 +1286,7 @@
   )
 
 ;; definition for symbol *ogre-bridge-joint-array*, type (array uint8)
-(define
-  *ogre-bridge-joint-array*
+(define *ogre-bridge-joint-array*
   (the-as (array uint8)
     (new 'static 'boxed-array :type uint8 :length 8 :allocated-length 8 #x4 #x9 #xc #x11 #x7 #xa #xf #x12)
     )
diff --git a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc
index 76f95d9525..48c3888c15 100644
--- a/test/decompiler/reference/levels/ogre/ogreboss_REF.gc
+++ b/test/decompiler/reference/levels/ogre/ogreboss_REF.gc
@@ -66,8 +66,7 @@
   )
 
 ;; definition for symbol *ogreboss-missile-shadow-control*, type shadow-control
-(define
-  *ogreboss-missile-shadow-control*
+(define *ogreboss-missile-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #xe))
@@ -82,8 +81,7 @@
   )
 
 ;; definition for symbol *ogreboss-shadow-control*, type shadow-control
-(define
-  *ogreboss-shadow-control*
+(define *ogreboss-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #xc))
diff --git a/test/decompiler/reference/levels/racer_common/racer_REF.gc b/test/decompiler/reference/levels/racer_common/racer_REF.gc
index b04cbe46bd..bdfb0e3428 100644
--- a/test/decompiler/reference/levels/racer_common/racer_REF.gc
+++ b/test/decompiler/reference/levels/racer_common/racer_REF.gc
@@ -79,8 +79,7 @@
   )
 
 ;; definition for symbol *racer-shadow-control*, type shadow-control
-(define
-  *racer-shadow-control*
+(define *racer-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #xa))
diff --git a/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc
index 8640f0a8cf..5d43db42b6 100644
--- a/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc
+++ b/test/decompiler/reference/levels/rolling/rolling-obs_REF.gc
@@ -1968,8 +1968,7 @@
   )
 
 ;; definition for symbol ripple-for-rolling-water, type object
-(define
-  ripple-for-rolling-water
+(define ripple-for-rolling-water
   (the-as object (new 'static 'ripple-wave-set
                    :count 3
                    :converted #f
diff --git a/test/decompiler/reference/levels/snow/snow-ball_REF.gc b/test/decompiler/reference/levels/snow/snow-ball_REF.gc
index fc41b05228..2467702909 100644
--- a/test/decompiler/reference/levels/snow/snow-ball_REF.gc
+++ b/test/decompiler/reference/levels/snow/snow-ball_REF.gc
@@ -166,8 +166,7 @@
   )
 
 ;; definition for symbol *snow-ball-shadow-control*, type shadow-control
-(define
-  *snow-ball-shadow-control*
+(define *snow-ball-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #xa))
diff --git a/test/decompiler/reference/levels/sunken/bully_REF.gc b/test/decompiler/reference/levels/sunken/bully_REF.gc
index 7bcfbdc6d9..4414f337e0 100644
--- a/test/decompiler/reference/levels/sunken/bully_REF.gc
+++ b/test/decompiler/reference/levels/sunken/bully_REF.gc
@@ -97,8 +97,7 @@
   )
 
 ;; definition for symbol *bully-shadow-control*, type shadow-control
-(define
-  *bully-shadow-control*
+(define *bully-shadow-control*
   (new 'static 'shadow-control :settings (new 'static 'shadow-settings
                                            :center
                                            (new 'static 'vector :w (the-as float #x9))
diff --git a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
index 2b6eafc411..de1c8b25d6 100644
--- a/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
+++ b/test/decompiler/reference/levels/village2/swamp-blimp_REF.gc
@@ -245,8 +245,7 @@
   )
 
 ;; definition for symbol *SWAMP_BLIMP-bank*, type swamp-blimp-bank
-(define
-  *SWAMP_BLIMP-bank*
+(define *SWAMP_BLIMP-bank*
   (new 'static 'swamp-blimp-bank :pause-before-dropping-arm #x4b0 :rise-per-break 16384.0 :arm-sink-wait 1500.0)
   )