diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53707a4370..310a515116 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,8 @@ if(MSVC AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
         -Xclang -fexceptions \
         -Xclang -std=c++17 \
         -Xclang -D_CRT_SECURE_NO_WARNINGS \
-        -mavx \
-        -Wno-c++11-narrowing -Wno-c++98-compat -W3")
+        /arch:AVX \
+        -Wno-c++11-narrowing -Wno-c++98-compat -Wno-c++20-compat -W3")
 
     # linker flags
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:16000000,16384")
diff --git a/common/cross_os_debug/xdbg.cpp b/common/cross_os_debug/xdbg.cpp
index f8989b13a1..0a336115be 100644
--- a/common/cross_os_debug/xdbg.cpp
+++ b/common/cross_os_debug/xdbg.cpp
@@ -521,7 +521,7 @@ bool check_stopped(const ThreadID& tid, SignalInfo* out) {
         out->kind = SignalInfo::DISAPPEARED;
         break;
       default:
-        printf("[Debugger] unhandled debug event %d\n", debugEvent.dwDebugEventCode);
+        printf("[Debugger] unhandled debug event %lu\n", debugEvent.dwDebugEventCode);
         out->kind = SignalInfo::UNKNOWN;
         break;
     }
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/common/texture/texture_conversion.h b/common/texture/texture_conversion.h
index 6127781db6..520769cdad 100644
--- a/common/texture/texture_conversion.h
+++ b/common/texture/texture_conversion.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "common/common_types.h"
+
 /*!
  * Convert from a pixel location in a texture (x, y, texture buffer width) to VRAM address (byte).
  * Uses the PSMCT32 format.
@@ -218,4 +220,4 @@ inline u32 rgba16_to_rgba32(u32 in) {
 // texture format enums
 enum class PSM { PSMCT16 = 0x02, PSMT8 = 0x13, PSMT4 = 0x14 };
 // clut format enums
-enum class CPSM { PSMCT32 = 0x0, PSMCT16 = 0x02 };
\ No newline at end of file
+enum class CPSM { PSMCT32 = 0x0, PSMCT16 = 0x02 };
diff --git a/common/util/DgoWriter.h b/common/util/DgoWriter.h
index f5c47031e2..87117a9e0e 100644
--- a/common/util/DgoWriter.h
+++ b/common/util/DgoWriter.h
@@ -6,6 +6,7 @@
  */
 
 #include <vector>
+#include <string>
 
 struct DgoDescription {
   std::string dgo_name;
diff --git a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
index 395b43d950..0eb536f712 100644
--- a/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
+++ b/decompiler/ObjectFile/LinkedObjectFileCreation.cpp
@@ -562,11 +562,13 @@ static void link_v5(LinkedObjectFile& f,
         } else if ((reloc & 0x3f) == 0x3f) {
           ASSERT(false);  // todo, does this ever get hit?
         } else {
+          /*
           int n_methods_base = reloc & 0x3f;
           int n_methods = n_methods_base * 4;
           if (n_methods_base) {
             n_methods += 3;
           }
+          */
           link_ptr += 2;  // ghidra misses some aliasing here and would have you think this is +1!
           const char* sname = (const char*)(&data.at(link_ptr));
           link_ptr += strlen(sname) + 1;
diff --git a/decompiler/ObjectFile/ObjectFileDB.cpp b/decompiler/ObjectFile/ObjectFileDB.cpp
index 6f29e39332..2ffa189b06 100644
--- a/decompiler/ObjectFile/ObjectFileDB.cpp
+++ b/decompiler/ObjectFile/ObjectFileDB.cpp
@@ -79,9 +79,8 @@ std::string ObjectFileData::to_unique_name() const {
     std::string result = record.name + "-";
     auto dgo_names_sorted = dgo_names;
     std::sort(dgo_names_sorted.begin(), dgo_names_sorted.end());
-    for (auto x : dgo_names_sorted) {
-      x = strip_dgo_extension(x);
-      result += x + "-";
+    for (const auto& x : dgo_names_sorted) {
+      result += strip_dgo_extension(x) + "-";
     }
     result.pop_back();
     return result;
diff --git a/decompiler/analysis/type_analysis.cpp b/decompiler/analysis/type_analysis.cpp
index b3ab4e50b0..89d64c3821 100644
--- a/decompiler/analysis/type_analysis.cpp
+++ b/decompiler/analysis/type_analysis.cpp
@@ -90,10 +90,9 @@ bool run_type_analysis_ir2(const TypeSpec& my_type, DecompilerTypeSystem& dts, F
     as_end->mark_function_as_no_return_value();
   }
 
-  std::vector<TypeState> block_init_types, op_types;
   std::vector<bool> block_needs_update(func.basic_blocks.size(), true);
-  block_init_types.resize(func.basic_blocks.size());
-  op_types.resize(func.ir2.atomic_ops->ops.size());
+  std::vector<TypeState> block_init_types(func.basic_blocks.size());
+  std::vector<TypeState> op_types(func.ir2.atomic_ops->ops.size());
   auto& aop = func.ir2.atomic_ops;
 
   // STEP 1 - topological sort the blocks. This gives us an order where we:
diff --git a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc
index 7c8e7e2404..c101cdb4e2 100644
--- a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc
@@ -2130,6 +2130,11 @@
   "generic-vu0": [["L1", "vu-function"]],
   "shrubbery": [["L133", "vu-function"]],
 
+  "credits": [
+    ["L32", "(array int32)"],
+    ["L33", "(array float)"]
+  ],
+
   // please do not add things after this entry! git is dumb.
   "object-file-that-doesnt-actually-exist-and-i-just-put-this-here-to-prevent-merge-conflicts-with-this-file": []
 }
diff --git a/decompiler/data/game_count.h b/decompiler/data/game_count.h
index 892ee34892..530c21440a 100644
--- a/decompiler/data/game_count.h
+++ b/decompiler/data/game_count.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include <string>
 #include "common/common_types.h"
 
 namespace decompiler {
diff --git a/decompiler/level_extractor/extract_tie.cpp b/decompiler/level_extractor/extract_tie.cpp
index 8dbf0597a5..341510db37 100644
--- a/decompiler/level_extractor/extract_tie.cpp
+++ b/decompiler/level_extractor/extract_tie.cpp
@@ -325,7 +325,7 @@ struct TieFrag {
     u16 tgt_ip1_ptr = 0;
     u16 tgt_ip2_ptr = 0;
     u16 kick_addr = 0;
-    u16 clr_ptr = 0;
+    // u16 clr_ptr = 0;
     u16 point_ptr = 0;
     u16 misc_x = 0;  // at 971's x.
     math::Vector4f gifbufs;
@@ -1250,7 +1250,7 @@ void emulate_tie_prototype_program(std::vector<TieProtoInfo>& protos) {
       //    iaddi vi15, vi00, 0x0      |  nop
       frag.prog_info.kick_addr = 0;
       //    mtir vi03, vf_clrbuf.x          |  nop
-      frag.prog_info.clr_ptr = 198;  // just forcing it to one buffer for now
+      // frag.prog_info.clr_ptr = 198;  // just forcing it to one buffer for now
       //    iaddiu vi_point_ptr, vi00, 0x32    |  nop
       frag.prog_info.point_ptr = 0x32;
 
@@ -1315,7 +1315,7 @@ void emulate_tie_instance_program(std::vector<TieProtoInfo>& protos) {
       // we omit the pipeline startup here.
 
       // this was set by the previous program that sets up this prototype frag
-      u16 clr_ptr = frag.prog_info.clr_ptr;
+      // u16 clr_ptr = frag.prog_info.clr_ptr;
       u16 tgt_bp1_ptr = frag.prog_info.tgt_bp1_ptr;
       u16 tgt_bp2_ptr = frag.prog_info.tgt_bp2_ptr;
       u16 tgt_ip1_ptr = frag.prog_info.tgt_ip1_ptr;
@@ -1358,7 +1358,7 @@ void emulate_tie_instance_program(std::vector<TieProtoInfo>& protos) {
 
       // iaddi vi_clr_ptr, vi_clr_ptr, 0x7   |  nop
       // u16 clr_ptr_base = clr_ptr;
-      clr_ptr += 6;  // it says 7, but we want to point to the first index data.
+      // clr_ptr += 6;  // it says 7, but we want to point to the first index data.
 
       // mtir vi_ind, vf_inds.y              |  addx.w vf_res13, vf_res02, vf00 <- flags crap
       // div Q, vf00.w, vf_pos02.w           |  mulaw.xyzw ACC, vf_clr2, vf00
diff --git a/decompiler/main.cpp b/decompiler/main.cpp
index bede66b8a0..99b49c73ec 100644
--- a/decompiler/main.cpp
+++ b/decompiler/main.cpp
@@ -11,8 +11,11 @@
 #include "decompiler/data/TextureDB.h"
 #include "common/util/os.h"
 #include "common/util/diff.h"
+#include "common/util/Timer.h"
 
 int main(int argc, char** argv) {
+  Timer decomp_timer;
+
   fmt::print("[Mem] Top of main: {} MB\n", get_peak_rss() / (1024 * 1024));
   using namespace decompiler;
   if (!file_util::setup_project_path(std::nullopt)) {
@@ -216,6 +219,6 @@ int main(int argc, char** argv) {
     process_streamed_audio(config.audio_dir_file_name, config.streamed_audio_file_names);
   }
 
-  lg::info("Disassembly has completed successfully.");
+  lg::info("Decompiler has finished successfully in {:.2f} seconds.", decomp_timer.getSeconds());
   return 0;
 }
diff --git a/decompiler/util/DecompilerTypeSystem.cpp b/decompiler/util/DecompilerTypeSystem.cpp
index e324554c23..44cc76e9b1 100644
--- a/decompiler/util/DecompilerTypeSystem.cpp
+++ b/decompiler/util/DecompilerTypeSystem.cpp
@@ -14,7 +14,7 @@ DecompilerTypeSystem::DecompilerTypeSystem() {
 namespace {
 // some utilities for parsing the type def file
 
-goos::Object& car(goos::Object& pair) {
+goos::Object& car(const goos::Object& pair) {
   if (pair.is_pair()) {
     return pair.as_pair()->car;
   } else {
@@ -22,7 +22,7 @@ goos::Object& car(goos::Object& pair) {
   }
 }
 
-goos::Object& cdr(goos::Object& pair) {
+goos::Object& cdr(const goos::Object& pair) {
   if (pair.is_pair()) {
     return pair.as_pair()->cdr;
   } else {
diff --git a/decompiler/util/data_decompile.cpp b/decompiler/util/data_decompile.cpp
index 8f226774a8..7991db76c9 100644
--- a/decompiler/util/data_decompile.cpp
+++ b/decompiler/util/data_decompile.cpp
@@ -1388,8 +1388,7 @@ goos::Object decompile_pair(const DecompilerLabel& label,
       // invalid.
       lg::error(
           "There is an improper list. This is probably okay, but should be checked manually "
-          "because we "
-          "could not find a test case yet.");
+          "because we could not find a test case yet.");
       list_tokens.push_back(pretty_print::to_symbol("."));
       list_tokens.push_back(decompile_pair_elt(cdr_word, labels, words, ts, file));
       if (add_quote) {
diff --git a/game/kernel/kmemcard.h b/game/kernel/kmemcard.h
index 78bd54b10f..a09e20d269 100644
--- a/game/kernel/kmemcard.h
+++ b/game/kernel/kmemcard.h
@@ -10,7 +10,7 @@
 
 void kmemcard_init_globals();
 
-constexpr s32 SAVE_SIZE = 691;  // likely different by versions! 692 on PAL/JPN
+constexpr s32 SAVE_SIZE = 691;  // likely different between versions! 692 on PAL/JPN
 constexpr s32 BANK_SIZE = 0x10000;
 
 // each card can be in one of these states:
diff --git a/game/system/SystemThread.cpp b/game/system/SystemThread.cpp
index 86daaab03b..af8f55d759 100644
--- a/game/system/SystemThread.cpp
+++ b/game/system/SystemThread.cpp
@@ -1,7 +1,3 @@
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include "SystemThread.h"
 #include "common/log/log.h"
 
diff --git a/goal_src/engine/ambient/mood-tables.gc b/goal_src/engine/ambient/mood-tables.gc
index 8405405aa8..ab25d73c19 100644
--- a/goal_src/engine/ambient/mood-tables.gc
+++ b/goal_src/engine/ambient/mood-tables.gc
@@ -305,8 +305,7 @@
   (none)
   )
 
-(define
-  *default-interp-table*
+(define *default-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -338,8 +337,7 @@
     )
   )
 
-(define
-  *village1-palette-interp-table*
+(define *village1-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -371,8 +369,7 @@
     )
   )
 
-(define
-  *misty-palette-interp-table*
+(define *misty-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -404,8 +401,7 @@
     )
   )
 
-(define
-  *firecanyon-palette-interp-table*
+(define *firecanyon-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -437,8 +433,7 @@
     )
   )
 
-(define
-  *rolling-palette-interp-table*
+(define *rolling-palette-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -470,8 +465,7 @@
     )
   )
 
-(define
-  *village2-sky-texture-table*
+(define *village2-sky-texture-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -503,8 +497,7 @@
     )
   )
 
-(define
-  *finalboss-interp-table*
+(define *finalboss-interp-table*
   (new 'static 'sky-color-day
     :hour
     (new 'static 'inline-array sky-color-hour 24
@@ -536,8 +529,7 @@
     )
   )
 
-(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
@@ -598,8 +590,7 @@
                                )
   )
 
-(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
@@ -708,8 +699,7 @@
 
 (update-mood-shadow-direction (-> *village1-mood-lights-table* data 7))
 
-(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
@@ -763,8 +753,7 @@
                                )
   )
 
-(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
@@ -825,8 +814,7 @@
                                )
   )
 
-(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
@@ -888,8 +876,7 @@
                                )
   )
 
-(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
@@ -1041,8 +1028,7 @@
   0.41
   )
 
-(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
@@ -1090,8 +1076,7 @@
                                )
   )
 
-(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)
@@ -1110,8 +1095,7 @@
                                )
   )
 
-(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)
@@ -1133,8 +1117,7 @@
                                   )
   )
 
-(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
@@ -1153,8 +1136,7 @@
                                )
   )
 
-(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
@@ -1174,8 +1156,7 @@
                                )
   )
 
-(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)
@@ -1197,8 +1178,7 @@
                                   )
   )
 
-(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
@@ -1217,8 +1197,7 @@
                                )
   )
 
-(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)
@@ -1237,8 +1216,7 @@
                                )
   )
 
-(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)
@@ -1257,8 +1235,7 @@
                                )
   )
 
-(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)
@@ -1280,8 +1257,7 @@
                                   )
   )
 
-(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
@@ -1300,8 +1276,7 @@
                                )
   )
 
-(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
@@ -1363,8 +1338,7 @@
                                )
   )
 
-(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
@@ -1402,8 +1376,7 @@
 
 (update-mood-shadow-direction (-> *misty-mood-lights-table* data 1))
 
-(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
@@ -1457,8 +1430,7 @@
                                )
   )
 
-(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
@@ -1520,8 +1492,7 @@
                                )
   )
 
-(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
@@ -1581,8 +1552,7 @@
 
 (update-mood-shadow-direction (-> *village2-mood-lights-table* data 3))
 
-(define
-  *village2-mood-sun-table*
+(define *village2-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -1628,8 +1598,7 @@
     )
   )
 
-(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
@@ -1691,8 +1660,7 @@
                                )
   )
 
-(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
@@ -1752,8 +1720,7 @@
 
 (update-mood-shadow-direction (-> *swamp-mood-lights-table* data 3))
 
-(define
-  *swamp-mood-sun-table*
+(define *swamp-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -1799,8 +1766,7 @@
     )
   )
 
-(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
@@ -1828,8 +1794,7 @@
                                )
   )
 
-(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)
@@ -1863,8 +1828,7 @@
 
 (update-mood-shadow-direction (-> *sunken-mood-lights-table* data 1))
 
-(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
@@ -1888,8 +1852,7 @@
                                )
   )
 
-(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
@@ -1951,8 +1914,7 @@
                                )
   )
 
-(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
@@ -2014,8 +1976,7 @@
 
 (update-mood-shadow-direction (-> *rolling-mood-lights-table* data 3))
 
-(define
-  *rolling-mood-sun-table*
+(define *rolling-mood-sun-table*
   (new 'static 'mood-sun-table
     :data
     (new 'static 'inline-array mood-sun 8
@@ -2061,8 +2022,7 @@
     )
   )
 
-(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
@@ -2124,8 +2084,7 @@
                                )
   )
 
-(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
@@ -2193,8 +2152,7 @@
 
 (update-mood-shadow-direction (-> *firecanyon-mood-lights-table* data 3))
 
-(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
@@ -2248,8 +2206,7 @@
                                )
   )
 
-(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
@@ -2311,8 +2268,7 @@
                                )
   )
 
-(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
@@ -2396,8 +2352,7 @@
 
 (update-mood-shadow-direction (-> *ogre-mood-lights-table* data 5))
 
-(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
@@ -2481,8 +2436,7 @@
 
 (update-mood-shadow-direction (-> *ogre2-mood-lights-table* data 5))
 
-(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
@@ -2502,8 +2456,7 @@
                                )
   )
 
-(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)
@@ -2528,8 +2481,7 @@
 
 (update-mood-shadow-direction (the-as mood-lights (-> *ogre3-mood-lights-table* data)))
 
-(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
@@ -2591,8 +2543,7 @@
                                )
   )
 
-(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
@@ -2640,8 +2591,7 @@
                                   )
   )
 
-(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
@@ -2661,8 +2611,7 @@
                                )
   )
 
-(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)
@@ -2728,8 +2677,7 @@
 
 (update-mood-shadow-direction (the-as mood-lights (-> *lavatube-mood-lights-table* data)))
 
-(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
@@ -2748,8 +2696,7 @@
                                )
   )
 
-(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
@@ -2803,8 +2750,7 @@
                                )
   )
 
-(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
@@ -2945,8 +2891,7 @@
   0.41
   )
 
-(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)
@@ -2965,8 +2910,7 @@
                                )
   )
 
-(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)
@@ -2988,8 +2932,7 @@
                                   )
   )
 
-(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/goal_src/engine/ambient/mood.gc b/goal_src/engine/ambient/mood.gc
index 84ecdafee7..181d70ebb1 100644
--- a/goal_src/engine/ambient/mood.gc
+++ b/goal_src/engine/ambient/mood.gc
@@ -515,15 +515,13 @@
                                        )
         )
 
-(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)
     )
   )
 
-(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)
     )
@@ -1721,8 +1719,7 @@
                                    )
         )
 
-(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/goal_src/engine/camera/cam-layout.gc b/goal_src/engine/camera/cam-layout.gc
index 56a04a5a99..8157886698 100644
--- a/goal_src/engine/camera/cam-layout.gc
+++ b/goal_src/engine/camera/cam-layout.gc
@@ -263,9 +263,9 @@
                     (when (!= s1-0 sv-272)
                       (vector-float*! sv-192 (-> s3-0 sv-272) (-> s3-0 sv-272 w))
                       (vector-cross! sv-208 (-> s3-0 sv-272) (-> s3-0 s1-0))
-                      (vector-normalize! sv-208 (-> (new 'static 'array float 1 1.0) 0))
+                      (vector-normalize! sv-208 (the-as float 1.0))
                       (vector-cross! sv-224 sv-208 (-> s3-0 sv-272))
-                      (vector-normalize! sv-224 (-> (new 'static 'array float 1 1.0) 0))
+                      (vector-normalize! sv-224 (the-as float 1.0))
                       (let ((f0-6 (cam-layout-intersect-dist (-> s3-0 s1-0) sv-192 sv-224)))
                         (when (!= f0-6 409600000.0)
                           (vector+float*! sv-240 sv-192 sv-224 f0-6)
@@ -317,7 +317,7 @@
                             (else
                               (dotimes (v1-87 (the-as int (-> sv-16 elt-count)))
                                 (when (and (!= v1-87 s1-0) (!= v1-87 sv-272))
-                                  (if (< (-> (new 'static 'array float 1 4096.0) 0) (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w)))
+                                  (if (< 4096.0 (- (vector-dot sv-160 (-> s3-0 v1-87)) (-> s3-0 v1-87 w)))
                                       (goto cfg-47)
                                       )
                                   )
@@ -347,7 +347,7 @@
                     (set! sv-272 (+ sv-272 1))
                     )
                   (when (nonzero? sv-256)
-                    (vector-float*! s0-0 s0-0 (/ (-> (new 'static 'array float 1 1.0) 0) (the float sv-256)))
+                    (vector-float*! s0-0 s0-0 (/ 1.0 (the float sv-256)))
                     (cond
                       ((>= *volume-normal-current* 599)
                        (format 0 "ERROR <GMJ>: camera editing out of volume normals~%")
@@ -433,20 +433,20 @@
     0.0
     0.0
     (cond
-      ((< (-> (new 'static 'array float 1 1.0) 0) arg3)
-       (set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 1.0)) 0))
+      ((< 1.0 arg3)
+       (set! arg3 (the-as float 1.0))
        )
       ((< arg3 0.0)
-       (set! arg3 (-> (the-as (pointer float) (new 'static 'array float 1 0.0)) 0))
+       (set! arg3 (the-as float 0.0))
        )
       )
-    (vector-normalize-copy! s2-0 arg1 (-> (new 'static 'array float 1 1.0) 0))
-    (vector-normalize-copy! s1-0 arg2 (-> (new 'static 'array float 1 1.0) 0))
+    (vector-normalize-copy! s2-0 arg1 (the-as float 1.0))
+    (vector-normalize-copy! s1-0 arg2 (the-as float 1.0))
     (vector-cross! s0-0 s2-0 s1-0)
     (let* ((f30-0 (vector-length s0-0))
            (f28-0 (asin f30-0))
            )
-      (vector-float*! arg0 arg1 (/ (sin (* (- (-> (new 'static 'array float 1 1.0) 0) arg3) f28-0)) f30-0))
+      (vector-float*! arg0 arg1 (/ (sin (* (- 1.0 arg3) f28-0)) f30-0))
       (vector+float*! arg0 arg0 arg2 (/ (sin (* arg3 f28-0)) f30-0))
       )
     )
@@ -470,36 +470,15 @@
   (let ((s3-0 (new-stack-vector0))
         (gp-0 (new-stack-vector0))
         )
-    (arg0
-      s3-0
-      (-> arg1 from)
-      (-> arg1 to)
-      (-> (new 'static 'array float 1 0.0) 0)
-      (-> arg1 axis)
-      (-> (new 'static 'array float 1 65536.0) 0)
-      )
+    (arg0 s3-0 (-> arg1 from) (-> arg1 to) (the-as float 0.0) (-> arg1 axis) (the-as float 65536.0))
     (vector+! s3-0 s3-0 (-> arg1 origin))
     (dotimes (s2-0 10)
       (set! (-> gp-0 quad) (-> s3-0 quad))
-      (arg0
-        s3-0
-        (-> arg1 from)
-        (-> arg1 to)
-        (* 0.1 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0)))
-        (-> arg1 axis)
-        (-> (new 'static 'array float 1 65536.0) 0)
-        )
+      (arg0 s3-0 (-> arg1 from) (-> arg1 to) (* 0.1 (+ 1.0 (the float s2-0))) (-> arg1 axis) (the-as float 65536.0))
       (vector+! s3-0 s3-0 (-> arg1 origin))
       (camera-line s3-0 gp-0 (-> arg1 color))
       )
-    (arg0
-      gp-0
-      (-> arg1 from)
-      (-> arg1 to)
-      (-> *CAM_LAYOUT-bank* debug-t)
-      (-> arg1 axis)
-      (-> (new 'static 'array float 1 65536.0) 0)
-      )
+    (arg0 gp-0 (-> arg1 from) (-> arg1 to) (-> *CAM_LAYOUT-bank* debug-t) (-> arg1 axis) (the-as float 65536.0))
     (format *stdcon* "~S  ~f~%" (-> arg1 disp) (vector-length gp-0))
     (vector+! gp-0 gp-0 (-> arg1 origin))
     (camera-line (-> arg1 origin) gp-0 (-> arg1 color))
@@ -508,7 +487,7 @@
       (new 'static 'vector :z 1024.0)
       gp-0
       (-> arg1 color)
-      (-> (new 'static 'array float 1 4096.0) 0)
+      (meters 1.0)
       )
     )
   )
@@ -517,17 +496,11 @@
   (let ((s3-0 (new-stack-vector0))
         (gp-0 (new-stack-vector0))
         )
-    (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (-> (new 'static 'array float 1 0.0) 0))
+    (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (the-as float 0.0))
     (vector+! s3-0 s3-0 (-> arg1 origin))
     (dotimes (s2-0 10)
       (set! (-> gp-0 quad) (-> s3-0 quad))
-      (arg0
-        s3-0
-        (-> arg1 from)
-        (-> arg1 to)
-        (-> arg1 axis)
-        (* 182.04445 (* 18.0 (+ (-> (new 'static 'array float 1 1.0) 0) (the float s2-0))))
-        )
+      (arg0 s3-0 (-> arg1 from) (-> arg1 to) (-> arg1 axis) (* 182.04445 (* 18.0 (+ 1.0 (the float s2-0)))))
       (vector+! s3-0 s3-0 (-> arg1 origin))
       (camera-line s3-0 gp-0 (-> arg1 color))
       )
@@ -540,7 +513,7 @@
       (new 'static 'vector :z 1024.0)
       gp-0
       (-> arg1 color)
-      (-> (new 'static 'array float 1 4096.0) 0)
+      (meters 1.0)
       )
     )
   )
@@ -560,8 +533,8 @@
         s5-0
         s4-0
         (* 0.5 (cam-slave-get-fov arg0))
-        (-> (new 'static 'array float 1 0.75) 0)
-        (-> (new 'static 'array float 1 1.0) 0)
+        (the-as float 0.75)
+        (the-as float 1.0)
         (new 'static 'vector4w :z #xff :w #x80)
         )
       )
@@ -575,7 +548,7 @@
           (new 'static 'vector :z 1024.0)
           s5-1
           (new 'static 'vector4w :x #x80 :w #x80)
-          (-> (new 'static 'array float 1 4096.0) 0)
+          (meters 1.0)
           )
         )
     )
@@ -588,7 +561,7 @@
           (new 'static 'vector :z 1024.0)
           s5-2
           (new 'static 'vector4w :y #x80 :w #x80)
-          (-> (new 'static 'array float 1 4096.0) 0)
+          (meters 1.0)
           )
         )
     )
@@ -601,7 +574,7 @@
           (new 'static 'vector :z 1024.0)
           s5-3
           (new 'static 'vector4w :x #x80 :z #x80 :w #x80)
-          (-> (new 'static 'array float 1 4096.0) 0)
+          (meters 1.0)
           )
         )
     )
@@ -615,7 +588,7 @@
                )
       (cond
         ((cam-slave-get-vector-with-offset arg0 s4-1 'pivot)
-         (curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1)
+         (curve-get-pos! s5-4 (the-as float 0.0) s3-1)
          (vector-! s4-1 s4-1 s5-4)
          )
         (else
@@ -637,11 +610,11 @@
                 )
           )
         )
-      (curve-get-pos! s5-4 (-> (new 'static 'array float 1 0.0) 0) s3-1)
+      (curve-get-pos! s5-4 (the-as float 0.0) s3-1)
       (vector+! s5-4 s5-4 s4-1)
       (dotimes (s1-1 8)
         (set! (-> s2-0 quad) (-> s5-4 quad))
-        (curve-get-pos! s5-4 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-1 1))) s3-1)
+        (curve-get-pos! s5-4 (* 0.125 (the float (+ s1-1 1))) s3-1)
         (vector+! s5-4 s5-4 s4-1)
         (camera-line s2-0 s5-4 (new 'static 'vector4w :x #xff :y #xff :w #x80))
         )
@@ -652,7 +625,7 @@
         (new 'static 'vector :z 1024.0)
         s5-4
         (new 'static 'vector4w :x #xff :y #xff :w #x80)
-        (-> (new 'static 'array float 1 4096.0) 0)
+        (meters 1.0)
         )
       )
     )
@@ -667,24 +640,24 @@
                )
       (cond
         ((cam-slave-get-vector-with-offset arg0 s4-2 'pivot)
-         (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
+         (curve-get-pos! s5-5 (the-as float 1.0) s3-2)
          (vector-! s4-2 s4-2 s5-5)
          )
         ((get-curve-data! arg0 s1-2 'campath 'campath-k (the-as float -1000000000.0))
-         (curve-get-pos! s4-2 (-> (new 'static 'array float 1 0.0) 0) s1-2)
-         (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
+         (curve-get-pos! s4-2 (the-as float 0.0) s1-2)
+         (curve-get-pos! s5-5 (the-as float 1.0) s3-2)
          (vector-! s4-2 s4-2 s5-5)
          )
         ((cam-slave-get-vector-with-offset arg0 s4-2 'trans)
-         (curve-get-pos! s5-5 (-> (new 'static 'array float 1 1.0) 0) s3-2)
+         (curve-get-pos! s5-5 (the-as float 1.0) s3-2)
          (vector-! s4-2 s4-2 s5-5)
          )
         )
-      (curve-get-pos! s5-5 (-> (new 'static 'array float 1 0.0) 0) s3-2)
+      (curve-get-pos! s5-5 (the-as float 0.0) s3-2)
       (vector+! s5-5 s5-5 s4-2)
       (dotimes (s1-3 8)
         (set! (-> s2-1 quad) (-> s5-5 quad))
-        (curve-get-pos! s5-5 (* (-> (new 'static 'array float 1 0.125) 0) (the float (+ s1-3 1))) s3-2)
+        (curve-get-pos! s5-5 (* 0.125 (the float (+ s1-3 1))) s3-2)
         (vector+! s5-5 s5-5 s4-2)
         (camera-line s2-1 s5-5 (new 'static 'vector4w :z #xff :w #x80))
         )
@@ -695,20 +668,20 @@
         (new 'static 'vector :z 1024.0)
         s5-5
         (new 'static 'vector4w :z #xff :w #x80)
-        (-> (new 'static 'array float 1 4096.0) 0)
+        (meters 1.0)
         )
-      (curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (-> (new 'static 'array float 1 0.0) 0)) s3-2)
+      (curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (the-as float 0.0)) s3-2)
       (vector+! s5-5 s5-5 s4-2)
       (camera-cross
         (new 'static 'vector :y 1024.0)
         (new 'static 'vector :z 1024.0)
         s5-5
         (new 'static 'vector4w :z #xff :w #x80)
-        (-> (new 'static 'array float 1 4096.0) 0)
+        (meters 1.0)
         )
       )
     )
-  (let ((s2-3 (res-lump-data arg0 'campoints pointer :time (-> (new 'static 'array float 1 1.0) 0)))
+  (let ((s2-3 (res-lump-data arg0 'campoints pointer :time (the-as float 1.0)))
         (v1-95 (res-lump-struct arg0 'campoints-offset structure :time (the-as float -1000000000.0)))
         (s4-3 (new 'stack-no-clear 'vector))
         (s3-3 (new 'stack-no-clear 'vector))
@@ -732,11 +705,11 @@
         (new 'static 'vector :z 1024.0)
         s5-6
         (new 'static 'vector4w :x #xff :y #xff :w #x80)
-        (-> (new 'static 'array float 1 4096.0) 0)
+        (meters 1.0)
         )
       )
     )
-  (let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (-> (new 'static 'array float 1 1.0) 0)))
+  (let ((s4-4 (res-lump-data arg0 'focalpull pointer :time (the-as float 1.0)))
         (s5-7 (new 'static 'vector))
         )
     (when (and s4-4 (or (!= *camera-layout-blink* 'focalpull) (logtest? (-> *display* real-actual-frame-counter) 8)))
@@ -756,7 +729,7 @@
         (new 'static 'vector :z 1024.0)
         s5-7
         (new 'static 'vector4w :y #xff :z #xff :w #x80)
-        (-> (new 'static 'array float 1 4096.0) 0)
+        (meters 1.0)
         )
       )
     )
@@ -772,12 +745,12 @@
       (vector-! (-> s5-8 from) (-> s5-8 from) (-> s5-8 origin))
       (vector-! (-> s5-8 to) (-> s5-8 to) (-> s5-8 origin))
       (vector-cross! s4-5 (-> s5-8 from) (-> s5-8 to))
-      (vector-normalize! s4-5 (-> (new 'static 'array float 1 8192.0) 0))
+      (vector-normalize! s4-5 (the-as float 8192.0))
       (vector+! s4-5 s4-5 (-> s5-8 origin))
       (camera-line (-> s5-8 origin) s4-5 (new 'static 'vector4w :x #x80 :y #x80 :z #x80 :w #x80))
       (when (not (paused?))
         (+! (-> *CAM_LAYOUT-bank* debug-t) (-> *CAM_LAYOUT-bank* debug-step))
-        (if (< (-> (new 'static 'array float 1 1.0) 0) (-> *CAM_LAYOUT-bank* debug-t))
+        (if (< 1.0 (-> *CAM_LAYOUT-bank* debug-t))
             (set! (-> *CAM_LAYOUT-bank* debug-t) 0.0)
             )
         )
@@ -833,10 +806,10 @@
     ((cpad-hold? arg2 l3)
      (set! (-> arg0 z) (- (-> arg0 z) (analog-input
                                         (the-as int (-> *cpad-list* cpads arg2 rightx))
-                                        (-> (new 'static 'array float 1 128.0) 0)
-                                        (-> (new 'static 'array float 1 48.0) 0)
-                                        (-> (new 'static 'array float 1 110.0) 0)
-                                        (-> (new 'static 'array float 1 1.0) 0)
+                                        (the-as float 128.0)
+                                        (the-as float 48.0)
+                                        (the-as float 110.0)
+                                        (the-as float 1.0)
                                         )
                           )
            )
@@ -844,27 +817,27 @@
     (else
       (set! (-> arg0 y) (- (-> arg0 y) (analog-input
                                          (the-as int (-> *cpad-list* cpads arg2 rightx))
-                                         (-> (new 'static 'array float 1 128.0) 0)
-                                         (-> (new 'static 'array float 1 48.0) 0)
-                                         (-> (new 'static 'array float 1 110.0) 0)
-                                         (-> (new 'static 'array float 1 1.0) 0)
+                                         (the-as float 128.0)
+                                         (the-as float 48.0)
+                                         (the-as float 110.0)
+                                         (the-as float 1.0)
                                          )
                            )
             )
       (+! (-> arg0 x) (analog-input
                         (the-as int (-> *cpad-list* cpads arg2 righty))
-                        (-> (new 'static 'array float 1 128.0) 0)
-                        (-> (new 'static 'array float 1 48.0) 0)
-                        (-> (new 'static 'array float 1 110.0) 0)
-                        (-> (new 'static 'array float 1 1.0) 0)
+                        (the-as float 128.0)
+                        (the-as float 48.0)
+                        (the-as float 110.0)
+                        (the-as float 1.0)
                         )
           )
       (set! (-> arg1 x) (- (-> arg1 x) (analog-input
                                          (the-as int (-> *cpad-list* cpads arg2 leftx))
-                                         (-> (new 'static 'array float 1 128.0) 0)
-                                         (-> (new 'static 'array float 1 48.0) 0)
-                                         (-> (new 'static 'array float 1 110.0) 0)
-                                         (-> (new 'static 'array float 1 1.0) 0)
+                                         (the-as float 128.0)
+                                         (the-as float 48.0)
+                                         (the-as float 110.0)
+                                         (the-as float 1.0)
                                          )
                            )
             )
@@ -873,9 +846,9 @@
             (set! (-> arg1 y) (+ 0.5
                                  (analog-input
                                    (the-as int (-> *cpad-list* cpads arg2 abutton 9))
-                                   (-> (new 'static 'array float 1 0.0) 0)
-                                   (-> (new 'static 'array float 1 32.0) 0)
-                                   (-> (new 'static 'array float 1 230.0) 0)
+                                   (the-as float 0.0)
+                                   (the-as float 32.0)
+                                   (the-as float 230.0)
                                    (the-as float 0.5)
                                    )
                                  (-> arg1 y)
@@ -887,9 +860,9 @@
         (if (cpad-hold? arg2 l1)
             (set! (-> arg1 y) (- (-> arg1 y) (+ 0.5 (analog-input
                                                       (the-as int (-> *cpad-list* cpads arg2 abutton 8))
-                                                      (-> (new 'static 'array float 1 0.0) 0)
-                                                      (-> (new 'static 'array float 1 32.0) 0)
-                                                      (-> (new 'static 'array float 1 230.0) 0)
+                                                      (the-as float 0.0)
+                                                      (the-as float 32.0)
+                                                      (the-as float 230.0)
                                                       (the-as float 0.5)
                                                       )
                                                 )
@@ -899,10 +872,10 @@
         )
       (set! (-> arg1 z) (- (-> arg1 z) (analog-input
                                          (the-as int (-> *cpad-list* cpads arg2 lefty))
-                                         (-> (new 'static 'array float 1 128.0) 0)
-                                         (-> (new 'static 'array float 1 48.0) 0)
-                                         (-> (new 'static 'array float 1 110.0) 0)
-                                         (-> (new 'static 'array float 1 1.0) 0)
+                                         (the-as float 128.0)
+                                         (the-as float 48.0)
+                                         (the-as float 110.0)
+                                         (the-as float 1.0)
                                          )
                            )
             )
@@ -1162,10 +1135,11 @@
   )
 
 (defun fov->maya ((arg0 float))
-  (if (= arg0 0.0)
-      (-> (new 'static 'array float 1 0.0) 0)
-      (/ 12.700255 (tan (* 0.5 arg0)))
-      )
+  (the-as float (if (= arg0 0.0)
+                    0.0
+                    (/ 12.700255 (tan (* 0.5 arg0)))
+                    )
+          )
   )
 
 (defun cam-layout-save-cam-rot ((arg0 symbol) (arg1 string) (arg2 entity-actor))
@@ -1390,7 +1364,7 @@
                 'fov
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1404,7 +1378,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1441,7 +1415,7 @@
                 'focalPull
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1455,7 +1429,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1651,7 +1625,7 @@
                 'intro-time
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1665,7 +1639,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1676,7 +1650,7 @@
          (if arg0
              (format #t "setup intro-time 0.0 (defaults to 1 sec)~%")
              )
-         (set! f30-0 (-> (new 'static 'array float 1 1.0) 0))
+         (set! f30-0 1.0)
          )
         (arg0
           (format #t "setup intro-time ~f~%" f30-0)
@@ -1702,7 +1676,7 @@
                 'intro-exitValue
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1716,7 +1690,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1748,7 +1722,7 @@
                 'interpTime
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1762,7 +1736,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1826,7 +1800,7 @@
                                  'spline-follow-dist-offset
                                  'interp
                                  (the-as float -1000000000.0)
-                                 (-> (new 'static 'array float 1 0.0) 0)
+                                 (the-as float 0.0)
                                  (the-as (pointer res-tag) #f)
                                  *res-static-buf*
                                  )
@@ -1867,7 +1841,7 @@
                 'tiltAdjust
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1881,7 +1855,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1910,7 +1884,7 @@
                 'stringMinLength
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1924,7 +1898,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1953,7 +1927,7 @@
                 'stringMaxLength
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -1967,7 +1941,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -1996,7 +1970,7 @@
                 'stringMinHeight
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -2010,7 +1984,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -2039,7 +2013,7 @@
                 'stringMaxHeight
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -2053,7 +2027,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -2082,7 +2056,7 @@
                 'stringCliffHeight
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -2096,7 +2070,7 @@
               (string->symbol *res-key-string*)
               'interp
               (the-as float -1000000000.0)
-              (-> (new 'static 'array float 1 0.0) 0)
+              (the-as float 0.0)
               (the-as (pointer res-tag) #f)
               *res-static-buf*
               )
@@ -2125,7 +2099,7 @@
                 'maxAngle
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -2138,7 +2112,7 @@
                    (string->symbol *res-key-string*)
                    'interp
                    (the-as float -1000000000.0)
-                   (-> (new 'static 'array float 1 0.0) 0)
+                   (the-as float 0.0)
                    (the-as (pointer res-tag) #f)
                    *res-static-buf*
                    )
@@ -2474,7 +2448,7 @@
                 arg0
                 'interp
                 (the-as float -1000000000.0)
-                (-> (new 'static 'array float 1 0.0) 0)
+                (the-as float 0.0)
                 (the-as (pointer res-tag) #f)
                 *res-static-buf*
                 )
@@ -2482,15 +2456,15 @@
         (f0-0 (-> arg1 0))
         )
     (if (= f0-0 0.0)
-        (set! f0-0 (-> (new 'static 'array float 1 1.0) 0))
+        (set! f0-0 1.0)
         )
     (let ((f0-2
             (+ f30-0
                (analog-input
                  (the-as int (-> *cpad-list* cpads 0 leftx))
-                 (-> (new 'static 'array float 1 128.0) 0)
-                 (-> (new 'static 'array float 1 48.0) 0)
-                 (-> (new 'static 'array float 1 110.0) 0)
+                 (the-as float 128.0)
+                 (the-as float 48.0)
+                 (the-as float 110.0)
                  f0-0
                  )
                )
@@ -2508,7 +2482,7 @@
   )
 
 (defbehavior clmf-cam-meters cam-layout ((arg0 meters) (arg1 symbol))
-  (let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0))))
+  (let ((f0-0 (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0))))
     (format arg0 ": ~M" f0-0)
     )
   #t
@@ -2520,7 +2494,7 @@
   )
 
 (defbehavior clmf-cam-deg cam-layout ((arg0 degrees) (arg1 symbol))
-  (format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0)))
+  (format arg0 ": ~R" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0)))
   #t
   )
 
@@ -2538,7 +2512,7 @@
   )
 
 (defbehavior clmf-cam-float cam-layout ((arg0 float) (arg1 symbol))
-  (format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (-> (new 'static 'array float 1 0.0) 0)))
+  (format arg0 ": ~f" (cam-slave-get-float (-> self cam-entity) arg1 (the-as float 0.0)))
   #t
   )
 
@@ -2557,8 +2531,7 @@
   #t
   )
 
-(define
-  *clm-focalpull-attr*
+(define *clm-focalpull-attr*
   (new 'static 'clm
     :title "---focalpull attributes--"
     :items
@@ -2627,8 +2600,7 @@
     )
   )
 
-(define
-  *clm-index-attr*
+(define *clm-index-attr*
   (new 'static 'clm
     :title "---index attributes--"
     :items
@@ -2697,8 +2669,7 @@
     )
   )
 
-(define
-  *clm-intro-attr*
+(define *clm-intro-attr*
   (new 'static 'clm
     :title "---intro attributes--"
     :items
@@ -2764,8 +2735,7 @@
     )
   )
 
-(define
-  *clm-spline-attr*
+(define *clm-spline-attr*
   (new 'static 'clm
     :title "---spline attributes--"
     :items
@@ -2813,8 +2783,7 @@
     )
   )
 
-(define
-  *clm-vol-attr*
+(define *clm-vol-attr*
   (new 'static 'clm
     :title "---volume attributes--"
     :items
@@ -2863,8 +2832,7 @@
     )
   )
 
-(define
-  *clm-cam-attr*
+(define *clm-cam-attr*
   (new 'static 'clm
     :title "---camera attributes--"
     :items
@@ -3221,8 +3189,7 @@
     )
   )
 
-(define
-  *clm-cam-lookthrough*
+(define *clm-cam-lookthrough*
   (new 'static 'clm
     :title "---cam-lookthrough---"
     :items
@@ -3288,8 +3255,7 @@
     )
   )
 
-(define
-  *clm-edit*
+(define *clm-edit*
   (new 'static 'clm
     :title "---edit---"
     :items
@@ -3485,8 +3451,7 @@
     )
   )
 
-(define
-  *clm-save-all*
+(define *clm-save-all*
   (new 'static 'clm
     :title "---save all?---"
     :items
@@ -3516,8 +3481,7 @@
     )
   )
 
-(define
-  *clm-save-one*
+(define *clm-save-one*
   (new 'static 'clm
     :title "---single save?---"
     :items
@@ -3547,8 +3511,7 @@
     )
   )
 
-(define
-  *clm-select*
+(define *clm-select*
   (new 'static 'clm
     :title "---camera---"
     :items
diff --git a/goal_src/engine/camera/cam-states.gc b/goal_src/engine/camera/cam-states.gc
index 3edcfdd070..10902117dc 100644
--- a/goal_src/engine/camera/cam-states.gc
+++ b/goal_src/engine/camera/cam-states.gc
@@ -429,8 +429,7 @@
   )
 
 
-(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)
   )
 
@@ -2994,8 +2993,7 @@
   )
 
 
-(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))
   )
 
@@ -3227,8 +3225,7 @@
   )
 
 
-(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/goal_src/engine/game/crates.gc b/goal_src/engine/game/crates.gc
index eb4b3ba9ff..232d13b7b0 100644
--- a/goal_src/engine/game/crates.gc
+++ b/goal_src/engine/game/crates.gc
@@ -75,8 +75,7 @@
   )
 
 
-(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/goal_src/engine/game/task/task-control.gc b/goal_src/engine/game/task/task-control.gc
index 87722a3045..ce5179cc19 100644
--- a/goal_src/engine/game/task/task-control.gc
+++ b/goal_src/engine/game/task/task-control.gc
@@ -295,8 +295,7 @@
 
 
 ;; tasks for assistant (note: keira)
-(define
-  *assistant-tasks*
+(define *assistant-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -424,8 +423,7 @@
     )
   )
 
-(define
-  *assistant-village2-tasks*
+(define *assistant-village2-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -702,8 +700,7 @@
     )
   )
 
-(define
-  *gambler-tasks*
+(define *gambler-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -815,8 +812,7 @@
     )
   )
 
-(define
-  *geologist-tasks*
+(define *geologist-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -928,8 +924,7 @@
     )
   )
 
-(define
-  *mayor-tasks*
+(define *mayor-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1050,8 +1045,7 @@
     )
   )
 
-(define
-  *sage-tasks*
+(define *sage-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1195,8 +1189,7 @@
     )
   )
 
-(define
-  *sage-bluehut-tasks*
+(define *sage-bluehut-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1309,8 +1302,7 @@
     )
   )
 
-(define
-  *oracle-village1-tasks*
+(define *oracle-village1-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1428,8 +1420,7 @@
     )
   )
 
-(define
-  *oracle-village2-tasks*
+(define *oracle-village2-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1547,8 +1538,7 @@
     )
   )
 
-(define
-  *oracle-village3-tasks*
+(define *oracle-village3-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -1666,8 +1656,7 @@
     )
   )
 
-(define
-  *miners-tasks*
+(define *miners-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -2056,8 +2045,7 @@
     )
   )
 
-(define
-  *sage-villagec-tasks*
+(define *sage-villagec-tasks*
   (new 'static 'task-control
     :current-stage -1
     :stage
@@ -2303,8 +2291,7 @@
                                   )
         )
 
-(define
-  *task-controls*
+(define *task-controls*
   (the-as (array task-control)
     (new
       'static
diff --git a/goal_src/engine/gfx/depth-cue.gc b/goal_src/engine/gfx/depth-cue.gc
index 9e171d4b0d..a52450a98b 100644
--- a/goal_src/engine/gfx/depth-cue.gc
+++ b/goal_src/engine/gfx/depth-cue.gc
@@ -7,8 +7,7 @@
 
 ;; DECOMP BEGINS
 
-(define
-  *depth-cue-work*
+(define *depth-cue-work*
   (new 'static 'depth-cue-work
     :texture-strip-tmpl
     (new 'static 'dma-gif-packet
diff --git a/goal_src/engine/gfx/merc/merc-death.gc b/goal_src/engine/gfx/merc/merc-death.gc
index e1373ce820..e5b765965d 100644
--- a/goal_src/engine/gfx/merc/merc-death.gc
+++ b/goal_src/engine/gfx/merc/merc-death.gc
@@ -27,28 +27,23 @@
   (none)
   )
 
-(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)
   )
 
-(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)
   )
 
-(define
-  death-default
+(define death-default
   (new 'static 'death-info :vertex-skip #x50 :timer #x4b :overlap #x4 :effect #x29 :sound 'temp-enemy-die)
   )
 
-(define
-  death-warp-in
+(define death-warp-in
   (new 'static 'death-info :vertex-skip #x96 :timer #x4b :effect #x29 :sound 'warpgate-tele)
   )
 
-(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/goal_src/engine/gfx/shrub/shrub-work.gc b/goal_src/engine/gfx/shrub/shrub-work.gc
index e005b882a3..d07694b4b4 100644
--- a/goal_src/engine/gfx/shrub/shrub-work.gc
+++ b/goal_src/engine/gfx/shrub/shrub-work.gc
@@ -7,9 +7,7 @@
 
 ;; DECOMP BEGINS
 
-;; 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
@@ -478,14 +476,10 @@
     )
   )
 
-;; failed to figure out what this is:
 (set! (-> *instance-shrub-work* mscalf-tmpl vif0 imm) 103)
 
-;; failed to figure out what this is:
 (set! (-> *instance-shrub-work* mscalf-ret-tmpl vif0 imm) 103)
 
-;; definition for function upload-generic-shrub
-;; Used lq/sq
 (defun upload-generic-shrub ((arg0 dma-buffer) (arg1 generic-shrub-fragment) (arg2 int) (arg3 int))
   (let* ((v1-0 arg0)
          (t0-0 (the-as object (-> v1-0 base)))
diff --git a/goal_src/engine/level/level-info.gc b/goal_src/engine/level/level-info.gc
index ae601f026a..6796901602 100644
--- a/goal_src/engine/level/level-info.gc
+++ b/goal_src/engine/level/level-info.gc
@@ -7,8 +7,7 @@
 
 ;; DECOMP BEGINS
 
-(define
-  training
+(define training
   (new 'static 'level-load-info
     :index 1
     :name 'training
@@ -128,8 +127,7 @@
     )
   )
 
-(define
-  village1
+(define village1
   (new 'static 'level-load-info
     :index 2
     :name 'village1
@@ -268,8 +266,7 @@
     )
   )
 
-(define
-  beach
+(define beach
   (new 'static 'level-load-info
     :index 3
     :name 'beach
@@ -318,8 +315,7 @@
     )
   )
 
-(define
-  jungle
+(define jungle
   (new 'static 'level-load-info
     :index 4
     :name 'jungle
@@ -369,8 +365,7 @@
     )
   )
 
-(define
-  jungleb
+(define jungleb
   (new 'static 'level-load-info
     :index 5
     :name 'jungleb
@@ -417,8 +412,7 @@
     )
   )
 
-(define
-  misty
+(define misty
   (new 'static 'level-load-info
     :index 6
     :name 'misty
@@ -604,8 +598,7 @@
     )
   )
 
-(define
-  firecanyon
+(define firecanyon
   (new 'static 'level-load-info
     :index 7
     :name 'firecanyon
@@ -671,8 +664,7 @@
     )
   )
 
-(define
-  village2
+(define village2
   (new 'static 'level-load-info
     :index 8
     :name 'village2
@@ -757,8 +749,7 @@
     )
   )
 
-(define
-  sunken
+(define sunken
   (new 'static 'level-load-info
     :index 9
     :name 'sunken
@@ -860,8 +851,7 @@
     )
   )
 
-(define
-  sunkenb
+(define sunkenb
   (new 'static 'level-load-info
     :index 10
     :name 'sunkenb
@@ -927,8 +917,7 @@
     )
   )
 
-(define
-  swamp
+(define swamp
   (new 'static 'level-load-info
     :index 11
     :name 'swamp
@@ -1133,8 +1122,7 @@
     )
   )
 
-(define
-  rolling
+(define rolling
   (new 'static 'level-load-info
     :index 12
     :name 'rolling
@@ -1182,8 +1170,7 @@
     )
   )
 
-(define
-  ogre
+(define ogre
   (new 'static 'level-load-info
     :index 13
     :name 'ogre
@@ -1267,8 +1254,7 @@
     )
   )
 
-(define
-  village3
+(define village3
   (new 'static 'level-load-info
     :index 14
     :name 'village3
@@ -1353,8 +1339,7 @@
     )
   )
 
-(define
-  snow
+(define snow
   (new 'static 'level-load-info
     :index 15
     :name 'snow
@@ -1547,8 +1532,7 @@
     )
   )
 
-(define
-  maincave
+(define maincave
   (new 'static 'level-load-info
     :index 16
     :name 'maincave
@@ -1632,8 +1616,7 @@
     )
   )
 
-(define
-  darkcave
+(define darkcave
   (new 'static 'level-load-info
     :index 17
     :name 'darkcave
@@ -1681,8 +1664,7 @@
     )
   )
 
-(define
-  robocave
+(define robocave
   (new 'static 'level-load-info
     :index 18
     :name 'robocave
@@ -1748,8 +1730,7 @@
     )
   )
 
-(define
-  lavatube
+(define lavatube
   (new 'static 'level-load-info
     :index 19
     :name 'lavatube
@@ -1851,8 +1832,7 @@
     )
   )
 
-(define
-  citadel
+(define citadel
   (new 'static 'level-load-info
     :index 20
     :name 'citadel
@@ -2063,8 +2043,7 @@
     )
   )
 
-(define
-  finalboss
+(define finalboss
   (new 'static 'level-load-info
     :index 21
     :name 'finalboss
@@ -2159,8 +2138,7 @@
                 )
         )
 
-(define
-  demo
+(define demo
   (new 'static 'level-load-info
     :index 23
     :name 'demo
@@ -2206,8 +2184,7 @@
     )
   )
 
-(define
-  title
+(define title
   (new 'static 'level-load-info
     :index 24
     :name 'title
@@ -2255,8 +2232,7 @@
     )
   )
 
-(define
-  halfpipe
+(define halfpipe
   (new 'static 'level-load-info
     :index 25
     :name 'halfpipe
diff --git a/goal_src/engine/nav/navigate.gc b/goal_src/engine/nav/navigate.gc
index f6ad510afd..571b1f8476 100644
--- a/goal_src/engine/nav/navigate.gc
+++ b/goal_src/engine/nav/navigate.gc
@@ -236,18 +236,15 @@
   (vector+! arg1 arg1 (-> obj origin))
   )
 
-(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))
   )
 
-(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))
   )
 
-(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/goal_src/engine/target/target-death.gc b/goal_src/engine/target/target-death.gc
index 2863fb464e..280591a1f6 100644
--- a/goal_src/engine/target/target-death.gc
+++ b/goal_src/engine/target/target-death.gc
@@ -525,8 +525,7 @@
                        )
         )
 
-(define
-  *smack-up-mods*
+(define *smack-up-mods*
   (new 'static 'surface
     :name 'jump
     :turnv 131072.0
@@ -1084,8 +1083,7 @@
   (the-as (function none :behavior target) target-post)
   )
 
-(define
-  *death-spool-array*
+(define *death-spool-array*
   (the-as (array spool-anim)
     (new
       'static
diff --git a/goal_src/engine/target/target-util.gc b/goal_src/engine/target/target-util.gc
index bba79ef3ad..58a8256bdf 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
@@ -23,8 +20,7 @@
   :sort 1
   )
 
-(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))
@@ -712,7 +708,6 @@
   (the-as collide-shape (-> obj control))
   )
 
-
 (defun average-turn-angle ((arg0 target))
   (let ((f30-0 0.0))
     (dotimes (s5-0 8)
diff --git a/goal_src/engine/ui/credits.gc b/goal_src/engine/ui/credits.gc
index 8e2b7711e0..f3484f8381 100644
--- a/goal_src/engine/ui/credits.gc
+++ b/goal_src/engine/ui/credits.gc
@@ -5,48 +5,40 @@
 ;; name in dgo: credits
 ;; dgos: GAME, ENGINE
 
-;; definition for function set-credits-font-color
-;; INFO: Return type mismatch int vs none.
+;; DECOMP BEGINS
+
 (defun set-credits-font-color ((arg0 float))
-  (let ((f0-0 255.0))
-   )
+  255.0
   (dotimes (v1-0 4)
-   (let ((f0-2 (* 64.0 arg0)))
-    (if (< 128.0 f0-2)
-     (set! f0-2 128.0)
-     )
-    (set! (-> *font-work* color-table 32 color v1-0 r) (the int f0-2))
+    (let ((f0-2 (* 64.0 arg0)))
+      (if (< 128.0 f0-2)
+          (set! f0-2 128.0)
+          )
+      (set! (-> *font-work* color-table 32 color v1-0 r) (the int f0-2))
+      )
+    (let ((f0-5 (* 64.0 arg0)))
+      (if (< 128.0 f0-5)
+          (set! f0-5 128.0)
+          )
+      (set! (-> *font-work* color-table 32 color v1-0 g) (the int f0-5))
+      )
+    (let ((f0-8 (* 64.0 arg0)))
+      (if (< 128.0 f0-8)
+          (set! f0-8 128.0)
+          )
+      (set! (-> *font-work* color-table 32 color v1-0 b) (the int f0-8))
+      )
     )
-   (let ((f0-5 (* 64.0 arg0)))
-    (if (< 128.0 f0-5)
-     (set! f0-5 128.0)
-     )
-    (set! (-> *font-work* color-table 32 color v1-0 g) (the int f0-5))
-    )
-   (let ((f0-8 (* 64.0 arg0)))
-    (if (< 128.0 f0-8)
-     (set! f0-8 128.0)
-     )
-    (set! (-> *font-work* color-table 32 color v1-0 b) (the int f0-8))
-    )
-   )
+  0
   (none)
   )
 
-;; definition for symbol *title-credits-scale*, type (array float)
 (define *title-credits-scale*
-  (the-as (array float)
-          (new 'static 'boxed-array :type float :length 8
-               0.9 0.9 0.6 0.6 1.0 0.9 1.1 0.9)
-   )
+  (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*
-  (the-as (array int32)
-          (new 'static 'boxed-array :type int32 :length 8
-               15 20 15 15 20 15 20 15)
-   )
+  (new 'static 'boxed-array :type int32 :length 8 :allocated-length 8 15 20 15 15 20 15 20 15)
   )
 
 (defun draw-title-credits ((arg0 float))
@@ -54,14 +46,8 @@
     (let* ((s4-0 11)
            (f30-0 (* arg0 (the float (+ s4-0 -2))))
            (s5-0 (the int f30-0))
-           (gp-0 (new 'stack 'font-context
-                      *font-default-matrix*
-                      0
-                      0
-                      0.0
-                      (font-color default)
-                      (font-flags shadow kerning)
-                      )
+           (gp-0
+             (new 'stack 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning))
              )
            )
       1.0
@@ -87,19 +73,19 @@
                           128.0
                           )
                          (else
-                          (* 128.0 (- 1.0 (* 1.25 (+ -2.2 f0-10))))
-                          )
+                           (* 128.0 (- 1.0 (* 1.25 (+ -2.2 f0-10))))
+                           )
                          )
-                  )
+                       )
                 )
             (set! (-> gp-0 origin x) -44.0)
             (set! (-> gp-0 origin y) 90.0)
             (dotimes (s4-1 3)
-              (let* ((s2-0 (+ (+ s4-1 3840) s5-1))
+              (let* ((s2-0 (+ s4-1 3840 s5-1))
                      (s3-0 (lookup-text! *common-text* (the-as game-text-id s2-0) #t))
                      )
                 (when (= s2-0 3841)
-                  (case (scf-get-territory) 
+                  (case (scf-get-territory)
                     ((1)
                      (set! s3-0 (lookup-text! *common-text* (game-text-id europe) #t))
                      )
@@ -115,11 +101,7 @@
                   (print-game-text s3-0 gp-0 #f (the int f30-1) 22)
                   )
                 )
-              (set! (-> gp-0 origin y)
-                    (+ (-> gp-0 origin y)
-                       (the float (-> *title-credits-spacing* (+ s5-1 s4-1)))
-                       )
-                    )
+              (+! (-> gp-0 origin y) (the float (-> *title-credits-spacing* (+ s5-1 s4-1))))
               )
             )
           )
@@ -130,55 +112,59 @@
   (none)
   )
 
-;; definition for function draw-end-credits
 (defun draw-end-credits ((arg0 int))
   (local-vars (v1-13 int))
   (let ((s4-0 (+ (- arg0) (the int (* 1.5 (the float (-> *video-parms* screen-sy))))))
-    (gp-0 2815)
-    (s3-0 0)
-    (s2-0 #t)
-    (s5-0 (new 'stack 'font-context *font-default-matrix* 31 0 0.0 (font-color default) (font-flags shadow kerning)))
-    )
-   (let ((v1-2 s5-0))
-    (set! (-> v1-2 width) (the float 450))
-    )
-   (let ((v1-3 s5-0))
-    (set! (-> v1-3 height) (the float 10))
-    )
-   (let ((v1-4 s5-0))
-    (set! (-> v1-4 scale) 1.0)
-    )
-   (set! (-> s5-0 flags) (font-flags shadow kerning middle large))
-   (while (or s2-0 (and (< s4-0 (- s3-0)) (< (the-as uint gp-0) (the-as uint 3249))))
-    (+! s4-0 s3-0)
-    (+! gp-0 1)
-    (let ((a0-8 (lookup-text! *common-text* (the-as game-text-id gp-0) #t)))
-     (if a0-8
-      (set! s3-0 (the int (+ 5.0 (print-game-text a0-8 s5-0 #t 128 20))))
-      (set! s3-0 25)
-      )
-     )
-    (set! s2-0 #f)
-    )
-   (cond
-    ((>= (the-as uint gp-0) (the-as uint 3249))
-     #t
-     )
-    (else
-     (set! (-> s5-0 origin y) (the float s4-0))
-     (while (< (-> s5-0 origin y) (the float (-> *video-parms* screen-sy)))
-      (let ((a0-11 (lookup-text! *common-text* (the-as game-text-id gp-0) #t)))
-       (if a0-11
-        (set! v1-13 (the int (+ 5.0 (print-game-text a0-11 s5-0 #f 128 20))))
-        (set! v1-13 25)
+        (gp-0 2815)
+        (s3-0 0)
+        (s2-0 #t)
+        (s5-0
+          (new 'stack 'font-context *font-default-matrix* 31 0 0.0 (font-color default) (font-flags shadow kerning))
+          )
+        )
+    (let ((v1-2 s5-0))
+      (set! (-> v1-2 width) (the float 450))
+      )
+    (let ((v1-3 s5-0))
+      (set! (-> v1-3 height) (the float 10))
+      )
+    (let ((v1-4 s5-0))
+      (set! (-> v1-4 scale) 1.0)
+      )
+    (set! (-> s5-0 flags) (font-flags shadow kerning middle large))
+    (while (or s2-0 (and (< s4-0 (- s3-0)) (< (the-as uint gp-0) (the-as uint 3249))))
+      (+! s4-0 s3-0)
+      (+! gp-0 1)
+      (let ((a0-8 (lookup-text! *common-text* (the-as game-text-id gp-0) #t)))
+        (if a0-8
+            (set! s3-0 (the int (+ 5.0 (print-game-text a0-8 s5-0 #t 128 20))))
+            (set! s3-0 25)
+            )
+        )
+      (set! s2-0 #f)
+      )
+    (cond
+      ((>= (the-as uint gp-0) (the-as uint 3249))
+       #t
+       )
+      (else
+        (set! (-> s5-0 origin y) (the float s4-0))
+        (while (< (-> s5-0 origin y) (the float (-> *video-parms* screen-sy)))
+          (let ((a0-11 (lookup-text! *common-text* (the-as game-text-id gp-0) #t)))
+            (if a0-11
+                (set! v1-13 (the int (+ 5.0 (print-game-text a0-11 s5-0 #f 128 20))))
+                (set! v1-13 25)
+                )
+            )
+          (+! (-> s5-0 origin y) (the float v1-13))
+          (+! gp-0 1)
+          )
+        #f
         )
-       )
-      (set! (-> s5-0 origin y) (+ (-> s5-0 origin y) (the float v1-13)))
-      (+! gp-0 1)
       )
-     #f
-     )
     )
-   )
   )
 
+
+
+
diff --git a/goal_src/engine/ui/progress/progress-static.gc b/goal_src/engine/ui/progress/progress-static.gc
index b87c990629..045963a549 100644
--- a/goal_src/engine/ui/progress/progress-static.gc
+++ b/goal_src/engine/ui/progress/progress-static.gc
@@ -151,10 +151,7 @@
   )
 
 ;; maps options to a progress screen
-(#if (not PC_PORT)
-    (define *options-remap* (new 'static 'boxed-array :type (array game-option) :length 0 :allocated-length 35))
-    (define *options-remap* (new 'static 'boxed-array :type (array game-option) :length 0 :allocated-length 50))
-    )
+(define *options-remap* (new 'static 'boxed-array :type (array game-option) :length 0 :allocated-length (#if (not PC_PORT) 35 50)))
 
 ;; TODO probably an enum.
 ;; maps "levels" to the appropriate offset in *level-task-data*
diff --git a/goal_src/levels/beach/beach-part.gc b/goal_src/levels/beach/beach-part.gc
index fc086408e4..490626f60f 100644
--- a/goal_src/levels/beach/beach-part.gc
+++ b/goal_src/levels/beach/beach-part.gc
@@ -616,8 +616,7 @@
   ((sp-flt spt-fade-a -0.014222222))
   )
 
-(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/goal_src/levels/beach/seagull.gc b/goal_src/levels/beach/seagull.gc
index 92754e7b80..0ccd1155f1 100644
--- a/goal_src/levels/beach/seagull.gc
+++ b/goal_src/levels/beach/seagull.gc
@@ -34,8 +34,7 @@
     )
   )
 
-(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)
   )
 
@@ -134,8 +133,7 @@
   (none)
   )
 
-(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/goal_src/levels/common/dark-eco-pool.gc b/goal_src/levels/common/dark-eco-pool.gc
index aa7fe52ddf..4828841a22 100644
--- a/goal_src/levels/common/dark-eco-pool.gc
+++ b/goal_src/levels/common/dark-eco-pool.gc
@@ -30,8 +30,7 @@
                                          )
         )
 
-(define
-  ripple-for-maincave-dark-eco-pool
+(define ripple-for-maincave-dark-eco-pool
   (new 'static 'ripple-wave-set
     :count 3
     :converted #f
@@ -46,8 +45,7 @@
     )
   )
 
-(define
-  ripple-for-finalboss-dark-eco-pool
+(define ripple-for-finalboss-dark-eco-pool
   (new 'static 'ripple-wave-set
     :count 3
     :converted #f
@@ -76,8 +74,7 @@
                                    )
         )
 
-(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/goal_src/levels/common/nav-enemy.gc b/goal_src/levels/common/nav-enemy.gc
index 7641802bb9..1ca7e156a1 100644
--- a/goal_src/levels/common/nav-enemy.gc
+++ b/goal_src/levels/common/nav-enemy.gc
@@ -2085,8 +2085,7 @@ nav-enemy-default-event-handler
   nav-enemy-jump-post
   )
 
-(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/goal_src/levels/common/ropebridge.gc b/goal_src/levels/common/ropebridge.gc
index fa88f088c6..f27428899c 100644
--- a/goal_src/levels/common/ropebridge.gc
+++ b/goal_src/levels/common/ropebridge.gc
@@ -145,8 +145,7 @@
                                      )
         )
 
-(define
-  *ropebridge-tunings*
+(define *ropebridge-tunings*
   (new 'static 'inline-array ropebridge-tuning 6
     (new 'static 'ropebridge-tuning
       :num-springs 16
diff --git a/goal_src/levels/common/water-anim.gc b/goal_src/levels/common/water-anim.gc
index 3400e27ff7..88369d01fd 100644
--- a/goal_src/levels/common/water-anim.gc
+++ b/goal_src/levels/common/water-anim.gc
@@ -414,8 +414,7 @@
   )
 
 
-(define
-  *water-anim-look*
+(define *water-anim-look*
   (the-as (array water-anim-look)
     (new
       'static
diff --git a/goal_src/levels/flut_common/flutflut.gc b/goal_src/levels/flut_common/flutflut.gc
index e10b15349f..0408ffeb10 100644
--- a/goal_src/levels/flut_common/flutflut.gc
+++ b/goal_src/levels/flut_common/flutflut.gc
@@ -46,8 +46,7 @@
   (the-as flutflut ((method-of-type process-drawable relocate) obj arg0))
   )
 
-(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/goal_src/levels/jungleb/plant-boss.gc b/goal_src/levels/jungleb/plant-boss.gc
index 329b4d4795..1c58c180cf 100644
--- a/goal_src/levels/jungleb/plant-boss.gc
+++ b/goal_src/levels/jungleb/plant-boss.gc
@@ -171,8 +171,7 @@
   :longest-edge (meters 0)
   )
 
-(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))
@@ -292,11 +291,11 @@
       )
     (while #t
       (let ((a0-3 (-> self skel root-channel 0)))
-        (set! (-> a0-3 param 0) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-3 param 0) 1.0)
         (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-loop!)
         )
       (let ((v1-16 (-> self skel root-channel 1)))
-        (set! (-> v1-16 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) (-> self parent-override 0 energy)))
+        (set! (-> v1-16 frame-interp) (- 1.0 (-> self parent-override 0 energy)))
         )
       (suspend)
       )
@@ -315,7 +314,7 @@
     (let ((gp-0 (-> self skel root-channel 0)))
       (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 29)))
       (set! (-> gp-0 param 0) (ja-aframe (the-as float 90.0) 0))
-      (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) 0.0)
       (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 29)) num-func-seek!)
       )
@@ -323,13 +322,13 @@
       (suspend)
       (let ((gp-1 (-> self skel root-channel 0)))
         (set! (-> gp-1 param 0) (ja-aframe (the-as float 90.0) 0))
-        (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-1 param 1) 1.0)
         (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
     (let ((a0-7 (-> self skel root-channel 0)))
       (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1)))
-      (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-7 param 1) 1.0)
       (joint-control-channel-group! a0-7 (the-as art-joint-anim #f) num-func-seek!)
       )
     (ja-channel-push! 1 75)
@@ -338,7 +337,7 @@
       (set! (-> gp-2 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 25)) data 0 length) -1))
             )
-      (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-2 param 1) 1.0)
       (set! (-> gp-2 frame-num) (ja-aframe (the-as float 90.0) 0))
       (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 25)) num-func-seek!)
       )
@@ -346,7 +345,7 @@
       (suspend)
       (let ((a0-11 (-> self skel root-channel 0)))
         (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1)))
-        (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-11 param 1) 1.0)
         (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -382,8 +381,7 @@
         )
       (else
         (ja-channel-push! 1 75)
-        (let ((f30-0 (rand-vu-float-range (-> (new 'static 'array float 1 0.8) 0) (-> (new 'static 'array float 1 1.0) 0)))
-              )
+        (let ((f30-0 (rand-vu-float-range (the-as float 0.8) (the-as float 1.0))))
           (case (-> self side)
             ((1)
              (let ((a0-6 (-> self skel root-channel 0)))
@@ -493,7 +491,7 @@
         (set! (-> a0-0 param 0)
               (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) data 0 length) -1))
               )
-        (set! (-> a0-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-0 param 1) 1.0)
         (set! (-> a0-0 frame-num) 0.0)
         (joint-control-channel-group! a0-0 (the-as art-joint-anim (-> self draw art-group data 33)) num-func-seek!)
         )
@@ -501,7 +499,7 @@
         (suspend)
         (let ((a0-1 (-> self skel root-channel 0)))
           (set! (-> a0-1 param 0) (the float (+ (-> a0-1 frame-group data 0 length) -1)))
-          (set! (-> a0-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-1 param 1) 1.0)
           (joint-control-channel-group-eval! a0-1 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -523,7 +521,7 @@
        (let ((gp-1 (-> self skel root-channel 0)))
          (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 36)))
          (set! (-> gp-1 param 0) (ja-aframe (the-as float 45.0) 0))
-         (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-1 param 1) 1.0)
          (set! (-> gp-1 frame-num) 0.0)
          (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 36)) num-func-seek!)
          )
@@ -531,7 +529,7 @@
          (suspend)
          (let ((gp-2 (-> self skel root-channel 0)))
            (set! (-> gp-2 param 0) (ja-aframe (the-as float 45.0) 0))
-           (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-2 param 1) 1.0)
            (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -540,7 +538,7 @@
         (let ((gp-3 (-> self skel root-channel 0)))
           (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 35)))
           (set! (-> gp-3 param 0) (ja-aframe (the-as float 45.0) 0))
-          (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> gp-3 param 1) 1.0)
           (set! (-> gp-3 frame-num) 0.0)
           (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 35)) num-func-seek!)
           )
@@ -548,7 +546,7 @@
           (suspend)
           (let ((gp-4 (-> self skel root-channel 0)))
             (set! (-> gp-4 param 0) (ja-aframe (the-as float 45.0) 0))
-            (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> gp-4 param 1) 1.0)
             (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -556,7 +554,7 @@
       )
     (let ((a0-13 (-> self skel root-channel 0)))
       (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1)))
-      (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-13 param 1) 1.0)
       (joint-control-channel-group! a0-13 (the-as art-joint-anim #f) num-func-seek!)
       )
     (ja-channel-push! 1 75)
@@ -565,7 +563,7 @@
       (set! (-> gp-5 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 33)) data 0 length) -1))
             )
-      (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-5 param 1) 1.0)
       (set! (-> gp-5 frame-num) (ja-aframe (the-as float 45.0) 0))
       (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 33)) num-func-seek!)
       )
@@ -573,7 +571,7 @@
       (suspend)
       (let ((a0-17 (-> self skel root-channel 0)))
         (set! (-> a0-17 param 0) (the float (+ (-> a0-17 frame-group data 0 length) -1)))
-        (set! (-> a0-17 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-17 param 1) 1.0)
         (joint-control-channel-group-eval! a0-17 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -598,7 +596,7 @@
           (set! (-> a0-3 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 34)) data 0 length) -1))
                 )
-          (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-3 param 1) 1.0)
           (set! (-> a0-3 frame-num) 0.0)
           (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 34)) num-func-seek!)
           )
@@ -607,7 +605,7 @@
           (suspend)
           (let ((a0-4 (-> self skel root-channel 0)))
             (set! (-> a0-4 param 0) (the float (+ (-> a0-4 frame-group data 0 length) -1)))
-            (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-4 param 1) 1.0)
             (joint-control-channel-group-eval! a0-4 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -683,7 +681,7 @@
     (let ((gp-0 (-> self skel root-channel 0)))
       (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 52)))
       (set! (-> gp-0 param 0) (ja-aframe (the-as float 45.0) 0))
-      (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) 0.0)
       (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 52)) num-func-seek!)
       )
@@ -691,13 +689,13 @@
       (suspend)
       (let ((gp-1 (-> self skel root-channel 0)))
         (set! (-> gp-1 param 0) (ja-aframe (the-as float 45.0) 0))
-        (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-1 param 1) 1.0)
         (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
     (let ((a0-7 (-> self skel root-channel 0)))
       (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1)))
-      (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-7 param 1) 1.0)
       (joint-control-channel-group! a0-7 (the-as art-joint-anim #f) num-func-seek!)
       )
     (ja-channel-push! 1 75)
@@ -706,7 +704,7 @@
       (set! (-> gp-2 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 50)) data 0 length) -1))
             )
-      (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-2 param 1) 1.0)
       (set! (-> gp-2 frame-num) (ja-aframe (the-as float 45.0) 0))
       (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 50)) num-func-seek!)
       )
@@ -714,7 +712,7 @@
       (suspend)
       (let ((a0-11 (-> self skel root-channel 0)))
         (set! (-> a0-11 param 0) (the float (+ (-> a0-11 frame-group data 0 length) -1)))
-        (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-11 param 1) 1.0)
         (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -729,12 +727,12 @@
   :code
   (behavior ((arg0 symbol))
     (when (not arg0)
-      (let ((f30-0 (rand-vu-float-range (-> (new 'static 'array float 1 0.0) 0) (-> (new 'static 'array float 1 1.0) 0)))
+      (let ((f30-0 (rand-vu-float-range (the-as float 0.0) (the-as float 1.0)))
             (gp-0 (-> *display* base-frame-counter))
             )
         (until (>= (- (-> *display* base-frame-counter) gp-0) (the int (* 300.0 f30-0)))
           (let ((a0-2 (-> self skel root-channel 0)))
-            (set! (-> a0-2 param 0) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-2 param 0) 1.0)
             (joint-control-channel-group-eval! a0-2 (the-as art-joint-anim #f) num-func-loop!)
             )
           (suspend)
@@ -746,7 +744,7 @@
         (set! (-> a0-6 param 0)
               (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 51)) data 0 length) -1))
               )
-        (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-6 param 1) 1.0)
         (set! (-> a0-6 frame-num) 0.0)
         (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 51)) num-func-seek!)
         )
@@ -755,7 +753,7 @@
         (suspend)
         (let ((a0-7 (-> self skel root-channel 0)))
           (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1)))
-          (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-7 param 1) 1.0)
           (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -913,7 +911,7 @@
 (defbehavior plant-boss-vine-init plant-boss-arm ((arg0 vector) (arg1 vector) (arg2 float) (arg3 int))
   (stack-size-set! (-> self main-thread) 128)
   (set! (-> self root-override) (the-as collide-shape (new 'process 'trsqv)))
-  (set-vector! (-> self root-override scale) arg2 arg2 arg2 (-> (new 'static 'array float 1 1.0) 0))
+  (set-vector! (-> self root-override scale) arg2 arg2 arg2 1.0)
   (set! (-> self root-override trans quad) (-> arg0 quad))
   (quaternion-zxy! (-> self root-override quat) arg1)
   (set! (-> self side) arg3)
@@ -957,7 +955,7 @@
              (set! (-> a0-2 param 0)
                    (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) data 0 length) -1))
                    )
-             (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+             (set! (-> a0-2 param 1) 1.0)
              (set! (-> a0-2 frame-num) 0.0)
              (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 43)) num-func-seek!)
              )
@@ -965,7 +963,7 @@
              (suspend)
              (let ((a0-3 (-> self skel root-channel 0)))
                (set! (-> a0-3 param 0) (the float (+ (-> a0-3 frame-group data 0 length) -1)))
-               (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+               (set! (-> a0-3 param 1) 1.0)
                (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-seek!)
                )
              )
@@ -978,7 +976,7 @@
               (set! (-> a0-5 param 0)
                     (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 40)) data 0 length) -1))
                     )
-              (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+              (set! (-> a0-5 param 1) 1.0)
               (set! (-> a0-5 frame-num) 0.0)
               (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 40)) num-func-seek!)
               )
@@ -986,7 +984,7 @@
               (suspend)
               (let ((a0-6 (-> self skel root-channel 0)))
                 (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1)))
-                (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+                (set! (-> a0-6 param 1) 1.0)
                 (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!)
                 )
               )
@@ -1017,7 +1015,7 @@
   :code
   (behavior ((arg0 symbol))
     (let ((a0-1 (-> self skel root-channel 0)))
-      (set! (-> a0-1 param 0) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-1 param 0) 1.0)
       (joint-control-channel-group! a0-1 (the-as art-joint-anim #f) num-func-loop!)
       )
     (ja-channel-push! 1 30)
@@ -1026,7 +1024,7 @@
        (let ((gp-0 (-> self skel root-channel 0)))
          (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44)))
          (set! (-> gp-0 param 0) (ja-aframe (the-as float 30.0) 0))
-         (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-0 param 1) 1.0)
          (set! (-> gp-0 frame-num) 0.0)
          (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!)
          )
@@ -1035,7 +1033,7 @@
          (suspend)
          (let ((gp-1 (-> self skel root-channel 0)))
            (set! (-> gp-1 param 0) (ja-aframe (the-as float 30.0) 0))
-           (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-1 param 1) 1.0)
            (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1045,7 +1043,7 @@
          (set! (-> gp-3 param 0)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1))
                )
-         (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-3 param 1) 1.0)
          (set! (-> gp-3 frame-num) (ja-aframe (the-as float 30.0) 0))
          (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!)
          )
@@ -1053,7 +1051,7 @@
          (suspend)
          (let ((a0-14 (-> self skel root-channel 0)))
            (set! (-> a0-14 param 0) (the float (+ (-> a0-14 frame-group data 0 length) -1)))
-           (set! (-> a0-14 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-14 param 1) 1.0)
            (joint-control-channel-group-eval! a0-14 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1062,7 +1060,7 @@
         (let ((gp-4 (-> self skel root-channel 0)))
           (set! (-> gp-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 41)))
           (set! (-> gp-4 param 0) (ja-aframe (the-as float 30.0) 0))
-          (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> gp-4 param 1) 1.0)
           (set! (-> gp-4 frame-num) 0.0)
           (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!)
           )
@@ -1071,7 +1069,7 @@
           (suspend)
           (let ((gp-5 (-> self skel root-channel 0)))
             (set! (-> gp-5 param 0) (ja-aframe (the-as float 30.0) 0))
-            (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> gp-5 param 1) 1.0)
             (joint-control-channel-group-eval! gp-5 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -1081,7 +1079,7 @@
           (set! (-> gp-7 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) data 0 length) -1))
                 )
-          (set! (-> gp-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> gp-7 param 1) 1.0)
           (set! (-> gp-7 frame-num) (ja-aframe (the-as float 30.0) 0))
           (joint-control-channel-group! gp-7 (the-as art-joint-anim (-> self draw art-group data 41)) num-func-seek!)
           )
@@ -1089,7 +1087,7 @@
           (suspend)
           (let ((a0-26 (-> self skel root-channel 0)))
             (set! (-> a0-26 param 0) (the float (+ (-> a0-26 frame-group data 0 length) -1)))
-            (set! (-> a0-26 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-26 param 1) 1.0)
             (joint-control-channel-group-eval! a0-26 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -1151,7 +1149,7 @@
     (until v1-19
       (suspend)
       (let ((a0-16 (-> self skel root-channel 0)))
-        (set! (-> a0-16 param 0) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-16 param 0) 1.0)
         (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-loop!)
         )
       (set! v1-19 (and (-> self state-object) (< (-> self state-time-frame) (-> *display* base-frame-counter))))
@@ -1191,7 +1189,7 @@
          (set! (-> a0-2 param 0)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 47)) data 0 length) -1))
                )
-         (set! (-> a0-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> a0-2 param 1) 1.0)
          (set! (-> a0-2 frame-num) 0.0)
          (joint-control-channel-group! a0-2 (the-as art-joint-anim (-> self draw art-group data 47)) num-func-seek!)
          )
@@ -1200,7 +1198,7 @@
          (suspend)
          (let ((a0-3 (-> self skel root-channel 0)))
            (set! (-> a0-3 param 0) (the float (+ (-> a0-3 frame-group data 0 length) -1)))
-           (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-3 param 1) 1.0)
            (joint-control-channel-group-eval! a0-3 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1211,7 +1209,7 @@
           (set! (-> a0-5 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 46)) data 0 length) -1))
                 )
-          (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-5 param 1) 1.0)
           (set! (-> a0-5 frame-num) 0.0)
           (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 46)) num-func-seek!)
           )
@@ -1220,7 +1218,7 @@
           (suspend)
           (let ((a0-6 (-> self skel root-channel 0)))
             (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1)))
-            (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-6 param 1) 1.0)
             (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -1252,7 +1250,7 @@
        (let ((a0-4 (-> self skel root-channel 0)))
          (set! (-> a0-4 frame-group) (the-as art-joint-anim (-> self draw art-group data 44)))
          (set! (-> a0-4 param 0) 0.0)
-         (set! (-> a0-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> a0-4 param 1) 1.0)
          (set! (-> a0-4 frame-num)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1))
                )
@@ -1262,7 +1260,7 @@
          (suspend)
          (let ((a0-5 (-> self skel root-channel 0)))
            (set! (-> a0-5 param 0) 0.0)
-           (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-5 param 1) 1.0)
            (joint-control-channel-group-eval! a0-5 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1272,7 +1270,7 @@
         (let ((a0-10 (-> self skel root-channel 0)))
           (set! (-> a0-10 frame-group) (the-as art-joint-anim (-> self draw art-group data 41)))
           (set! (-> a0-10 param 0) 0.0)
-          (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-10 param 1) 1.0)
           (set! (-> a0-10 frame-num)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 41)) data 0 length) -1))
                 )
@@ -1282,7 +1280,7 @@
           (suspend)
           (let ((a0-11 (-> self skel root-channel 0)))
             (set! (-> a0-11 param 0) 0.0)
-            (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-11 param 1) 1.0)
             (joint-control-channel-group-eval! a0-11 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -1370,7 +1368,7 @@
         (set! (-> a0-6 param 0)
               (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) data 0 length) -1))
               )
-        (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-6 param 1) 1.0)
         (set! (-> a0-6 frame-num) 0.0)
         (joint-control-channel-group! a0-6 (the-as art-joint-anim (-> self draw art-group data 9)) num-func-seek!)
         )
@@ -1386,7 +1384,7 @@
         (suspend)
         (let ((a0-10 (-> self skel root-channel 0)))
           (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1)))
-          (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-10 param 1) 1.0)
           (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -1400,7 +1398,7 @@
 (defstate plant-boss-intro (plant-boss)
   :code
   (behavior ()
-    (set-setting! *setting-control* self 'music 'danger (-> (new 'static 'array float 1 0.0) 0) 0)
+    (set-setting! *setting-control* self 'music 'danger (the-as float 0.0) 0)
     (send-event *target* 'reset-pickup 'eco)
     (let ((v1-9 (-> self entity extra perm)))
       (logior! (-> v1-9 status) (entity-perm-status user-set-from-cstage))
@@ -1417,9 +1415,7 @@
       )
     (b! #t cfg-3 :delay (nop!))
     (label cfg-2)
-    (set! (-> self energy)
-          (seek (-> self energy) (-> (new 'static 'array float 1 1.0) 0) (* 2.0 (-> *display* seconds-per-frame)))
-          )
+    (set! (-> self energy) (seek (-> self energy) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame))))
     (suspend)
     (label cfg-3)
     (let ((v1-22 (-> self skel channel)))
@@ -1487,32 +1483,30 @@
     (set-mode! (-> self body) (joint-mod-handler-mode world-look-at))
     (set! (-> self body flex-blend) 0.0)
     (let ((a0-25 (-> self skel root-channel 0)))
-      (set! (-> a0-25 param 0) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-25 param 0) 1.0)
       (joint-control-channel-group! a0-25 (the-as art-joint-anim #f) num-func-loop!)
       )
     (ja-channel-push! 1 150)
     (let ((gp-2 (-> self skel root-channel 0)))
       (set! (-> gp-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 10)))
       (set! (-> gp-2 param 0) (ja-aframe (the-as float 510.0) 0))
-      (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-2 param 1) 1.0)
       (set! (-> gp-2 frame-num) 0.0)
       (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 10)) num-func-seek!)
       )
     (until (ja-done? 0)
-      (set! (-> self energy)
-            (seek (-> self energy) (-> (new 'static 'array float 1 1.0) 0) (* 0.2 (-> *display* seconds-per-frame)))
-            )
+      (set! (-> self energy) (seek (-> self energy) (the-as float 1.0) (* 0.2 (-> *display* seconds-per-frame))))
       (ja-blend-eval)
       (suspend)
       (let ((gp-3 (-> self skel root-channel 0)))
         (set! (-> gp-3 param 0) (ja-aframe (the-as float 510.0) 0))
-        (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-3 param 1) 1.0)
         (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
     (let ((a0-33 (-> self skel root-channel 0)))
       (set! (-> a0-33 param 0) (the float (+ (-> a0-33 frame-group data 0 length) -1)))
-      (set! (-> a0-33 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-33 param 1) 1.0)
       (joint-control-channel-group! a0-33 (the-as art-joint-anim #f) num-func-seek!)
       )
     (let ((v1-77 (-> self entity extra perm)))
@@ -1534,10 +1528,10 @@
   plant-boss-default-event-handler
   :enter
   (behavior ()
-    (set-setting! *setting-control* self 'music 'danger (-> (new 'static 'array float 1 0.0) 0) 0)
+    (set-setting! *setting-control* self 'music 'danger (the-as float 0.0) 0)
     (set! (-> self state-time) (-> *display* base-frame-counter))
     (set! (-> self body flex-blend) 0.0)
-    (set! (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0))
+    (set! (-> self neck flex-blend) 1.0)
     (none)
     )
   :trans
@@ -1584,7 +1578,7 @@
          (set! (-> gp-0 param 0)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
                )
-         (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-0 param 1) 1.0)
          (set! (-> gp-0 frame-num) (ja-aframe (the-as float 60.0) 0))
          (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
          )
@@ -1593,7 +1587,7 @@
          (suspend)
          (let ((a0-7 (-> self skel root-channel 0)))
            (set! (-> a0-7 param 0) (the float (+ (-> a0-7 frame-group data 0 length) -1)))
-           (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-7 param 1) 1.0)
            (joint-control-channel-group-eval! a0-7 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1607,7 +1601,7 @@
        (let ((gp-1 (-> self skel root-channel 0)))
          (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 13)))
          (set! (-> gp-1 param 0) (ja-aframe (the-as float 75.0) 0))
-         (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-1 param 1) 1.0)
          (set! (-> gp-1 frame-num) 0.0)
          (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 13)) num-func-seek!)
          )
@@ -1616,13 +1610,13 @@
          (suspend)
          (let ((gp-2 (-> self skel root-channel 0)))
            (set! (-> gp-2 param 0) (ja-aframe (the-as float 75.0) 0))
-           (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-2 param 1) 1.0)
            (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
        (let ((a0-19 (-> self skel root-channel 0)))
          (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1)))
-         (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> a0-19 param 1) 1.0)
          (joint-control-channel-group! a0-19 (the-as art-joint-anim #f) num-func-seek!)
          )
        (ja-channel-push! 1 75)
@@ -1631,7 +1625,7 @@
          (set! (-> gp-3 param 0)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
                )
-         (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-3 param 1) 1.0)
          (set! (-> gp-3 frame-num) (ja-aframe (the-as float 75.0) 0))
          (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
          )
@@ -1640,7 +1634,7 @@
          (suspend)
          (let ((a0-23 (-> self skel root-channel 0)))
            (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1)))
-           (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-23 param 1) 1.0)
            (joint-control-channel-group-eval! a0-23 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1662,7 +1656,7 @@
           (set! (-> a0-35 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
                 )
-          (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-35 param 1) 1.0)
           (set! (-> a0-35 frame-num) 0.0)
           (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
           )
@@ -1673,7 +1667,7 @@
         (set! (-> a0-36 param 0)
               (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
               )
-        (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-36 param 1) 1.0)
         (set! (-> a0-36 frame-num) 0.0)
         (joint-control-channel-group! a0-36 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
         )
@@ -1681,7 +1675,7 @@
         (suspend)
         (let ((a0-37 (-> self skel root-channel 0)))
           (set! (-> a0-37 param 0) (the float (+ (-> a0-37 frame-group data 0 length) -1)))
-          (set! (-> a0-37 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-37 param 1) 1.0)
           (joint-control-channel-group-eval! a0-37 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -1691,7 +1685,7 @@
           (set! (-> a0-43 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
                 )
-          (set! (-> a0-43 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-43 param 1) 1.0)
           (set! (-> a0-43 frame-num) 0.0)
           (joint-control-channel-group! a0-43 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
           )
@@ -1703,7 +1697,7 @@
           (set! (-> a0-45 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) data 0 length) -1))
                 )
-          (set! (-> a0-45 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-45 param 1) 1.0)
           (set! (-> a0-45 frame-num) 0.0)
           (joint-control-channel-group! a0-45 (the-as art-joint-anim (-> self draw art-group data 4)) num-func-seek!)
           )
@@ -1711,7 +1705,7 @@
           (suspend)
           (let ((a0-46 (-> self skel root-channel 0)))
             (set! (-> a0-46 param 0) (the float (+ (-> a0-46 frame-group data 0 length) -1)))
-            (set! (-> a0-46 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-46 param 1) 1.0)
             (joint-control-channel-group-eval! a0-46 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -1740,7 +1734,7 @@
     (+! (-> self cycle-count) 1)
     (set! (-> self snap-count) 0)
     (set! (-> self body flex-blend) 0.0)
-    (set! (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0))
+    (set! (-> self neck flex-blend) 1.0)
     (set! (-> self want-aphid-count) (min (- 4 (the int (-> self health))) (cond
                                                                              ((>= (-> self try) 15)
                                                                               1
@@ -1821,7 +1815,7 @@
            (set! (-> a1-2 message) 'shove)
            (set! (-> a1-2 param 0) (-> arg3 param 0))
            (let ((v1-6 (new 'static 'attack-info :mask #xc0)))
-             (set! (-> v1-6 shove-up) (-> (new 'static 'array float 1 8192.0) 0))
+             (set! (-> v1-6 shove-up) 8192.0)
              (set! (-> v1-6 shove-back) 24576.0)
              (set! (-> a1-2 param 1) (the-as uint v1-6))
              )
@@ -1860,7 +1854,7 @@
     (let ((gp-0 (-> self skel root-channel 0)))
       (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 11)))
       (set! (-> gp-0 param 0) (ja-aframe (the-as float 60.0) 0))
-      (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) 0.0)
       (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!)
       )
@@ -1869,7 +1863,7 @@
       (suspend)
       (let ((gp-1 (-> self skel root-channel 0)))
         (set! (-> gp-1 param 0) (ja-aframe (the-as float 60.0) 0))
-        (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-1 param 1) 1.0)
         (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -1877,7 +1871,7 @@
     (let ((gp-2 (-> self skel root-channel 0)))
       (set! (-> gp-2 frame-group) (the-as art-joint-anim (-> self draw art-group data 11)))
       (set! (-> gp-2 param 0) (ja-aframe (the-as float 120.0) 0))
-      (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-2 param 1) 1.0)
       (set! (-> gp-2 frame-num) (ja-aframe (the-as float 60.0) 0))
       (joint-control-channel-group! gp-2 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!)
       )
@@ -1885,7 +1879,7 @@
       (suspend)
       (let ((gp-3 (-> self skel root-channel 0)))
         (set! (-> gp-3 param 0) (ja-aframe (the-as float 120.0) 0))
-        (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-3 param 1) 1.0)
         (joint-control-channel-group-eval! gp-3 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -1895,7 +1889,7 @@
       (set! (-> gp-4 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 11)) data 0 length) -1))
             )
-      (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-4 param 1) 1.0)
       (set! (-> gp-4 frame-num) (ja-aframe (the-as float 120.0) 0))
       (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 11)) num-func-seek!)
       )
@@ -1903,7 +1897,7 @@
       (suspend)
       (let ((a0-16 (-> self skel root-channel 0)))
         (set! (-> a0-16 param 0) (the float (+ (-> a0-16 frame-group data 0 length) -1)))
-        (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-16 param 1) 1.0)
         (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -1929,7 +1923,7 @@
           (set! (-> a0-18 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1))
                 )
-          (set! (-> a0-18 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-18 param 1) 1.0)
           (set! (-> a0-18 frame-num) 0.0)
           (joint-control-channel-group! a0-18 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!)
           )
@@ -1937,7 +1931,7 @@
           (suspend)
           (let ((a0-19 (-> self skel root-channel 0)))
             (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1)))
-            (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-19 param 1) 1.0)
             (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -2033,8 +2027,8 @@
         )
       )
     (let ((f30-0 (lerp-scale
-                   (-> (new 'static 'array float 1 0.0) 0)
-                   (-> (new 'static 'array float 1 1.0) 0)
+                   (the-as float 0.0)
+                   (the-as float 1.0)
                    (vector-vector-distance (target-pos 0) (-> self root-override trans))
                    (the-as float 26624.0)
                    (the-as float 86016.0)
@@ -2042,23 +2036,17 @@
                  )
           )
       (until (or v1-64 (ja-done? 0))
-        (set! (-> self body flex-blend) (seek
-                                          (-> self body flex-blend)
-                                          (-> (new 'static 'array float 1 1.0) 0)
-                                          (* 2.0 (-> *display* seconds-per-frame))
-                                          )
+        (set! (-> self body flex-blend)
+              (seek (-> self body flex-blend) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame)))
               )
-        (set! (-> self neck flex-blend) (seek
-                                          (-> self neck flex-blend)
-                                          (-> (new 'static 'array float 1 0.0) 0)
-                                          (* 2.0 (-> *display* seconds-per-frame))
-                                          )
+        (set! (-> self neck flex-blend)
+              (seek (-> self neck flex-blend) (the-as float 0.0) (* 2.0 (-> *display* seconds-per-frame)))
               )
         (set! f30-0 (seek
                       f30-0
                       (lerp-scale
-                        (-> (new 'static 'array float 1 1.0) 0)
-                        (-> (new 'static 'array float 1 0.0) 0)
+                        (the-as float 1.0)
+                        (the-as float 0.0)
                         (vector-vector-distance (target-pos 0) (-> self root-override trans))
                         (the-as float 26624.0)
                         (the-as float 86016.0)
@@ -2069,7 +2057,7 @@
         (set! (-> self interp) f30-0)
         (let ((a0-19 (-> self skel root-channel 0)))
           (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1)))
-          (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-19 param 1) 1.0)
           (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!)
           )
         (let ((a0-20 (-> self skel root-channel 1)))
@@ -2103,14 +2091,15 @@
     )
   :code
   (behavior ()
-    (let ((f30-1 (if (= (if (> (-> self skel active-channels) 0)
-                            (-> self skel root-channel 0 frame-group)
-                            )
-                        (-> self draw art-group data 5)
-                        )
-                     (fmax (-> (new 'static 'array float 1 129.0) 0) (ja-aframe-num 0))
-                     (-> (new 'static 'array float 1 129.0) 0)
-                     )
+    (let ((f30-1 (the-as float (if (= (if (> (-> self skel active-channels) 0)
+                                          (-> self skel root-channel 0 frame-group)
+                                          )
+                                      (-> self draw art-group data 5)
+                                      )
+                                   (fmax 129.0 (ja-aframe-num 0))
+                                   129.0
+                                   )
+                         )
                  )
           (gp-0 0)
           )
@@ -2159,11 +2148,9 @@
           (send-event (handle->process (-> self camera)) 'joint "camera2")
           )
         (set! (-> self body flex-blend)
-              (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame))
-              )
-        (set! (-> self interp)
-              (seek (-> self interp) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame))
+              (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame))
               )
+        (set! (-> self interp) (seek (-> self interp) (the-as float 0.0) (-> *display* seconds-per-frame)))
         (let ((a0-31 (-> self skel root-channel 0)))
           (set! (-> a0-31 param 0) (the float (+ (-> a0-31 frame-group data 0 length) -1)))
           (set! (-> a0-31 param 1) 0.66)
@@ -2183,7 +2170,7 @@
       (set! (-> a0-35 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 20)) data 0 length) -1))
             )
-      (set! (-> a0-35 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-35 param 1) 1.0)
       (set! (-> a0-35 frame-num) 0.0)
       (joint-control-channel-group! a0-35 (the-as art-joint-anim (-> self draw art-group data 20)) num-func-seek!)
       )
@@ -2192,7 +2179,7 @@
       (suspend)
       (let ((a0-36 (-> self skel root-channel 0)))
         (set! (-> a0-36 param 0) (the float (+ (-> a0-36 frame-group data 0 length) -1)))
-        (set! (-> a0-36 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-36 param 1) 1.0)
         (joint-control-channel-group-eval! a0-36 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -2227,24 +2214,24 @@
       (let ((s4-0 (-> self skel root-channel 0)))
         (set! (-> s4-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 7)))
         (set! (-> s4-0 param 0) (ja-aframe (the-as float 210.0) 0))
-        (set! (-> s4-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> s4-0 param 1) 1.0)
         (set! (-> s4-0 frame-num) 0.0)
         (joint-control-channel-group! s4-0 (the-as art-joint-anim (-> self draw art-group data 7)) num-func-seek!)
         )
       (until (ja-done? 0)
         (ja-blend-eval)
         (set! (-> self body flex-blend)
-              (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame))
+              (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame))
               )
         (if (>= 1 arg0)
             (set! (-> self neck flex-blend)
-                  (seek (-> self neck flex-blend) (-> (new 'static 'array float 1 1.0) 0) (-> *display* seconds-per-frame))
+                  (seek (-> self neck flex-blend) (the-as float 1.0) (-> *display* seconds-per-frame))
                   )
             )
         (suspend)
         (let ((s4-1 (-> self skel root-channel 0)))
           (set! (-> s4-1 param 0) (ja-aframe (the-as float 210.0) 0))
-          (set! (-> s4-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> s4-1 param 1) 1.0)
           (joint-control-channel-group-eval! s4-1 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -2254,30 +2241,27 @@
       (let ((s5-1 (-> self skel root-channel 0)))
         (set! (-> s5-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 7)))
         (set! (-> s5-1 param 0) (ja-aframe (the-as float 240.0) 0))
-        (set! (-> s5-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> s5-1 param 1) 1.0)
         (set! (-> s5-1 frame-num) (ja-aframe (the-as float 210.0) 0))
         (joint-control-channel-group! s5-1 (the-as art-joint-anim (-> self draw art-group data 7)) num-func-seek!)
         )
       (until (ja-done? 0)
         (set! (-> self body flex-blend)
-              (seek (-> self body flex-blend) (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame))
+              (seek (-> self body flex-blend) (the-as float 0.0) (-> *display* seconds-per-frame))
               )
-        (set! (-> self neck flex-blend) (seek
-                                          (-> self neck flex-blend)
-                                          (-> (new 'static 'array float 1 1.0) 0)
-                                          (* 2.0 (-> *display* seconds-per-frame))
-                                          )
+        (set! (-> self neck flex-blend)
+              (seek (-> self neck flex-blend) (the-as float 1.0) (* 2.0 (-> *display* seconds-per-frame)))
               )
         (suspend)
         (let ((s5-2 (-> self skel root-channel 0)))
           (set! (-> s5-2 param 0) (ja-aframe (the-as float 240.0) 0))
-          (set! (-> s5-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> s5-2 param 1) 1.0)
           (joint-control-channel-group-eval! s5-2 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
       (let ((a0-23 (-> self skel root-channel 0)))
         (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1)))
-        (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-23 param 1) 1.0)
         (joint-control-channel-group! a0-23 (the-as art-joint-anim #f) num-func-seek!)
         )
       (if gp-0
@@ -2302,13 +2286,11 @@
         (set! s5-0 (-> s5-0 0 brother))
         )
       )
-    (set! (-> self health)
-          (seek (-> self health) (-> (new 'static 'array float 1 0.0) 0) (-> (new 'static 'array float 1 1.0) 0))
-          )
+    (set! (-> self health) (seek (-> self health) (the-as float 0.0) (the-as float 1.0)))
     (send-event (ppointer->process (-> self leaf 1)) 'kill 0)
     (send-event (ppointer->process (-> self leaf 0)) 'kill 0)
     (let ((a0-5 (-> self skel root-channel 0)))
-      (set! (-> a0-5 param 0) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-5 param 0) 1.0)
       (joint-control-channel-group! a0-5 (the-as art-joint-anim #f) num-func-loop!)
       )
     (ja-channel-push! 1 60)
@@ -2317,7 +2299,7 @@
        (let ((gp-1 (-> self skel root-channel 0)))
          (set! (-> gp-1 frame-group) (the-as art-joint-anim (-> self draw art-group data 15)))
          (set! (-> gp-1 param 0) (ja-aframe (the-as float 20.0) 0))
-         (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-1 param 1) 1.0)
          (set! (-> gp-1 frame-num) 0.0)
          (joint-control-channel-group! gp-1 (the-as art-joint-anim (-> self draw art-group data 15)) num-func-seek!)
          )
@@ -2326,7 +2308,7 @@
          (suspend)
          (let ((gp-2 (-> self skel root-channel 0)))
            (set! (-> gp-2 param 0) (ja-aframe (the-as float 20.0) 0))
-           (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-2 param 1) 1.0)
            (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -2335,7 +2317,7 @@
        (let ((gp-3 (-> self skel root-channel 0)))
          (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 16)))
          (set! (-> gp-3 param 0) (ja-aframe (the-as float 20.0) 0))
-         (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> gp-3 param 1) 1.0)
          (set! (-> gp-3 frame-num) 0.0)
          (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!)
          )
@@ -2344,7 +2326,7 @@
          (suspend)
          (let ((gp-4 (-> self skel root-channel 0)))
            (set! (-> gp-4 param 0) (ja-aframe (the-as float 20.0) 0))
-           (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-4 param 1) 1.0)
            (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -2353,7 +2335,7 @@
         (let ((gp-5 (-> self skel root-channel 0)))
           (set! (-> gp-5 frame-group) (the-as art-joint-anim (-> self draw art-group data 14)))
           (set! (-> gp-5 param 0) (ja-aframe (the-as float 20.0) 0))
-          (set! (-> gp-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> gp-5 param 1) 1.0)
           (set! (-> gp-5 frame-num) 0.0)
           (joint-control-channel-group! gp-5 (the-as art-joint-anim (-> self draw art-group data 14)) num-func-seek!)
           )
@@ -2362,7 +2344,7 @@
           (suspend)
           (let ((gp-6 (-> self skel root-channel 0)))
             (set! (-> gp-6 param 0) (ja-aframe (the-as float 20.0) 0))
-            (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> gp-6 param 1) 1.0)
             (joint-control-channel-group-eval! gp-6 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
@@ -2373,7 +2355,7 @@
         )
     (let ((a0-23 (-> self skel root-channel 0)))
       (set! (-> a0-23 param 0) (the float (+ (-> a0-23 frame-group data 0 length) -1)))
-      (set! (-> a0-23 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-23 param 1) 1.0)
       (joint-control-channel-group! a0-23 (the-as art-joint-anim #f) num-func-seek!)
       )
     (while (not (ja-done? 0))
@@ -2431,7 +2413,7 @@
               )
           (let ((a0-10 (-> self skel root-channel 0)))
             (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1)))
-            (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-10 param 1) 1.0)
             (joint-control-channel-group! a0-10 (the-as art-joint-anim #f) num-func-seek!)
             )
           (ja-channel-push! 1 150)
@@ -2440,7 +2422,7 @@
             (set! (-> a0-12 param 0)
                   (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 17)) data 0 length) -1))
                   )
-            (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-12 param 1) 1.0)
             (set! (-> a0-12 frame-num) 0.0)
             (joint-control-channel-group! a0-12 (the-as art-joint-anim (-> self draw art-group data 17)) num-func-seek!)
             )
@@ -2476,7 +2458,7 @@
             (suspend)
             (let ((a0-22 (-> self skel root-channel 0)))
               (set! (-> a0-22 param 0) (the float (+ (-> a0-22 frame-group data 0 length) -1)))
-              (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0))
+              (set! (-> a0-22 param 1) 1.0)
               (joint-control-channel-group-eval! a0-22 (the-as art-joint-anim #f) num-func-seek!)
               )
             )
@@ -2521,7 +2503,7 @@
       (('bonk)
        (go plant-boss-dead-bounce (lerp-scale
                                     (the-as float 0.1)
-                                    (-> (new 'static 'array float 1 1.0) 0)
+                                    (the-as float 1.0)
                                     (the-as float (-> arg3 param 1))
                                     (the-as float 40960.0)
                                     (the-as float 81920.0)
@@ -2573,7 +2555,7 @@
           (set! (-> self money) (ppointer->handle (birth-pickup-at-point
                                                     (-> self node-list data 42 bone transform vector 3)
                                                     (pickup-type money)
-                                                    (-> (new 'static 'array float 1 1.0) 0)
+                                                    (the-as float 1.0)
                                                     #t
                                                     self
                                                     (the-as fact-info #f)
@@ -2592,7 +2574,7 @@
       (set! (-> s5-0 frame-num) 0.0)
       )
     (let ((s5-1 (-> self skel root-channel 1)))
-      (set! (-> s5-1 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) arg0))
+      (set! (-> s5-1 frame-interp) (- 1.0 arg0))
       (joint-control-channel-group-eval!
         s5-1
         (the-as art-joint-anim (-> self draw art-group data 17))
@@ -2606,11 +2588,11 @@
       (suspend)
       (let ((a0-13 (-> self skel root-channel 0)))
         (set! (-> a0-13 param 0) (the float (+ (-> a0-13 frame-group data 0 length) -1)))
-        (set! (-> a0-13 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-13 param 1) 1.0)
         (joint-control-channel-group-eval! a0-13 (the-as art-joint-anim #f) num-func-seek!)
         )
       (let ((v1-39 (-> self skel root-channel 1)))
-        (set! (-> v1-39 frame-interp) (- (-> (new 'static 'array float 1 1.0) 0) arg0))
+        (set! (-> v1-39 frame-interp) (- 1.0 arg0))
         (set! (-> v1-39 num-func) num-func-identity)
         (set! (-> v1-39 frame-num) (the float (+ (-> v1-39 frame-group data 0 length) -1)))
         )
@@ -2653,7 +2635,7 @@
         (set! (-> s2-2 collide-with) (collide-kind target))
         (set! (-> s2-2 prim-core offense) (collide-offense no-offense))
         (set! (-> s2-2 transform-index) 13)
-        (set-vector! (-> s2-2 local-sphere) 0.0 (-> (new 'static 'array float 1 8192.0) 0) 0.0 16384.0)
+        (set-vector! (-> s2-2 local-sphere) 0.0 8192.0 0.0 16384.0)
         (append-prim s3-0 s2-2)
         (set! (-> obj attack-prim 0) s2-2)
         )
@@ -2662,7 +2644,7 @@
         (set! (-> s2-3 collide-with) (collide-kind))
         (set! (-> s2-3 prim-core offense) (collide-offense no-offense))
         (set! (-> s2-3 transform-index) 13)
-        (set-vector! (-> s2-3 local-sphere) 0.0 (-> (new 'static 'array float 1 8192.0) 0) 0.0 16384.0)
+        (set-vector! (-> s2-3 local-sphere) 0.0 8192.0 0.0 16384.0)
         (append-prim s3-0 s2-3)
         (set! (-> obj death-prim 0) s2-3)
         )
@@ -2692,7 +2674,7 @@
         s5-1
         plant-boss-arm-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x -24576.0 :z 8192.0 :w 1.0))
-        (-> (new 'static 'array float 1 -8192.0) 0)
+        -8192.0
         1
         )
       (-> s5-1 ppointer)
@@ -2707,7 +2689,7 @@
         s5-2
         plant-boss-arm-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 24576.0 :z 8192.0 :w 1.0))
-        (-> (new 'static 'array float 1 8192.0) 0)
+        8192.0
         0
         )
       (-> s5-2 ppointer)
@@ -2722,7 +2704,7 @@
         s5-3
         plant-boss-back-arms-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :w 1.0))
-        (-> (new 'static 'array float 1 0.0) 0)
+        0.0
         2
         )
       (-> s5-3 ppointer)
@@ -2738,7 +2720,7 @@
         plant-boss-vine-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 38912.0 :z 8192.0 :w 1.0))
         (new 'static 'vector :y 14563.556)
-        (-> (new 'static 'array float 1 1.0) 0)
+        1.0
         3
         )
       (-> s5-4 ppointer)
@@ -2754,7 +2736,7 @@
         plant-boss-vine-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x -40960.0 :z 8192.0 :w 1.0))
         (new 'static 'vector :y -5461.3335)
-        (-> (new 'static 'array float 1 1.0) 0)
+        1.0
         3
         )
       (-> s5-5 ppointer)
@@ -2774,7 +2756,7 @@
           (new 'static 'vector :x -29491.2 :z -7168.0 :w 1.0)
           )
         (new 'static 'vector :x -1820.4445 :y -11286.756)
-        (-> (new 'static 'array float 1 0.8) 0)
+        0.8
         3
         )
       (-> s5-6 ppointer)
@@ -2790,7 +2772,7 @@
         plant-boss-vine-init
         (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :x 32768.0 :z -3072.0 :w 1.0))
         (new 'static 'vector :x -910.2222 :y 22755.555)
-        (-> (new 'static 'array float 1 0.8) 0)
+        0.8
         3
         )
       (-> s5-7 ppointer)
@@ -2856,7 +2838,7 @@
                 s5-11
                 plant-boss-leaf-init
                 (vector+! (new-stack-vector0) (-> obj root-override trans) (new 'static 'vector :w 1.0))
-                (-> (new 'static 'array float 1 0.0) 0)
+                0.0
                 0
                 )
               (-> s5-11 ppointer)
@@ -2880,7 +2862,7 @@
                   (-> obj root-override trans)
                   (new 'static 'vector :x -13189.12 :y 2838.528 :z 12288.0 :w 1.0)
                   )
-                (-> (new 'static 'array float 1 0.0) 0)
+                0.0
                 1
                 )
               (-> s5-12 ppointer)
@@ -2895,24 +2877,12 @@
   (set! (-> obj money) (the-as handle #f))
   (set! (-> obj try-inc) #f)
   (set! (-> obj neck) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 13))
-  (set-vector!
-    (-> obj neck twist-max)
-    3640.889
-    (-> (new 'static 'array float 1 8192.0) 0)
-    0.0
-    (-> (new 'static 'array float 1 1.0) 0)
-    )
+  (set-vector! (-> obj neck twist-max) 3640.889 8192.0 0.0 1.0)
   (set! (-> obj neck up) (the-as uint 0))
   (set! (-> obj neck nose) (the-as uint 1))
   (set! (-> obj neck ear) (the-as uint 2))
   (set! (-> obj body) (new 'process 'joint-mod (joint-mod-handler-mode flex-blend) obj 4))
-  (set-vector!
-    (-> obj body twist-max)
-    0.0
-    (-> (new 'static 'array float 1 8192.0) 0)
-    0.0
-    (-> (new 'static 'array float 1 1.0) 0)
-    )
+  (set-vector! (-> obj body twist-max) 0.0 8192.0 0.0 1.0)
   (set! (-> obj body up) (the-as uint 1))
   (set! (-> obj body nose) (the-as uint 0))
   (set! (-> obj body ear) (the-as uint 2))
diff --git a/goal_src/levels/maincave/dark-crystal.gc b/goal_src/levels/maincave/dark-crystal.gc
index d63c38c8a7..95947dad66 100644
--- a/goal_src/levels/maincave/dark-crystal.gc
+++ b/goal_src/levels/maincave/dark-crystal.gc
@@ -56,15 +56,13 @@
   :longest-edge (meters 0)
   )
 
-(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)
     )
   )
 
-(define
-  *dark-crystal-exploder-params*
+(define *dark-crystal-exploder-params*
   (new 'static 'joint-exploder-static-params
     :joints
     (new
diff --git a/goal_src/levels/maincave/driller-lurker.gc b/goal_src/levels/maincave/driller-lurker.gc
index f3edf9f338..79b6beacc3 100644
--- a/goal_src/levels/maincave/driller-lurker.gc
+++ b/goal_src/levels/maincave/driller-lurker.gc
@@ -75,8 +75,7 @@
   :shadow 4
   )
 
-(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/goal_src/levels/maincave/gnawer.gc b/goal_src/levels/maincave/gnawer.gc
index c798c8f3a0..dc5436832c 100644
--- a/goal_src/levels/maincave/gnawer.gc
+++ b/goal_src/levels/maincave/gnawer.gc
@@ -137,8 +137,7 @@
   :longest-edge (meters 0)
   )
 
-(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/goal_src/levels/maincave/mother-spider.gc b/goal_src/levels/maincave/mother-spider.gc
index 8038b6f4ad..bab144934b 100644
--- a/goal_src/levels/maincave/mother-spider.gc
+++ b/goal_src/levels/maincave/mother-spider.gc
@@ -27,8 +27,7 @@
   :longest-edge (meters 0)
   )
 
-(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)
@@ -42,8 +41,7 @@
     )
   )
 
-(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/goal_src/levels/misty/misty-conveyor.gc b/goal_src/levels/misty/misty-conveyor.gc
index 9aaa59e0b2..81a5e8cd66 100644
--- a/goal_src/levels/misty/misty-conveyor.gc
+++ b/goal_src/levels/misty/misty-conveyor.gc
@@ -538,8 +538,7 @@
     )
   )
 
-(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/goal_src/levels/misty/sidekick-human.gc b/goal_src/levels/misty/sidekick-human.gc
index 4ca3a6c3b6..b8e4ebab9f 100644
--- a/goal_src/levels/misty/sidekick-human.gc
+++ b/goal_src/levels/misty/sidekick-human.gc
@@ -1202,8 +1202,7 @@
   )
 
 
-(define
-  *lurker-army*
+(define *lurker-army*
   (the-as (array army-info) (new
                               'static
                               'boxed-array
diff --git a/goal_src/levels/ogre/ogre-obs.gc b/goal_src/levels/ogre/ogre-obs.gc
index 78e3fac564..281478f59b 100644
--- a/goal_src/levels/ogre/ogre-obs.gc
+++ b/goal_src/levels/ogre/ogre-obs.gc
@@ -1134,8 +1134,7 @@
   (the-as (function none :behavior ogre-bridge) rider-post)
   )
 
-(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/goal_src/levels/ogre/ogreboss.gc b/goal_src/levels/ogre/ogreboss.gc
index 5db216bdd4..120ec89cdc 100644
--- a/goal_src/levels/ogre/ogreboss.gc
+++ b/goal_src/levels/ogre/ogreboss.gc
@@ -67,8 +67,7 @@
   :longest-edge (meters 0)
   )
 
-(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 @@
                                )
   )
 
-(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))
@@ -239,14 +237,7 @@
         (-> gp-1 ppointer)
         )
       )
-    (activate!
-      *camera-smush-control*
-      (the-as float 819.2)
-      37
-      600
-      (-> (new 'static 'array float 1 1.0) 0)
-      (the-as float 0.995)
-      )
+    (activate! *camera-smush-control* (the-as float 819.2) 37 600 (the-as float 1.0) (the-as float 0.995))
     (let* ((s4-1 (get-process *default-dead-pool* manipy #x4000))
            (gp-2 (when s4-1
                    (let ((t9-7 (method-of-type manipy activate)))
@@ -259,9 +250,9 @@
            )
       (quaternion-axis-angle!
         (-> (the-as manipy (-> gp-2 0)) root quat)
-        (-> (new 'static 'array float 1 0.0) 0)
-        (-> (new 'static 'array float 1 1.0) 0)
-        (-> (new 'static 'array float 1 0.0) 0)
+        (the-as float 0.0)
+        (the-as float 1.0)
+        (the-as float 0.0)
         (* 65536.0 (rand-vu))
         )
       (send-event (ppointer->process gp-2) 'anim-mode 'play1)
@@ -273,15 +264,9 @@
 (defun ogreboss-missile-scale-explosion ((arg0 handle))
   (let* ((gp-0 (handle->process arg0))
          (f0-0 (-> (the-as process-drawable gp-0) root scale x))
-         (f0-2 (seek f0-0 (-> (new 'static 'array float 1 0.0) 0) (-> *display* seconds-per-frame)))
+         (f0-2 (seek f0-0 (the-as float 0.0) (-> *display* seconds-per-frame)))
          )
-    (set-vector!
-      (-> (the-as process-drawable gp-0) root scale)
-      f0-2
-      f0-2
-      f0-2
-      (-> (new 'static 'array float 1 1.0) 0)
-      )
+    (set-vector! (-> (the-as process-drawable gp-0) root scale) f0-2 f0-2 f0-2 1.0)
     )
   0
   (none)
@@ -344,7 +329,7 @@
                    0.0
                    (set! (-> s4-1 quad) (-> (the-as target t1-0) control trans quad))
                    (set! (-> s4-1 y) (+ 4096.0 (-> s4-1 y)))
-                   (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 (-> (new 'static 'array float 1 1.0) 0))
+                   (set-vector! s3-0 0.0 (- 118784.0 (-> s4-1 y)) 0.0 1.0)
                    (let ((f30-0
                            (fill-and-probe-using-line-sphere
                              *collide-cache*
@@ -363,7 +348,7 @@
                        (bucket-id debug-draw1)
                        s4-1
                        s3-0
-                       (-> (new 'static 'array float 1 1.0) 0)
+                       (meters 0.00024414062)
                        (the-as rgba (new 'static 'rgba :g #xff :a #x80))
                        )
                      (when (>= f30-0 0.0)
@@ -385,7 +370,7 @@
                  )
                (else
                  (let ((v1-37 (new 'stack-no-clear 'vector)))
-                   (set-vector! v1-37 0.0 -12288000.0 0.0 (-> (new 'static 'array float 1 1.0) 0))
+                   (set-vector! v1-37 0.0 -12288000.0 0.0 1.0)
                    (send-event arg0 'impulse v1-37)
                    )
                  )
@@ -504,19 +489,13 @@
     (quaternion-axis-angle!
       (-> self tumble-quat)
       (cos f30-1)
-      (-> (new 'static 'array float 1 0.0) 0)
+      (the-as float 0.0)
       (sin f30-1)
       (the-as float 2730.6667)
       )
     )
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 469) self))
-  (set-vector!
-    (-> self draw color-emissive)
-    (-> (new 'static 'array float 1 0.125) 0)
-    (-> (new 'static 'array float 1 0.0625) 0)
-    0.0
-    0.0
-    )
+  (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0)
   (go ogreboss-missile-idle)
   (none)
   )
@@ -613,7 +592,7 @@
          )
        )
       (('grow-faster)
-       (let ((f0-2 (-> (new 'static 'array float 1 1.0) 0)))
+       (let ((f0-2 1.0))
          (set! (-> self grow-rate) f0-2)
          f0-2
          )
@@ -645,7 +624,7 @@
       (set! (-> gp-0 frame-num) 0.0)
       )
     (set! (-> self joint enable) #t)
-    (set! (-> self joint blend) (-> (new 'static 'array float 1 1.0) 0))
+    (set! (-> self joint blend) 1.0)
     (set! (-> self state-time) (-> *display* base-frame-counter))
     (while #t
       (quaternion-vector-angle!
@@ -655,17 +634,17 @@
         )
       (quaternion*! (-> self joint transform quat) (-> self joint transform quat) (-> self tumble-quat))
       (+! (-> self size) (* (-> self grow-rate) (-> *display* seconds-per-frame)))
-      (set! (-> self size) (fmin (-> (new 'static 'array float 1 1.0) 0) (-> self size)))
+      (set! (-> self size) (fmin 1.0 (-> self size)))
       (let* ((f0-10 (sqrtf (-> self size)))
              (f28-0 (* 0.0033333334 (the float (- (-> *display* base-frame-counter) (-> self state-time)))))
              (f30-0 (* 116508.445 f28-0 (-> self speed)))
              )
-        (set-vector! (-> self joint transform scale) f0-10 f0-10 f0-10 (-> (new 'static 'array float 1 1.0) 0))
+        (set-vector! (-> self joint transform scale) f0-10 f0-10 f0-10 1.0)
         (let ((gp-1 (-> self joint transform)))
           (set! (-> gp-1 trans x) (* 4096.0 (sin f30-0)))
           (set! (-> gp-1 trans y) (+ 122880.0 (* 12288.0 (sin (* 98304.0 f28-0)))))
           (set! (-> gp-1 trans z) (* 4096.0 (cos f30-0)))
-          (set! (-> gp-1 trans w) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> gp-1 trans w) 1.0)
           )
         )
       (spawn (-> self part) (-> self node-list data 3 bone transform vector 3))
@@ -696,14 +675,7 @@
     1
     (the-as symbol (-> self draw origin))
     )
-  (activate!
-    *camera-smush-control*
-    (the-as float 819.2)
-    37
-    600
-    (-> (new 'static 'array float 1 1.0) 0)
-    (the-as float 0.995)
-    )
+  (activate! *camera-smush-control* (the-as float 819.2) 37 600 (the-as float 1.0) (the-as float 0.995))
   (let ((gp-1 (get-process *default-dead-pool* part-tracker #x4000)))
     (when gp-1
       (let ((t9-4 (method-of-type part-tracker activate)))
@@ -724,26 +696,26 @@
     (set! (-> a0-3 param 0)
           (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 43)) data 0 length) -1))
           )
-    (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+    (set! (-> a0-3 param 1) 1.0)
     (set! (-> a0-3 frame-num) 0.0)
     (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 43)) num-func-seek!)
     )
   (until (ja-done? 0)
     (set! (-> self joint blend)
-          (seek (-> self joint blend) (-> (new 'static 'array float 1 0.0) 0) (* 5.0 (-> *display* seconds-per-frame)))
+          (seek (-> self joint blend) (the-as float 0.0) (* 5.0 (-> *display* seconds-per-frame)))
           )
     (let* ((f1-1 (/ (- (ja-frame-num 0) (ja-aframe (the-as float 54.0) 0))
                     (- (the float (ja-num-frames 0)) (ja-aframe (the-as float 54.0) 0))
                     )
                  )
-           (f0-13 (fmax 0.0 (fmin (-> (new 'static 'array float 1 1.0) 0) f1-1)))
+           (f0-13 (fmax 0.0 (fmin 1.0 f1-1)))
            )
       (vector-lerp! (-> self root-override trans) (-> self src-pos) (-> self orig-pos) f0-13)
       )
     (suspend)
     (let ((a0-10 (-> self skel root-channel 0)))
       (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1)))
-      (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-10 param 1) 1.0)
       (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!)
       )
     )
@@ -762,19 +734,19 @@
       (set! (-> a0-3 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 42)) data 0 length) -1))
             )
-      (set! (-> a0-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-3 param 1) 1.0)
       (set! (-> a0-3 frame-num) 0.0)
       (joint-control-channel-group! a0-3 (the-as art-joint-anim (-> self draw art-group data 42)) num-func-seek!)
       )
     (until (ja-done? 0)
       (set! (-> self joint blend)
-            (seek (-> self joint blend) (-> (new 'static 'array float 1 0.0) 0) (* 5.0 (-> *display* seconds-per-frame)))
+            (seek (-> self joint blend) (the-as float 0.0) (* 5.0 (-> *display* seconds-per-frame)))
             )
       (let* ((f1-1 (/ (- (ja-frame-num 0) (ja-aframe (the-as float 32.0) 0))
                       (- (the float (ja-num-frames 0)) (ja-aframe (the-as float 32.0) 0))
                       )
                    )
-             (f0-13 (fmax 0.0 (fmin (-> (new 'static 'array float 1 1.0) 0) f1-1)))
+             (f0-13 (fmax 0.0 (fmin 1.0 f1-1)))
              )
         (vector-lerp! (-> self root-override trans) (-> self src-pos) (-> self orig-pos) f0-13)
         )
@@ -782,7 +754,7 @@
       (suspend)
       (let ((a0-10 (-> self skel root-channel 0)))
         (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1)))
-        (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-10 param 1) 1.0)
         (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -837,7 +809,7 @@
     (let ((gp-0 (-> self skel root-channel 0)))
       (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44)))
       (set! (-> gp-0 param 0) (ja-aframe (the-as float 100.0) 0))
-      (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) 0.0)
       (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!)
       )
@@ -851,7 +823,7 @@
       (suspend)
       (let ((gp-2 (-> self skel root-channel 0)))
         (set! (-> gp-2 param 0) (ja-aframe (the-as float 100.0) 0))
-        (set! (-> gp-2 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-2 param 1) 1.0)
         (joint-control-channel-group-eval! gp-2 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -875,7 +847,7 @@
     (let ((gp-0 (-> self skel root-channel 0)))
       (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 44)))
       (set! (-> gp-0 param 0) (ja-aframe (the-as float 162.0) 0))
-      (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-0 param 1) 1.0)
       (set! (-> gp-0 frame-num) (ja-aframe (the-as float 100.0) 0))
       (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!)
       )
@@ -883,7 +855,7 @@
       (suspend)
       (let ((gp-1 (-> self skel root-channel 0)))
         (set! (-> gp-1 param 0) (ja-aframe (the-as float 162.0) 0))
-        (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> gp-1 param 1) 1.0)
         (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -935,7 +907,7 @@
       (set! (-> gp-4 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 44)) data 0 length) -1))
             )
-      (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> gp-4 param 1) 1.0)
       (set! (-> gp-4 frame-num) (ja-aframe (the-as float 162.0) 0))
       (joint-control-channel-group! gp-4 (the-as art-joint-anim (-> self draw art-group data 44)) num-func-seek!)
       )
@@ -943,7 +915,7 @@
       (suspend)
       (let ((a0-12 (-> self skel root-channel 0)))
         (set! (-> a0-12 param 0) (the float (+ (-> a0-12 frame-group data 0 length) -1)))
-        (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-12 param 1) 1.0)
         (joint-control-channel-group-eval! a0-12 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -1017,21 +989,15 @@
     (quaternion-axis-angle!
       (-> self tumble-quat)
       (cos f30-1)
-      (-> (new 'static 'array float 1 0.0) 0)
+      (the-as float 0.0)
       (sin f30-1)
       (the-as float 2730.6667)
       )
     )
   (set! (-> self joint) (new 'process 'joint-mod-blend-local self 3 #f))
   (set! (-> self part) (create-launch-control (-> *part-group-id-table* 468) self))
-  (set-vector!
-    (-> self draw color-emissive)
-    (-> (new 'static 'array float 1 0.125) 0)
-    (-> (new 'static 'array float 1 0.0625) 0)
-    0.0
-    0.0
-    )
-  (set! (-> self speed) (-> (new 'static 'array float 1 1.0) 0))
+  (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0)
+  (set! (-> self speed) 1.0)
   (set! (-> self size) 0.0)
   (set! (-> self grow-rate) (/ 300.0 arg1))
   (set! (-> self sound-id) (new-sound-id))
@@ -1079,7 +1045,7 @@
   :code
   (behavior ()
     (set! (-> self state-time) (-> *display* base-frame-counter))
-    (let ((f30-0 (-> (new 'static 'array float 1 2.0) 0)))
+    (let ((f30-0 2.0))
       (let ((gp-0 (-> self skel root-channel 0)))
         (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 38)))
         (set! (-> gp-0 param 0) (ja-aframe (the-as float 40.0) 0))
@@ -1089,9 +1055,7 @@
         )
       (until (ja-done? 0)
         (set! (-> self side-pos)
-              (* (fmin (-> (new 'static 'array float 1 1.0) 0) (/ (ja-frame-num 0) (ja-aframe (the-as float 40.0) 0)))
-                 (-> self dest-pos)
-                 )
+              (* (fmin 1.0 (/ (ja-frame-num 0) (ja-aframe (the-as float 40.0) 0))) (-> self dest-pos))
               )
         (suspend)
         (let ((gp-1 (-> self skel root-channel 0)))
@@ -1112,7 +1076,7 @@
       (until (ja-done? 0)
         (if (>= (ja-frame-num 0) (ja-aframe (the-as float 235.0) 0))
             (set! (-> self side-pos)
-                  (seek (-> self side-pos) (-> (new 'static 'array float 1 0.0) 0) (* 20480.0 (-> *display* seconds-per-frame)))
+                  (seek (-> self side-pos) (the-as float 0.0) (* 20480.0 (-> *display* seconds-per-frame)))
                   )
             )
         (suspend)
@@ -1136,7 +1100,7 @@
       (the-as float 49152.0)
       (collide-kind background)
       (the-as process-drawable #f)
-      (-> (new 'static 'array float 1 0.0) 0)
+      (the-as float 0.0)
       (the-as float 409600.0)
       )
     (none)
@@ -1172,7 +1136,7 @@
   (set! (-> self side-pos) 0.0)
   (set! (-> self dest-pos) (the-as float (cond
                                            ((zero? arg0)
-                                            (-> (new 'static 'array float 1 0.0) 0)
+                                            0.0
                                             )
                                            ((= arg0 1)
                                             -20480.0
@@ -1181,7 +1145,7 @@
                                             20480.0
                                             )
                                            (else
-                                             (-> (new 'static 'array float 1 0.0) 0)
+                                             0.0
                                              )
                                            )
                                    )
@@ -1190,13 +1154,7 @@
   (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)
-    (-> (new 'static 'array float 1 0.125) 0)
-    (-> (new 'static 'array float 1 0.0625) 0)
-    0.0
-    0.0
-    )
+  (set-vector! (-> self draw color-emissive) 0.125 0.0625 0.0 0.0)
   (go ogreboss-bounce-boulder-idle)
   (none)
   )
@@ -1292,7 +1250,7 @@
          (let ((gp-0 (-> self skel root-channel 0)))
            (set! (-> gp-0 frame-group) (the-as art-joint-anim (-> self draw art-group data 2)))
            (set! (-> gp-0 param 0) (ja-aframe (the-as float 140.0) 0))
-           (set! (-> gp-0 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-0 param 1) 1.0)
            (set! (-> gp-0 frame-num) 0.0)
            (joint-control-channel-group! gp-0 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
            )
@@ -1300,7 +1258,7 @@
            (suspend)
            (let ((gp-1 (-> self skel root-channel 0)))
              (set! (-> gp-1 param 0) (ja-aframe (the-as float 140.0) 0))
-             (set! (-> gp-1 param 1) (-> (new 'static 'array float 1 1.0) 0))
+             (set! (-> gp-1 param 1) 1.0)
              (joint-control-channel-group-eval! gp-1 (the-as art-joint-anim #f) num-func-seek!)
              )
            )
@@ -1312,7 +1270,7 @@
          (let ((gp-3 (-> self skel root-channel 0)))
            (set! (-> gp-3 frame-group) (the-as art-joint-anim (-> self draw art-group data 2)))
            (set! (-> gp-3 param 0) (ja-aframe (the-as float 168.0) 0))
-           (set! (-> gp-3 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-3 param 1) 1.0)
            (set! (-> gp-3 frame-num) (ja-aframe (the-as float 140.0) 0))
            (joint-control-channel-group! gp-3 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
            )
@@ -1320,7 +1278,7 @@
            (suspend)
            (let ((gp-4 (-> self skel root-channel 0)))
              (set! (-> gp-4 param 0) (ja-aframe (the-as float 168.0) 0))
-             (set! (-> gp-4 param 1) (-> (new 'static 'array float 1 1.0) 0))
+             (set! (-> gp-4 param 1) 1.0)
              (joint-control-channel-group-eval! gp-4 (the-as art-joint-anim #f) num-func-seek!)
              )
            )
@@ -1334,7 +1292,7 @@
            (set! (-> gp-6 param 0)
                  (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1))
                  )
-           (set! (-> gp-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> gp-6 param 1) 1.0)
            (set! (-> gp-6 frame-num) (ja-aframe (the-as float 168.0) 0))
            (joint-control-channel-group! gp-6 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
            )
@@ -1342,7 +1300,7 @@
            (suspend)
            (let ((a0-15 (-> self skel root-channel 0)))
              (set! (-> a0-15 param 0) (the float (+ (-> a0-15 frame-group data 0 length) -1)))
-             (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0))
+             (set! (-> a0-15 param 1) 1.0)
              (joint-control-channel-group-eval! a0-15 (the-as art-joint-anim #f) num-func-seek!)
              )
            )
@@ -1353,7 +1311,7 @@
            (set! (-> a0-18 param 0)
                  (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 4)) data 0 length) -1))
                  )
-           (set! (-> a0-18 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-18 param 1) 1.0)
            (set! (-> a0-18 frame-num) 0.0)
            (joint-control-channel-group! a0-18 (the-as art-joint-anim (-> self draw art-group data 4)) num-func-seek!)
            )
@@ -1361,7 +1319,7 @@
            (suspend)
            (let ((a0-19 (-> self skel root-channel 0)))
              (set! (-> a0-19 param 0) (the float (+ (-> a0-19 frame-group data 0 length) -1)))
-             (set! (-> a0-19 param 1) (-> (new 'static 'array float 1 1.0) 0))
+             (set! (-> a0-19 param 1) 1.0)
              (joint-control-channel-group-eval! a0-19 (the-as art-joint-anim #f) num-func-seek!)
              )
            )
@@ -1373,7 +1331,7 @@
               (set! (-> a0-21 param 0)
                     (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 3)) data 0 length) -1))
                     )
-              (set! (-> a0-21 param 1) (-> (new 'static 'array float 1 1.0) 0))
+              (set! (-> a0-21 param 1) 1.0)
               (set! (-> a0-21 frame-num) 0.0)
               (joint-control-channel-group! a0-21 (the-as art-joint-anim (-> self draw art-group data 3)) num-func-seek!)
               )
@@ -1381,7 +1339,7 @@
               (suspend)
               (let ((a0-22 (-> self skel root-channel 0)))
                 (set! (-> a0-22 param 0) (the float (+ (-> a0-22 frame-group data 0 length) -1)))
-                (set! (-> a0-22 param 1) (-> (new 'static 'array float 1 1.0) 0))
+                (set! (-> a0-22 param 1) 1.0)
                 (joint-control-channel-group-eval! a0-22 (the-as art-joint-anim #f) num-func-seek!)
                 )
               )
@@ -1473,7 +1431,7 @@
         (set! (-> a0-15 param 0)
               (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 24)) data 0 length) -1))
               )
-        (set! (-> a0-15 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-15 param 1) 1.0)
         (set! (-> a0-15 frame-num) 0.0)
         (joint-control-channel-group! a0-15 (the-as art-joint-anim (-> self draw art-group data 24)) num-func-seek!)
         )
@@ -1481,7 +1439,7 @@
         (suspend)
         (let ((a0-16 (-> self skel root-channel 0)))
           (set! (-> a0-16 param 0) (the float (+ (-> a0-16 frame-group data 0 length) -1)))
-          (set! (-> a0-16 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-16 param 1) 1.0)
           (joint-control-channel-group-eval! a0-16 (the-as art-joint-anim #f) num-func-seek!)
           )
         )
@@ -1490,7 +1448,7 @@
       (send-event *target* 'continue (get-continue-by-name *game-info* "ogre-start"))
       (ogreboss-inc-try-count)
       )
-    (set-setting! *setting-control* self 'music 'ogreboss (-> (new 'static 'array float 1 0.0) 0) 0)
+    (set-setting! *setting-control* self 'music 'ogreboss (the-as float 0.0) 0)
     (go ogreboss-wait-for-player)
     (none)
     )
@@ -1564,12 +1522,7 @@
     (let ((s5-0 (new 'stack-no-clear 'vector)))
       (set! (-> gp-0 src) (-> self node-list data 52 bone transform vector 3))
       (set! (-> gp-0 duration)
-            (the-as
-              time-frame
-              (the int
-                   (* 300.0 (+ 1.25 (* -0.25 (-> self level)) (/ (-> (new 'static 'array float 1 0.5) 0) (-> self difficulty))))
-                   )
-              )
+            (the-as time-frame (the int (* 300.0 (+ 1.25 (* -0.25 (-> self level)) (/ 0.5 (-> self difficulty))))))
             )
       (set! (-> gp-0 pickup-type) (the-as pickup-type arg0))
       (set! (-> gp-0 blast-radius) 32768.0)
@@ -1850,7 +1803,7 @@
   (behavior ()
     (set! (-> self mask) (logior (process-mask enemy) (-> self mask)))
     (ogreboss-set-stage1-camera)
-    (ogreboss-move-near (seconds 3) (-> (new 'static 'array float 1 1.0) 0))
+    (ogreboss-move-near (seconds 3) (the-as float 1.0))
     (cond
       ((= (if (> (-> self skel active-channels) 0)
               (-> self skel root-channel 0 frame-group)
@@ -1863,7 +1816,7 @@
          (set! (-> a0-7 param 0)
                (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 2)) data 0 length) -1))
                )
-         (set! (-> a0-7 param 1) (-> (new 'static 'array float 1 1.0) 0))
+         (set! (-> a0-7 param 1) 1.0)
          (set! (-> a0-7 frame-num) 0.0)
          (joint-control-channel-group! a0-7 (the-as art-joint-anim (-> self draw art-group data 2)) num-func-seek!)
          )
@@ -1871,7 +1824,7 @@
          (suspend)
          (let ((a0-8 (-> self skel root-channel 0)))
            (set! (-> a0-8 param 0) (the float (+ (-> a0-8 frame-group data 0 length) -1)))
-           (set! (-> a0-8 param 1) (-> (new 'static 'array float 1 1.0) 0))
+           (set! (-> a0-8 param 1) 1.0)
            (joint-control-channel-group-eval! a0-8 (the-as art-joint-anim #f) num-func-seek!)
            )
          )
@@ -1883,7 +1836,7 @@
           (set! (-> a0-11 param 0)
                 (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 5)) data 0 length) -1))
                 )
-          (set! (-> a0-11 param 1) (-> (new 'static 'array float 1 1.0) 0))
+          (set! (-> a0-11 param 1) 1.0)
           (set! (-> a0-11 frame-num) 0.0)
           (joint-control-channel-group! a0-11 (the-as art-joint-anim (-> self draw art-group data 5)) num-func-seek!)
           )
@@ -1891,14 +1844,14 @@
           (suspend)
           (let ((a0-12 (-> self skel root-channel 0)))
             (set! (-> a0-12 param 0) (the float (+ (-> a0-12 frame-group data 0 length) -1)))
-            (set! (-> a0-12 param 1) (-> (new 'static 'array float 1 1.0) 0))
+            (set! (-> a0-12 param 1) 1.0)
             (joint-control-channel-group-eval! a0-12 (the-as art-joint-anim #f) num-func-seek!)
             )
           )
         )
       )
     (let* ((gp-0 (the int (* (-> self difficulty) (+ 8.0 (* 4.0 (-> self level))))))
-           (f0-17 (-> (new 'static 'array float 1 1.0) 0))
+           (f0-17 1.0)
            (f1-2 0.15)
            (f2-2 (-> self difficulty))
            (f30-0 (+ f0-17 (* f1-2 (* f2-2 f2-2) (-> self level))))
@@ -1925,10 +1878,10 @@
         (let ((s5-0 0))
           (let ((f28-0 0.0))
             (cond
-              ((>= (-> (new 'static 'array float 1 1.0) 0) (-> *target* fact-info-target health))
+              ((>= 1.0 (-> *target* fact-info-target health))
                (set! f28-0 0.1)
                )
-              ((>= (-> (new 'static 'array float 1 2.0) 0) (-> *target* fact-info-target health))
+              ((>= 2.0 (-> *target* fact-info-target health))
                (set! f28-0 0.05)
                )
               )
@@ -1937,7 +1890,7 @@
                            (* 0.0 f28-0)
                            )
                           ((< (-> self try-count) (the-as uint 10))
-                           (* (-> (new 'static 'array float 1 0.5) 0) f28-0)
+                           (* 0.5 f28-0)
                            )
                           (else
                             (empty)
@@ -1989,14 +1942,14 @@
           )
         )
       )
-    (ogreboss-move-far (seconds 2) (-> (new 'static 'array float 1 1.0) 0))
+    (ogreboss-move-far (seconds 2) (the-as float 1.0))
     (ja-channel-push! 1 30)
     (let ((a0-28 (-> self skel root-channel 0)))
       (set! (-> a0-28 frame-group) (the-as art-joint-anim (-> self draw art-group data 16)))
       (set! (-> a0-28 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) data 0 length) -1))
             )
-      (set! (-> a0-28 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-28 param 1) 1.0)
       (set! (-> a0-28 frame-num) 0.0)
       (joint-control-channel-group! a0-28 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!)
       )
@@ -2004,7 +1957,7 @@
       (suspend)
       (let ((a0-29 (-> self skel root-channel 0)))
         (set! (-> a0-29 param 0) (the float (+ (-> a0-29 frame-group data 0 length) -1)))
-        (set! (-> a0-29 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-29 param 1) 1.0)
         (joint-control-channel-group-eval! a0-29 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -2076,11 +2029,8 @@
         )
     (let ((f30-0 (the float (- (-> *display* base-frame-counter) (-> self hit-time)))))
       (when (and (> (-> self hit-count) 0) (>= 45.0 f30-0))
-        (set! f0-0 (+ (ja-aframe (-> (new 'static 'array float 1 0.0) 0) 1)
-                      (* 0.022222223
-                         f30-0
-                         (- (ja-aframe (the-as float 8.0) 1) (ja-aframe (-> (new 'static 'array float 1 0.0) 0) 1))
-                         )
+        (set! f0-0 (+ (ja-aframe (the-as float 0.0) 1)
+                      (* 0.022222223 f30-0 (- (ja-aframe (the-as float 8.0) 1) (ja-aframe (the-as float 0.0) 1)))
                       )
               )
         (set! f1-0 (cond
@@ -2222,7 +2172,7 @@
   :code
   (behavior ()
     (ogreboss-set-stage2-camera)
-    (ogreboss-move-far (seconds 0.1) (-> (new 'static 'array float 1 2.0) 0))
+    (ogreboss-move-far (seconds 0.1) (the-as float 2.0))
     (let ((f30-0 (* 0.75 (-> self difficulty))))
       (let ((gp-0 #f))
         (ja-channel-push! 1 60)
@@ -2345,7 +2295,7 @@
   :trans
   (behavior ()
     (let ((v1-1 (handle->process (-> self boulder))))
-      (if (and v1-1 (>= (-> (the-as ogreboss-super-boulder v1-1) size) (-> (new 'static 'array float 1 1.0) 0)))
+      (if (and v1-1 (>= (-> (the-as ogreboss-super-boulder v1-1) size) 1.0))
           (go ogreboss-stage3-throw)
           )
       )
@@ -2361,11 +2311,8 @@
   :code
   (behavior ()
     (set! (-> self shuffle-pos) 0.0)
-    (let ((f30-0 (+ (-> (new 'static 'array float 1 1.0) 0)
-                    (* (-> (new 'static 'array float 1 0.25) 0) (-> self difficulty) (-> self level))
-                    )
-                 )
-          (gp-0 (if (rand-vu-percent? (-> (new 'static 'array float 1 0.5) 0))
+    (let ((f30-0 (+ 1.0 (* 0.25 (-> self difficulty) (-> self level))))
+          (gp-0 (if (rand-vu-percent? (the-as float 0.5))
                     0
                     1
                     )
@@ -2559,7 +2506,7 @@
       (set! (-> a0-5 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 9)) data 0 length) -1))
             )
-      (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-5 param 1) 1.0)
       (set! (-> a0-5 frame-num) 0.0)
       (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 9)) num-func-seek!)
       )
@@ -2567,7 +2514,7 @@
       (suspend)
       (let ((a0-6 (-> self skel root-channel 0)))
         (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1)))
-        (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-6 param 1) 1.0)
         (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -2577,7 +2524,7 @@
       (set! (-> a0-9 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 16)) data 0 length) -1))
             )
-      (set! (-> a0-9 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-9 param 1) 1.0)
       (set! (-> a0-9 frame-num) 0.0)
       (joint-control-channel-group! a0-9 (the-as art-joint-anim (-> self draw art-group data 16)) num-func-seek!)
       )
@@ -2585,11 +2532,11 @@
       (suspend)
       (let ((a0-10 (-> self skel root-channel 0)))
         (set! (-> a0-10 param 0) (the float (+ (-> a0-10 frame-group data 0 length) -1)))
-        (set! (-> a0-10 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-10 param 1) 1.0)
         (joint-control-channel-group-eval! a0-10 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
-    (ogreboss-submerge (seconds 1) (-> (new 'static 'array float 1 1.0) 0))
+    (ogreboss-submerge (seconds 1) (the-as float 1.0))
     (while (handle->process (-> self boulder))
       (suspend)
       )
@@ -2604,8 +2551,8 @@
 (defstate ogreboss-stage3-hit (ogreboss)
   :code
   (behavior ()
-    (set! (-> self level) (+ (-> (new 'static 'array float 1 1.0) 0) (-> self level)))
-    (if (< (-> (new 'static 'array float 1 2.0) 0) (-> self level))
+    (set! (-> self level) (+ 1.0 (-> self level)))
+    (if (< 2.0 (-> self level))
         (go ogreboss-die)
         )
     (send-event (handle->process (-> self boulder)) 'go-hit)
@@ -2615,7 +2562,7 @@
       (set! (-> a0-5 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1))
             )
-      (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-5 param 1) 1.0)
       (set! (-> a0-5 frame-num) 0.0)
       (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!)
       )
@@ -2623,7 +2570,7 @@
       (suspend)
       (let ((a0-6 (-> self skel root-channel 0)))
         (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1)))
-        (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-6 param 1) 1.0)
         (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -2676,7 +2623,7 @@
       (set! (-> a0-5 param 0)
             (the float (+ (-> (the-as art-joint-anim (-> self draw art-group data 12)) data 0 length) -1))
             )
-      (set! (-> a0-5 param 1) (-> (new 'static 'array float 1 1.0) 0))
+      (set! (-> a0-5 param 1) 1.0)
       (set! (-> a0-5 frame-num) 0.0)
       (joint-control-channel-group! a0-5 (the-as art-joint-anim (-> self draw art-group data 12)) num-func-seek!)
       )
@@ -2685,7 +2632,7 @@
       (suspend)
       (let ((a0-6 (-> self skel root-channel 0)))
         (set! (-> a0-6 param 0) (the float (+ (-> a0-6 frame-group data 0 length) -1)))
-        (set! (-> a0-6 param 1) (-> (new 'static 'array float 1 1.0) 0))
+        (set! (-> a0-6 param 1) 1.0)
         (joint-control-channel-group-eval! a0-6 (the-as art-joint-anim #f) num-func-seek!)
         )
       )
@@ -2763,9 +2710,9 @@
       )
     (set! (-> self target-count) gp-1)
     )
-  (set-vector! (-> self target-offset-array 0) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0))
-  (set-vector! (-> self target-offset-array-2) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0))
-  (set-vector! (-> self target-offset-array-3) 0.0 16384.0 0.0 (-> (new 'static 'array float 1 1.0) 0))
+  (set-vector! (-> self target-offset-array 0) 0.0 16384.0 0.0 1.0)
+  (set-vector! (-> self target-offset-array-2) 0.0 16384.0 0.0 1.0)
+  (set-vector! (-> self target-offset-array-3) 0.0 16384.0 0.0 1.0)
   (set! (-> self target-blast-radius-array 0) 24576.0)
   (set! (-> self target-blast-radius-array 1) 24576.0)
   (set! (-> self target-blast-radius-array 2) 24576.0)
@@ -2849,7 +2796,7 @@
   (set! (-> obj try-count) (-> obj entity extra perm user-uint8 0))
   (cond
     ((< (-> obj try-count) (the-as uint 5))
-     (set! (-> obj difficulty) (-> (new 'static 'array float 1 1.0) 0))
+     (set! (-> obj difficulty) 1.0)
      )
     ((< (-> obj try-count) (the-as uint 10))
      (set! (-> obj difficulty) 0.83334)
@@ -2858,7 +2805,7 @@
      (set! (-> obj difficulty) 0.66667)
      )
     (else
-      (set! (-> obj difficulty) (-> (new 'static 'array float 1 0.5) 0))
+      (set! (-> obj difficulty) 0.5)
       )
     )
   (set! (-> obj lava) (entity-actor-lookup (-> obj entity) 'water-actor 0))
@@ -2871,8 +2818,8 @@
   (set! (-> obj z-plane w) (- (vector-dot (-> obj z-plane) (-> obj root-override trans))))
   (vector-x-quaternion! (-> obj side-dir) (-> obj root-override quat))
   (set! (-> obj far-pos quad) (-> obj root-override trans quad))
-  (let ((f0-38 (-> (new 'static 'array float 1 1.0) 0)))
-    (set-vector! (-> obj root-override scale) f0-38 f0-38 f0-38 (-> (new 'static 'array float 1 1.0) 0))
+  (let ((f0-38 1.0))
+    (set-vector! (-> obj root-override scale) f0-38 f0-38 f0-38 1.0)
     )
   (vector+*! (-> obj near-pos) (-> obj far-pos) (-> obj z-plane) (the-as float 348160.0))
   (set! (-> obj at-near-spot) #t)
diff --git a/goal_src/levels/racer_common/racer.gc b/goal_src/levels/racer_common/racer.gc
index a61df0a965..bcd542a28a 100644
--- a/goal_src/levels/racer_common/racer.gc
+++ b/goal_src/levels/racer_common/racer.gc
@@ -8,12 +8,12 @@
 (define-extern blocking-plane-destroy (function none))
 (define-extern blocking-plane-spawn (function curve-control none))
 
-;; failed to figure out what this is:
+;; DECOMP BEGINS
+
 (if (not (nmember "racerp" *kernel-packages*))
     (set! *kernel-packages* (cons "racerp" *kernel-packages*))
     )
 
-;; definition of type racer
 (deftype racer (process-drawable)
   ((parent-override (pointer target)             :offset         12)
    (root-override   collide-shape-moving         :offset        112)
@@ -38,24 +38,7 @@
     )
   )
 
-;; definition for method 3 of type racer
-(defmethod inspect racer ((obj racer))
-  (let ((t9-0 (method-of-type process-drawable inspect)))
-    (t9-0 obj)
-    )
-  (format #t "~T~Textra-trans: ~`vector`P~%" (-> obj extra-trans))
-  (format #t "~T~Tcondition: ~D~%" (-> obj condition))
-  (format #t "~T~Tcell: ~D~%" (-> obj cell))
-  (format #t "~T~Tpath-data[2] @ #x~X~%" (-> obj path-data))
-  (format #t "~T~Tpath-target: ~A~%" (-> obj path-target))
-  (format #t "~T~Tpath-racer: ~A~%" (-> obj path-racer))
-  (format #t "~T~Tauto-get-off: ~A~%" (-> obj auto-get-off))
-  (format #t "~T~Tshadow-backup: ~A~%" (-> obj shadow-backup))
-  obj
-  )
 
-;; definition for method 7 of type racer
-;; INFO: Return type mismatch process-drawable vs racer.
 (defmethod relocate racer ((obj racer) (arg0 int))
   (countdown (v1-0 2)
     (if (-> obj path-data v1-0)
@@ -65,7 +48,6 @@
   (the-as racer ((method-of-type process-drawable relocate) obj arg0))
   )
 
-;; failed to figure out what this is:
 (defskelgroup *racer-sg* racer
   0
   3
@@ -76,7 +58,6 @@
   :sort 1
   )
 
-;; failed to figure out what this is:
 (defskelgroup *racer-explode-sg* racer
   22
   24
@@ -85,9 +66,7 @@
   :longest-edge (meters 0)
   )
 
-;; 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))
@@ -99,8 +78,6 @@
                                )
   )
 
-;; definition for function racer-effect
-;; INFO: Return type mismatch int vs none.
 (defbehavior racer-effect racer ()
   (when (!= (-> self condition) 4)
     (spawn (-> self part) (-> self root-override trans))
@@ -110,7 +87,6 @@
   (none)
   )
 
-;; failed to figure out what this is:
 (defstate wait-for-start (racer)
   :virtual #t
   :event
@@ -243,7 +219,6 @@
     )
   )
 
-;; failed to figure out what this is:
 (defstate idle (racer)
   :virtual #t
   :event
@@ -281,7 +256,7 @@
           (hide-hud)
           (level-hint-surpress!)
           (kill-current-level-hint '() '(sidekick voicebox) 'exit)
-          (when (and (hud-hidden?) (can-grab-display? (the-as process-taskable self)))
+          (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))
                     )
@@ -310,7 +285,6 @@
   (the-as (function none :behavior racer) ja-post)
   )
 
-;; failed to figure out what this is:
 (defstate pickup (racer)
   :virtual #t
   :event
@@ -384,7 +358,7 @@
       (suspend)
       )
     (let ((s5-0 (-> *display* base-frame-counter)))
-      (until (>= (- (-> *display* base-frame-counter) s5-0) 300)
+      (until (>= (- (-> *display* base-frame-counter) s5-0) (seconds 1))
         (racer-effect)
         (suspend)
         )
@@ -394,7 +368,6 @@
     )
   )
 
-;; failed to figure out what this is:
 (defstate wait-for-return (racer)
   :virtual #t
   :event
@@ -446,8 +419,6 @@
     )
   )
 
-;; definition for method 11 of type racer
-;; INFO: Return type mismatch object vs none.
 (defmethod init-from-entity! racer ((obj racer) (arg0 entity-actor))
   (let ((s4-0 (new 'process 'collide-shape-moving obj (collide-list-enum hit-by-player))))
     (set! (-> s4-0 dynam) (copy *standard-dynamics* 'process))
diff --git a/goal_src/levels/rolling/rolling-obs.gc b/goal_src/levels/rolling/rolling-obs.gc
index 6f6b0352fa..f6980fc340 100644
--- a/goal_src/levels/rolling/rolling-obs.gc
+++ b/goal_src/levels/rolling/rolling-obs.gc
@@ -1741,8 +1741,7 @@
   )
 
 
-(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/goal_src/levels/snow/snow-ball.gc b/goal_src/levels/snow/snow-ball.gc
index f5f51492b7..5c2a303c2b 100644
--- a/goal_src/levels/snow/snow-ball.gc
+++ b/goal_src/levels/snow/snow-ball.gc
@@ -110,8 +110,7 @@
   :shadow 5
   )
 
-(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/goal_src/levels/sunken/bully.gc b/goal_src/levels/sunken/bully.gc
index 868874cfd4..6ba622e994 100644
--- a/goal_src/levels/sunken/bully.gc
+++ b/goal_src/levels/sunken/bully.gc
@@ -76,8 +76,7 @@
   :longest-edge (meters 0)
   )
 
-(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/goal_src/levels/village2/swamp-blimp.gc b/goal_src/levels/village2/swamp-blimp.gc
index f945f37827..7500d3921f 100644
--- a/goal_src/levels/village2/swamp-blimp.gc
+++ b/goal_src/levels/village2/swamp-blimp.gc
@@ -237,8 +237,7 @@
   )
 
 
-(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)
   )
 
diff --git a/goalc/compiler/compilation/State.cpp b/goalc/compiler/compilation/State.cpp
index 56a778c1ff..c4068781f4 100644
--- a/goalc/compiler/compilation/State.cpp
+++ b/goalc/compiler/compilation/State.cpp
@@ -12,8 +12,9 @@ void Compiler::compile_state_handler_set(StructureType* state_type_info,
                                          Env* env,
                                          Val*& code_val,
                                          Val*& enter_val) {
-  // do not set state handler field if handler is #f, that's already the value in the static data
-  // but what if it's ACTUALLY setting it to #f??? see crate-buzzer wait
+  // do not set state handler field if handler is *no-state*
+  // we don't use #f here because you might want to actually set the state to #f
+  // (see crate-buzzer wait)
   auto& arg = args.named.at(name);
   if (!(arg.is_symbol() && arg.as_symbol()->name == "*no-state*")) {
     auto field = get_field_of_structure(state_type_info, state_object, name, env);
diff --git a/goalc/compiler/compilation/Static.cpp b/goalc/compiler/compilation/Static.cpp
index b90633a7ac..3d2446c2ba 100644
--- a/goalc/compiler/compilation/Static.cpp
+++ b/goalc/compiler/compilation/Static.cpp
@@ -32,8 +32,7 @@ void Compiler::compile_static_structure_inline(const goos::Object& form,
     auto field_name_def = symbol_string(pair_car(*field_defs));
     field_defs = &pair_cdr(*field_defs);
 
-    auto field_value = pair_car(*field_defs);
-    field_value = expand_macro_completely(field_value, env);
+    auto field_value = expand_macro_completely(pair_car(*field_defs), env);
     field_defs = &pair_cdr(*field_defs);
 
     if (field_name_def.at(0) != ':') {
diff --git a/goalc/compiler/compilation/Type.cpp b/goalc/compiler/compilation/Type.cpp
index d10cde8a05..44c575eae2 100644
--- a/goalc/compiler/compilation/Type.cpp
+++ b/goalc/compiler/compilation/Type.cpp
@@ -639,10 +639,8 @@ Val* Compiler::get_field_of_structure(const StructureType* type,
     result = fe->alloc_val<MemoryDerefVal>(di.result_type, loc, MemLoadInfo(di));
     result->mark_as_settable();
   } else {
-    auto type_for_offset = field.type;
-    if (field.type.base_type() == "inline-array") {
-      type_for_offset = field.type.get_single_arg();
-    }
+    const auto& type_for_offset =
+        field.type.base_type() == "inline-array" ? field.type.get_single_arg() : field.type;
     auto field_type_info = m_ts.lookup_type(type_for_offset);
     result = fe->alloc_val<MemoryOffsetConstantVal>(
         field.type, object, field.field.offset() + offset + field_type_info->get_offset());
@@ -773,7 +771,6 @@ Val* Compiler::compile_deref(const goos::Object& form, const goos::Object& _rest
                              result->type().print());
       }
       auto di = m_ts.get_deref_info(result->type());
-      auto base_type = di.result_type;
       ASSERT(di.can_deref);
       if (has_constant_idx) {
         result = fe->alloc_val<MemoryOffsetConstantVal>(di.result_type, result,
@@ -790,7 +787,6 @@ Val* Compiler::compile_deref(const goos::Object& form, const goos::Object& _rest
                              result->type().print());
       }
       auto di = m_ts.get_deref_info(result->type());
-      auto base_type = di.result_type;
       ASSERT(di.mem_deref);
       ASSERT(di.can_deref);
       Val* loc = nullptr;
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..f7d1c3c9cb 100644
--- a/test/decompiler/reference/engine/ui/credits_REF.gc
+++ b/test/decompiler/reference/engine/ui/credits_REF.gc
@@ -30,19 +30,13 @@
   )
 
 ;; definition for symbol *title-credits-scale*, type (array float)
-(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)
-    )
+(define *title-credits-scale*
+  (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*
-  (the-as (array int32)
-    (new 'static 'boxed-array :type int32 :length 8 :allocated-length 8 15 20 15 15 20 15 20 15)
-    )
+(define *title-credits-spacing*
+  (new 'static 'boxed-array :type int32 :length 8 :allocated-length 8 15 20 15 15 20 15 20 15)
   )
 
 ;; definition for function draw-title-credits
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)
   )