diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 97853b5b0..6f8ef15a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,9 +33,9 @@ jobs:
       - name: Compile and run some examples
         run: |
           cd resources
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\hello_world_many.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\time.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\fannkuch-redux.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-run --print-linking examples\hello_world_many.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-run --print-linking examples\time.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-run --print-linking examples\fannkuch-redux.c3
           ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\contextfree\boolerr.c3
           ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\ls.c3
           ..\build\${{ matrix.build_type }}\c3c.exe compile-run examples\load_world.c3
@@ -122,11 +122,11 @@ jobs:
       - name: Compile and run some examples
         run: |
           cd resources
-          ../build/c3c compile-run examples/hello_world_many.c3
-          ../build/c3c compile-run examples/time.c3
-          ../build/c3c compile-run examples/fannkuch-redux.c3
-          ../build/c3c compile-run examples/contextfree/boolerr.c3
-          ../build/c3c compile-run examples/load_world.c3
+          ../build/c3c compile-run --print-linking examples/hello_world_many.c3
+          ../build/c3c compile-run --print-linking examples/time.c3
+          ../build/c3c compile-run --print-linking examples/fannkuch-redux.c3
+          ../build/c3c compile-run --print-linking examples/contextfree/boolerr.c3
+          ../build/c3c compile-run --print-linking examples/load_world.c3
           ../build/c3c compile --test -g -O0 --threads 1 --target macos-x64 examples/constants.c3
 
       - name: Build testproject
@@ -293,7 +293,7 @@ jobs:
           ../build/c3c compile-run examples/load_world.c3
           ../build/c3c compile-run examples/process.c3
           ../build/c3c compile-run examples/ls.c3
-          ../build/c3c compile-run --system-linker=no linux_stack.c3
+          ../build/c3c compile-run --linker=builtin linux_stack.c3
           ../build/c3c compile-run linux_stack.c3
 
       - name: Compile run unit tests
@@ -309,7 +309,7 @@ jobs:
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run --debug-log --system-linker=no
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: run compiler tests
         run: |
@@ -400,7 +400,7 @@ jobs:
           ../build/c3c compile-run examples/factorial_macro.c3
           ../build/c3c compile-run examples/fasta.c3
           ../build/c3c compile-run examples/process.c3
-          ../build/c3c compile-run --system-linker=no linux_stack.c3
+          ../build/c3c compile-run --linker=builtin linux_stack.c3
           ../build/c3c compile-run linux_stack.c3
 
       - name: Compile run unit tests
@@ -416,7 +416,7 @@ jobs:
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run --debug-log --system-linker=no
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: run compiler tests
         run: |
@@ -474,6 +474,7 @@ jobs:
           ../build/c3c compile-run examples/contextfree/boolerr.c3
           ../build/c3c compile-run examples/process.c3
           ../build/c3c compile-run examples/load_world.c3
+          ../build/c3c compile-run -O5 examples/load_world.c3
 
       - name: Compile run unit tests
         run: |
@@ -488,7 +489,7 @@ jobs:
       - name: Build testproject direct linker
         run: |
           cd resources/testproject
-          ../../build/c3c run --debug-log --system-linker=no
+          ../../build/c3c run --debug-log --linker=builtin
 
       - name: Build testproject lib
         run: |
diff --git a/README.md b/README.md
index ea7651d54..61de5d8c5 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ fn void main()
 - No mandatory header files
 - New semantic macro system
 - Module based name spacing
-- Subarrays (slices)
+- Slices
 - Compile time reflection
 - Enhanced compile time execution
 - Generics based on generic modules
@@ -212,6 +212,8 @@ More platforms will be supported in the future.
 3. Unzip executable and standard lib.
 4. Run `./c3c`.
 
+(*Note that there is a known issue with debug symbol generation on MacOS 13, see issue #1086)
+
 #### Installing on Arch Linux
 There is an AUR package for the c3c compiler : [c3c-git](https://aur.archlinux.org/packages/c3c-git).
 
diff --git a/lib/std/atomic.c3 b/lib/std/atomic.c3
index 9f39017c2..eff1d59c4 100644
--- a/lib/std/atomic.c3
+++ b/lib/std/atomic.c3
@@ -124,7 +124,7 @@ macro @atomic_exec(#func, data, value, ordering) @local
 		case RELEASE: return #func(data, value, RELEASE);
 		case ACQUIRE_RELEASE: return #func(data, value, ACQUIRE_RELEASE);
 		case SEQ_CONSISTENT: return #func(data, value, SEQ_CONSISTENT);
-		default: assert(false, "Ordering may not be non-atomic or unordered.");
+		default: unreachable("Ordering may not be non-atomic or unordered.");
 	}
 }
 
diff --git a/lib/std/atomic_nolibc.c3 b/lib/std/atomic_nolibc.c3
index 753bee9b2..b9ec23e3a 100644
--- a/lib/std/atomic_nolibc.c3
+++ b/lib/std/atomic_nolibc.c3
@@ -9,7 +9,7 @@ macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $succe
 		case AtomicOrdering.RELAXED.ordinal: return $$compare_exchange(ptr, expected, desired, false, false, $success, AtomicOrdering.RELAXED.ordinal, $alignment);
 		case AtomicOrdering.ACQUIRE.ordinal: return $$compare_exchange(ptr, expected, desired, false, false, $success, AtomicOrdering.ACQUIRE.ordinal, $alignment);
 		case AtomicOrdering.SEQ_CONSISTENT.ordinal: return $$compare_exchange(ptr, expected, desired, false, false, $success, AtomicOrdering.SEQ_CONSISTENT.ordinal, $alignment);
-		default: assert(false, "Unrecognized failure ordering");
+		default: unreachable("Unrecognized failure ordering");
 	}
 	return 0;
 }
@@ -23,12 +23,12 @@ macro @__atomic_compare_exchange_ordering_success(ptr, expected, desired, succes
 		case AtomicOrdering.RELEASE.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.RELEASE.ordinal, failure, $alignment);
 		case AtomicOrdering.ACQUIRE_RELEASE.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.ACQUIRE_RELEASE.ordinal, failure, $alignment);
 		case AtomicOrdering.SEQ_CONSISTENT.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.SEQ_CONSISTENT.ordinal, failure, $alignment);
-		default: assert(false, "Unrecognized success ordering");
+		default: unreachable("Unrecognized success ordering");
 	}
 	return 0;
 }
 
-fn CInt __atomic_compare_exchange(CInt size, any* ptr, any* expected, any* desired, CInt success, CInt failure) @extern("__atomic_compare_exchange") @export
+fn CInt __atomic_compare_exchange(CInt size, any ptr, any expected, any desired, CInt success, CInt failure) @extern("__atomic_compare_exchange") @export
 {
 	switch (size)
 	{
@@ -57,7 +57,7 @@ fn CInt __atomic_compare_exchange(CInt size, any* ptr, any* expected, any* desir
 				nextcase;
 			$endif
 		default:
-			assert(false, "Unsuported size (%d) for atomic_compare_exchange", size);
+			unreachable("Unsuported size (%d) for atomic_compare_exchange", size);
 	}
 	return 0;
 }
\ No newline at end of file
diff --git a/lib/std/collections/generic_list.c3 b/lib/std/collections/anylist.c3
similarity index 70%
rename from lib/std/collections/generic_list.c3
rename to lib/std/collections/anylist.c3
index 18587f0e1..90cb08bb8 100644
--- a/lib/std/collections/generic_list.c3
+++ b/lib/std/collections/anylist.c3
@@ -1,18 +1,18 @@
 // Copyright (c) 2024 Christoffer Lerno. All rights reserved.
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::collections::generic_list;
+module std::collections::anylist;
 import std::io,std::math;
 
-def GenericPredicate = fn bool(any* value);
-def GenericTest = fn bool(any* type, any* context);
+def AnyPredicate = fn bool(any value);
+def AnyTest = fn bool(any type, any context);
 
-struct GenericList (Printable)
+struct AnyList (Printable)
 {
 	usz size;
 	usz capacity;
-	Allocator* allocator;
-	any** entries;
+	Allocator allocator;
+	any* entries;
 }
 
 
@@ -20,14 +20,14 @@ struct GenericList (Printable)
  * @param initial_capacity "The initial capacity to reserve"
  * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
  **/
-fn GenericList* GenericList.new_init(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap())
+fn AnyList* AnyList.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.size = 0;
 	if (initial_capacity > 0)
 	{
 		initial_capacity = math::next_power_of_2(initial_capacity);
-		self.entries = allocator::alloc_array(allocator, any*, initial_capacity);
+		self.entries = allocator::alloc_array(allocator, any, initial_capacity);
 	}
 	else
 	{
@@ -37,26 +37,17 @@ fn GenericList* GenericList.new_init(&self, usz initial_capacity = 16, Allocator
 	return self;
 }
 
-/**
- * @param initial_capacity "The initial capacity to reserve"
- * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
- **/
-fn GenericList* GenericList.init_new(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(initial_capacity, allocator) @inline;
-}
-
 /**
  * Initialize the list using the temp allocator.
  *
  * @param initial_capacity "The initial capacity to reserve"
  **/
-fn GenericList* GenericList.temp_init(&self, usz initial_capacity = 16)
+fn AnyList* AnyList.temp_init(&self, usz initial_capacity = 16)
 {
 	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-fn usz! GenericList.to_format(&self, Formatter* formatter) @dynamic
+fn usz! AnyList.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -76,12 +67,12 @@ fn usz! GenericList.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
-fn String GenericList.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String AnyList.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("%s", *self, .allocator = allocator);
 }
 
-fn String GenericList.to_tstring(&self)
+fn String AnyList.to_tstring(&self)
 {
 	return string::tformat("%s", *self);
 }
@@ -89,13 +80,13 @@ fn String GenericList.to_tstring(&self)
 /**
  * Push an element on the list by cloning it.
  **/
-macro void GenericList.push(&self, element)
+macro void AnyList.push(&self, element)
 {
 	if (!self.allocator) self.allocator = allocator::heap();
 	self.append_internal(allocator::clone(self.allocator, element));
 }
 
-fn void GenericList.append_internal(&self, any* element) @local
+fn void AnyList.append_internal(&self, any element) @local
 {
 	self.ensure_capacity();
 	self.entries[self.size++] = element;
@@ -104,7 +95,7 @@ fn void GenericList.append_internal(&self, any* element) @local
 /**
  * Free a retained element removed using *_retained.
  **/
-fn void GenericList.free_element(&self, any* element) @inline
+fn void AnyList.free_element(&self, any element) @inline
 {
 	allocator::free(self.allocator, element.ptr);
 }
@@ -115,7 +106,7 @@ fn void GenericList.free_element(&self, any* element) @inline
  *
  * @return! CastResult.TYPE_MISMATCH, IteratorResult.NO_MORE_ELEMENT
  **/
-macro GenericList.pop(&self, $Type)
+macro AnyList.pop(&self, $Type)
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.free_element(self.entries[self.size]);
@@ -126,7 +117,7 @@ macro GenericList.pop(&self, $Type)
  * Pop the last value and allocate the copy using the given allocator.
  * @return! IteratorResult.NO_MORE_ELEMENT
  **/
-fn any*! GenericList.new_pop(&self, Allocator* allocator = allocator::heap())
+fn any! AnyList.new_pop(&self, Allocator allocator = allocator::heap())
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.free_element(self.entries[self.size]);
@@ -137,19 +128,19 @@ fn any*! GenericList.new_pop(&self, Allocator* allocator = allocator::heap())
  * Pop the last value and allocate the copy using the temp allocator
  * @return! IteratorResult.NO_MORE_ELEMENT
  **/
-fn any*! GenericList.temp_pop(&self) => self.new_pop(allocator::temp());
+fn any! AnyList.temp_pop(&self) => self.new_pop(allocator::temp());
 
 /**
  * Pop the last value. It must later be released using list.free_element()
  * @return! IteratorResult.NO_MORE_ELEMENT
  **/
-fn any*! GenericList.pop_retained(&self)
+fn any! AnyList.pop_retained(&self)
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[--self.size];
 }
 
-fn void GenericList.clear(&self)
+fn void AnyList.clear(&self)
 {
 	for (usz i = 0; i < self.size; i++)
 	{
@@ -161,7 +152,7 @@ fn void GenericList.clear(&self)
 /**
  * Same as pop() but pops the first value instead.
  **/
-macro GenericList.pop_first(&self, $Type)
+macro AnyList.pop_first(&self, $Type)
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
@@ -171,7 +162,7 @@ macro GenericList.pop_first(&self, $Type)
 /**
  * Same as pop_retained() but pops the first value instead.
  **/
-fn any*! GenericList.pop_first_retained(&self)
+fn any! AnyList.pop_first_retained(&self)
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
@@ -181,7 +172,7 @@ fn any*! GenericList.pop_first_retained(&self)
 /**
  * Same as new_pop() but pops the first value instead.
  **/
-fn any*! GenericList.new_pop_first(&self, Allocator* allocator = allocator::heap())
+fn any! AnyList.new_pop_first(&self, Allocator allocator = allocator::heap())
 {
 	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.free_element(self.entries[self.size]);
@@ -192,19 +183,19 @@ fn any*! GenericList.new_pop_first(&self, Allocator* allocator = allocator::heap
 /**
  * Same as temp_pop() but pops the first value instead.
  **/
-fn any*! GenericList.temp_pop_first(&self) => self.new_pop_first(allocator::temp());
+fn any! AnyList.temp_pop_first(&self) => self.new_pop_first(allocator::temp());
 
 /**
  * @require index < self.size
  **/
-fn void GenericList.remove_at(&self, usz index)
+fn void AnyList.remove_at(&self, usz index)
 {
 	if (!--self.size || index == self.size) return;
 	self.free_element(self.entries[index]);
 	self.entries[index .. self.size - 1] = self.entries[index + 1 .. self.size];
 }
 
-fn void GenericList.add_all(&self, GenericList* other_list)
+fn void AnyList.add_all(&self, AnyList* other_list)
 {
 	if (!other_list.size) return;
 	self.reserve(other_list.size);
@@ -217,7 +208,7 @@ fn void GenericList.add_all(&self, GenericList* other_list)
 /**
  * Reverse the elements in a list.
  **/
-fn void GenericList.reverse(&self)
+fn void AnyList.reverse(&self)
 {
 	if (self.size < 2) return;
 	usz half = self.size / 2U;
@@ -228,7 +219,7 @@ fn void GenericList.reverse(&self)
 	}
 }
 
-fn any*[] GenericList.array_view(&self)
+fn any[] AnyList.array_view(&self)
 {
 	return self.entries[:self.size];
 }
@@ -236,7 +227,7 @@ fn any*[] GenericList.array_view(&self)
 /**
  * Push an element to the front of the list.
  **/
-macro void GenericList.push_front(&self, type)
+macro void AnyList.push_front(&self, type)
 {
 	self.insert_at(0, type);
 }
@@ -244,16 +235,16 @@ macro void GenericList.push_front(&self, type)
 /**
  * @require index < self.size
  **/
-macro void GenericList.insert_at(&self, usz index, type) @local
+macro void AnyList.insert_at(&self, usz index, type) @local
 {
-	any* value = allocator::copy(self.allocator, type);
+	any value = allocator::copy(self.allocator, type);
 	self.insert_at_internal(self, index, value);
 }
 
 /**
  * @require index < self.size
  **/
-fn void GenericList.insert_at_internal(&self, usz index, any* value) @local
+fn void AnyList.insert_at_internal(&self, usz index, any value) @local
 {
 	self.ensure_capacity();
 	for (usz i = self.size; i > index; i--)
@@ -268,7 +259,7 @@ fn void GenericList.insert_at_internal(&self, usz index, any* value) @local
 /**
  * @require self.size > 0
  **/
-fn void GenericList.remove_last(&self)
+fn void AnyList.remove_last(&self)
 {
 	self.free_element(self.entries[--self.size]);
 }
@@ -276,37 +267,37 @@ fn void GenericList.remove_last(&self)
 /**
  * @require self.size > 0
  **/
-fn void GenericList.remove_first(&self)
+fn void AnyList.remove_first(&self)
 {
 	self.remove_at(0);
 }
 
-macro GenericList.first(&self, $Type)
+macro AnyList.first(&self, $Type)
 {
 	return *anycast(self.first_any(), $Type);
 }
 
-fn any*! GenericList.first_any(&self) @inline
+fn any! AnyList.first_any(&self) @inline
 {
 	return self.size ? self.entries[0] : IteratorResult.NO_MORE_ELEMENT?;
 }
 
-macro GenericList.last(&self, $Type)
+macro AnyList.last(&self, $Type)
 {
 	return *anycast(self.last_any(), $Type);
 }
 
-fn any*! GenericList.last_any(&self) @inline
+fn any! AnyList.last_any(&self) @inline
 {
 	return self.size ? self.entries[self.size - 1] : IteratorResult.NO_MORE_ELEMENT?;
 }
 
-fn bool GenericList.is_empty(&self) @inline
+fn bool AnyList.is_empty(&self) @inline
 {
 	return !self.size;
 }
 
-fn usz GenericList.len(&self) @operator(len) @inline
+fn usz AnyList.len(&self) @operator(len) @inline
 {
 	return self.size;
 }
@@ -314,7 +305,7 @@ fn usz GenericList.len(&self) @operator(len) @inline
 /**
  * @require index < self.size "Index out of range"
  **/
-macro GenericList.get(&self, usz index, $Type)
+macro AnyList.get(&self, usz index, $Type)
 {
 	return *anycast(self.entries[index], $Type);
 }
@@ -322,12 +313,12 @@ macro GenericList.get(&self, usz index, $Type)
 /**
  * @require index < self.size "Index out of range"
  **/
-fn any* GenericList.get_any(&self, usz index) @inline
+fn any AnyList.get_any(&self, usz index) @inline
 {
 	return self.entries[index];
 }
 
-fn void GenericList.free(&self)
+fn void AnyList.free(&self)
 {
 	if (!self.allocator) return;
 	self.clear();
@@ -336,9 +327,9 @@ fn void GenericList.free(&self)
 	self.entries = null;
 }
 
-fn void GenericList.swap(&self, usz i, usz j)
+fn void AnyList.swap(&self, usz i, usz j)
 {
-	any* temp = self.entries[i];
+	any temp = self.entries[i];
 	self.entries[i] = self.entries[j];
 	self.entries[j] = temp;
 }
@@ -347,7 +338,7 @@ fn void GenericList.swap(&self, usz i, usz j)
  * @param filter "The function to determine if it should be removed or not"
  * @return "the number of deleted elements"
  **/
-fn usz GenericList.remove_if(&self, GenericPredicate filter)
+fn usz AnyList.remove_if(&self, AnyPredicate filter)
 {
 	return self._remove_if(filter, false);
 }
@@ -356,12 +347,12 @@ fn usz GenericList.remove_if(&self, GenericPredicate filter)
  * @param selection "The function to determine if it should be kept or not"
  * @return "the number of deleted elements"
  **/
-fn usz GenericList.retain_if(&self, GenericPredicate selection)
+fn usz AnyList.retain_if(&self, AnyPredicate selection)
 {
 	return self._remove_if(selection, true);
 }
 
-macro usz GenericList._remove_if(&self, GenericPredicate filter, bool $invert) @local
+macro usz AnyList._remove_if(&self, AnyPredicate filter, bool $invert) @local
 {
 	usz size = self.size;
 	for (usz i = size, usz k = size; k > 0; k = i)
@@ -387,17 +378,17 @@ macro usz GenericList._remove_if(&self, GenericPredicate filter, bool $invert) @
 	return size - self.size;
 }
 
-fn usz GenericList.remove_using_test(&self, GenericTest filter, any* context)
+fn usz AnyList.remove_using_test(&self, AnyTest filter, any context)
 {
 	return self._remove_using_test(filter, false, context);
 }
 
-fn usz GenericList.retain_using_test(&self, GenericTest filter, any* context)
+fn usz AnyList.retain_using_test(&self, AnyTest filter, any context)
 {
 	return self._remove_using_test(filter, true, context);
 }
 
-macro usz GenericList._remove_using_test(&self, GenericTest filter, bool $invert, ctx) @local
+macro usz AnyList._remove_using_test(&self, AnyTest filter, bool $invert, ctx) @local
 {
 	usz size = self.size;
 	for (usz i = size, usz k = size; k > 0; k = i)
@@ -426,17 +417,17 @@ macro usz GenericList._remove_using_test(&self, GenericTest filter, bool $invert
 /**
  * Reserve at least min_capacity
  **/
-fn void GenericList.reserve(&self, usz min_capacity)
+fn void AnyList.reserve(&self, usz min_capacity)
 {
 	if (!min_capacity) return;
 	if (self.capacity >= min_capacity) return;
 	if (!self.allocator) self.allocator = allocator::heap();
 	min_capacity = math::next_power_of_2(min_capacity);
-	self.entries = allocator::realloc(self.allocator, self.entries, any*.sizeof * min_capacity);
+	self.entries = allocator::realloc(self.allocator, self.entries, any.sizeof * min_capacity);
 	self.capacity = min_capacity;
 }
 
-macro any* GenericList.@item_at(&self, usz index) @operator([])
+macro any AnyList.@item_at(&self, usz index) @operator([])
 {
 	return self.entries[index];
 }
@@ -444,7 +435,7 @@ macro any* GenericList.@item_at(&self, usz index) @operator([])
 /**
  * @require index <= self.size "Index out of range"
  **/
-macro void GenericList.set(&self, usz index, value)
+macro void AnyList.set(&self, usz index, value)
 {
 	if (index == self.size)
 	{
@@ -455,7 +446,7 @@ macro void GenericList.set(&self, usz index, value)
 	self.entries[index] = allocator::copy(self.allocator, value);
 }
 
-fn void GenericList.ensure_capacity(&self, usz added = 1) @inline @private
+fn void AnyList.ensure_capacity(&self, usz added = 1) @inline @private
 {
 	usz new_size = self.size + added;
 	if (self.capacity >= new_size) return;
diff --git a/lib/std/collections/bitset.c3 b/lib/std/collections/bitset.c3
index 76af33693..6ea47cf47 100644
--- a/lib/std/collections/bitset.c3
+++ b/lib/std/collections/bitset.c3
@@ -86,31 +86,17 @@ struct GrowableBitSet
  * @param initial_capacity
  * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
  **/
-fn GrowableBitSet* GrowableBitSet.new_init(&self, usz initial_capacity = 1, Allocator* allocator = allocator::heap())
+fn GrowableBitSet* GrowableBitSet.new_init(&self, usz initial_capacity = 1, Allocator allocator = allocator::heap())
 {
 	self.data.new_init(initial_capacity, allocator);
 	return self;
 }
 
-/**
- * @param initial_capacity
- * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
- **/
-fn GrowableBitSet* GrowableBitSet.init_new(&self, usz initial_capacity = 1, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(initial_capacity, allocator) @inline;
-}
-
 fn GrowableBitSet* GrowableBitSet.temp_init(&self, usz initial_capacity = 1)
 {
 	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-fn GrowableBitSet* GrowableBitSet.init_temp(&self, usz initial_capacity = 1) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init(initial_capacity);
-}
-
 fn void GrowableBitSet.free(&self)
 {
 	self.data.free();
diff --git a/lib/std/collections/enummap.c3 b/lib/std/collections/enummap.c3
index bf5835b08..0b254e8b4 100644
--- a/lib/std/collections/enummap.c3
+++ b/lib/std/collections/enummap.c3
@@ -25,7 +25,7 @@ fn usz! EnumMap.to_format(&self, Formatter* formatter) @dynamic
 	return n;
 }
 
-fn String EnumMap.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String EnumMap.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("%s", *self, .allocator = allocator);
 }
diff --git a/lib/std/collections/enumset.c3 b/lib/std/collections/enumset.c3
index 8eaa79dcd..7f207694d 100644
--- a/lib/std/collections/enumset.c3
+++ b/lib/std/collections/enumset.c3
@@ -141,7 +141,7 @@ fn usz! EnumSet.to_format(&set, Formatter* formatter) @dynamic
 	return n;
 }
 
-fn String EnumSet.to_new_string(&set, Allocator* allocator = allocator::heap()) @dynamic
+fn String EnumSet.to_new_string(&set, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("%s", *set, .allocator = allocator);
 }
diff --git a/lib/std/collections/linkedlist.c3 b/lib/std/collections/linkedlist.c3
index bd3082b28..9b48ac97b 100644
--- a/lib/std/collections/linkedlist.c3
+++ b/lib/std/collections/linkedlist.c3
@@ -3,6 +3,8 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::collections::linkedlist(<Type>);
 
+const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
+
 struct Node @private
 {
 	Node *next;
@@ -12,51 +14,28 @@ struct Node @private
 
 struct LinkedList
 {
-	Allocator *allocator;
+	Allocator allocator;
 	usz size;
 	Node *_first;
 	Node *_last;
 }
 
-fn void LinkedList.push(&self, Type value)
-{
-	self.link_first(value);
-}
-
-fn void LinkedList.push_last(&self, Type value)
-{
-	self.link_last(value);
-}
-
 /**
  * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
  * @return "the initialized list"
  **/
-fn LinkedList* LinkedList.new_init(&self, Allocator* allocator = allocator::heap())
+fn LinkedList* LinkedList.new_init(&self, Allocator allocator = allocator::heap())
 {
 	*self = { .allocator = allocator };
 	return self;
 }
 
-/**
- * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
- * @return "the initialized list"
- **/
-fn LinkedList* LinkedList.init_new(&self, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(allocator);
-}
 
 fn LinkedList* LinkedList.temp_init(&self)
 {
 	return self.new_init(allocator::temp()) @inline;
 }
 
-fn LinkedList* LinkedList.init_temp(&self) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init() @inline;
-}
-
 /**
  * @require self.allocator
  **/
@@ -71,7 +50,7 @@ macro Node* LinkedList.alloc_node(&self) @private
 	return allocator::alloc(self.allocator, Node);
 }
 
-fn void LinkedList.link_first(&self, Type value) @private
+fn void LinkedList.push_front(&self, Type value)
 {
 	Node *first = self._first;
 	Node *new_node = self.alloc_node();
@@ -88,7 +67,7 @@ fn void LinkedList.link_first(&self, Type value) @private
 	self.size++;
 }
 
-fn void LinkedList.link_last(&self, Type value) @private
+fn void LinkedList.push(&self, Type value)
 {
 	Node *last = self._last;
 	Node *new_node = self.alloc_node();
@@ -172,7 +151,7 @@ fn void LinkedList.set(&self, usz index, Type element)
 /**
  * @require index < self.size
  **/
-fn void LinkedList.remove(&self, usz index)
+fn void LinkedList.remove_at(&self, usz index)
 {
 	self.unlink(self.node_at_index(index));
 }
@@ -180,14 +159,14 @@ fn void LinkedList.remove(&self, usz index)
 /**
  * @require index <= self.size
  **/
-fn void LinkedList.insert(&self, usz index, Type element)
+fn void LinkedList.insert_at(&self, usz index, Type element)
 {
 	switch (index)
 	{
 		case 0:
-			self.push(element);
+			self.push_front(element);
 		case self.size:
-			self.push_last(element);
+			self.push(element);
 		default:
 			self.link_before(self.node_at_index(index), element);
 	}
@@ -232,51 +211,77 @@ fn void LinkedList.unlink_first(&self) @private
 	self.size--;
 }
 
-fn bool LinkedList.remove_value(&self, Type t)
+fn usz LinkedList.remove(&self, Type t) @if(ELEMENT_IS_EQUATABLE)
 {
-	for (Node* node = self._first; node != null; node = node.next)
+	usz start = self.size;
+	Node* node = self._first;
+	while (node)
 	{
-		if (node.value == t)
+		switch
 		{
-			self.unlink(node);
-			return true;
+			case equals(node.value, t):
+				Node* next = node.next;
+				self.unlink(node);
+				node = next;
+			default:
+				node = node.next;
 		}
 	}
-	return false;
+	return start - self.size;
 }
 
-fn bool LinkedList.remove_last_value(&self, Type t)
+fn Type! LinkedList.pop(&self)
 {
-	for (Node* node = self._last; node != null; node = node.prev)
-	{
-		if (node.value == t)
-		{
-			self.unlink(node);
-			return true;
-		}
-	}
-	return false;
+	if (!self._last) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.unlink_last();
+	return self._last.value;
 }
 
-fn Type! LinkedList.pop(&self)
+fn Type! LinkedList.pop_front(&self)
 {
 	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	defer self.unlink_first();
 	return self._first.value;
 }
 
-fn void! LinkedList.remove_last(&self)
+fn void! LinkedList.remove_last(&self) @maydiscard
 {
 	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	self.unlink_last();
 }
 
-fn void! LinkedList.remove_first(&self)
+fn void! LinkedList.remove_first(&self) @maydiscard
 {
 	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
 	self.unlink_first();
 }
 
+
+fn bool LinkedList.remove_first_match(&self, Type t) @if(ELEMENT_IS_EQUATABLE)
+{
+	for (Node* node = self._first; node != null; node = node.next)
+	{
+		if (node.value == t)
+		{
+			self.unlink(node);
+			return true;
+		}
+	}
+	return false;
+}
+
+fn bool LinkedList.remove_last_match(&self, Type t)  @if(ELEMENT_IS_EQUATABLE)
+{
+	for (Node* node = self._last; node != null; node = node.prev)
+	{
+		if (node.value == t)
+		{
+			self.unlink(node);
+			return true;
+		}
+	}
+	return false;
+}
 /**
  * @require self._last
  **/
diff --git a/lib/std/collections/list.c3 b/lib/std/collections/list.c3
index d1607bb68..fa3a2a2db 100644
--- a/lib/std/collections/list.c3
+++ b/lib/std/collections/list.c3
@@ -5,7 +5,7 @@ module std::collections::list(<Type>);
 import std::io,std::math;
 
 def ElementPredicate = fn bool(Type *type);
-def ElementTest = fn bool(Type *type, any* context);
+def ElementTest = fn bool(Type *type, any context);
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 const ELEMENT_IS_POINTER = Type.kindof == POINTER;
 
@@ -13,7 +13,7 @@ struct List (Printable)
 {
 	usz size;
 	usz capacity;
-	Allocator *allocator;
+	Allocator allocator;
 	Type *entries;
 }
 
@@ -22,7 +22,7 @@ struct List (Printable)
  * @param initial_capacity "The initial capacity to reserve"
  * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
  **/
-fn List* List.new_init(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap())
+fn List* List.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.size = 0;
@@ -39,15 +39,6 @@ fn List* List.new_init(&self, usz initial_capacity = 16, Allocator* allocator =
 	return self;
 }
 
-/**
- * @param initial_capacity "The initial capacity to reserve"
- * @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
- **/
-fn List* List.init_new(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(initial_capacity, allocator) @inline;
-}
-
 /**
  * Initialize the list using the temp allocator.
  *
@@ -58,20 +49,10 @@ fn List* List.temp_init(&self, usz initial_capacity = 16)
 	return self.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-/**
- * Initialize the list using the temp allocator.
- *
- * @param initial_capacity "The initial capacity to reserve"
- **/
-fn List* List.init_temp(&self, usz initial_capacity = 16) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init(initial_capacity) @inline;
-}
-
 /**
  * @require self.size == 0 "The List must be empty"
  **/
-fn void List.init_wrapping_array(&self, Type[] types, Allocator* allocator = allocator::heap())
+fn void List.init_wrapping_array(&self, Type[] types, Allocator allocator = allocator::heap())
 {
 	self.allocator = allocator;
 	self.size = types.len;
@@ -99,7 +80,7 @@ fn usz! List.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
-fn String List.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String List.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("%s", *self, .allocator = allocator);
 }
@@ -110,21 +91,14 @@ fn String List.to_tstring(&self)
 }
 
 fn void List.push(&self, Type element) @inline
-{
-	self.append(element);
-}
-
-fn void List.append(&self, Type element)
 {
 	self.ensure_capacity();
-	self.entries[self.size++] = element;
+    self.entries[self.size++] = element;
 }
 
-/**
- * @require self.size > 0
- **/
-fn Type List.pop(&self)
+fn Type! List.pop(&self)
 {
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.entries[--self.size];
 }
 
@@ -136,11 +110,11 @@ fn void List.clear(&self)
 /**
  * @require self.size > 0
  **/
-fn Type List.pop_first(&self)
+fn Type! List.pop_first(&self)
 {
-	Type value = self.entries[0];
-	self.remove_at(0);
-	return value;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	defer self.remove_at(0);
+	return self.entries[0];
 }
 
 /**
@@ -163,7 +137,7 @@ fn void List.add_all(&self, List* other_list)
 }
 
 
-fn Type[] List.to_new_array(&self, Allocator* allocator = allocator::heap())
+fn Type[] List.to_new_array(&self, Allocator allocator = allocator::heap())
 {
 	if (!self.size) return Type[] {};
 	Type[] result = allocator::alloc_array(allocator, Type, self.size);
@@ -232,30 +206,28 @@ fn void List.set_at(&self, usz index, Type type)
 	self.entries[index] = type;
 }
 
-/**
- * @require self.size > 0
- **/
-fn void List.remove_last(&self)
+fn void! List.remove_last(&self) @maydiscard
 {
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.size--;
 }
 
-/**
- * @require self.size > 0
- **/
-fn void List.remove_first(&self)
+fn void! List.remove_first(&self) @maydiscard
 {
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
 	self.remove_at(0);
 }
 
-fn Type* List.first(&self)
+fn Type! List.first(&self)
 {
-	return self.size ? &self.entries[0] : null;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	return self.entries[0];
 }
 
-fn Type* List.last(&self)
+fn Type! List.last(&self)
 {
-	return self.size ? &self.entries[self.size - 1] : null;
+	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	return self.entries[self.size - 1];
 }
 
 fn bool List.is_empty(&self) @inline
@@ -335,12 +307,12 @@ macro usz List._remove_if(&self, ElementPredicate filter, bool $invert) @local
 	return size - self.size;
 }
 
-fn usz List.remove_using_test(&self, ElementTest filter, any* context)
+fn usz List.remove_using_test(&self, ElementTest filter, any context)
 {
 	return self._remove_using_test(filter, false, context);
 }
 
-fn usz List.retain_using_test(&self, ElementTest filter, any* context)
+fn usz List.retain_using_test(&self, ElementTest filter, any context)
 {
 	return self._remove_using_test(filter, true, context);
 }
@@ -457,18 +429,38 @@ fn bool List.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 }
 
 
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
+fn bool List.remove_last_match(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
+{
+	return @ok(self.remove_at(self.rindex_of(value)));
+}
+
+/**
+ * @param [&inout] self "The list to remove elements from"
+ * @param value "The value to remove"
+ * @return "true if the value was found"
+ **/
+fn bool List.remove_first_match(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
+{
+	return @ok(self.remove_at(self.index_of(value)));
+}
+
 /**
  * @param [&inout] self "The list to remove elements from"
  * @param value "The value to remove"
  * @return "the number of deleted elements."
  **/
-fn usz List.remove(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
+fn usz List.remove_all_matches(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 {
 	usz size = self.size;
 	for (usz i = size; i > 0; i--)
 	{
 		if (!equals(self.entries[i - 1], value)) continue;
-		for (usz j = i; j < size; j++)
+		for (usz j = i; j < self.size; j++)
 		{
 			self.entries[j - 1] = self.entries[j];
 		}
@@ -477,10 +469,10 @@ fn usz List.remove(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 	return size - self.size;
 }
 
-fn void List.remove_all(&self, List* other_list) @if(ELEMENT_IS_EQUATABLE)
+fn void List.remove_all_from(&self, List* other_list) @if(ELEMENT_IS_EQUATABLE)
 {
 	if (!other_list.size) return;
-	foreach (v : other_list) self.remove(v);
+	foreach (v : other_list) self.remove_all_matches(v);
 }
 
 /**
diff --git a/lib/std/collections/map.c3 b/lib/std/collections/map.c3
index 6877e85ab..fbb753131 100644
--- a/lib/std/collections/map.c3
+++ b/lib/std/collections/map.c3
@@ -13,7 +13,7 @@ const bool COPY_KEYS = types::implements_copy(Key);
 struct HashMap
 {
 	Entry*[] table;
-	Allocator* allocator;
+	Allocator allocator;
 	uint count; // Number of elements
 	uint threshold; // Resize limit
 	float load_factor;
@@ -26,7 +26,7 @@ struct HashMap
  * @require !self.allocator "Map was already initialized"
  * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
  **/
-fn HashMap* HashMap.new_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator* allocator = allocator::heap())
+fn HashMap* HashMap.new_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
 {
 	capacity = math::next_power_of_2(capacity);
 	self.allocator = allocator;
@@ -36,18 +36,6 @@ fn HashMap* HashMap.new_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, fl
 	return self;
 }
 
-/**
- * @param [&inout] allocator "The allocator to use"
- * @require capacity > 0 "The capacity must be 1 or higher"
- * @require load_factor > 0.0 "The load factor must be higher than 0"
- * @require !map.allocator "Map was already initialized"
- * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
- **/
-fn HashMap* HashMap.init_new(&map, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return map.new_init(capacity, load_factor, allocator);
-}
-
 /**
  * @require capacity > 0 "The capacity must be 1 or higher"
  * @require load_factor > 0.0 "The load factor must be higher than 0"
@@ -59,16 +47,6 @@ fn HashMap* HashMap.temp_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, f
 	return self.new_init(capacity, load_factor, allocator::temp()) @inline;
 }
 
-/**
- * @require capacity > 0 "The capacity must be 1 or higher"
- * @require load_factor > 0.0 "The load factor must be higher than 0"
- * @require !map.allocator "Map was already initialized"
- * @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
- **/
-fn HashMap* HashMap.init_temp(&map, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR) @deprecated("Replaced by temp_init")
-{
-	return map.temp_init(capacity, load_factor) @inline;
-}
 
 /**
  * Has this hash map been initialized yet?
@@ -85,23 +63,13 @@ fn bool HashMap.is_initialized(&map)
  * @param [&inout] allocator "The allocator to use"
  * @param [&in] other_map "The map to copy from."
  **/
-fn HashMap* HashMap.new_init_from_map(&self, HashMap* other_map, Allocator* allocator = allocator::heap())
+fn HashMap* HashMap.new_init_from_map(&self, HashMap* other_map, Allocator allocator = allocator::heap())
 {
 	self.new_init(other_map.table.len, other_map.load_factor, allocator);
 	self.put_all_for_create(other_map);
 	return self;
 }
 
-/**
- * @param [&inout] allocator "The allocator to use"
- * @param [&in] other_map "The map to copy from."
- **/
-fn HashMap* HashMap.init_new_from_map(&self, HashMap* other_map, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init_from_map")
-
-{
-	return self.new_init_from_map(other_map, allocator) @inline;
-}
-
 /**
  * @param [&in] other_map "The map to copy from."
  **/
@@ -110,15 +78,6 @@ fn HashMap* HashMap.temp_init_from_map(&map, HashMap* other_map)
 	return map.new_init_from_map(other_map, allocator::temp()) @inline;
 }
 
-/**
- * @param [&in] other_map "The map to copy from."
- **/
-fn HashMap* HashMap.init_temp_from_map(&map, HashMap* other_map) @deprecated("Replaced by temp_init_from_map")
-{
-	return map.temp_init_from_map(other_map) @inline;
-}
-
-
 fn bool HashMap.is_empty(&map) @inline
 {
 	return !map.count;
@@ -243,7 +202,7 @@ fn Key[] HashMap.key_tlist(&map)
 	return map.key_new_list(allocator::temp()) @inline;
 }
 
-fn Key[] HashMap.key_new_list(&map, Allocator* allocator = allocator::heap())
+fn Key[] HashMap.key_new_list(&map, Allocator allocator = allocator::heap())
 {
 	if (!map.count) return {};
 
@@ -287,7 +246,7 @@ fn Value[] HashMap.value_tlist(&map)
 	return map.value_new_list(allocator::temp()) @inline;
 }
 
-fn Value[] HashMap.value_new_list(&map, Allocator* allocator = allocator::heap())
+fn Value[] HashMap.value_new_list(&map, Allocator allocator = allocator::heap())
 {
 	if (!map.count) return {};
 	Value[] list = allocator::alloc_array(allocator, Value, map.count);
diff --git a/lib/std/collections/object.c3 b/lib/std/collections/object.c3
index 08753c198..a0ae74456 100644
--- a/lib/std/collections/object.c3
+++ b/lib/std/collections/object.c3
@@ -11,7 +11,7 @@ const Object NULL_OBJECT = { .type = void*.typeid };
 struct Object (Printable)
 {
 	typeid type;
-	Allocator* allocator;
+	Allocator allocator;
 	union
 	{
 		uint128 i;
@@ -76,7 +76,7 @@ fn usz! Object.to_format(&self, Formatter* formatter) @dynamic
 	}
 }
 
-fn Object* new_obj(Allocator* allocator)
+fn Object* new_obj(Allocator allocator)
 {
 	return allocator::new(allocator, Object, { .allocator = allocator, .type = void.typeid });
 }
@@ -86,22 +86,22 @@ fn Object* new_null()
 	return &NULL_OBJECT;
 }
 
-fn Object* new_int(int128 i, Allocator* allocator)
+fn Object* new_int(int128 i, Allocator allocator)
 {
 	return allocator::new(allocator, Object, { .i = i, .allocator = allocator, .type = int128.typeid });
 }
 
-macro Object* new_enum(e, Allocator* allocator)
+macro Object* new_enum(e, Allocator allocator)
 {
 	return allocator::new(allocator, Object, { .i = (int128)e, .allocator = allocator, .type = @typeid(e) });
 }
 
-fn Object* new_float(double f, Allocator* allocator)
+fn Object* new_float(double f, Allocator allocator)
 {
 	return allocator::new(allocator, Object, { .f = f, .allocator = allocator, .type = double.typeid });
 }
 
-fn Object* new_string(String s, Allocator* allocator)
+fn Object* new_string(String s, Allocator allocator)
 {
 	return allocator::new(allocator, Object, { .s = s.copy(allocator), .allocator = allocator, .type = String.typeid });
 }
@@ -234,10 +234,10 @@ macro Object* Object.set_at(&self, usz index, String key, value)
  * @require self.is_indexable()
  * @ensure return != null
  **/
-macro Object* Object.append(&self, value)
+macro Object* Object.push(&self, value)
 {
 	Object* val = self.object_from_value(value);
-	self.append_object(val);
+	self.push_object(val);
 	return val;
 }
 
@@ -268,10 +268,10 @@ fn usz Object.get_len(&self)
 /**
  * @require self.is_indexable()
  **/
-fn void Object.append_object(&self, Object* to_append)
+fn void Object.push_object(&self, Object* to_append)
 {
 	self.init_array_if_needed();
-	self.array.append(to_append);
+	self.array.push(to_append);
 }
 
 /**
@@ -282,11 +282,11 @@ fn void Object.set_object_at(&self, usz index, Object* to_set)
 	self.init_array_if_needed();
 	while (self.array.len() < index)
 	{
-		self.array.append(&NULL_OBJECT);
+		self.array.push(&NULL_OBJECT);
 	}
 	if (self.array.len() == index)
 	{
-		self.array.append(to_set);
+		self.array.push(to_set);
 		return;
 	}
 	self.array.get(index).free();
diff --git a/lib/std/collections/priorityqueue.c3 b/lib/std/collections/priorityqueue.c3
index e96bfd690..a66f616d5 100644
--- a/lib/std/collections/priorityqueue.c3
+++ b/lib/std/collections/priorityqueue.c3
@@ -36,12 +36,7 @@ struct PrivatePriorityQueue (Printable)
 	Heap heap;
 }
 
-fn void PrivatePriorityQueue.init_new(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap()) @inline @deprecated("Replaced by new_init")
-{
-	return self.new_init(initial_capacity, allocator);
-}
-
-fn void PrivatePriorityQueue.new_init(&self, usz initial_capacity = 16, Allocator* allocator = allocator::heap()) @inline
+fn void PrivatePriorityQueue.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap()) @inline
 {
 	self.heap.new_init(initial_capacity, allocator);
 }
@@ -51,11 +46,6 @@ fn void PrivatePriorityQueue.temp_init(&self, usz initial_capacity = 16) @inline
 	self.heap.new_init(initial_capacity, allocator::temp()) @inline;
 }
 
-fn void PrivatePriorityQueue.init_temp(&self, usz initial_capacity = 16) @inline @deprecated("Replaced by temp_init")
-{
-	return self.temp_init(initial_capacity) @inline;
-}
-
 fn void PrivatePriorityQueue.push(&self, Type element)
 {
 	self.heap.push(element);
@@ -117,7 +107,7 @@ fn Type! PrivatePriorityQueue.pop(&self)
 	return self.heap.pop();
 }
 
-fn Type! PrivatePriorityQueue.peek(&self)
+fn Type! PrivatePriorityQueue.first(&self)
 {
 	if (!self.len()) return IteratorResult.NO_MORE_ELEMENT?;
 	return self.heap.get(0);
@@ -141,7 +131,7 @@ fn bool PrivatePriorityQueue.is_empty(&self)
 /**
  * @require index < self.len()
  */
-fn Type PrivatePriorityQueue.peek_at(&self, usz index) @operator([])
+fn Type PrivatePriorityQueue.get(&self, usz index) @operator([])
 {
 	return self.heap[index];
 }
@@ -151,7 +141,7 @@ fn usz! PrivatePriorityQueue.to_format(&self, Formatter* formatter) @dynamic
 	return self.heap.to_format(formatter);
 }
 
-fn String PrivatePriorityQueue.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String PrivatePriorityQueue.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return self.heap.to_new_string(allocator);
 }
diff --git a/lib/std/collections/range.c3 b/lib/std/collections/range.c3
index 0b784bbe0..e09a45534 100644
--- a/lib/std/collections/range.c3
+++ b/lib/std/collections/range.c3
@@ -29,7 +29,7 @@ fn Type Range.get(&self, usz index) @operator([])
 	return (Type)(self.start + (usz)index);
 }
 
-fn String Range.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String Range.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("[%s..%s]", self.start, self.end, .allocator = allocator);
 }
@@ -66,7 +66,7 @@ fn usz! ExclusiveRange.to_format(&self, Formatter* formatter) @dynamic
 	return formatter.printf("[%s..<%s]", self.start, self.end)!;
 }
 
-fn String ExclusiveRange.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String ExclusiveRange.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return string::new_format("[%s..<%s]", self.start, self.end, .allocator = allocator);
 }
diff --git a/lib/std/collections/ringbuffer.c3 b/lib/std/collections/ringbuffer.c3
index 507dd9116..895cfcf5f 100644
--- a/lib/std/collections/ringbuffer.c3
+++ b/lib/std/collections/ringbuffer.c3
@@ -12,7 +12,7 @@ fn void RingBuffer.init(&self) @inline
 	*self = {};
 }
 
-fn void RingBuffer.putc(&self, Type c)
+fn void RingBuffer.push(&self, Type c)
 {
 	if (self.written < SIZE)
 	{
@@ -26,7 +26,7 @@ fn void RingBuffer.putc(&self, Type c)
 	}
 }
 
-fn Type RingBuffer.getc(&self, usz index)
+fn Type RingBuffer.get(&self, usz index) @operator([])
 {
 	index %= SIZE;
 	usz avail = SIZE - self.head;
@@ -37,7 +37,7 @@ fn Type RingBuffer.getc(&self, usz index)
 	return self.buf[index - avail];
 }
 
-fn Type! RingBuffer.popc(&self)
+fn Type! RingBuffer.pop(&self)
 {
 	switch
 	{
@@ -52,7 +52,7 @@ fn Type! RingBuffer.popc(&self)
 	}
 }
 
-fn usz RingBuffer.get(&self, usz index, Type[] buffer)
+fn usz RingBuffer.read(&self, usz index, Type[] buffer)
 {
 	index %= SIZE;
 	if (self.written < SIZE)
@@ -87,7 +87,7 @@ fn usz RingBuffer.get(&self, usz index, Type[] buffer)
 	return n1 + n2;
 }
 
-fn void RingBuffer.push(&self, Type[] buffer)
+fn void RingBuffer.write(&self, Type[] buffer)
 {
 	usz i;
 	while (self.written < SIZE && i < buffer.len)
diff --git a/lib/std/core/allocators/arena_allocator.c3 b/lib/std/core/allocators/arena_allocator.c3
index 49ee2c063..84a6cd026 100644
--- a/lib/std/core/allocators/arena_allocator.c3
+++ b/lib/std/core/allocators/arena_allocator.c3
@@ -52,7 +52,7 @@ fn void ArenaAllocator.reset(&self, usz mark) @dynamic => self.used = mark;
  * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
  * @require size > 0
  **/
-fn void*! ArenaAllocator.acquire(&self, usz size, bool clear, usz alignment, usz offset) @dynamic
+fn void*! ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	usz total_len = self.data.len;
@@ -65,7 +65,7 @@ fn void*! ArenaAllocator.acquire(&self, usz size, bool clear, usz alignment, usz
 	self.used = end;
 	ArenaAllocatorHeader* header = mem - ArenaAllocatorHeader.sizeof;
 	header.size = size;
-	if (clear) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
+	if (init_type == ZERO) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
 	return mem;
 }
 
@@ -75,7 +75,7 @@ fn void*! ArenaAllocator.acquire(&self, usz size, bool clear, usz alignment, usz
  * @require old_pointer != null
  * @require size > 0
  **/
-fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignment, usz offset) @dynamic
+fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	assert(old_pointer >= self.data.ptr, "Pointer originates from a different allocator.");
@@ -100,7 +100,7 @@ fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignmen
 		return old_pointer;
 	}
 	// Otherwise just allocate new memory.
-	void* mem = self.acquire(size, false, alignment, 0)!;
+	void* mem = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	return mem;
 }
\ No newline at end of file
diff --git a/lib/std/core/allocators/dynamic_arena.c3 b/lib/std/core/allocators/dynamic_arena.c3
index 495cf6d76..8691ccaec 100644
--- a/lib/std/core/allocators/dynamic_arena.c3
+++ b/lib/std/core/allocators/dynamic_arena.c3
@@ -6,7 +6,7 @@ import std::math;
 
 struct DynamicArenaAllocator (Allocator)
 {
-	Allocator* backing_allocator;
+	Allocator backing_allocator;
 	DynamicArenaPage* page;
 	DynamicArenaPage* unused_page;
 	usz page_size;
@@ -16,7 +16,7 @@ struct DynamicArenaAllocator (Allocator)
  * @param [&inout] allocator
  * @require page_size >= 128
  **/
-fn void DynamicArenaAllocator.init(&self, usz page_size, Allocator* allocator)
+fn void DynamicArenaAllocator.init(&self, usz page_size, Allocator allocator)
 {
 	self.page = null;
 	self.unused_page = null;
@@ -77,7 +77,7 @@ fn void DynamicArenaAllocator.release(&self, void* ptr, bool) @dynamic
  * @require old_pointer != null `Resize doesn't handle null pointers`
  * @require self.page `tried to realloc pointer on invalid allocator`
  */
-fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment, usz offset) @dynamic
+fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	DynamicArenaPage* current_page = self.page;
 	alignment = alignment_for_allocation(alignment);
@@ -102,7 +102,7 @@ fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz a
 		current_page.used += add_size;
 		return old_pointer;
 	}
-	void* new_mem = self.acquire(size, false, alignment, 0)!;
+	void* new_mem = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(new_mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT);
 	return new_mem;
 }
@@ -158,7 +158,7 @@ fn void*! DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @loca
  * @require size > 0 `acquire expects size > 0`
  * @require !alignment || math::is_power_of_2(alignment)
  */
-fn void*! DynamicArenaAllocator.acquire(&self, usz size, bool clear, usz alignment, usz offset) @dynamic
+fn void*! DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	DynamicArenaPage* page = self.page;
@@ -195,6 +195,6 @@ fn void*! DynamicArenaAllocator.acquire(&self, usz size, bool clear, usz alignme
 		chunk.size = size;
 		return mem;
 	|}!;
-	if (clear) mem::clear(ptr, size, mem::DEFAULT_MEM_ALIGNMENT);
+	if (init_type == ZERO) mem::clear(ptr, size, mem::DEFAULT_MEM_ALIGNMENT);
 	return ptr;
 }
diff --git a/lib/std/core/allocators/heap_allocator.c3 b/lib/std/core/allocators/heap_allocator.c3
index f74d656d9..45e26bb3c 100644
--- a/lib/std/core/allocators/heap_allocator.c3
+++ b/lib/std/core/allocators/heap_allocator.c3
@@ -21,16 +21,16 @@ fn void SimpleHeapAllocator.init(&self, MemoryAllocFn allocator)
 	self.free_list = null;
 }
 
-fn void*! SimpleHeapAllocator.acquire(&self, usz size, bool clear, usz alignment, usz offset) @dynamic
+fn void*! SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
-	if (clear)
+	if (init_type == ZERO)
 	{
 		return alignment > 0 ? @aligned_alloc(self._calloc, size, alignment) : self._calloc(size);
 	}
 	return alignment > 0 ? @aligned_alloc(self._alloc, size, alignment) : self._alloc(size);
 }
 
-fn void*! SimpleHeapAllocator.resize(&self, void* old_pointer, usz size, usz alignment, usz offset) @dynamic
+fn void*! SimpleHeapAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	return alignment > 0
 		? @aligned_realloc(self._calloc, self._free, old_pointer, size, alignment)
diff --git a/lib/std/core/allocators/libc_allocator.c3 b/lib/std/core/allocators/libc_allocator.c3
index aafec93d9..602aa8669 100644
--- a/lib/std/core/allocators/libc_allocator.c3
+++ b/lib/std/core/allocators/libc_allocator.c3
@@ -12,9 +12,9 @@ module std::core::mem::allocator @if(env::POSIX);
 import std::os;
 import libc;
 
-fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
-	if (clear)
+	if (init_type == ZERO)
 	{
 		void* data @noinit;
 		if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
@@ -43,19 +43,9 @@ fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz
 	}
 }
 
-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
-	if (!new_bytes)
-	{
-		self.release(old_ptr, alignment > 0);
-		return null;
-	}
-	if (!old_ptr)
-	{
-		return self.acquire(new_bytes, false, alignment, 0);
-	}
 	if (alignment <= mem::DEFAULT_MEM_ALIGNMENT) return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
-
     void* new_ptr;
 	if (posix::posix_memalign(&new_ptr, alignment, new_bytes)) return AllocationFailure.OUT_OF_MEMORY?;
 
@@ -83,9 +73,9 @@ module std::core::mem::allocator @if(env::WIN32);
 import std::os::win32;
 import libc;
 
-fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
-	if (clear)
+	if (init_type == ZERO)
 	{
 		if (alignment > 0)
 		{
@@ -101,7 +91,7 @@ fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz
     return data;
 }
 
-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
@@ -123,9 +113,9 @@ fn void LibcAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
 module std::core::mem::allocator @if(!env::WIN32 && !env::POSIX);
 import libc;
 
-fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
-	if (clear)
+	if (init_type == ZERO)
 	{
 		void* data = alignment ? @aligned_alloc(fn void*(usz bytes) => libc::calloc(bytes, 1), bytes, alignment)!! : libc::calloc(bytes, 1);
         return data ?: AllocationFailure.OUT_OF_MEMORY?;
@@ -142,7 +132,7 @@ fn void*! LibcAllocator.acquire(&self, usz bytes, bool clear, usz alignment, usz
 }
 
 
-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment, usz offset) @dynamic
+fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
diff --git a/lib/std/core/allocators/on_stack_allocator.c3 b/lib/std/core/allocators/on_stack_allocator.c3
index 5595ec559..ce9cc96a4 100644
--- a/lib/std/core/allocators/on_stack_allocator.c3
+++ b/lib/std/core/allocators/on_stack_allocator.c3
@@ -2,7 +2,7 @@ module std::core::mem::allocator;
 
 struct OnStackAllocator (Allocator)
 {
-	Allocator* backing_allocator;
+	Allocator backing_allocator;
 	char[] data;
 	usz used;
 	OnStackAllocatorExtraChunk* chunk;
@@ -20,7 +20,7 @@ struct OnStackAllocatorExtraChunk @local
  * @param [&inout] allocator
  * Initialize a memory arena for use using the provided bytes.
  **/
-fn void OnStackAllocator.init(&self, char[] data, Allocator* allocator)
+fn void OnStackAllocator.init(&self, char[] data, Allocator allocator)
 {
 	self.data = data;
 	self.backing_allocator = allocator;
@@ -103,18 +103,18 @@ fn OnStackAllocatorExtraChunk* on_stack_allocator_find_chunk(OnStackAllocator* a
  * @require old_pointer != null
  * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
  **/
-fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment, usz deprecated) @dynamic
+fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	if (!allocation_in_stack_mem(self, old_pointer))
 	{
 		OnStackAllocatorExtraChunk* chunk = on_stack_allocator_find_chunk(self, old_pointer);
 		assert(chunk, "Tried to realloc pointer not belonging to the allocator");
-		return chunk.data = self.backing_allocator.resize(old_pointer, size, alignment, 0)!;
+		return chunk.data = self.backing_allocator.resize(old_pointer, size, alignment)!;
 	}
 
 	OnStackAllocatorHeader* header = old_pointer - OnStackAllocatorHeader.sizeof;
 	usz old_size = header.size;
-	void* mem = self.acquire(size, false, alignment, 0)!;
+	void* mem = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(mem, old_pointer, old_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	return mem;
 }
@@ -123,7 +123,7 @@ fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignm
  * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
  * @require size > 0
  **/
-fn void*! OnStackAllocator.acquire(&self, usz size, bool clear, usz alignment, usz deprecated) @dynamic
+fn void*! OnStackAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	bool aligned = alignment > 0;
 	alignment = alignment_for_allocation(alignment);
@@ -132,7 +132,7 @@ fn void*! OnStackAllocator.acquire(&self, usz size, bool clear, usz alignment, u
 	void* unaligned_pointer_to_offset = start_mem + self.used + OnStackAllocatorHeader.sizeof ;
 	void* mem = mem::aligned_pointer(unaligned_pointer_to_offset, alignment);
 	usz end = (usz)(mem - self.data.ptr) + size;
-	Allocator* backing_allocator = self.backing_allocator;
+	Allocator backing_allocator = self.backing_allocator;
 
 	if (end > total_len)
 	{
@@ -140,7 +140,7 @@ fn void*! OnStackAllocator.acquire(&self, usz size, bool clear, usz alignment, u
 		defer catch allocator::free(backing_allocator, chunk);
 		defer try self.chunk = chunk;
 		*chunk = { .prev = self.chunk, .is_aligned = aligned };
-		return chunk.data = backing_allocator.acquire(size, clear, aligned ? alignment : 0, 0)!;
+		return chunk.data = backing_allocator.acquire(size, init_type, aligned ? alignment : 0)!;
 	}
 	self.used = end;
 	OnStackAllocatorHeader* header = mem - OnStackAllocatorHeader.sizeof;
diff --git a/lib/std/core/allocators/temp_allocator.c3 b/lib/std/core/allocators/temp_allocator.c3
index 5b5a1c143..8f60cf4ea 100644
--- a/lib/std/core/allocators/temp_allocator.c3
+++ b/lib/std/core/allocators/temp_allocator.c3
@@ -9,7 +9,7 @@ struct TempAllocatorChunk @local
 
 struct TempAllocator (Allocator)
 {
-	Allocator* backing_allocator;
+	Allocator backing_allocator;
 	TempAllocatorPage* last_page;
 	usz used;
 	usz capacity;
@@ -35,7 +35,7 @@ macro bool TempAllocatorPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED ==
 /**
  * @require size >= 16
  **/
-fn TempAllocator*! new_temp_allocator(usz size, Allocator* allocator)
+fn TempAllocator*! new_temp_allocator(usz size, Allocator allocator)
 {
 	TempAllocator* temp = allocator::alloc_with_padding(allocator, TempAllocator, size)!;
 	temp.last_page = null;
@@ -45,11 +45,6 @@ fn TempAllocator*! new_temp_allocator(usz size, Allocator* allocator)
 	return temp;
 }
 
-fn TempAllocator*! new_temp(usz size, Allocator* allocator) @deprecated("Use new_temp_allocator")
-{
-	return new_temp_allocator(size, allocator);
-}
-
 fn usz TempAllocator.mark(&self) @dynamic => self.used;
 
 fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
@@ -94,13 +89,13 @@ fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size,
 	*pointer_to_prev = page.prev_page;
 	usz page_size = page.pagesize();
 	// Clear on size > original size.
-	void* data = self.acquire(size, size > page_size, alignment, 0)!;
+	void* data = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(data, &page.data[0], page_size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 	self.backing_allocator.release(real_pointer, page.is_aligned());
 	return data;
 }
 
-fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment, usz deprecated) @dynamic
+fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
 {
 	TempAllocatorChunk *chunk = pointer - TempAllocatorChunk.sizeof;
 	if (chunk.size == (usz)-1)
@@ -111,8 +106,7 @@ fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment, us
 		return self._realloc_page(page, size, alignment);
 	}
 
-	// TODO optimize last allocation
-	TempAllocatorChunk* data = self.acquire(size, size > chunk.size, alignment, 0)!;
+	TempAllocatorChunk* data = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(data, pointer, chunk.size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
 
 	return data;
@@ -123,7 +117,7 @@ fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment, us
  * @require !alignment || math::is_power_of_2(alignment)
  * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
  **/
-fn void*! TempAllocator.acquire(&self, usz size, bool clear, usz alignment, usz deprecated) @dynamic
+fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	void* start_mem = &self.data;
@@ -142,7 +136,7 @@ fn void*! TempAllocator.acquire(&self, usz size, bool clear, usz alignment, usz
 		TempAllocatorChunk* chunk_start = mem - TempAllocatorChunk.sizeof;
 		chunk_start.size = size;
 		self.used = new_usage;
-		if (clear) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
+		if (init_type == ZERO) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
 		return mem;
 	}
 
@@ -154,7 +148,7 @@ fn void*! TempAllocator.acquire(&self, usz size, bool clear, usz alignment, usz
 	{
 		// This is actually simpler, since it will create the offset for us.
 		usz total_alloc_size = mem::aligned_offset(TempAllocatorPage.sizeof + size, alignment);
-		if (clear)
+		if (init_type == ZERO)
 		{
 			mem = allocator::calloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
 		}
@@ -171,7 +165,7 @@ fn void*! TempAllocator.acquire(&self, usz size, bool clear, usz alignment, usz
 		// Here we might need to pad
 		usz padded_header_size = mem::aligned_offset(TempAllocatorPage.sizeof, mem::DEFAULT_MEM_ALIGNMENT);
 		usz total_alloc_size = padded_header_size + size;
-		void* alloc = self.backing_allocator.acquire(total_alloc_size, clear, 0, 0)!;
+		void* alloc = self.backing_allocator.acquire(total_alloc_size, init_type, 0)!;
 
 		// Find the page.
 		page = alloc + padded_header_size - TempAllocatorPage.sizeof;
diff --git a/lib/std/core/allocators/tracking_allocator.c3 b/lib/std/core/allocators/tracking_allocator.c3
index 646dc43f5..46148403b 100644
--- a/lib/std/core/allocators/tracking_allocator.c3
+++ b/lib/std/core/allocators/tracking_allocator.c3
@@ -20,7 +20,7 @@ def AllocMap = HashMap(<uptr, Allocation>);
 // is not compatible with allocators that uses mark()
 struct TrackingAllocator (Allocator)
 {
-	Allocator* inner_allocator;
+	Allocator inner_allocator;
 	AllocMap map;
 	usz mem_total;
 	usz allocs_total;
@@ -31,7 +31,7 @@ struct TrackingAllocator (Allocator)
  *
  * @param [&inout] allocator "The allocator to track"
  **/
-fn void TrackingAllocator.init(&self, Allocator* allocator)
+fn void TrackingAllocator.init(&self, Allocator allocator)
 {
 	*self = { .inner_allocator = allocator };
 	self.map.new_init(.allocator = allocator);
@@ -69,7 +69,7 @@ fn usz TrackingAllocator.total_allocated(&self) => self.mem_total;
  **/
 fn usz TrackingAllocator.total_allocation_count(&self) => self.allocs_total;
 
-fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator* allocator)
+fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator allocator)
 {
 	return self.map.value_tlist();
 }
@@ -79,9 +79,9 @@ fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator* allocator)
  **/
 fn usz TrackingAllocator.allocation_count(&self) => self.map.count;
 
-fn void*! TrackingAllocator.acquire(&self, usz size, bool clear, usz alignment, usz deprecated) @dynamic
+fn void*! TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
-	void* data = self.inner_allocator.acquire(size, clear, alignment, 0)!;
+	void* data = self.inner_allocator.acquire(size, init_type, alignment)!;
 	self.allocs_total++;
 	void*[MAX_BACKTRACE] bt;
 	backtrace::capture_current(&bt);
@@ -91,9 +91,9 @@ fn void*! TrackingAllocator.acquire(&self, usz size, bool clear, usz alignment,
 	return data;
 }
 
-fn void*! TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment, usz deprecated) @dynamic
+fn void*! TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
-	void* data = self.inner_allocator.resize(old_pointer, size, alignment, 0)!;
+	void* data = self.inner_allocator.resize(old_pointer, size, alignment)!;
 	self.map.remove((uptr)old_pointer);
 	void*[MAX_BACKTRACE] bt;
 	backtrace::capture_current(&bt);
@@ -107,7 +107,7 @@ fn void TrackingAllocator.release(&self, void* old_pointer, bool is_aligned) @dy
 {
 	if (catch self.map.remove((uptr)old_pointer))
     {
-        assert(false, "Attempt to release untracked pointer %p, this is likely a bug.", old_pointer);
+        unreachable("Attempt to release untracked pointer %p, this is likely a bug.", old_pointer);
     }
 	self.inner_allocator.release(old_pointer, is_aligned);
 }
@@ -119,7 +119,7 @@ fn void TrackingAllocator.clear(&self)
 
 fn void TrackingAllocator.print_report(&self) => self.fprint_report(io::stdout())!!;
 
-fn void! TrackingAllocator.fprint_report(&self, OutStream* out)
+fn void! TrackingAllocator.fprint_report(&self, OutStream out)
 {
 
 	usz total = 0;
diff --git a/lib/std/core/array.c3 b/lib/std/core/array.c3
index 60151d169..33d90236b 100644
--- a/lib/std/core/array.c3
+++ b/lib/std/core/array.c3
@@ -45,17 +45,17 @@ macro rindex_of(array, element)
 }
 
 /**
- * Concatenate two arrays or subarrays, returning a subarray containing the concatenation of them.
+ * Concatenate two arrays or slices, returning a slice containing the concatenation of them.
  *
  * @param [in] arr1
  * @param [in] arr2
  * @param [&inout] allocator "The allocator to use, default is the heap allocator"
- * @require @typekind(arr1) == SUBARRAY || @typekind(arr1) == ARRAY
- * @require @typekind(arr2) == SUBARRAY || @typekind(arr2) == ARRAY
+ * @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
+ * @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
  * @require @typeis(arr1[0], $typeof(arr2[0])) "Arrays must have the same type"
  * @ensure result.len == arr1.len + arr2.len
  **/
-macro concat_new(arr1, arr2, Allocator* allocator = allocator::heap())
+macro concat_new(arr1, arr2, Allocator allocator = allocator::heap())
 {
 	var $Type = $typeof(arr1[0]);
 	$Type[] result = allocator::alloc_array(allocator, $Type, arr1.len + arr2.len);
@@ -71,13 +71,13 @@ macro concat_new(arr1, arr2, Allocator* allocator = allocator::heap())
 }
 
 /**
- * Concatenate two arrays or subarrays, returning a subarray containing the concatenation of them,
+ * Concatenate two arrays or slices, returning a slice containing the concatenation of them,
  * allocated using the temp allocator.
  *
  * @param [in] arr1
  * @param [in] arr2
- * @require @typekind(arr1) == SUBARRAY || @typekind(arr1) == ARRAY
- * @require @typekind(arr2) == SUBARRAY || @typekind(arr2) == ARRAY
+ * @require @typekind(arr1) == SLICE || @typekind(arr1) == ARRAY
+ * @require @typekind(arr2) == SLICE || @typekind(arr2) == ARRAY
  * @require @typeis(arr1[0], $typeof(arr2[0])) "Arrays must have the same type"
  * @ensure result.len == arr1.len + arr2.len
  **/
diff --git a/lib/std/core/bitorder.c3 b/lib/std/core/bitorder.c3
index 77a3eb5ff..431aa6116 100644
--- a/lib/std/core/bitorder.c3
+++ b/lib/std/core/bitorder.c3
@@ -88,7 +88,7 @@ bitstruct UInt128LE : uint128 @littleendian
 }
 
 /**
- * @require is_array_or_sub_of_char(bytes) "argument must be an array, a pointer to an array or a subarray of char"
+ * @require is_array_or_slice_of_char(bytes) "argument must be an array, a pointer to an array or a slice of char"
  * @require is_bitorder($Type) "type must be a bitorder integer"
  **/
 macro read(bytes, $Type)
@@ -104,7 +104,7 @@ macro read(bytes, $Type)
 }
 
 /**
- * @require is_arrayptr_or_sub_of_char(bytes) "argument must be a pointer to an array or a subarray of char"
+ * @require is_arrayptr_or_slice_of_char(bytes) "argument must be a pointer to an array or a slice of char"
  * @require is_bitorder($Type) "type must be a bitorder integer"
  **/
 macro write(x, bytes, $Type)
@@ -144,7 +144,7 @@ macro is_bitorder($Type)
 	$endswitch
 }
 
-macro bool is_array_or_sub_of_char(bytes)
+macro bool is_array_or_slice_of_char(bytes)
 {
 	$switch (@typekind(bytes))
 	$case POINTER:
@@ -154,7 +154,7 @@ macro bool is_array_or_sub_of_char(bytes)
 			return $Inner2.typeid == char.typeid;
 		$endif
 	$case ARRAY:
-	$case SUBARRAY:
+	$case SLICE:
 		var $Inner = $typefrom($typeof(bytes).inner);
 		return $Inner.typeid == char.typeid;
 	$default:
@@ -162,7 +162,7 @@ macro bool is_array_or_sub_of_char(bytes)
 	$endswitch
 }
 
-macro bool is_arrayptr_or_sub_of_char(bytes)
+macro bool is_arrayptr_or_slice_of_char(bytes)
 {
 	$switch (@typekind(bytes))
 	$case POINTER:
@@ -171,7 +171,7 @@ macro bool is_arrayptr_or_sub_of_char(bytes)
 			var $Inner2 = $typefrom($Inner.inner);
 			return $Inner2.typeid == char.typeid;
 		$endif
-	$case SUBARRAY:
+	$case SLICE:
 		var $Inner = $typefrom($typeof(bytes).inner);
 		return $Inner.typeid == char.typeid;
 	$default:
diff --git a/lib/std/core/builtin.c3 b/lib/std/core/builtin.c3
index 8f054d33c..22cf0895c 100644
--- a/lib/std/core/builtin.c3
+++ b/lib/std/core/builtin.c3
@@ -61,7 +61,7 @@ macro void @swap(&a, &b) @builtin
  * @ensure @typeis(return, $Type*)
  * @return! CastResult.TYPE_MISMATCH
  **/
-macro anycast(any* v, $Type) @builtin
+macro anycast(any v, $Type) @builtin
 {
 	if (v.type != $Type.typeid) return CastResult.TYPE_MISMATCH?;
 	return ($Type*)v.ptr;
@@ -126,7 +126,7 @@ PanicFn panic = &default_panic;
 
 fn void panicf(String fmt, String file, String function, uint line, args...)
 {
-	@stack_mem(512; Allocator* allocator)
+	@stack_mem(512; Allocator allocator)
 	{
 		DString s;
 		s.new_init(.allocator = allocator);
diff --git a/lib/std/core/dstring.c3 b/lib/std/core/dstring.c3
index c4a1d289f..bb9012002 100644
--- a/lib/std/core/dstring.c3
+++ b/lib/std/core/dstring.c3
@@ -8,7 +8,7 @@ const usz MIN_CAPACITY @private = 16;
 /**
  * @require !self.data() "String already initialized"
  **/
-fn DString DString.new_init(&self, usz capacity = MIN_CAPACITY, Allocator* allocator = allocator::heap())
+fn DString DString.new_init(&self, usz capacity = MIN_CAPACITY, Allocator allocator = allocator::heap())
 {
 	if (capacity < MIN_CAPACITY) capacity = MIN_CAPACITY;
 	StringData* data = allocator::alloc_with_padding(allocator, StringData, capacity)!!;
@@ -18,14 +18,6 @@ fn DString DString.new_init(&self, usz capacity = MIN_CAPACITY, Allocator* alloc
 	return *self = (DString)data;
 }
 
-/**
- * @require !self.data() "String already initialized"
- **/
-fn DString DString.init_new(&self, usz capacity = MIN_CAPACITY, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(capacity, allocator) @inline;
-}
-
 /**
  * @require !self.data() "String already initialized"
  **/
@@ -35,22 +27,14 @@ fn DString DString.temp_init(&self, usz capacity = MIN_CAPACITY)
 	return *self;
 }
 
-/**
- * @require !self.data() "String already initialized"
- **/
-fn DString DString.init_temp(&self, usz capacity = MIN_CAPACITY) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init(capacity) @inline;
-}
-
-fn DString new_with_capacity(usz capacity, Allocator* allocator = allocator::heap())
+fn DString new_with_capacity(usz capacity, Allocator allocator = allocator::heap())
 {
 	return DString{}.new_init(capacity, allocator);
 }
 
 fn DString temp_with_capacity(usz capacity) => new_with_capacity(capacity, allocator::temp()) @inline;
 
-fn DString new(String c = "", Allocator* allocator = allocator::heap())
+fn DString new(String c = "", Allocator allocator = allocator::heap())
 {
 	usz len = c.len;
 	StringData* data = (StringData*)new_with_capacity(len, allocator);
@@ -64,7 +48,7 @@ fn DString new(String c = "", Allocator* allocator = allocator::heap())
 
 fn DString temp_new(String s = "") => new(s, allocator::temp()) @inline;
 
-fn DString DString.new_concat(self, DString b, Allocator* allocator = allocator::heap())
+fn DString DString.new_concat(self, DString b, Allocator allocator = allocator::heap())
 {
 	DString string;
 	string.new_init(self.len() + b.len(), allocator);
@@ -75,8 +59,6 @@ fn DString DString.new_concat(self, DString b, Allocator* allocator = allocator:
 
 fn DString DString.temp_concat(self, DString b) => self.new_concat(b, allocator::temp());
 
-fn DString DString.new_tconcat(self, DString b) @deprecated("Replaced by temp_concat") => self.new_concat(b, allocator::temp());
-
 fn ZString DString.zstr_view(&self)
 {
 	StringData* data = self.data();
@@ -166,7 +148,7 @@ fn void DString.append_char32(&self, Char32 c)
 
 fn DString DString.tcopy(&self) => self.copy(allocator::temp());
 
-fn DString DString.copy(self, Allocator* allocator = null)
+fn DString DString.copy(self, Allocator allocator = null)
 {
 	if (!self)
 	{
@@ -180,7 +162,7 @@ fn DString DString.copy(self, Allocator* allocator = null)
 	return new_string;
 }
 
-fn ZString DString.copy_zstr(self, Allocator* allocator = allocator::heap())
+fn ZString DString.copy_zstr(self, Allocator allocator = allocator::heap())
 {
 	usz str_len = self.len();
 	if (!str_len)
@@ -194,7 +176,7 @@ fn ZString DString.copy_zstr(self, Allocator* allocator = allocator::heap())
 	return (ZString)zstr;
 }
 
-fn String DString.copy_str(self, Allocator* allocator = allocator::heap())
+fn String DString.copy_str(self, Allocator allocator = allocator::heap())
 {
 	return (String)self.copy_zstr(allocator)[:self.len()];
 }
@@ -258,7 +240,7 @@ fn void DString.append_chars(&self, String str)
 	data.len += other_len;
 }
 
-fn Char32[] DString.copy_utf32(&self, Allocator* allocator = allocator::heap())
+fn Char32[] DString.copy_utf32(&self, Allocator allocator = allocator::heap())
 {
 	return self.str_view().to_new_utf32(allocator) @inline!!;
 }
@@ -403,7 +385,7 @@ fn usz! DString.appendfn(&self, String format, args...) @maydiscard
 	return len + 1;
 }
 
-fn DString new_join(String[] s, String joiner, Allocator* allocator = allocator::heap())
+fn DString new_join(String[] s, String joiner, Allocator allocator = allocator::heap())
 {
 	if (!s.len) return (DString)null;
 	usz total_size = joiner.len * s.len;
@@ -450,7 +432,7 @@ fn void DString.reserve(&self, usz addition)
 	*self = (DString)allocator::realloc(data.allocator, data, StringData.sizeof + new_capacity);
 }
 
-fn usz! DString.read_from_stream(&self, InStream* reader)
+fn usz! DString.read_from_stream(&self, InStream reader)
 {
 	if (&reader.available)
 	{
@@ -482,7 +464,7 @@ fn usz! DString.read_from_stream(&self, InStream* reader)
 
 struct StringData @private
 {
-	Allocator* allocator;
+	Allocator allocator;
 	usz len;
 	usz capacity;
 	char[*] chars;
diff --git a/lib/std/core/env.c3 b/lib/std/core/env.c3
index 821464079..9261ef4a0 100644
--- a/lib/std/core/env.c3
+++ b/lib/std/core/env.c3
@@ -123,6 +123,7 @@ const bool BIG_ENDIAN = $$PLATFORM_BIG_ENDIAN;
 const bool I128_NATIVE_SUPPORT = $$PLATFORM_I128_SUPPORTED;
 const bool F16_SUPPORT = $$PLATFORM_F16_SUPPORTED;
 const bool F128_SUPPORT = $$PLATFORM_F128_SUPPORTED;
+const REGISTER_SIZE = $$REGISTER_SIZE;
 const bool COMPILER_SAFE_MODE = $$COMPILER_SAFE_MODE;
 const bool DEBUG_SYMBOLS = $$DEBUG_SYMBOLS;
 const usz LLVM_VERSION = $$LLVM_VERSION;
diff --git a/lib/std/core/mem.c3 b/lib/std/core/mem.c3
index 9955c9da7..a4f552772 100644
--- a/lib/std/core/mem.c3
+++ b/lib/std/core/mem.c3
@@ -343,9 +343,9 @@ macro void set_inline(void* dst, char val, usz $len, usz $dst_align = 0, bool $i
 	$$memset_inline(dst, val, $len, $is_volatile, $dst_align);
 }
 /**
- * @require values::@inner_kind(a) == TypeKind.SUBARRAY || values::@inner_kind(a) == TypeKind.POINTER
- * @require values::@inner_kind(b) == TypeKind.SUBARRAY || values::@inner_kind(b) == TypeKind.POINTER
- * @require values::@inner_kind(a) != TypeKind.SUBARRAY || len == -1
+ * @require values::@inner_kind(a) == TypeKind.SLICE || values::@inner_kind(a) == TypeKind.POINTER
+ * @require values::@inner_kind(b) == TypeKind.SLICE || values::@inner_kind(b) == TypeKind.POINTER
+ * @require values::@inner_kind(a) != TypeKind.SLICE || len == -1
  * @require values::@inner_kind(a) != TypeKind.POINTER || len > -1
  * @require values::@assign_to(a, b) && values::@assign_to(b, a)
  **/
@@ -356,7 +356,7 @@ macro bool equals(a, b, isz len = -1, usz $align = 0)
 	$endif
 	void* x @noinit;
 	void* y @noinit;
-	$if values::@inner_kind(a) == TypeKind.SUBARRAY:
+	$if values::@inner_kind(a) == TypeKind.SLICE:
 		len = a.len;
 		if (len != b.len) return false;
 		x = a.ptr;
@@ -403,9 +403,9 @@ macro type_alloc_must_be_aligned($Type)
 /**
  * Run with a specific allocator inside of the macro body.
  **/
-macro void @scoped(Allocator* allocator; @body())
+macro void @scoped(Allocator allocator; @body())
 {
-	Allocator* old_allocator = allocator::thread_allocator;
+	Allocator old_allocator = allocator::thread_allocator;
 	allocator::thread_allocator = allocator;
 	defer allocator::thread_allocator = old_allocator;
 	@body();
@@ -415,7 +415,7 @@ macro void @report_heap_allocs_in_scope(;@body())
 {
 	TrackingAllocator tracker;
 	tracker.init(allocator::thread_allocator);
-	Allocator* old_allocator = allocator::thread_allocator;
+	Allocator old_allocator = allocator::thread_allocator;
 	allocator::thread_allocator = &tracker;
 	defer
 	{
@@ -426,7 +426,7 @@ macro void @report_heap_allocs_in_scope(;@body())
 	@body();
 }
 
-macro void @stack_mem(usz $size; @body(Allocator* mem)) @builtin
+macro void @stack_mem(usz $size; @body(Allocator mem)) @builtin
 {
 	char[$size] buffer;
 	OnStackAllocator allocator;
@@ -504,11 +504,6 @@ macro void @pool(TempAllocator* #other_temp = null; @body) @builtin
 import libc;
 
 
-
-macro TempAllocator* temp() @deprecated("Use allocator::temp()") => allocator::temp();
-macro Allocator* current_allocator() @deprecated("Use allocator::heap()") => allocator::heap();
-macro Allocator* heap() @deprecated("Use allocator::heap()") => allocator::heap();
-
 module std::core::mem @if(WASM_NOLIBC);
 
 SimpleHeapAllocator wasm_allocator @private;
@@ -552,10 +547,10 @@ fn void* malloc(usz size) @builtin @inline @nodiscard
 	return allocator::malloc(allocator::heap(), size);
 }
 
-fn void* tmalloc(usz size, usz alignment = 0, usz offset = 0) @builtin @inline @nodiscard
+fn void* tmalloc(usz size, usz alignment = 0) @builtin @inline @nodiscard
 {
 	if (!size) return null;
-	return allocator::temp().acquire(size, false, alignment, 0)!!;
+	return allocator::temp().acquire(size, NO_ZERO, alignment)!!;
 }
 
 /**
@@ -608,16 +603,6 @@ macro alloc_aligned($Type) @nodiscard
 	return ($Type*)malloc_aligned($Type.sizeof, $Type.alignof);
 }
 
-macro new_clear($Type) @deprecated("Use mem::new")
-{
-	return new($Type);
-}
-
-macro new_temp($Type) @deprecated("Use mem::temp_alloc or mem::temp_new")
-{
-	return tmalloc($Type.sizeof);
-}
-
 /**
  * @require $vacount < 2 : "Too many arguments."
  * @require $or($vacount == 0, $assignable($vaexpr(0), $Type)) : "The second argument must be an initializer for the type"
@@ -638,12 +623,6 @@ macro temp_alloc($Type) @nodiscard
 	return tmalloc($Type.sizeof);
 }
 
-macro new_temp_clear($Type) @deprecated("use mem::temp_new")
-{
-	return tcalloc($Type.sizeof);
-}
-
-
 
 /**
  * @require $Type.alignof <= DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'new_array_aligned' instead"
@@ -679,36 +658,16 @@ macro alloc_array_aligned($Type, usz elements) @nodiscard
 	return allocator::alloc_array(allocator::heap(), $Type, elements);
 }
 
-macro talloc_array($Type, usz elements) @nodiscard @deprecated("use mem::temp_alloc_array")
-{
-	return temp_alloc_array($Type, elements);
-}
-
 macro temp_alloc_array($Type, usz elements) @nodiscard
 {
 	return (($Type*)tmalloc($Type.sizeof * elements, $Type.alignof))[:elements];
 }
 
-macro temp_array($Type, usz elements) @nodiscard @deprecated("use mem::temp_alloc_array")
-{
-	return temp_alloc_array($Type, elements);
-}
-
 macro temp_new_array($Type, usz elements) @nodiscard
 {
 	return (($Type*)tcalloc($Type.sizeof * elements, $Type.alignof))[:elements];
 }
 
-macro new_zero_array($Type, usz elements) @deprecated("Use new_array")
-{
-	return new_array($Type, elements);
-}
-
-macro temp_zero_array($Type, usz elements) @deprecated("Use temp_new_array")
-{
-	return temp_new_array($Type, elements);
-}
-
 fn void* calloc(usz size) @builtin @inline @nodiscard
 {
 	return allocator::calloc(allocator::heap(), size);
@@ -719,10 +678,10 @@ fn void* calloc_aligned(usz size, usz alignment) @builtin @inline @nodiscard
 	return allocator::calloc_aligned(allocator::heap(), size, alignment)!!;
 }
 
-fn void* tcalloc(usz size, usz alignment = 0, usz offset = 0) @builtin @inline @nodiscard
+fn void* tcalloc(usz size, usz alignment = 0) @builtin @inline @nodiscard
 {
 	if (!size) return null;
-	return allocator::temp().acquire(size, false, alignment, 0)!!;
+	return allocator::temp().acquire(size, ZERO, alignment)!!;
 }
 
 fn void* realloc(void *ptr, usz new_size) @builtin @inline @nodiscard
@@ -749,6 +708,6 @@ fn void* trealloc(void* ptr, usz size, usz alignment = mem::DEFAULT_MEM_ALIGNMEN
 {
 	if (!size) return null;
     if (!ptr) return tmalloc(size, alignment);
-	return allocator::temp().resize(ptr, size, alignment, 0)!!;
+	return allocator::temp().resize(ptr, size, alignment)!!;
 }
 
diff --git a/lib/std/core/mem_allocator.c3 b/lib/std/core/mem_allocator.c3
index 4c0453ddd..cc1b61314 100644
--- a/lib/std/core/mem_allocator.c3
+++ b/lib/std/core/mem_allocator.c3
@@ -10,6 +10,11 @@ struct TrackingEnv
 	uint line;
 }
 
+enum AllocInitType
+{
+	NO_ZERO,
+	ZERO
+}
 
 interface Allocator
 {
@@ -18,18 +23,16 @@ interface Allocator
 	/**
      * @require !alignment || math::is_power_of_2(alignment)
      * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
-     * @require offset == 0 `offset no longer supported`
      * @require size > 0
      **/
-	fn void*! acquire(usz size, bool clear, usz alignment, usz offset);
+	fn void*! acquire(usz size, AllocInitType init_type, usz alignment = 0);
 	/**
      * @require !alignment || math::is_power_of_2(alignment)
      * @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
-     * @require offset == 0 `offset no longer supported`
      * @require ptr != null
      * @require new_size > 0
      **/
-	fn void*! resize(void* ptr, usz new_size, usz alignment, usz offset);
+	fn void*! resize(void* ptr, usz new_size, usz alignment = 0);
 	/**
      * @require ptr != null
      **/
@@ -49,51 +52,51 @@ fn usz alignment_for_allocation(usz alignment) @inline @private
 	return alignment < mem::DEFAULT_MEM_ALIGNMENT ? alignment = mem::DEFAULT_MEM_ALIGNMENT : alignment;
 }
 
-macro void* malloc(Allocator* allocator, usz size) @nodiscard
+macro void* malloc(Allocator allocator, usz size) @nodiscard
 {
 	return malloc_try(allocator, size)!!;
 }
 
-macro void*! malloc_try(Allocator* allocator, usz size) @nodiscard
+macro void*! malloc_try(Allocator allocator, usz size) @nodiscard
 {
 	if (!size) return null;
 	$if env::TESTING:
-		char* data = allocator.acquire(size, false, 0, 0)!;
+		char* data = allocator.acquire(size, NO_ZERO)!;
 		mem::set(data, 0xAA, size, mem::DEFAULT_MEM_ALIGNMENT);
 		return data;
 	$else
-		return allocator.acquire(size, false, 0, 0);
+		return allocator.acquire(size, NO_ZERO);
 	$endif
 }
 
-macro void* calloc(Allocator* allocator, usz size) @nodiscard
+macro void* calloc(Allocator allocator, usz size) @nodiscard
 {
 	return calloc_try(allocator, size)!!;
 }
 
-macro void*! calloc_try(Allocator* allocator, usz size) @nodiscard
+macro void*! calloc_try(Allocator allocator, usz size) @nodiscard
 {
 	if (!size) return null;
-	return allocator.acquire(size, true, 0, 0);
+	return allocator.acquire(size, ZERO);
 }
 
-macro void* realloc(Allocator* allocator, void* ptr, usz new_size) @nodiscard
+macro void* realloc(Allocator allocator, void* ptr, usz new_size) @nodiscard
 {
 	return realloc_try(allocator, ptr, new_size)!!;
 }
 
-macro void*! realloc_try(Allocator* allocator, void* ptr, usz new_size) @nodiscard
+macro void*! realloc_try(Allocator allocator, void* ptr, usz new_size) @nodiscard
 {
 	if (!new_size)
 	{
 		free(allocator, ptr);
 		return null;
 	}
-	if (!ptr) return allocator.acquire(new_size, false, 0, 0);
-	return allocator.resize(ptr, new_size, 0, 0);
+	if (!ptr) return allocator.acquire(new_size, NO_ZERO);
+	return allocator.resize(ptr, new_size);
 }
 
-macro void free(Allocator* allocator, void* ptr)
+macro void free(Allocator allocator, void* ptr)
 {
 	if (!ptr) return;
 	$if env::TESTING:
@@ -102,25 +105,25 @@ macro void free(Allocator* allocator, void* ptr)
 	allocator.release(ptr, false);
 }
 
-macro void*! malloc_aligned(Allocator* allocator, usz size, usz alignment, usz offset = 0) @nodiscard
+macro void*! malloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
 	$if env::TESTING:
-		char* data = allocator.acquire(size, false, alignment, offset)!;
+		char* data = allocator.acquire(size, NO_ZERO, alignment)!;
 		mem::set(data, 0xAA, size, mem::DEFAULT_MEM_ALIGNMENT);
 		return data;
 	$else
-		return allocator.acquire(size, false, alignment, offset);
+		return allocator.acquire(size, NO_ZERO, alignment);
 	$endif
 }
 
-macro void*! calloc_aligned(Allocator* allocator, usz size, usz alignment, usz offset = 0) @nodiscard
+macro void*! calloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
-	return allocator.acquire(size, true, alignment, offset);
+	return allocator.acquire(size, ZERO, alignment);
 }
 
-macro void*! realloc_aligned(Allocator* allocator, void* ptr, usz new_size, usz alignment, usz offset = 0) @nodiscard
+macro void*! realloc_aligned(Allocator allocator, void* ptr, usz new_size, usz alignment) @nodiscard
 {
 	if (!new_size)
 	{
@@ -131,23 +134,23 @@ macro void*! realloc_aligned(Allocator* allocator, void* ptr, usz new_size, usz
 	{
 		return malloc_aligned(allocator, new_size, alignment);
 	}
-	return allocator.resize(ptr, new_size, alignment, offset);
+	return allocator.resize(ptr, new_size, alignment);
 }
 
-macro void free_aligned(Allocator* allocator, void* ptr)
+macro void free_aligned(Allocator allocator, void* ptr)
 {
 	if (!ptr) return;
 	$if env::TESTING:
 	((char*)ptr)[0] = 0xBA;
 	$endif
-	allocator.release(ptr, true);
+	allocator.release(ptr, .aligned = true);
 }
 
 /**
  * @require $vacount < 2 : "Too many arguments."
  * @require $or($vacount == 0, $assignable($vaexpr(0), $Type)) : "The second argument must be an initializer for the type"
  **/
-macro new(Allocator* allocator, $Type, ...) @nodiscard
+macro new(Allocator allocator, $Type, ...) @nodiscard
 {
 	$if $vacount == 0:
 		return ($Type*)calloc(allocator, $Type.sizeof);
@@ -162,7 +165,7 @@ macro new(Allocator* allocator, $Type, ...) @nodiscard
  * @require $vacount < 2 : "Too many arguments."
  * @require $or($vacount == 0, $assignable($vaexpr(0), $Type)) : "The second argument must be an initializer for the type"
  **/
-macro new_try(Allocator* allocator, $Type, ...) @nodiscard
+macro new_try(Allocator allocator, $Type, ...) @nodiscard
 {
 	$if $vacount == 0:
 		return ($Type*)calloc_try(allocator, $Type.sizeof);
@@ -173,62 +176,62 @@ macro new_try(Allocator* allocator, $Type, ...) @nodiscard
 	$endif
 }
 
-macro new_with_padding(Allocator* allocator, $Type, usz padding) @nodiscard
+macro new_with_padding(Allocator allocator, $Type, usz padding) @nodiscard
 {
 	return ($Type*)calloc_try(allocator, $Type.sizeof + padding);
 }
 
-macro alloc(Allocator* allocator, $Type) @nodiscard
+macro alloc(Allocator allocator, $Type) @nodiscard
 {
 	return ($Type*)malloc(allocator, $Type.sizeof);
 }
 
-macro alloc_try(Allocator* allocator, $Type) @nodiscard
+macro alloc_try(Allocator allocator, $Type) @nodiscard
 {
 	return ($Type*)malloc_try(allocator, $Type.sizeof);
 }
 
-macro alloc_with_padding(Allocator* allocator, $Type, usz padding) @nodiscard
+macro alloc_with_padding(Allocator allocator, $Type, usz padding) @nodiscard
 {
 	return ($Type*)malloc_try(allocator, $Type.sizeof + padding);
 }
 
-macro new_array(Allocator* allocator, $Type, usz elements) @nodiscard
+macro new_array(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return new_array_try(allocator, $Type, elements)!!;
 }
 
-macro new_array_try(Allocator* allocator, $Type, usz elements) @nodiscard
+macro new_array_try(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)calloc_try(allocator, $Type.sizeof * elements))[:elements];
 }
 
-macro new_array_aligned(Allocator* allocator, $Type, usz elements) @nodiscard
+macro new_array_aligned(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return ((Type*)calloc_aligned(allocator, $Type.sizeof * elements, $Type.alignof))[:elements]!!;
 }
 
-macro alloc_array(Allocator* allocator, $Type, usz elements) @nodiscard
+macro alloc_array(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return alloc_array_try(allocator, $Type, elements)!!;
 }
 
-macro alloc_array_aligned(Allocator* allocator, $Type, usz elements) @nodiscard
+macro alloc_array_aligned(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return ((Type*)malloc_aligned(allocator, $Type.sizeof * elements, $Type.alignof))[:elements]!!;
 }
 
-macro alloc_array_try(Allocator* allocator, $Type, usz elements) @nodiscard
+macro alloc_array_try(Allocator allocator, $Type, usz elements) @nodiscard
 {
 	return (($Type*)malloc_try(allocator, $Type.sizeof * elements))[:elements];
 }
 
-macro clone(Allocator* allocator, value) @nodiscard
+macro clone(Allocator allocator, value) @nodiscard
 {
 	return new(allocator, $typeof(value), value);
 }
 
-fn any* clone_any(Allocator* allocator, any* value) @nodiscard
+fn any clone_any(Allocator allocator, any value) @nodiscard
 {
 	usz size = value.type.sizeof;
 	void* data = malloc(allocator, size);
@@ -236,106 +239,6 @@ fn any* clone_any(Allocator* allocator, any* value) @nodiscard
 	return any_make(data, value.type);
 }
 
-// Allocator "functions"
-
-macro void*! Allocator.alloc_checked(&self, usz size) @deprecated("Use allocator::malloc_try")
-{
-	return malloc_try(self, size);
-}
-
-macro void*! Allocator.calloc_checked(&self, usz size) @deprecated("Use allocator::calloc_try")
-{
-	return calloc_try(self, size);
-}
-
-macro void*! Allocator.realloc_checked(&self, void* ptr, usz new_size) @deprecated("Use allocator::realloc_try")
-{
-	return realloc_try(ptr, new_size);
-}
-
-macro Allocator.new_array(&self, $Type, usz size, usz end_padding = 0) @deprecated("Use allocator::alloc_array")
-{
-	return (($Type*)self.alloc_checked($Type.sizeof * size + end_padding))[:size]!!;
-}
-
-macro Allocator.new_array_checked(&self, $Type, usz size, usz end_padding = 0) @deprecated("Use allocator::alloc_array_try")
-{
-	return (($Type*)self.alloc_checked($Type.sizeof * size + end_padding))[:size];
-}
-
-macro Allocator.new_zero_array(&self, $Type, usz size, usz end_padding = 0) @deprecated("Use allocator::new_array")
-{
-	return (($Type*)self.calloc_checked($Type.sizeof * size + end_padding))[:size]!!;
-}
-
-macro Allocator.new_zero_array_checked(&self, $Type, usz size, usz end_padding = 0) @deprecated("Use allocator::new_array_try")
-{
-	return (($Type*)self.calloc_checked($Type.sizeof * size + end_padding))[:size];
-}
-
-macro Allocator.new(&self, $Type, usz end_padding = 0) @nodiscard @deprecated("Use allocator::alloc")
-{
-	return ($Type*)self.alloc_checked($Type.sizeof + end_padding)!!;
-}
-
-macro Allocator.new_checked(&self, $Type, usz end_padding = 0) @nodiscard @deprecated("Use allocator::alloc_try")
-{
-	return ($Type*)self.alloc_checked($Type.sizeof + end_padding);
-}
-
-macro Allocator.new_clear(&self, $Type, usz end_padding = 0) @nodiscard @deprecated("Use allocator::new")
-{
-	return ($Type*)self.calloc_checked($Type.sizeof + end_padding)!!;
-}
-
-macro Allocator.new_clear_checked(&self, $Type, usz end_padding = 0) @nodiscard  @deprecated("Use allocator::new_try")
-{
-	return ($Type*)self.calloc_checked($Type.sizeof + end_padding);
-}
-macro Allocator.clone(&self, value) @deprecated("Use allocator::clone")
-{
-	var x = self.alloc($typeof(value));
-	*x = value;
-	return x;
-}
-
-fn void* Allocator.alloc(&self, usz size) @nodiscard @deprecated("Use allocator::malloc")
-{
-	return malloc(self, size);
-}
-fn void* Allocator.calloc(&self, usz size) @nodiscard @deprecated("Use allocator::calloc")
-{
-	return calloc(self, size);
-}
-fn void* Allocator.realloc(&self, void* ptr, usz new_size) @nodiscard @deprecated("Use allocator::realloc")
-{
-	return realloc(self, ptr, new_size);
-}
-
-fn void*! Allocator.alloc_aligned(&self, usz size, usz alignment, usz offset = 0) @deprecated("Use allocator::malloc_aligned")
-{
-	return malloc_aligned(self, size, alignment, 0);
-}
-
-fn void*! Allocator.calloc_aligned(&self, usz size, usz alignment, usz offset = 0) @deprecated("Use allocator::calloc_aligned")
-{
-	return calloc_aligned(self, size, alignment, 0);
-}
-
-fn void*! Allocator.realloc_aligned(&self, void* ptr, usz new_size, usz alignment = 0, usz offset = 0)  @deprecated("Use allocator::realloc_aligned")
-{
-	return realloc_aligned(self, ptr, new_size, alignment, 0);
-}
-
-fn void Allocator.free(&self, void* ptr) @deprecated("Use allocator::free")
-{
-	free(self, ptr);
-}
-fn void Allocator.free_aligned(&self, void* ptr) @deprecated("Use allocator::free_aligned")
-{
-	free_aligned(self, ptr);
-}
-
 
 /**
  * @require bytes > 0
@@ -395,12 +298,12 @@ macro void*! @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes
 
 
 // All allocators
-tlocal Allocator* thread_allocator @private = &allocator::LIBC_ALLOCATOR;
+tlocal Allocator thread_allocator @private = &allocator::LIBC_ALLOCATOR;
 tlocal TempAllocator* thread_temp_allocator @private = null;
 tlocal TempAllocator*[2] temp_allocator_pair @private;
-Allocator* temp_base_allocator @private = &allocator::LIBC_ALLOCATOR;
+Allocator temp_base_allocator @private = &allocator::LIBC_ALLOCATOR;
 
-macro TempAllocator* create_default_sized_temp_allocator(Allocator* allocator) @local
+macro TempAllocator* create_default_sized_temp_allocator(Allocator allocator) @local
 {
 	$switch (env::MEMORY_ENV)
 	$case NORMAL:
@@ -414,7 +317,7 @@ macro TempAllocator* create_default_sized_temp_allocator(Allocator* allocator) @
 	$endswitch
 }
 
-macro Allocator* heap() => thread_allocator;
+macro Allocator heap() => thread_allocator;
 
 macro TempAllocator* temp()
 {
@@ -432,7 +335,7 @@ fn void init_default_temp_allocators() @private
 	thread_temp_allocator = temp_allocator_pair[0];
 }
 
-fn TempAllocator *temp_allocator_next() @private
+fn TempAllocator* temp_allocator_next() @private
 {
 	if (!thread_temp_allocator)
 	{
diff --git a/lib/std/core/runtime.c3 b/lib/std/core/runtime.c3
index effe35950..70ca8bd92 100644
--- a/lib/std/core/runtime.c3
+++ b/lib/std/core/runtime.c3
@@ -4,13 +4,13 @@
 module std::core::runtime;
 import libc, std::time, std::io, std::sort;
 
-struct AnyStruct
+struct AnyRaw
 {
 	void* ptr;
 	typeid type;
 }
 
-struct SubArrayStruct
+struct SliceRaw
 {
 	void* ptr;
 	usz len;
@@ -24,7 +24,7 @@ struct BenchmarkUnit
 	BenchmarkFn func;
 }
 
-fn BenchmarkUnit[] benchmark_collection_create(Allocator* allocator = allocator::heap())
+fn BenchmarkUnit[] benchmark_collection_create(Allocator allocator = allocator::heap())
 {
 	BenchmarkFn[] fns = $$BENCHMARK_FNS;
 	String[] names = $$BENCHMARK_NAMES;
@@ -142,7 +142,7 @@ struct TestUnit
 	TestFn func;
 }
 
-fn TestUnit[] test_collection_create(Allocator* allocator = allocator::heap())
+fn TestUnit[] test_collection_create(Allocator allocator = allocator::heap())
 {
 	TestFn[] fns = $$TEST_FNS;
 	String[] names = $$TEST_NAMES;
diff --git a/lib/std/core/string.c3 b/lib/std/core/string.c3
index 69664fb73..b45ac67bd 100644
--- a/lib/std/core/string.c3
+++ b/lib/std/core/string.c3
@@ -44,8 +44,7 @@ macro ZString tformat_zstr(String fmt, ...)
 	str.appendf(fmt, $vasplat());
 	return str.zstr_view();
 }
-
-macro String new_format(String fmt, ..., Allocator* allocator = allocator::heap())
+macro String new_format(String fmt, ..., Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -55,7 +54,7 @@ macro String new_format(String fmt, ..., Allocator* allocator = allocator::heap(
 	};
 }
 
-macro ZString new_format_zstr(String fmt, ..., Allocator* allocator = allocator::heap())
+macro ZString new_format_zstr(String fmt, ..., Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -71,7 +70,7 @@ macro bool char_in_set(char c, String set)
 	return false;
 }
 
-fn String join_new(String[] s, String joiner, Allocator* allocator = allocator::heap())
+fn String join_new(String[] s, String joiner, Allocator allocator = allocator::heap())
 {
 	if (!s)
 	{
@@ -169,7 +168,7 @@ fn String String.strip_end(string, String needle)
  * @require needle.len > 0 "The needle must be at least 1 character long"
  * @ensure return.len > 0
  **/
-fn String[] String.split(s, String needle, usz max = 0, Allocator* allocator = allocator::heap())
+fn String[] String.split(s, String needle, usz max = 0, Allocator allocator = allocator::heap())
 {
 	usz capacity = 16;
 	usz i = 0;
@@ -328,7 +327,7 @@ fn usz ZString.len(str)
 }
 
 
-fn ZString String.zstr_copy(s, Allocator* allocator = allocator::heap())
+fn ZString String.zstr_copy(s, Allocator allocator = allocator::heap())
 {
 	usz len = s.len;
 	char* str = allocator::malloc(allocator, len + 1);
@@ -337,7 +336,7 @@ fn ZString String.zstr_copy(s, Allocator* allocator = allocator::heap())
 	return (ZString)str;
 }
 
-fn String String.concat(s1, String s2, Allocator* allocator = allocator::heap())
+fn String String.concat(s1, String s2, Allocator allocator = allocator::heap())
 {
 	usz full_len = s1.len + s2.len;
 	char* str = allocator::malloc(allocator, full_len + 1);
@@ -353,7 +352,7 @@ fn String String.tconcat(s1, String s2) => s1.concat(s2, allocator::temp());
 
 fn ZString String.zstr_tcopy(s) => s.zstr_copy(allocator::temp()) @inline;
 
-fn String String.copy(s, Allocator* allocator = allocator::heap())
+fn String String.copy(s, Allocator allocator = allocator::heap())
 {
 	usz len = s.len;
 	char* str = allocator::malloc(allocator, len + 1);
@@ -362,7 +361,7 @@ fn String String.copy(s, Allocator* allocator = allocator::heap())
 	return (String)str[:len];
 }
 
-fn void String.free(&s, Allocator* allocator = allocator::heap())
+fn void String.free(&s, Allocator allocator = allocator::heap())
 {
 	if (!s.len) return;
 	allocator::free(allocator, s.ptr);
@@ -371,7 +370,7 @@ fn void String.free(&s, Allocator* allocator = allocator::heap())
 
 fn String String.tcopy(s) => s.copy(allocator::temp()) @inline;
 
-fn String ZString.copy(z, Allocator* allocator = allocator::temp())
+fn String ZString.copy(z, Allocator allocator = allocator::temp())
 {
 	return z.str_view().copy(allocator) @inline;
 }
@@ -387,7 +386,7 @@ fn String ZString.tcopy(z)
  * @return! UnicodeResult.INVALID_UTF8 "If the string contained an invalid UTF-8 sequence"
  * @return! AllocationFailure "If allocation of the string fails"
  **/
-fn Char16[]! String.to_new_utf16(s, Allocator* allocator = allocator::heap())
+fn Char16[]! String.to_new_utf16(s, Allocator allocator = allocator::heap())
 {
 	usz len16 = conv::utf16len_for_utf8(s);
 	Char16* data = allocator::alloc_array_try(allocator, Char16, len16 + 1)!;
@@ -407,7 +406,7 @@ fn Char16[]! String.to_temp_utf16(s)
 	return s.to_new_utf16(allocator::temp());
 }
 
-fn WString! String.to_new_wstring(s, Allocator* allocator = allocator::heap())
+fn WString! String.to_new_wstring(s, Allocator allocator = allocator::heap())
 {
 	return (WString)s.to_new_utf16(allocator).ptr;
 }
@@ -417,7 +416,7 @@ fn WString! String.to_temp_wstring(s)
 	return (WString)s.to_temp_utf16().ptr;
 }
 
-fn Char32[]! String.to_new_utf32(s, Allocator* allocator = allocator::heap())
+fn Char32[]! String.to_new_utf32(s, Allocator allocator = allocator::heap())
 {
 	usz codepoints = conv::utf8_codepoints(s);
 	Char32* data = allocator::alloc_array_try(allocator, Char32, codepoints + 1)!;
@@ -436,14 +435,14 @@ fn void String.convert_ascii_to_lower(s)
 	foreach (&c : s) if (c.is_upper()) *c += 'a' - 'A';
 }
 
-fn String String.new_ascii_to_lower(s, Allocator* allocator = allocator::heap())
+fn String String.new_ascii_to_lower(s, Allocator allocator = allocator::heap())
 {
 	String copy = s.copy(allocator);
 	copy.convert_ascii_to_lower();
 	return copy;
 }
 
-fn String String.temp_ascii_to_lower(s, Allocator* allocator = allocator::heap())
+fn String String.temp_ascii_to_lower(s, Allocator allocator = allocator::heap())
 {
 	return s.new_ascii_to_lower(allocator::temp());
 }
@@ -453,7 +452,7 @@ fn void String.convert_ascii_to_upper(s)
 	foreach (&c : s) if (c.is_lower()) *c -= 'a' - 'A';
 }
 
-fn String String.new_ascii_to_upper(s, Allocator* allocator = allocator::heap())
+fn String String.new_ascii_to_upper(s, Allocator allocator = allocator::heap())
 {
 	String copy = s.copy(allocator);
 	copy.convert_ascii_to_upper();
@@ -470,7 +469,7 @@ fn String String.temp_ascii_to_upper(s)
 	return s.new_ascii_to_upper(allocator::temp());
 }
 
-fn String! new_from_utf32(Char32[] utf32, Allocator* allocator = allocator::heap())
+fn String! new_from_utf32(Char32[] utf32, Allocator allocator = allocator::heap())
 {
 	usz len = conv::utf8len_for_utf32(utf32);
 	char* data = allocator::malloc_try(allocator, len + 1)!;
@@ -480,7 +479,7 @@ fn String! new_from_utf32(Char32[] utf32, Allocator* allocator = allocator::heap
 	return (String)data[:len];
 }
 
-fn String! new_from_utf16(Char16[] utf16, Allocator* allocator = allocator::heap())
+fn String! new_from_utf16(Char16[] utf16, Allocator allocator = allocator::heap())
 {
 	usz len = conv::utf8len_for_utf16(utf16);
 	char* data = allocator::malloc_try(allocator, len + 1)!;
@@ -490,7 +489,7 @@ fn String! new_from_utf16(Char16[] utf16, Allocator* allocator = allocator::heap
 	return (String)data[:len];
 }
 
-fn String! new_from_wstring(WString wstring, Allocator* allocator = allocator::heap())
+fn String! new_from_wstring(WString wstring, Allocator allocator = allocator::heap())
 {
 	usz utf16_len;
 	while (wstring[utf16_len] != 0) utf16_len++;
diff --git a/lib/std/core/types.c3 b/lib/std/core/types.c3
index 340e7ca1e..87c825606 100644
--- a/lib/std/core/types.c3
+++ b/lib/std/core/types.c3
@@ -11,7 +11,7 @@ fault ConversionResult
 /**
  * @require $Type.kindof.is_int() || $Type.kindof == TypeKind.ENUM "Argument was not an integer"
  **/
-macro any_to_int(any* v, $Type)
+macro any_to_int(any v, $Type)
 {
 	typeid any_type = v.type;
 	TypeKind kind = any_type.kindof;
@@ -108,10 +108,10 @@ fn bool TypeKind.is_int(kind) @inline
 	return kind == TypeKind.SIGNED_INT || kind == TypeKind.UNSIGNED_INT;
 }
 
-macro bool is_subarray_convertable($Type)
+macro bool is_slice_convertable($Type)
 {
 	$switch ($Type.kindof)
-		$case SUBARRAY:
+		$case SLICE:
 			return true;
 		$case POINTER:
 			return $Type.inner.kindof == TypeKind.ARRAY;
@@ -298,7 +298,7 @@ enum TypeKind : char
 	FUNC,
 	OPTIONAL,
 	ARRAY,
-	SUBARRAY,
+	SLICE,
 	VECTOR,
 	DISTINCT,
 	POINTER,
diff --git a/lib/std/encoding/csv.c3 b/lib/std/encoding/csv.c3
index 7fc4cd1d3..25050c53f 100644
--- a/lib/std/encoding/csv.c3
+++ b/lib/std/encoding/csv.c3
@@ -3,22 +3,22 @@ import std::io;
 
 struct CsvReader
 {
-	InStream* stream;
+	InStream stream;
 	String separator;
 }
 
-fn void CsvReader.init(&self, InStream* stream, String separator = ",")
+fn void CsvReader.init(&self, InStream stream, String separator = ",")
 {
 	self.stream = stream;
 	self.separator = separator;
 }
 
-fn String[]! CsvReader.read_new_row(self, Allocator* allocator = allocator::heap())
+fn String[]! CsvReader.read_new_row(self, Allocator allocator = allocator::heap())
 {
 	return self.read_new_row_with_allocator(allocator::temp()) @inline;
 }
 
-fn String[]! CsvReader.read_new_row_with_allocator(self, Allocator* allocator = allocator::heap())
+fn String[]! CsvReader.read_new_row_with_allocator(self, Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -45,7 +45,7 @@ macro CsvReader.@each_row(self, int rows = int.max; @body(String[] row))
 	String sep = self.separator;
 	while (rows--)
 	{
-		@stack_mem(512; Allocator* mem)
+		@stack_mem(512; Allocator mem)
 		{
 			String[] parts;
 			@pool()
diff --git a/lib/std/encoding/json.c3 b/lib/std/encoding/json.c3
index 2c295e452..cbd014414 100644
--- a/lib/std/encoding/json.c3
+++ b/lib/std/encoding/json.c3
@@ -15,7 +15,7 @@ fault JsonParsingError
 	INVALID_NUMBER,
 }
 
-fn Object*! parse(InStream* s, Allocator* allocator = allocator::heap())
+fn Object*! parse(InStream s, Allocator allocator = allocator::heap())
 {
 	JsonContext context = { .last_string = dstring::new_with_capacity(64, allocator), .stream = s, .allocator = allocator };
 	defer context.last_string.free();
@@ -44,8 +44,8 @@ enum JsonTokenType @local
 struct JsonContext @local
 {
 	uint line;
-	InStream* stream;
-	Allocator* allocator;
+	InStream stream;
+	Allocator allocator;
 	JsonTokenType token;
 	DString last_string;
 	double last_number;
@@ -170,7 +170,7 @@ fn Object*! parse_array(JsonContext* context) @local
 	while (token != JsonTokenType.RBRACKET)
 	{
 		Object* element = parse_from_token(context, token)!;
-		list.append(element);
+		list.push(element);
 		token = advance(context)!;
 		if (token == JsonTokenType.COMMA)
 		{
diff --git a/lib/std/io/bits.c3 b/lib/std/io/bits.c3
index 04449195b..9be309e4d 100644
--- a/lib/std/io/bits.c3
+++ b/lib/std/io/bits.c3
@@ -2,12 +2,12 @@ module std::io;
 
 struct BitReader
 {
-	InStream* reader;
+	InStream reader;
 	uint bits;
 	uint len;
 }
 
-fn void BitReader.init(&self, InStream* byte_reader)
+fn void BitReader.init(&self, InStream byte_reader)
 {
 	*self = { .reader = byte_reader };
 }
@@ -40,12 +40,12 @@ fn char! BitReader.read_bits(&self, uint nbits)
 
 struct BitWriter
 {
-	OutStream* writer;
+	OutStream writer;
 	uint bits;
 	uint len;
 }
 
-fn void BitWriter.init(&self, OutStream* byte_writer)
+fn void BitWriter.init(&self, OutStream byte_writer)
 {
 	*self = { .writer = byte_writer };
 }
diff --git a/lib/std/io/file.c3 b/lib/std/io/file.c3
index b250893c6..db110e6b9 100644
--- a/lib/std/io/file.c3
+++ b/lib/std/io/file.c3
@@ -161,7 +161,7 @@ fn char[]! load_buffer(String filename, char[] buffer)
 
 }
 
-fn char[]! load_new(String filename, Allocator* allocator = allocator::heap())
+fn char[]! load_new(String filename, Allocator allocator = allocator::heap())
 {
 	File file = open(filename, "rb")!;
 	defer (void)file.close();
diff --git a/lib/std/io/formatter.c3 b/lib/std/io/formatter.c3
index bf4fa358a..aaecfc05d 100644
--- a/lib/std/io/formatter.c3
+++ b/lib/std/io/formatter.c3
@@ -6,7 +6,7 @@ const int PRINTF_NTOA_BUFFER_SIZE = 256;
 
 interface Printable
 {
-	fn String to_new_string(Allocator *allocator) @optional;
+	fn String to_new_string(Allocator allocator) @optional;
 	fn usz! to_format(Formatter* formatter) @optional;
 }
 
@@ -72,7 +72,7 @@ fn usz! Formatter.out(&self, char c) @private
 	return 1;
 }
 
-fn usz! Formatter.print_with_function(&self, Printable* arg)
+fn usz! Formatter.print_with_function(&self, Printable arg)
 {
 	if (&arg.to_format)
 	{
@@ -98,7 +98,7 @@ fn usz! Formatter.print_with_function(&self, Printable* arg)
 			self.width = old_width;
 			self.prec = old_prec;
 		}
-		@stack_mem(1024; Allocator* mem)
+		@stack_mem(1024; Allocator mem)
 		{
 			return self.out_substr(arg.to_new_string(mem));
 		};
@@ -107,7 +107,7 @@ fn usz! Formatter.print_with_function(&self, Printable* arg)
 }
 
 
-fn usz! Formatter.out_str(&self, any* arg) @private
+fn usz! Formatter.out_str(&self, any arg) @private
 {
 	switch (arg.type.kindof)
 	{
@@ -119,7 +119,7 @@ fn usz! Formatter.out_str(&self, any* arg) @private
 		case FAULT:
 			return self.out_substr((*(anyfault*)arg.ptr).nameof);
 		case ANY:
-			return self.out_str(*(any**)arg);
+			return self.out_str(*(any*)arg);
 		case OPTIONAL:
 			unreachable();
 		case SIGNED_INT:
@@ -149,7 +149,7 @@ fn usz! Formatter.out_str(&self, any* arg) @private
 			return self.out_substr(*(bool*)arg.ptr ? "true" : "false");
 		default:
 	}
-	usz! n = self.print_with_function((Printable*)arg);
+	usz! n = self.print_with_function((Printable)arg);
 	if (catch err = n)
 	{
 		case SearchResult.MISSING:
@@ -246,7 +246,7 @@ fn usz! Formatter.out_str(&self, any* arg) @private
 			}
 			len += self.out_substr(">]")!;
 			return len;
-		case SUBARRAY:
+		case SLICE:
 			// this is SomeType[] so grab the "SomeType"
 			typeid inner = arg.type.inner;
 			if (inner == char.typeid)
@@ -291,7 +291,7 @@ fn void! out_null_fn(void* data @unused, char c @unused) @private
 
 
 
-fn usz! Formatter.vprintf(&self, String format, any*[] anys)
+fn usz! Formatter.vprintf(&self, String format, any[] anys)
 {
 	if (!self.out_fn)
 	{
@@ -358,7 +358,7 @@ fn usz! Formatter.vprintf(&self, String format, any*[] anys)
 		// evaluate specifier
 		uint base = 0;
 		if (variant_index >= anys.len) return PrintFault.MISSING_ARG?;
-		any* current = anys[variant_index++];
+		any current = anys[variant_index++];
 		switch (c)
 		{
 			case 'd':
diff --git a/lib/std/io/formatter_private.c3 b/lib/std/io/formatter_private.c3
index 13b5e2b52..57075cfd0 100644
--- a/lib/std/io/formatter_private.c3
+++ b/lib/std/io/formatter_private.c3
@@ -10,7 +10,7 @@ fn usz! Formatter.adjust(&self, usz len) @local
 	return self.pad(' ', self.width, len);
 }
 
-fn uint128! int_from_any(any* arg, bool *is_neg) @private
+fn uint128! int_from_any(any arg, bool *is_neg) @private
 {
 	switch (arg.type.kindof)
 	{
@@ -63,14 +63,11 @@ fn uint128! int_from_any(any* arg, bool *is_neg) @private
 	}
 }
 
-fn FloatType! float_from_any(any* arg) @private
+fn FloatType! float_from_any(any arg) @private
 {
 	$if env::F128_SUPPORT:
 		if (arg.type == float128.typeid) return (FloatType)*((float128*)arg.ptr);
 	$endif
-	$if env::F16_SUPPORT:
-		if (arg.type == float16.typeid) return *((float16*)arg.ptr);
-	$endif
 	if (arg.type.kindof == TypeKind.DISTINCT)
 	{
 		return float_from_any(arg.as_inner());
@@ -588,14 +585,14 @@ fn usz! Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint ba
 }
 
 
-fn usz! Formatter.ntoa_any(&self, any* arg, uint base) @private
+fn usz! Formatter.ntoa_any(&self, any arg, uint base) @private
 {
 	bool is_neg;
 	uint128 val = int_from_any(arg, &is_neg)!!;
 	return self.ntoa(val, is_neg, base) @inline;
 }
 
-fn usz! Formatter.out_char(&self, any* arg) @private
+fn usz! Formatter.out_char(&self, any arg) @private
 {
 	usz len = 1;
 	uint l = 1;
@@ -649,21 +646,21 @@ fn void! printf_advance_format(usz format_len, usz *index_ptr) @inline @private
 	if (val >= format_len) return FormattingFault.UNTERMINATED_FORMAT?;
 }
 
-fn any*! next_any(any** args_ptr, usz args_len, usz* arg_index_ptr) @inline @private
+fn any! next_any(any* args_ptr, usz args_len, usz* arg_index_ptr) @inline @private
 {
 	if (*arg_index_ptr >= args_len) return FormattingFault.MISSING_ARG?;
 	return args_ptr[(*arg_index_ptr)++];
 }
 
 fn int! printf_parse_format_field(
-	any** args_ptr, usz args_len, usz* args_index_ptr,
+	any* args_ptr, usz args_len, usz* args_index_ptr,
 	char* format_ptr, usz format_len, usz* index_ptr) @inline @private
 {
 	char c = format_ptr[*index_ptr];
 	if (c.is_digit()) return simple_atoi(format_ptr, format_len, index_ptr);
 	if (c != '*') return 0;
 	printf_advance_format(format_len, index_ptr)!;
-	any* val = next_any(args_ptr, args_len, args_index_ptr)!;
+	any val = next_any(args_ptr, args_len, args_index_ptr)!;
 	if (!val.type.kindof.is_int()) return FormattingFault.INVALID_WIDTH_ARG?;
 	uint! intval = types::any_to_int(val, int);
 	return intval ?? FormattingFault.INVALID_WIDTH_ARG?;
diff --git a/lib/std/io/io.c3 b/lib/std/io/io.c3
index 927a6fba8..d172b9f5a 100644
--- a/lib/std/io/io.c3
+++ b/lib/std/io/io.c3
@@ -49,9 +49,9 @@ fault IoError
  * @param stream
  * @require @is_instream(stream)
  **/
-macro String! readline(stream = io::stdin(), Allocator* allocator = allocator::heap())
+macro String! readline(stream = io::stdin(), Allocator allocator = allocator::heap())
 {
-	bool $is_stream = @typeid(stream) == InStream*.typeid;
+	bool $is_stream = @typeid(stream) == InStream.typeid;
 	$if $is_stream:
 		$typeof(&stream.read_byte) func = &stream.read_byte;
 		char val = func((void*)stream)!;
@@ -108,14 +108,14 @@ macro usz! fprint(out, x)
 	$endswitch
 }
 
-fn usz! fprintf(OutStream* out, String format, args...)
+fn usz! fprintf(OutStream out, String format, args...)
 {
 	Formatter formatter;
 	formatter.init(&out_putstream_fn, &out);
 	return formatter.vprintf(format, args);
 }
 
-fn usz! fprintfn(OutStream* out, String format, args...) @maydiscard
+fn usz! fprintfn(OutStream out, String format, args...) @maydiscard
 {
 	Formatter formatter;
 	formatter.init(&out_putstream_fn, &out);
@@ -133,7 +133,7 @@ macro usz! fprintn(out, x = "")
 	usz len = fprint(out, x)!;
 	out.write_byte('\n')!;
 	$switch
-		$case @typeid(out) == OutStream*.typeid:
+		$case @typeid(out) == OutStream.typeid:
 			if (&out.flush) out.flush()!;
 		$case $defined(out.flush):
 			out.flush()!;
@@ -164,7 +164,7 @@ macro void eprintn(x)
 
 fn void! out_putstream_fn(void* data, char c) @private
 {
-	OutStream** stream = data;
+	OutStream* stream = data;
 	return (*stream).write_byte(c);
 }
 
@@ -193,7 +193,7 @@ fn usz! printfn(String format, args...) @maydiscard
 fn usz! eprintf(String format, args...) @maydiscard
 {
 	Formatter formatter;
-	OutStream* stream = stderr();
+	OutStream stream = stderr();
 	formatter.init(&out_putstream_fn, &stream);
 	return formatter.vprintf(format, args);
 }
@@ -202,7 +202,7 @@ fn usz! eprintf(String format, args...) @maydiscard
 fn usz! eprintfn(String format, args...) @maydiscard
 {
 	Formatter formatter;
-	OutStream* stream = stderr();
+	OutStream stream = stderr();
 	formatter.init(&out_putstream_fn, &stream);
 	usz len = formatter.vprintf(format, args)! + 1;
 	stderr().write_byte('\n')!;
diff --git a/lib/std/io/os/getcwd.c3 b/lib/std/io/os/getcwd.c3
index 7dfdcc163..9e58c7093 100644
--- a/lib/std/io/os/getcwd.c3
+++ b/lib/std/io/os/getcwd.c3
@@ -1,7 +1,7 @@
 module std::io::os;
 import libc, std::os;
 
-macro String! getcwd(Allocator* allocator = allocator::heap())
+macro String! getcwd(Allocator allocator = allocator::heap())
 {
 	$switch
 		$case env::WIN32:
diff --git a/lib/std/io/os/ls.c3 b/lib/std/io/os/ls.c3
index dad50f7b3..0a72fb7eb 100644
--- a/lib/std/io/os/ls.c3
+++ b/lib/std/io/os/ls.c3
@@ -1,7 +1,7 @@
 module std::io::os @if(env::POSIX);
 import std::io, std::os;
 
-fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Allocator* allocator)
+fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Allocator allocator)
 {
 	PathList list;
 	list.new_init(.allocator = allocator);
@@ -16,7 +16,7 @@ fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Al
 		if (entry.d_type == posix::DT_LNK && no_symlinks) continue;
 		if (entry.d_type == posix::DT_DIR && no_dirs) continue;
 		Path path = path::new(name, allocator)!!;
-		list.append(path);
+		list.push(path);
 	}
 	return list;
 }
@@ -24,7 +24,7 @@ fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Al
 module std::io::os @if(env::WIN32);
 import std::time, std::os, std::io;
 
-fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Allocator* allocator)
+fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Allocator allocator)
 {
 	PathList list;
 	list.new_init(.allocator = allocator);
@@ -43,7 +43,7 @@ fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Al
 			{
 				String filename = string::temp_from_wstring((WString)&find_data.cFileName)!;
 				if (filename == ".." || filename == ".") continue;
-				list.append(path::new(filename, allocator)!);
+				list.push(path::new(filename, allocator)!);
 			};
 		} while (win32::findNextFileW(find, &find_data));
 		return list;
diff --git a/lib/std/io/os/temp_directory.c3 b/lib/std/io/os/temp_directory.c3
index 6cf288b54..766876727 100644
--- a/lib/std/io/os/temp_directory.c3
+++ b/lib/std/io/os/temp_directory.c3
@@ -1,7 +1,7 @@
 module std::io::os @if(env::LIBC);
 import std::io::path, std::os;
 
-fn Path! native_temp_directory(Allocator* allocator = allocator::heap()) @if(!env::WIN32)
+fn Path! native_temp_directory(Allocator allocator = allocator::heap()) @if(!env::WIN32)
 {
 	foreach (String env : { "TMPDIR", "TMP", "TEMP", "TEMPDIR" })
 	{
@@ -11,7 +11,7 @@ fn Path! native_temp_directory(Allocator* allocator = allocator::heap()) @if(!en
 	return path::new("/tmp", allocator);
 }
 
-fn Path! native_temp_directory(Allocator* allocator = allocator::heap()) @if(env::WIN32)
+fn Path! native_temp_directory(Allocator allocator = allocator::heap()) @if(env::WIN32)
 {
 	@pool(allocator)
 	{
@@ -25,7 +25,7 @@ fn Path! native_temp_directory(Allocator* allocator = allocator::heap()) @if(env
 
 module std::io::os @if(env::NO_LIBC);
 
-macro Path! native_temp_directory(Allocator* allocator = allocator::heap())
+macro Path! native_temp_directory(Allocator allocator = allocator::heap())
 {
 	return IoError.UNSUPPORTED_OPERATION?;
 }
diff --git a/lib/std/io/path.c3 b/lib/std/io/path.c3
index 7a2f8d073..617c17ec1 100644
--- a/lib/std/io/path.c3
+++ b/lib/std/io/path.c3
@@ -1,5 +1,6 @@
 module std::io::path;
 import std::collections::list, std::io::os;
+import std::os::win32;
 
 const PathEnv DEFAULT_PATH_ENV = env::WIN32 ? PathEnv.WIN32 : PathEnv.POSIX;
 const char PREFERRED_SEPARATOR_WIN32 = '\\';
@@ -26,7 +27,7 @@ enum PathEnv
 	POSIX
 }
 
-fn Path! getcwd(Allocator* allocator = allocator::heap())
+fn Path! getcwd(Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -40,7 +41,7 @@ fn usz! file_size(Path path) => os::native_file_size(path.str_view());
 fn bool exists(Path path) => os::native_file_or_dir_exists(path.str_view());
 fn Path! tgetcwd() => getcwd(allocator::temp()) @inline;
 fn void! chdir(Path path) => os::native_chdir(path) @inline;
-fn Path! temp_directory(Allocator* allocator = allocator::heap()) => os::native_temp_directory(allocator);
+fn Path! temp_directory(Allocator allocator = allocator::heap()) => os::native_temp_directory(allocator);
 fn void! delete(Path path) => os::native_remove(path.str_view()) @inline;
 
 macro bool is_separator(char c, PathEnv path_env = DEFAULT_PATH_ENV)
@@ -58,7 +59,7 @@ macro bool is_win32_separator(char c)
 	return c == '/' || c == '\\';
 }
 
-fn PathList! ls(Path dir, bool no_dirs = false, bool no_symlinks = false, String mask = "", Allocator* allocator = allocator::heap())
+fn PathList! ls(Path dir, bool no_dirs = false, bool no_symlinks = false, String mask = "", Allocator allocator = allocator::heap())
 {
 	$if $defined(os::native_ls):
 		return os::native_ls(dir, no_dirs, no_symlinks, mask, allocator);
@@ -105,7 +106,7 @@ fn void! rmtree(Path path)
 	$endif
 }
 
-fn Path! new(String path, Allocator* allocator = allocator::heap(), PathEnv path_env = DEFAULT_PATH_ENV)
+fn Path! new(String path, Allocator allocator = allocator::heap(), PathEnv path_env = DEFAULT_PATH_ENV)
 {
 	return { normalize(path.copy(allocator), path_env), path_env };
 }
@@ -115,7 +116,7 @@ fn Path! temp_new(String path, PathEnv path_env = DEFAULT_PATH_ENV)
 	return new(path, allocator::temp(), path_env);
 }
 
-fn Path! new_win32_wstring(WString path, Allocator* allocator = allocator::heap())
+fn Path! new_win32_wstring(WString path, Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -123,12 +124,12 @@ fn Path! new_win32_wstring(WString path, Allocator* allocator = allocator::heap(
 	};
 }
 
-fn Path! new_windows(String path, Allocator* allocator = allocator::heap())
+fn Path! new_windows(String path, Allocator allocator = allocator::heap())
 {
 	return new(path, allocator, WIN32);
 }
 
-fn Path! new_posix(String path, Allocator* allocator = allocator::heap())
+fn Path! new_posix(String path, Allocator allocator = allocator::heap())
 {
 	return new(path, allocator, POSIX);
 }
@@ -143,7 +144,7 @@ fn bool Path.equals(self, Path p2)
  *
  * @param [in] filename
  **/
-fn Path! Path.append(self, String filename, Allocator* allocator = allocator::heap())
+fn Path! Path.append(self, String filename, Allocator allocator = allocator::heap())
 {
 	if (!self.path_string.len) return new(filename, allocator, self.env)!;
 	assert(!is_separator(self.path_string[^1], self.env));
@@ -166,7 +167,19 @@ fn usz Path.start_of_base_name(self) @local
 	if (!path_str.len) return 0;
 	if (self.env == PathEnv.WIN32)
 	{
-		return path_str.rindex_of_char('\\') + 1 ?? volume_name_len(path_str, self.env)!!;
+		if (try index = path_str.rindex_of_char('\\'))
+		{
+			// c:\ style path, we're done!
+			if (path_str[0] != '\\') return index + 1;
+			// Handle \\server\foo
+			// Find the \ before "foo"
+			usz last_index = 2 + path_str[2..].index_of_char('\\')!!;
+			// If they don't match, we're done
+			assert(last_index <= index, "Invalid normalized, path %d vs %s in %s", last_index, index, path_str);
+			if (last_index != index) return index + 1;
+			// Otherwise just default to the volume length.
+		}
+		return volume_name_len(path_str, self.env)!!;
 	}
 	return path_str.rindex_of_char('/') + 1 ?? 0;
 }
@@ -176,28 +189,39 @@ fn bool! Path.is_absolute(self)
 	String path_str = self.str_view();
 	if (!path_str.len) return false;
 	usz path_start = volume_name_len(path_str, self.env)!;
+	if (path_start > 0 && path_str[0] == '\\') return true;
 	return path_start < path_str.len && is_separator(path_str[path_start], self.env);
 }
 
-fn Path! Path.absolute(self, Allocator* allocator = allocator::heap())
+/**
+ * @require self.env == DEFAULT_PATH_ENV : "This method is only available on native paths"
+ **/
+fn Path! Path.absolute(self, Allocator allocator = allocator::heap())
 {
 	String path_str = self.str_view();
-	if (!path_str.len) path_str = ".";
+	if (!path_str.len) return PathResult.INVALID_PATH?;
+	if (self.is_absolute()!) return new(path_str, allocator, self.env);
 	if (path_str == ".")
 	{
-		String cwd = os::getcwd(allocator::temp())!;
-		return new(cwd, allocator, self.env);
-	}
-	switch (self.env)
-	{
-		case WIN32:
-			usz path_start = volume_name_len(path_str, self.env)!;
-			if (path_start > 0) return self;
-		case POSIX:
-			if (path_str[0] == PREFERRED_SEPARATOR_POSIX) return self;
+		@pool(allocator)
+		{
+			String cwd = os::getcwd(allocator::temp())!;
+			return new(cwd, allocator, self.env);
+		};
 	}
-	String cwd = os::getcwd(allocator::temp())!;
-	return Path{ cwd, self.env }.append(path_str, allocator)!;
+	$if DEFAULT_PATH_ENV == WIN32:
+		@pool(allocator)
+		{
+			const usz BUFFER_LEN = 4096;
+			WString buffer = (WString)mem::temp_alloc_array(Char16, BUFFER_LEN);
+			buffer = win32::_wfullpath(buffer, path_str.to_temp_wstring()!, BUFFER_LEN);
+			if (!buffer) return PathResult.INVALID_PATH?;
+			return { string::new_from_wstring(buffer, allocator), WIN32 };
+		};
+	$else
+		String cwd = os::getcwd(allocator::temp())!;
+		return Path { cwd, self.env }.append(path_str, allocator)!;
+	$endif
 }
 
 fn String Path.basename(self)
@@ -208,13 +232,21 @@ fn String Path.basename(self)
 	return path_str[basename_start..];
 }
 
+
 fn String Path.dirname(self)
 {
 	usz basename_start = self.start_of_base_name();
 	String path_str = self.path_string;
-	if (basename_start == 0) return "";
+	if (basename_start == 0) return ".";
 	usz start = volume_name_len(path_str, self.env)!!;
-	if (basename_start <= start + 1) return path_str[:basename_start];
+	if (basename_start <= start + 1)
+	{
+		if (self.env == WIN32 && basename_start > start && path_str[0..1] == `\\`)
+		{
+			return path_str[:basename_start - 1];
+		}
+		return path_str[:basename_start];
+	}
 	return path_str[:basename_start - 1];
 }
 
@@ -248,13 +280,20 @@ fn usz! volume_name_len(String path, PathEnv path_env) @local
 			while (count < len && path[count] == '\\') count++;
 			// Not 2 => folded paths
 			if (count != 2) return 0;
-			// Check that we have a name followed by '/'
+			// Check that we have a name followed by '\'
+			isz base_found = 0;
 			for (usz i = 2; i < len; i++)
 			{
 				char c = path[i];
-				if (is_win32_separator(c)) return i;
+				if (is_win32_separator(c))
+				{
+					if (base_found) return i;
+					base_found = i;
+					continue;
+				}
 				if (is_reserved_win32_path_char(c)) return PathResult.INVALID_PATH?;
 			}
+			if (base_found > 0 && base_found + 1 < len) return len;
 			return PathResult.INVALID_PATH?;
 		case 'A'..'Z':
 		case 'a'..'z':
@@ -281,6 +320,10 @@ fn String! normalize(String path_str, PathEnv path_env = DEFAULT_PATH_ENV)
 {
 	if (!path_str.len) return "";
 	usz path_start = volume_name_len(path_str, path_env)!;
+	if (path_start > 0 && path_env == PathEnv.WIN32)
+	{
+		for (usz i = 0; i < path_start; i++) if (path_str[i] == '/') path_str[i] = '\\';
+	}
 	usz path_len = path_str.len;
 	if (path_start == path_len) return path_str;
 	char path_separator = path_env == PathEnv.WIN32 ? PREFERRED_SEPARATOR_WIN32 : PREFERRED_SEPARATOR_POSIX;
@@ -384,7 +427,9 @@ fn String! normalize(String path_str, PathEnv path_env = DEFAULT_PATH_ENV)
 		len++;
 	}
 	if (len > path_start + 1 && is_separator(path_str[len - 1], path_env)) len--;
-	path_str.ptr[len] = 0;
+	if (path_str.len > len) path_str.ptr[len] = 0;
+	// Empty path after normalization -> "."
+	if (!len) return ".";
 	return path_str[:len];
 }
 
@@ -395,6 +440,7 @@ fn String Path.root_directory(self)
 	String path_str = self.str_view();
 	usz len = path_str.len;
 	if (!len) return "";
+	if (path_str == ".") return ".";
 	if (self.env == PathEnv.WIN32)
 	{
 		usz root_len = volume_name_len(path_str, self.env)!!;
@@ -417,11 +463,12 @@ def PathWalker = fn bool! (Path, bool is_dir, void*);
 /*
  * Walk the path recursively. PathWalker is run on every file and
  * directory found. Return true to abort the walk.
+ * @require self.env == DEFAULT_PATH_ENV : "This method is only available on native paths"
  */
 fn bool! Path.walk(self, PathWalker w, void* data)
 {
 	const PATH_MAX = 512;
-	@stack_mem(PATH_MAX; Allocator* allocator)
+	@stack_mem(PATH_MAX; Allocator allocator)
 	{
 		Path abs = self.absolute(allocator)!;
 		PathList files = ls(abs, .allocator = allocator)!;
@@ -448,6 +495,11 @@ fn bool Path.has_suffix(self, String str)
 	return self.str_view().ends_with(str);
 }
 
+fn void Path.free_with_allocator(self, Allocator allocator)
+{
+	allocator::free(allocator, self.path_string.ptr);
+}
+
 fn void Path.free(self)
 {
 	free(self.path_string.ptr);
@@ -459,7 +511,7 @@ fn usz! Path.to_format(&self, Formatter* formatter) @dynamic
 	return formatter.print(self.str_view());
 }
 
-fn String Path.to_new_string(&self, Allocator* allocator = allocator::heap()) @dynamic
+fn String Path.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
 {
 	return self.str_view().copy(allocator);
 }
diff --git a/lib/std/io/stream.c3 b/lib/std/io/stream.c3
index f32702fad..61ba728ae 100644
--- a/lib/std/io/stream.c3
+++ b/lib/std/io/stream.c3
@@ -9,7 +9,7 @@ interface InStream
 	fn usz! available() @optional;
 	fn usz! read(char[] buffer);
 	fn char! read_byte();
-	fn usz! write_to(OutStream* out) @optional;
+	fn usz! write_to(OutStream out) @optional;
 	fn void! pushback_byte() @optional;
 }
 
@@ -21,10 +21,10 @@ interface OutStream
 	fn void! flush() @optional;
 	fn usz! write(char[] bytes);
 	fn void! write_byte(char c);
-	fn usz! read_to(InStream* in) @optional;
+	fn usz! read_to(InStream in) @optional;
 }
 
-fn usz! available(InStream* s)
+fn usz! available(InStream s)
 {
 	if (&s.available) return s.available();
 	if (&s.seek)
@@ -39,19 +39,19 @@ fn usz! available(InStream* s)
 
 macro bool @is_instream(#expr)
 {
-	return $assignable(#expr, InStream*);
+	return $assignable(#expr, InStream);
 }
 
 macro bool @is_outstream(#expr)
 {
-	return $assignable(#expr, OutStream*);
+	return $assignable(#expr, OutStream);
 }
 
 /**
  * @param [&out] ref
  * @require @is_instream(stream)
  **/
-macro usz! read_any(stream, any* ref)
+macro usz! read_any(stream, any ref)
 {
 	return read_all(stream, ((char*)ref)[:ref.type.sizeof]);
 }
@@ -61,7 +61,7 @@ macro usz! read_any(stream, any* ref)
  * @require @is_outstream(stream)
  * @ensure return == ref.type.sizeof
  */
-macro usz! write_any(stream, any* ref)
+macro usz! write_any(stream, any ref)
 {
 	return write_all(stream, ((char*)ref)[:ref.type.sizeof]);
 }
@@ -134,7 +134,7 @@ macro void! @pushback_using_seek(&s)
 	s.seek(-1, CURSOR)!;
 }
 
-fn usz! copy_to(InStream* in, OutStream* dst, char[] buffer = {})
+fn usz! copy_to(InStream in, OutStream dst, char[] buffer = {})
 {
 	if (buffer.len) return copy_through_buffer(in, dst, buffer);
 	if (&in.write_to) return in.write_to(dst);
@@ -156,7 +156,7 @@ fn usz! copy_to(InStream* in, OutStream* dst, char[] buffer = {})
 	$endswitch
 }
 
-macro usz! copy_through_buffer(InStream *in, OutStream* dst, char[] buffer) @local
+macro usz! copy_through_buffer(InStream in, OutStream dst, char[] buffer) @local
 {
 	usz total_copied;
 	while (true)
diff --git a/lib/std/io/stream/buffer.c3 b/lib/std/io/stream/buffer.c3
index 2f26d2984..301167f45 100644
--- a/lib/std/io/stream/buffer.c3
+++ b/lib/std/io/stream/buffer.c3
@@ -2,7 +2,7 @@ module std::io;
 
 struct ReadBuffer (InStream)
 {
-	InStream* wrapped_stream;
+	InStream wrapped_stream;
 	char[] bytes;
 	usz read_idx;
 	usz write_idx;
@@ -14,7 +14,7 @@ struct ReadBuffer (InStream)
  * @require bytes.len > 0
  * @require self.bytes.len == 0 "Init may not run on already initialized data"
  **/
-fn ReadBuffer* ReadBuffer.init(&self, InStream* wrapped_stream, char[] bytes)
+fn ReadBuffer* ReadBuffer.init(&self, InStream wrapped_stream, char[] bytes)
 {
 	*self = { .wrapped_stream = wrapped_stream, .bytes = bytes };
 	return self;
@@ -63,7 +63,7 @@ fn void! ReadBuffer.refill(&self) @local @inline
 
 struct WriteBuffer (OutStream)
 {
-	OutStream* wrapped_stream;
+	OutStream wrapped_stream;
 	char[] bytes;
 	usz index;
 }
@@ -74,7 +74,7 @@ struct WriteBuffer (OutStream)
  * @require bytes.len > 0 "Non-empty buffer required"
  * @require self.bytes.len == 0 "Init may not run on already initialized data"
  **/
-fn WriteBuffer* WriteBuffer.init(&self, OutStream* wrapped_stream, char[] bytes)
+fn WriteBuffer* WriteBuffer.init(&self, OutStream wrapped_stream, char[] bytes)
 {
 	*self = { .wrapped_stream = wrapped_stream, .bytes = bytes };
 	return self;
diff --git a/lib/std/io/stream/bytebuffer.c3 b/lib/std/io/stream/bytebuffer.c3
index 1e2f08c8b..8864b3630 100644
--- a/lib/std/io/stream/bytebuffer.c3
+++ b/lib/std/io/stream/bytebuffer.c3
@@ -3,7 +3,7 @@ import std::math;
 
 struct ByteBuffer (InStream, OutStream)
 {
-	Allocator* allocator;
+	Allocator allocator;
 	usz max_read;
 	char[] bytes;
 	usz read_idx;
@@ -16,17 +16,7 @@ struct ByteBuffer (InStream, OutStream)
  * max_read defines how many bytes might be kept before its internal buffer is shrinked.
  * @require self.bytes.len == 0 "Buffer already initialized."
  **/
-fn ByteBuffer*! ByteBuffer.init_new(&self, usz max_read, usz initial_capacity = 16, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(max_read, initial_capacity, allocator) @inline;
-}
-
-/**
- * ByteBuffer provides a streamable read/write buffer.
- * max_read defines how many bytes might be kept before its internal buffer is shrinked.
- * @require self.bytes.len == 0 "Buffer already initialized."
- **/
-fn ByteBuffer*! ByteBuffer.new_init(&self, usz max_read, usz initial_capacity = 16, Allocator* allocator = allocator::heap())
+fn ByteBuffer*! ByteBuffer.new_init(&self, usz max_read, usz initial_capacity = 16, Allocator allocator = allocator::heap())
 {
 	*self = { .allocator = allocator, .max_read = max_read };
 	initial_capacity = max(initial_capacity, 16);
@@ -34,11 +24,6 @@ fn ByteBuffer*! ByteBuffer.new_init(&self, usz max_read, usz initial_capacity =
 	return self;
 }
 
-fn ByteBuffer*! ByteBuffer.init_temp(&self, usz max_read, usz initial_capacity = 16) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init(max_read, initial_capacity) @inline;
-}
-
 fn ByteBuffer*! ByteBuffer.temp_init(&self, usz max_read, usz initial_capacity = 16)
 {
 	return self.new_init(max_read, initial_capacity, allocator::temp());
diff --git a/lib/std/io/stream/bytereader.c3 b/lib/std/io/stream/bytereader.c3
index 05c93a7b3..ea2ae3c79 100644
--- a/lib/std/io/stream/bytereader.c3
+++ b/lib/std/io/stream/bytereader.c3
@@ -53,7 +53,7 @@ fn usz! ByteReader.seek(&self, isz offset, Seek seek) @dynamic
 	return new_index;
 }
 
-fn usz! ByteReader.write_to(&self, OutStream* writer) @dynamic
+fn usz! ByteReader.write_to(&self, OutStream writer) @dynamic
 {
 	if (self.index >= self.bytes.len) return 0;
 	usz written = writer.write(self.bytes[self.index..])!;
diff --git a/lib/std/io/stream/bytewriter.c3 b/lib/std/io/stream/bytewriter.c3
index 8c0c52993..1caeb9b00 100644
--- a/lib/std/io/stream/bytewriter.c3
+++ b/lib/std/io/stream/bytewriter.c3
@@ -5,7 +5,7 @@ struct ByteWriter (OutStream)
 {
 	char[] bytes;
 	usz index;
-	Allocator* allocator;
+	Allocator allocator;
 }
 
 /**
@@ -14,23 +14,12 @@ struct ByteWriter (OutStream)
  * @require self.bytes.len == 0 "Init may not run on on already initialized data"
  * @ensure (bool)allocator, self.index == 0
  **/
-fn ByteWriter* ByteWriter.new_init(&self, Allocator* allocator = allocator::heap())
+fn ByteWriter* ByteWriter.new_init(&self, Allocator allocator = allocator::heap())
 {
 	*self = { .bytes = {}, .allocator = allocator };
 	return self;
 }
 
-/**
- * @param [&inout] self
- * @param [&inout] allocator
- * @require self.bytes.len == 0 "Init may not run on on already initialized data"
- * @ensure (bool)allocator, self.index == 0
- **/
-fn ByteWriter* ByteWriter.init_new(&self, Allocator* allocator = allocator::heap()) @deprecated("Replaced by new_init")
-{
-	return self.new_init(allocator) @inline;
-}
-
 /**
  * @param [&inout] self
  * @require self.bytes.len == 0 "Init may not run on on already initialized data"
@@ -41,16 +30,6 @@ fn ByteWriter* ByteWriter.temp_init(&self)
 	return self.new_init(allocator::temp()) @inline;
 }
 
-/**
- * @param [&inout] self
- * @require self.bytes.len == 0 "Init may not run on on already initialized data"
- * @ensure self.index == 0
- **/
-fn ByteWriter* ByteWriter.init_temp(&self) @deprecated("Replaced by temp_init")
-{
-	return self.temp_init() @inline;
-}
-
 fn ByteWriter* ByteWriter.init_with_buffer(&self, char[] data)
 {
 	*self = { .bytes = data, .allocator = null };
@@ -97,7 +76,7 @@ fn void! ByteWriter.write_byte(&self, char c) @dynamic
  * @param [&inout] self
  * @param reader
  **/
-fn usz! ByteWriter.read_from(&self, InStream* reader) @dynamic
+fn usz! ByteWriter.read_from(&self, InStream reader) @dynamic
 {
 	usz start_index = self.index;
 	if (&reader.available)
diff --git a/lib/std/io/stream/limitreader.c3 b/lib/std/io/stream/limitreader.c3
index c248a2f2d..06ee68768 100644
--- a/lib/std/io/stream/limitreader.c3
+++ b/lib/std/io/stream/limitreader.c3
@@ -2,7 +2,7 @@ module std::io;
 
 struct LimitReader (InStream)
 {
-	InStream* wrapped_stream;
+	InStream wrapped_stream;
 	usz limit;
 }
 
@@ -10,7 +10,7 @@ struct LimitReader (InStream)
  * @param [&inout] wrapped_stream "The stream to read from"
  * @param limit "The max limit to read"
  **/
-fn LimitReader* LimitReader.init(&self, InStream* wrapped_stream, usz limit)
+fn LimitReader* LimitReader.init(&self, InStream wrapped_stream, usz limit)
 {
 	*self = { .wrapped_stream = wrapped_stream, .limit = limit };
 	return self;
diff --git a/lib/std/io/stream/scanner.c3 b/lib/std/io/stream/scanner.c3
index 4965091b0..51c168003 100644
--- a/lib/std/io/stream/scanner.c3
+++ b/lib/std/io/stream/scanner.c3
@@ -2,7 +2,7 @@ module std::io;
 
 struct Scanner (InStream)
 {
-	InStream* wrapped_stream;
+	InStream wrapped_stream;
 	char[] buf;
 	usz pattern_idx;
 	usz read_idx;
@@ -16,7 +16,7 @@ struct Scanner (InStream)
  * @param [&in] stream "The stream to read data from."
  * @require buffer.len > 0 "Non-empty buffer required."
  **/
-fn void Scanner.init(&self, InStream* stream, char[] buffer)
+fn void Scanner.init(&self, InStream stream, char[] buffer)
 {
 	*self = { .wrapped_stream = stream, .buf = buffer };
 }
diff --git a/lib/std/math/math.c3 b/lib/std/math/math.c3
index fdd314a78..0c205dd0d 100644
--- a/lib/std/math/math.c3
+++ b/lib/std/math/math.c3
@@ -92,15 +92,13 @@ fault MatrixError
 
 def Complexf = Complex(<float>);
 def Complex = Complex(<double>);
-def complexf_identity = complex::identity(<float>);
-def complex_identity = complex::identity(<double>);
+def COMPLEX_IDENTITY = complex::IDENTITY(<double>);
+def COMPLEXF_IDENTITY = complex::IDENTITY(<float>);
 
 def Quaternionf = Quaternion(<float>);
 def Quaternion = Quaternion(<double>);
 def QUATERNION_IDENTITY = quaternion::IDENTITY(<double>);
 def QUATERNIONF_IDENTITY = quaternion::IDENTITY(<float>);
-def quaternion_identity = quaternion::identity(<double>);
-def quaternionf_identity = quaternion::identity(<float>);
 
 def Matrix2f = Matrix2x2(<float>);
 def Matrix2 = Matrix2x2(<double>);
diff --git a/lib/std/math/math_complex.c3 b/lib/std/math/math_complex.c3
index 28871d755..c323fc60c 100644
--- a/lib/std/math/math_complex.c3
+++ b/lib/std/math/math_complex.c3
@@ -10,7 +10,7 @@ union Complex
 }
 
 
-macro Complex identity() => { 1, 0 };
+const Complex IDENTITY = { 1, 0 };
 macro Complex Complex.add(self, Complex b) => Complex { .v = self.v + b.v };
 macro Complex Complex.add_each(self, Real b) => Complex { .v = self.v + b };
 macro Complex Complex.sub(self, Complex b) => Complex { .v = self.v - b.v };
diff --git a/lib/std/math/math_quaternion.c3 b/lib/std/math/math_quaternion.c3
index 938df7cef..efbd0bf13 100644
--- a/lib/std/math/math_quaternion.c3
+++ b/lib/std/math/math_quaternion.c3
@@ -11,7 +11,6 @@ union Quaternion
 
 const Quaternion IDENTITY = { 0, 0, 0, 1 };
 
-macro Quaternion identity() @deprecated("Replaced with QUATERNION_IDENTITY constant") => { 0, 0, 0, 1 };
 macro Quaternion Quaternion.add(Quaternion a, Quaternion b) => Quaternion { .v = a.v + b.v };
 macro Quaternion Quaternion.add_each(Quaternion a, Real b) => Quaternion { .v = a.v + b };
 macro Quaternion Quaternion.sub(Quaternion a, Quaternion b) => Quaternion { .v = a.v - b.v };
diff --git a/lib/std/net/inetaddr.c3 b/lib/std/net/inetaddr.c3
index ee783e30e..dc9318bff 100644
--- a/lib/std/net/inetaddr.c3
+++ b/lib/std/net/inetaddr.c3
@@ -4,9 +4,9 @@ import std::ascii;
 
 enum IpProtocol : char (AIFamily ai_family)
 {
-	UNSPECIFIED (os::AF_UNSPEC),
-	IPV4        (os::AF_INET),
-	IPV6        (os::AF_INET6),
+	UNSPECIFIED = os::AF_UNSPEC,
+	IPV4        = os::AF_INET,
+	IPV6        = os::AF_INET6,
 }
 
 struct InetAddress (Printable)
@@ -56,7 +56,7 @@ fn usz! InetAddress.to_format(InetAddress* addr, Formatter* formatter) @dynamic
 	return formatter.printf("%d.%d.%d.%d", addr.ipv4.a, addr.ipv4.b, addr.ipv4.c, addr.ipv4.d)!;
 }
 
-fn String InetAddress.to_new_string(InetAddress* addr, Allocator* allocator = allocator::heap()) @dynamic
+fn String InetAddress.to_new_string(InetAddress* addr, Allocator allocator = allocator::heap()) @dynamic
 {
 	if (addr.is_ipv6)
 	{
diff --git a/lib/std/net/net.c3 b/lib/std/net/net.c3
index c2cab40c8..bc77247de 100644
--- a/lib/std/net/net.c3
+++ b/lib/std/net/net.c3
@@ -57,7 +57,7 @@ fn uint! ipv4toint(String s)
 	return out;
 }
 
-fn String! int_to_new_ipv4(uint val, Allocator* allocator = allocator::heap())
+fn String! int_to_new_ipv4(uint val, Allocator allocator = allocator::heap())
 {
 	char[3 * 4 + 3 + 1] buffer;
 	String res = (String)io::bprintf(&buffer, "%d.%d.%d.%d", val >> 24, (val >> 16) & 0xFF, (val >> 8) & 0xFF, val & 0xFF)!;
diff --git a/lib/std/net/socket.c3 b/lib/std/net/socket.c3
index 26e3deb4a..bec049ded 100644
--- a/lib/std/net/socket.c3
+++ b/lib/std/net/socket.c3
@@ -83,12 +83,12 @@ macro Socket new_socket(fd, ai)
 
 enum SocketOption : char (CInt value)
 {
-	REUSEADDR (os::SO_REUSEADDR),
-	REUSEPORT (os::SO_REUSEPORT) @if(!env::WIN32),
-	KEEPALIVE (os::SO_KEEPALIVE),
-	BROADCAST (os::SO_BROADCAST),
-	OOBINLINE (os::SO_OOBINLINE),
-	DONTROUTE (os::SO_DONTROUTE),
+	REUSEADDR                  = os::SO_REUSEADDR,
+	REUSEPORT @if(!env::WIN32) = os::SO_REUSEPORT,
+	KEEPALIVE                  = os::SO_KEEPALIVE,
+	BROADCAST                  = os::SO_BROADCAST,
+	OOBINLINE                  = os::SO_OOBINLINE,
+	DONTROUTE                  = os::SO_DONTROUTE,
 }
 
 fn bool! Socket.get_broadcast(&self) => self.get_option(BROADCAST);
diff --git a/lib/std/os/backtrace.c3 b/lib/std/os/backtrace.c3
index df29db488..c0902be81 100644
--- a/lib/std/os/backtrace.c3
+++ b/lib/std/os/backtrace.c3
@@ -19,7 +19,7 @@ struct Backtrace (Printable)
 	String object_file;
 	String file;
 	uint line;
-	Allocator* allocator;
+	Allocator allocator;
 }
 
 
@@ -53,7 +53,7 @@ fn void Backtrace.free(&self)
 	allocator::free(self.allocator, self.file);
 }
 
-fn Backtrace* Backtrace.init(&self, uptr offset, String function, String object_file, String file = "", uint line = 0, Allocator* allocator)
+fn Backtrace* Backtrace.init(&self, uptr offset, String function, String object_file, String file = "", uint line = 0, Allocator allocator)
 {
 	if (!allocator)
 	{
@@ -95,7 +95,7 @@ def symbolize_backtrace = linux::symbolize_backtrace @if(env::LINUX);
 def symbolize_backtrace = win32::symbolize_backtrace @if(env::WIN32);
 def symbolize_backtrace = darwin::symbolize_backtrace @if(env::DARWIN);
 
-fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator) @if(!env::NATIVE_STACKTRACE)
+fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator allocator) @if(!env::NATIVE_STACKTRACE)
 {
 	return {};
 }
\ No newline at end of file
diff --git a/lib/std/os/env.c3 b/lib/std/os/env.c3
index 126302d0f..06a9be55e 100644
--- a/lib/std/os/env.c3
+++ b/lib/std/os/env.c3
@@ -9,7 +9,7 @@ import std::io::path, libc, std::os;
  * @require name.len > 0
  * @return! SearchResult.MISSING
  **/
-fn String! get_var(String name, Allocator* allocator = allocator::heap())
+fn String! get_var(String name, Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -72,7 +72,7 @@ fn bool set_var(String name, String value, bool overwrite = true)
 /**
  * Returns the current user's home directory.
  **/
-fn String! get_home_dir(Allocator* using = allocator::heap())
+fn String! get_home_dir(Allocator using = allocator::heap())
 {
 	String home;
 	$if !env::WIN32:
@@ -86,7 +86,7 @@ fn String! get_home_dir(Allocator* using = allocator::heap())
 /**
  * Returns the current user's config directory.
  **/
-fn Path! get_config_dir(Allocator* allocator = allocator::heap())
+fn Path! get_config_dir(Allocator allocator = allocator::heap())
 {
 	@pool(allocator)
 	{
@@ -126,7 +126,7 @@ fn bool clear_var(String name)
 	};
 }
 
-fn String! executable_path(Allocator *allocator = allocator::heap())
+fn String! executable_path(Allocator allocator = allocator::heap())
 {
 	$if env::DARWIN:
 		return darwin::executable_path(allocator);
diff --git a/lib/std/os/linux/linux.c3 b/lib/std/os/linux/linux.c3
index 894299a44..b1f47045c 100644
--- a/lib/std/os/linux/linux.c3
+++ b/lib/std/os/linux/linux.c3
@@ -128,7 +128,7 @@ fn ulong! elf_module_image_base(String path) @local
 	return 0;
 }
 
-fn Backtrace! backtrace_load_from_exec(void* addr, Allocator* allocator) @local
+fn Backtrace! backtrace_load_from_exec(void* addr, Allocator allocator) @local
 {
 	char[] buf = mem::temp_alloc_array(char, 1024);
 
@@ -138,7 +138,7 @@ fn Backtrace! backtrace_load_from_exec(void* addr, Allocator* allocator) @local
 	return backtrace_from_addr2line(addr, addr2line, obj_name, "???", allocator);
 }
 
-fn Backtrace! backtrace_load_from_dlinfo(void* addr, Linux_Dl_info* info, Allocator* allocator) @local
+fn Backtrace! backtrace_load_from_dlinfo(void* addr, Linux_Dl_info* info, Allocator allocator) @local
 {
 	char[] buf = mem::temp_alloc_array(char, 1024);
 
@@ -149,7 +149,7 @@ fn Backtrace! backtrace_load_from_dlinfo(void* addr, Linux_Dl_info* info, Alloca
 	return backtrace_from_addr2line(addr, addr2line, info.dli_fname.str_view(), sname, allocator);
 }
 
-fn Backtrace! backtrace_from_addr2line(void* addr, String addr2line, String obj_name, String func_name, Allocator* allocator) @local
+fn Backtrace! backtrace_from_addr2line(void* addr, String addr2line, String obj_name, String func_name, Allocator allocator) @local
 {
 	String[] parts = addr2line.tsplit(" at ");
 	if (parts.len != 2)
@@ -182,7 +182,7 @@ fn Backtrace! backtrace_from_addr2line(void* addr, String addr2line, String obj_
 	};
 }
 
-fn Backtrace! backtrace_load_element(void* addr, Allocator* allocator = allocator::heap()) @local
+fn Backtrace! backtrace_load_element(void* addr, Allocator allocator = allocator::heap()) @local
 {
 	if (!addr) return backtrace::BACKTRACE_UNKNOWN;
 
@@ -197,7 +197,7 @@ fn Backtrace! backtrace_load_element(void* addr, Allocator* allocator = allocato
 	};
 }
 
-fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
+fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator allocator)
 {
 	BacktraceList list;
 	list.new_init(backtrace.len, allocator);
@@ -214,7 +214,7 @@ fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
 		foreach (addr : backtrace)
 		{
 			Backtrace trace = backtrace_load_element(addr, allocator)!;
-			list.append(trace);
+			list.push(trace);
 		}
 	};
 	return list;
diff --git a/lib/std/os/macos/darwin.c3 b/lib/std/os/macos/darwin.c3
index 0a2d84083..4e46836be 100644
--- a/lib/std/os/macos/darwin.c3
+++ b/lib/std/os/macos/darwin.c3
@@ -68,7 +68,7 @@ struct Darwin_segment_command_64
 }
 
 
-fn String! executable_path(Allocator *allocator)
+fn String! executable_path(Allocator allocator)
 {
 	char[4096] path;
 	uint len = path.len;
@@ -93,7 +93,7 @@ fn uptr! load_address() @local
 }
 
 
-fn Backtrace! backtrace_load_element(String execpath, void* buffer, void* load_address, Allocator* allocator = allocator::heap()) @local
+fn Backtrace! backtrace_load_element(String execpath, void* buffer, void* load_address, Allocator allocator = allocator::heap()) @local
 {
 	@pool(allocator)
 	{
@@ -132,7 +132,7 @@ fn Backtrace! backtrace_load_element(String execpath, void* buffer, void* load_a
 	};
 }
 
-fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
+fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator allocator)
 {
 	void *load_addr = (void *)load_address()!;
 	BacktraceList list;
@@ -150,7 +150,7 @@ fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
 		String execpath = executable_path(allocator::temp())!;
 		foreach (addr : backtrace)
 		{
-			list.append(backtrace_load_element(execpath, addr, load_addr, allocator) ?? backtrace::BACKTRACE_UNKNOWN);
+			list.push(backtrace_load_element(execpath, addr, load_addr, allocator) ?? backtrace::BACKTRACE_UNKNOWN);
 		}
 	};
 	return list;
diff --git a/lib/std/os/macos/objc.c3 b/lib/std/os/macos/objc.c3
index 75d1c338e..ac9dfed93 100644
--- a/lib/std/os/macos/objc.c3
+++ b/lib/std/os/macos/objc.c3
@@ -24,7 +24,7 @@ macro Class! class_by_name(ZString c)
 	return cls ?: ObjcFailure.CLASS_NOT_FOUND?;
 }
 
-macro Class[] class_get_list(Allocator *allocator = allocator::heap())
+macro Class[] class_get_list(Allocator allocator = allocator::heap())
 {
 	int num_classes = macos_objc_getClassList(null, 0);
 	if (!num_classes) return {};
diff --git a/lib/std/os/win32/files.c3 b/lib/std/os/win32/files.c3
index c51c4ec0a..75d2dfdf5 100644
--- a/lib/std/os/win32/files.c3
+++ b/lib/std/os/win32/files.c3
@@ -99,6 +99,8 @@ extern fn CFile _fdopen(int fd, ZString mode);
 extern fn CInt _access(ZString path, CInt mode);
 extern fn CInt _waccess(WString path, CInt mode);
 
+extern fn WString _wfullpath(WString absPath, WString relPath, usz maxLength);
+
 /*
 extern ulong _win32_GetCurrentDirectoryW(ulong, Char16* buffer) @extern("GetCurrentDirectoryW");
 extern bool _win32_CreateSymbolicLinkW(WString symlink_file, WString target_file, ulong flags) @extern("CreateSymbolicLinkW");
diff --git a/lib/std/os/win32/process.c3 b/lib/std/os/win32/process.c3
index 9788aea29..f03d34f13 100644
--- a/lib/std/os/win32/process.c3
+++ b/lib/std/os/win32/process.c3
@@ -152,7 +152,7 @@ struct Symbol
 
 Win32_DWORD64 displacement;
 
-fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
+fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator allocator)
 {
 	BacktraceList list;
 	list.new_init(backtrace.len, allocator);
@@ -161,12 +161,12 @@ fn BacktraceList! symbolize_backtrace(void*[] backtrace, Allocator* allocator)
 	defer symCleanup(process);
 	foreach (addr : backtrace)
 	{
-		list.append(resolve_backtrace(addr, process, allocator) ?? backtrace::BACKTRACE_UNKNOWN);
+		list.push(resolve_backtrace(addr, process, allocator) ?? backtrace::BACKTRACE_UNKNOWN);
 	}
 	return list;
 }
 
-fn Backtrace! resolve_backtrace(void* addr, Win32_HANDLE process, Allocator* allocator)
+fn Backtrace! resolve_backtrace(void* addr, Win32_HANDLE process, Allocator allocator)
 {
 	Symbol symbol;
 	//Win32_DWORD image_type = load_modules()!;
diff --git a/releasenotes.md b/releasenotes.md
index a07bc66f1..41e6dc0ef 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,47 @@
 # C3C Release Notes
 
+## 0.6.0 Change list
+
+### Changes / improvements
+- `@default` implementations for interfaces removed.
+- `any*` => `any`, same for interfaces.
+- Private / local globals now have `internal` visibility in LLVM.
+- Updated enum syntax.
+- 'rgba' also available for swizzling.
+- The name "subarray" has been replaced by the more well known name "slice' across the codebase.
+- Improved alignment handling.
+- Add `--output-dir` to command line. #1155
+- Allow making distinct types out of "void", "typeid", "anyfault" and faults.
+- Removed `--system-linker` setting.
+- "Try" expressions may not be any binary or unary expressions. So for example `try foo() + 1` is disallowed.
+- Added `$$REGISTER_SIZE` for int register size.
+- `assert(false)` only allowed in unused branches or in tests. Compile time failed asserts is a compile time error.
+- Require expression blocks returning values to have the value used.
+- Detect "unsigned >= 0" as errors.
+- Improve callstack debug information #1184.
+- Request jump table using @jump for switches.
+- Improved inline debug information.
+- Improved error messages on inlined macros.
+- Introduce MSVC compatible SIMD ABI.
+
+### Fixes
+- Fixed issue in safe mode when converting enums.
+- Better checking of operator methods.
+- Bug when assigning an optional from an optional.
+- Lambdas were not type checked thoroughly #1185. 
+
+### Stdlib changes
+- "init_new/init_temp" removed. 
+- LinkedList API rewritten. 
+- List "pop" and "remove" function now return Optionals. 
+- RingBuffer API rewritten. Allocator interface changed. 
+- Deprecated Allocator, DString and mem functions removed. 
+- "identity" functions are now constants for Matrix and Complex numbers.
+- Removed 'append' from Object and List, replaced by 'push'.
+- `GenericList` renamed `AnyList`.
+- Proper handling of '.' and Win32 '//server' paths.
+- Path normalization - fix possible null terminator out of bounds.
+
 ## 0.5.6 Change list
 
 ### Changes / improvements
@@ -388,13 +430,13 @@
 - Fixed errors on flexible array slices.
 - Fix of `readdir` issues on macOS.
 - Fix to slice assignment of distinct types.
-- Fix of issue casting subarrays to distinct types.
+- Fix of issue casting slices to distinct types.
 - Fixes to `split`, `rindex_of`.
 - List no longer uses the temp allocator by default.
 - Remove test global when not in test mode.
 - Fix sum/product on floats.
 - Fix error on void! return of macros.
-- Removed too permissive casts on subarrays.
+- Removed too permissive casts on slices.
 - Using C files correctly places objects in the build folder.
 - Fix of overaligned deref.
 - Fix negating a float vector.
@@ -497,7 +539,7 @@
 - Added type.inner and type.len reflection.
 - Support float mod operations.
 - Add float.max/min.
-- Allow [in] contract to be used on subarray types.
+- Allow [in] contract to be used on slices.
 - Add linker and linked dir arguments to build files.
 - Auto-import std::core.
 - LLVM 15 support.
diff --git a/resources/castrules.md b/resources/castrules.md
index 8dab9184c..eca24eb92 100644
--- a/resources/castrules.md
+++ b/resources/castrules.md
@@ -18,7 +18,7 @@ Some short names:
 | int      | cond   | sw/sn    | always | explptr | no     | expand   | explbase | edist | no       | no     | no     | no     | no     | edist  | no     |
 | float    | cond   | expl     | sw/sn  | no      | no     | expand   | no       | edist | no       | no     | no     | no     | no     | no     | no     |
 | pointer  | cond   | explptr  | no     | ptrconv | arve   | expand   | no       | edist | no       | no     | no     | yes    | expl   | no     | expl   |
-| subarray | cond   | no       | no     | no      | saconv | no       | no       | edist | no?      | no     | no     | no     | no     | no     | no     |
+| slice    | cond   | no       | no     | no      | saconv | no       | no       | edist | no?      | no     | no     | no     | no     | no     | no     |
 | vec      | cond   | no       | no     | no      | no     | as base  | no       | edist | expl     | no     | no     | no     | no     | no     | no     |
 | bits     | no     | explbase | no     | no      | no     | no       | no?      | edist | explbase | no     | no     | no     | no     | no     | no     |
 | distc    | edist  | edist    | edist  | edist   | edist  | edist    | edist    | edist | edist    | edist  | edist  | edist  | edist  | edist  | edist  |
diff --git a/resources/examples/brainfk.c3 b/resources/examples/brainfk.c3
index c85be28f6..a948dd74e 100644
--- a/resources/examples/brainfk.c3
+++ b/resources/examples/brainfk.c3
@@ -9,7 +9,7 @@ fault InterpretError
 	INTEPRET_FAILED
 }
 
-fn void! print_error(usz pos, String err)
+fn void! print_error_type_at(usz pos, String err)
 {
 	io::printfn("Error at %s: %s", pos, err);
 	return InterpretError.INTEPRET_FAILED?;
@@ -25,10 +25,10 @@ fn void! brainf(String program)
 		switch (c)
 		{
 			case '<':
-				if (!mem) return print_error(sp, "Memory underflow");
+				if (!mem) return print_error_type_at(sp, "Memory underflow");
 				mem--;
 			case '>':
-				if (mem == BF_MEM - 1) return print_error(sp, "Memory overflow");
+				if (mem == BF_MEM - 1) return print_error_type_at(sp, "Memory overflow");
 				mem++;
 			case '+':
 				memory[mem]++;
@@ -45,7 +45,7 @@ fn void! brainf(String program)
 				usz start = sp - 1;
 				while (indent)
 				{
-					if (sp == program.len) return print_error(start, "No matching ']'");
+					if (sp == program.len) return print_error_type_at(start, "No matching ']'");
 					switch (program[sp++])
 					{
 						case ']': indent--;
@@ -59,7 +59,7 @@ fn void! brainf(String program)
 				usz indent = 1;
 				while (indent)
 				{
-					if (!sp) return print_error(start, "No matching '['");
+					if (!sp) return print_error_type_at(start, "No matching '['");
 					switch (program[--sp])
 					{
 						case ']': indent++;
diff --git a/resources/examples/contextfree/boolerr.c3 b/resources/examples/contextfree/boolerr.c3
index 89015acb4..a581e697b 100644
--- a/resources/examples/contextfree/boolerr.c3
+++ b/resources/examples/contextfree/boolerr.c3
@@ -27,7 +27,7 @@ struct Summary
 	bool ok;
 }
 
-fn void! Summary.print(Summary *s, OutStream* out)
+fn void! Summary.print(Summary *s, OutStream out)
 {
 	io::fprintf(out, "Summary({ .title = %s, .ok = %s})", s.title.get() ?? "missing", s.ok)!;
 }
@@ -76,7 +76,7 @@ fn void main()
     const String[] URLS = { "good", "title-empty", "title-missing", "head-missing", "fail" };
     DynamicArenaAllocator dynamic_arena;
 	dynamic_arena.init(1024, allocator::heap());
-	OutStream* out = io::stdout();
+	OutStream out = io::stdout();
     foreach (String url : URLS)
     {
         mem::@scoped(&dynamic_arena)
diff --git a/resources/examples/levenshtein.c3 b/resources/examples/levenshtein.c3
index 7ee37e900..1804a195a 100644
--- a/resources/examples/levenshtein.c3
+++ b/resources/examples/levenshtein.c3
@@ -1,7 +1,7 @@
 module levenshtein;
 import std::math;
 
-// This levenshtein exercises C3 subarrays.
+// This levenshtein exercises C3 slices.
 fn int levenshtein(String s, String t)
 {
 	// if either string is empty, difference is inserting all chars
diff --git a/resources/examples/nolibc/project.json b/resources/examples/nolibc/project.json
index 117a59507..aeaf3d0ef 100644
--- a/resources/examples/nolibc/project.json
+++ b/resources/examples/nolibc/project.json
@@ -29,7 +29,7 @@
       "link-libc": false,
       "opt": "O0",
       "safe": false,
-      "system-linker": true,
+      "linker": "builtin",
       "use-stdlib": false,
     },
   },
@@ -68,8 +68,8 @@
   // The size of the symtab, which limits the amount
   // of symbols that can be used. Should usually not be changed.
   "symtab": 1048576,
-  // Use the system linker.
-  "system-linker": false,
+  // Select linker.
+  "linker": "cc",
   // Include the standard library.
   "use-stdlib": true,
   // Set general level of x64 cpu: "baseline", "ssse3", "sse4", "avx1", "avx2-v1", "avx2-v2", "avx512", "native".
diff --git a/resources/examples/process.c3 b/resources/examples/process.c3
index 3306c3773..e633ebb1f 100644
--- a/resources/examples/process.c3
+++ b/resources/examples/process.c3
@@ -7,7 +7,7 @@ fn void! main()
 	String command = env::WIN32 ? "dir" : "ls";
 	SubProcess x = process::create({ command }, { .search_user_path = true })!!;
 	x.join()!;
-	InStream* stream = &&x.stdout();
+	InStream stream = &&x.stdout();
 	while (try char b = stream.read_byte())
 	{
 		io::printf("%c", b);
diff --git a/resources/examples/project_all_settings.json b/resources/examples/project_all_settings.json
index 261e954a3..94a84319b 100644
--- a/resources/examples/project_all_settings.json
+++ b/resources/examples/project_all_settings.json
@@ -66,7 +66,7 @@
   // of symbols that can be used. Should usually not be changed.
   "symtab": 1048576,
   // Use the system linker.
-  "system-linker": false,
+  "linker": "cc",
   // Include the standard library.
   "use-stdlib": true,
   // Set general level of x64 cpu: "baseline", "ssse3", "sse4", "avx1", "avx2-v1", "avx2-v2", "avx512", "native".
diff --git a/resources/grammar/grammar.y b/resources/grammar/grammar.y
index 619792850..0fe096d54 100644
--- a/resources/grammar/grammar.y
+++ b/resources/grammar/grammar.y
@@ -320,7 +320,12 @@ relational_stmt_expr
 	| relational_stmt_expr relational_op additive_expr
 	;
 
-rel_or_lambda_expr
+try_catch_rhs_expr
+	: call_expr
+	| lambda_decl IMPLIES relational_expr
+	;
+
+try_chain_expr
 	: relational_expr
 	| lambda_decl IMPLIES relational_expr
 	;
@@ -484,7 +489,7 @@ enum_list
 
 enum_constant
 	: CONST_IDENT opt_attributes
-	| CONST_IDENT '(' arg_list ')' opt_attributes
+	| CONST_IDENT opt_attributes '=' constant_expr
 	;
 
 identifier_list
@@ -493,9 +498,7 @@ identifier_list
 	;
 
 enum_param_decl
-	: type
-	| type IDENT
-	| type IDENT '=' expr
+	: type IDENT
 	;
 
 base_type
@@ -638,15 +641,15 @@ catch_unwrap
 	;
 
 try_unwrap
-	: TRY rel_or_lambda_expr
-	| TRY IDENT '=' rel_or_lambda_expr
-	| TRY type IDENT '=' rel_or_lambda_expr
+	: TRY try_catch_rhs_expr
+	| TRY IDENT '=' try_chain_expr
+	| TRY type IDENT '=' try_chain_expr
 	;
 
 try_unwrap_chain
 	: try_unwrap
 	| try_unwrap_chain AND_OP try_unwrap
-	| try_unwrap_chain AND_OP rel_or_lambda_expr
+	| try_unwrap_chain AND_OP try_chain_expr
 	;
 
 default_stmt
@@ -1017,12 +1020,6 @@ enum_params
 	| enum_params ',' enum_param_decl
 	;
 
-enum_param_list
-	: '(' enum_params ')'
-	| '(' ')'
-	| empty
-	;
-
 struct_member_decl
 	: type identifier_list opt_attributes ';'
 	| struct_or_union IDENT opt_attributes struct_body
@@ -1034,12 +1031,14 @@ struct_member_decl
 	;
 
 enum_spec
-	: ':' type enum_param_list
-	| empty
+	: ':' base_type '(' enum_params ')'
+	| ':' base_type
+	| ':' '(' enum_params ')'
 	;
 
 enum_declaration
 	: ENUM TYPE_IDENT opt_interface_impl enum_spec opt_attributes '{' enum_list '}'
+	| ENUM TYPE_IDENT opt_interface_impl opt_attributes '{' enum_list '}'
 	;
 
 faults
diff --git a/resources/testfragments/allocators_testing.c3 b/resources/testfragments/allocators_testing.c3
index 80fba3239..7f55e708f 100644
--- a/resources/testfragments/allocators_testing.c3
+++ b/resources/testfragments/allocators_testing.c3
@@ -21,7 +21,7 @@ fn void setstring(char* dst, String str)
 	dst[0] = 0;
 }
 
-fn void testAllocator(Allocator* a, int val)
+fn void testAllocator(Allocator a, int val)
 {
 	io::printn("Test");
 	void* data = allocator::malloc_aligned(a, val, 128, 16)!!;
diff --git a/resources/testfragments/demo1.c3 b/resources/testfragments/demo1.c3
index 6fef9e5d5..74e2d2ee2 100644
--- a/resources/testfragments/demo1.c3
+++ b/resources/testfragments/demo1.c3
@@ -111,7 +111,7 @@ fn void testArrays()
     printArray(&x);
     printArray(y);
     printArray(x[1..]);
-    puts("Array to pointer to subarray---");
+    puts("Array to pointer to slice---");
     int* z = &x;
     printArray(z[0..2]);
     printf("Pointer to array: %p\nPointer to slice: %p\nPointer to first element of slice: %p\n", z, &y, &y[0]);
diff --git a/src/build/build.h b/src/build/build.h
index 323a3b1db..89501775f 100644
--- a/src/build/build.h
+++ b/src/build/build.h
@@ -137,12 +137,6 @@ typedef enum
 	SINGLE_MODULE_ON = 1
 } SingleModule;
 
-typedef enum
-{
-	SYSTEM_LINKER_NOT_SET = -1,
-	SYSTEM_LINKER_OFF = 0,
-	SYSTEM_LINKER_ON = 1
-} SystemLinker;
 
 typedef enum
 {
@@ -187,6 +181,13 @@ typedef enum
 	SOFT_FLOAT_YES = 1
 } SoftFloat;
 
+typedef enum
+{
+	WIN64_SIMD_DEFAULT = -1,
+	WIN64_SIMD_FULL = 0,
+	WIN64_SIMD_ARRAY = 1
+} Win64Simd;
+
 typedef enum
 {
 	STRUCT_RETURN_DEFAULT = -1,
@@ -366,6 +367,7 @@ typedef struct BuildOptions_
 	const char *testfn;
 	const char *cc;
 	const char *build_dir;
+	const char *output_dir;
 	const char *llvm_out;
 	const char *asm_out;
 	const char *obj_out;
@@ -373,6 +375,7 @@ typedef struct BuildOptions_
 	RelocModel reloc_model;
 	X86VectorCapability x86_vector_capability;
 	X86CpuSet x86_cpu_set;
+	Win64Simd win_64_simd;
 	FpOpt fp_math;
 	EmitStdlib emit_stdlib;
 	UseStdlib use_stdlib;
@@ -501,6 +504,7 @@ typedef struct
 		X86VectorCapability x86_vector_capability : 4;
 		RiscvFloatCapability riscv_float_capability : 4;
 		bool trap_on_wrap : 1;
+		Win64Simd pass_win64_simd_as_arrays : 3;
 		FpOpt fp_math;
 		SafetyLevel safe_mode;
 		X86CpuSet x86_cpu_set;
diff --git a/src/build/build_internal.h b/src/build/build_internal.h
index a9fea1b2c..6e51b992c 100644
--- a/src/build/build_internal.h
+++ b/src/build/build_internal.h
@@ -47,6 +47,11 @@ static const char *riscv_capability[3] = {
 	[RISCVFLOAT_DOUBLE] = "double",
 };
 
+static const char *win64_simd_type[2] = {
+	[WIN64_SIMD_ARRAY] = "array",
+	[WIN64_SIMD_FULL] = "full",
+};
+
 static const char *fp_math[3] = {
 	[FP_STRICT] = "strict",
 	[FP_RELAXED] = "relaxed",
diff --git a/src/build/build_options.c b/src/build/build_options.c
index d91aeea4f..2125ae116 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -105,6 +105,7 @@ static void usage(void)
 	OUTPUT("  -D <name>                  - Add feature flag <name>.");
 	OUTPUT("  -U <name>                  - Remove feature flag <name>.");
 	OUTPUT("  --trust=<option>           - Trust level: none (default), include ($include allowed), full ($exec / exec allowed).");
+	OUTPUT("  --output-dir <dir>        - Override general output directory.");
 	OUTPUT("  --build-dir <dir>          - Override build output directory.");
 	OUTPUT("  --obj-out <dir>            - Override object file output directory.");
 	OUTPUT("  --script-dir <dir>         - Override the base directory for $exec.");
@@ -128,9 +129,7 @@ static void usage(void)
 	OUTPUT("  -l <library>               - Link with the library provided.");
 	OUTPUT("  -L <library dir>           - Append the directory to the linker search paths.");
 	OUTPUT("  -z <argument>              - Send the <argument> as a parameter to the linker.");
-	OUTPUT("  --system-linker=<yes|no>   - Use the system linker (default: no for cross compilation, yes otherwise). [deprecated]");
 	OUTPUT("  --cc <path>                - Set C compiler (for C files in projects and use as system linker).");
-	OUTPUT("  --linker <path>            - Use the linker in the given path. [deprecated]");
 	OUTPUT("  --linker=<option> [<path>] - Linker: builtin, cc, custom (default is 'cc'), 'custom' requires a path.");
 	OUTPUT("");
 	OUTPUT("  --use-stdlib=<yes|no>      - Include the standard library (default: yes).");
@@ -147,6 +146,7 @@ static void usage(void)
 	OUTPUT("  --memory-env=<option>      - Set the memory environment: normal, small, tiny, none.");
 	OUTPUT("  --strip-unused=<yes|no>    - Strip unused code and globals from the output. (default: yes)");
 	OUTPUT("  --fp-math=<option>         - FP math behaviour: strict, relaxed, fast.");
+	OUTPUT("  --win64-simd=<option>      - Win64 SIMD ABI: array, full.");
 	OUTPUT("");
 	OUTPUT("  --debug-stats              - Print debug statistics.");
 	OUTPUT("  --print-linking            - Print linker arguments.");
@@ -693,31 +693,6 @@ static void parse_option(BuildOptions *options)
 				}
 				return;
 			}
-			if ((argopt = match_argopt("system-linker")))
-			{
-				puts("NOTE: 'system-linker' is deprecated, please use --linker instead.");
-				options->custom_linker_path = NULL;
-				switch ((SystemLinker)parse_multi_option(argopt, 2, on_off))
-				{
-					case SYSTEM_LINKER_ON:
-						options->linker_type = LINKER_TYPE_CC;
-						break;
-					case SYSTEM_LINKER_OFF:
-						options->linker_type = LINKER_TYPE_BUILTIN;
-						break;
-					default:
-						UNREACHABLE
-				}
-				return;
-			}
-			if (match_longopt("linker"))
-			{
-				if (at_end() || next_is_opt()) error_exit("error: --linker expects a valid linker name.");
-				options->linker_type = LINKER_TYPE_CUSTOM;
-				options->custom_linker_path = next_arg();
-				puts("NOTE: 'linker' is deprecated, please use --linker=custom <path> instead.");
-				return;
-			}
 			if ((argopt = match_argopt("link-libc")))
 			{
 				options->link_libc = (LinkLibc)parse_multi_option(argopt, 2, on_off);
@@ -743,6 +718,11 @@ static void parse_option(BuildOptions *options)
 				options->x86_vector_capability = (X86VectorCapability)parse_multi_option(argopt, 6, x86_vector_capability);
 				return;
 			}
+			if ((argopt = match_argopt("win64-simd")))
+			{
+				options->win_64_simd = (Win64Simd)parse_multi_option(argopt, 2, win64_simd_type);
+				return;
+			}
 			if ((argopt = match_argopt("x86cpu")))
 			{
 				options->x86_cpu_set = (X86CpuSet)parse_multi_option(argopt, 8, x86_cpu_set);
@@ -967,6 +947,12 @@ static void parse_option(BuildOptions *options)
 				options->macos.min_version = next_arg();
 				return;
 			}
+			if (match_longopt("output-dir"))
+			{
+				if (at_end() || next_is_opt()) error_exit("error: --output-dir needs a directory.");
+				options->output_dir = next_arg();
+				return;
+			}
 			if (match_longopt("build-dir"))
 			{
 				if (at_end() || next_is_opt()) error_exit("error: --build-dir needs a directory.");
@@ -1119,6 +1105,7 @@ BuildOptions parse_arguments(int argc, const char *argv[])
 		.reloc_model = RELOC_DEFAULT,
 		.backend = BACKEND_LLVM,
 		.x86_vector_capability = X86VECTOR_DEFAULT,
+		.win_64_simd = WIN64_SIMD_DEFAULT,
 		.fp_math = FP_DEFAULT,
 		.x86_cpu_set = X86CPU_DEFAULT,
 		.riscv_float_capability = RISCVFLOAT_DEFAULT,
@@ -1132,6 +1119,7 @@ BuildOptions parse_arguments(int argc, const char *argv[])
 		.single_module = SINGLE_MODULE_NOT_SET,
 		.files = NULL,
 		.build_dir = NULL,
+		.output_dir = NULL,
 		.script_dir = NULL,
 
 	};
diff --git a/src/build/builder.c b/src/build/builder.c
index 40e7e5293..523c93f08 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -289,6 +289,7 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	target->emit_llvm = options->emit_llvm;
 	target->build_threads = options->build_threads;
 	target->emit_asm = options->emit_asm;
+	if (options->output_dir) target->output_dir = options->output_dir;
 	if (options->panicfn) target->panicfn = options->panicfn;
 	if (options->testfn) target->testfn = options->testfn;
 	if (options->benchfn) target->benchfn = options->benchfn;
@@ -317,6 +318,10 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	{
 		target->feature.riscv_float_capability = options->riscv_float_capability;
 	}
+	if (options->win_64_simd != WIN64_SIMD_DEFAULT)
+	{
+		target->feature.pass_win64_simd_as_arrays = options->win_64_simd;
+	}
 	if (command_accepts_files(options->command))
 	{
 		target->build_dir = options->build_dir ? options->build_dir : NULL;
diff --git a/src/build/project.c b/src/build/project.c
index 96e176a11..7b87ccab5 100644
--- a/src/build/project.c
+++ b/src/build/project.c
@@ -527,6 +527,7 @@ static void load_into_build_target(JSONObject *json, const char *type, BuildTarg
 	// Use the fact that they correspond to 0, 1, -1
 	target->feature.x86_struct_return = get_valid_bool(json, "x86-stack-struct-return", type, target->feature.x86_struct_return);
 	target->feature.soft_float = get_valid_bool(json, "soft-float", type, target->feature.soft_float);
+	target->feature.pass_win64_simd_as_arrays = get_valid_bool(json, "win64-simd-array", type, target->feature.pass_win64_simd_as_arrays);
 
 }
 static void project_add_target(Project *project, BuildTarget *default_target,  JSONObject *json, const char *name, const char *type, TargetType target_type)
diff --git a/src/compiler/abi/c_abi_win64.c b/src/compiler/abi/c_abi_win64.c
index b196d7253..6e9b45e64 100644
--- a/src/compiler/abi/c_abi_win64.c
+++ b/src/compiler/abi/c_abi_win64.c
@@ -4,7 +4,7 @@
 
 #include "compiler/c_abi_internal.h"
 
-ABIArgInfo *win64_classify(Regs *regs, Type *type, bool is_return, bool is_vector)
+ABIArgInfo *win64_classify(Regs *regs, Type *type, bool is_return, bool is_vector_call)
 {
 	if (type_is_void(type)) return abi_arg_ignore();
 	
@@ -19,7 +19,7 @@ ABIArgInfo *win64_classify(Regs *regs, Type *type, bool is_return, bool is_vecto
 
 	Type *base = NULL;
 	unsigned elements = 0;
-	if (is_vector && type_is_homogenous_aggregate(type, &base, &elements))
+	if (is_vector_call && type_is_homogenous_aggregate(type, &base, &elements))
 	{
 		// Enough registers AND return / builtin / vector
 		if (regs->float_regs >= elements &&
@@ -36,7 +36,8 @@ ABIArgInfo *win64_classify(Regs *regs, Type *type, bool is_return, bool is_vecto
 		// => to main handling.
 	}
 	ByteSize size = type_size(type);
-	if (type_is_abi_aggregate(type))
+	bool type_is_vector_to_pass_as_array = active_target.feature.pass_win64_simd_as_arrays && type_flat_is_vector(type);
+	if (type_is_vector_to_pass_as_array || type_is_abi_aggregate(type))
 	{
 		// Not 1, 2, 4, 8? Pass indirect.
 		if (size > 8 || !is_power_of_two(size))
diff --git a/src/compiler/abi/c_abi_x64.c b/src/compiler/abi/c_abi_x64.c
index bc1f5304c..db7f109d8 100644
--- a/src/compiler/abi/c_abi_x64.c
+++ b/src/compiler/abi/c_abi_x64.c
@@ -125,7 +125,7 @@ ABIArgInfo *x64_classify_reg_call_struct_type_check(Type *type, Registers *neede
 	assert(x64_type_is_structure(type));
 
 	// These are all passed in two registers.
-	if (type->type_kind == TYPE_SUBARRAY || type->type_kind == TYPE_ANY)
+	if (type->type_kind == TYPE_SLICE || type->type_kind == TYPE_ANY)
 	{
 		needed_registers->int_registers += 2;
 		return abi_arg_new_direct();
@@ -382,16 +382,14 @@ static void x64_classify(Type *type, ByteSize offset_base, X64Class *lo_class, X
 	{
 		case LOWERED_TYPES:
 		case TYPE_FUNC:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			UNREACHABLE
 		case TYPE_VOID:
 			*current = CLASS_NO_CLASS;
 			break;
 		case TYPE_I128:
 		case TYPE_U128:
-		case TYPE_SUBARRAY:
-		case TYPE_ANYPTR:
+		case TYPE_SLICE:
+		case TYPE_ANY:
 			*lo_class = CLASS_INTEGER;
 			*hi_class = CLASS_INTEGER;
 			break;
@@ -565,8 +563,6 @@ AbiType x64_get_int_type_at_offset(Type *type, unsigned offset, Type *source_typ
 		case LOWERED_TYPES:
 		case TYPE_VOID:
 		case TYPE_FUNC:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			UNREACHABLE
 		case TYPE_U64:
 		case TYPE_I64:
@@ -597,11 +593,11 @@ AbiType x64_get_int_type_at_offset(Type *type, unsigned offset, Type *source_typ
 			}
 			break;
 		}
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			if (offset < 8) return abi_type_get(type_ulong);
 			if (offset < 16) return abi_type_get(type_voidptr);
 			break;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			if (offset < 8) return abi_type_get(type_voidptr);
 			if (offset < 16) return abi_type_get(type_ulong);
 			break;
@@ -858,7 +854,7 @@ bool x64_type_is_structure(Type *type)
 	switch (type->type_kind)
 	{
 		case TYPE_STRUCT:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_ANY:
 			return true;
 		default:
diff --git a/src/compiler/abi/c_abi_x86.c b/src/compiler/abi/c_abi_x86.c
index 068e152f0..daf9e31a7 100644
--- a/src/compiler/abi/c_abi_x86.c
+++ b/src/compiler/abi/c_abi_x86.c
@@ -121,15 +121,13 @@ static bool x86_should_return_type_in_reg(Type *type)
 		case TYPE_OPTIONAL:
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_INTERFACE:
-		case TYPE_ANY:
-		case TYPE_INFPTR:
 			UNREACHABLE
 		case ALL_INTS:
 		case ALL_FLOATS:
 		case TYPE_BOOL:
 		case TYPE_POINTER:
-		case TYPE_SUBARRAY:
-		case TYPE_ANYPTR:
+		case TYPE_SLICE:
+		case TYPE_ANY:
 			return true;
 		case TYPE_ARRAY:
 			// Small arrays <= 8 bytes.
@@ -368,7 +366,7 @@ static inline ABIArgInfo *x86_classify_vector(Regs *regs, Type *type)
 
 /**
  * Handle:
- * error type, struct, union, subarray,
+ * error type, struct, union, slice,
  * string, array, error union, complex.
  */
 static inline ABIArgInfo *x86_classify_aggregate(CallABI call, Regs *regs, Type *type)
@@ -459,8 +457,6 @@ static ABIArgInfo *x86_classify_argument(CallABI call, Regs *regs, Type *type)
 		case LOWERED_TYPES:
 		case TYPE_VOID:
 		case TYPE_FUNC:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 		case TYPE_FLEXIBLE_ARRAY:
 			UNREACHABLE
 		case ALL_FLOATS:
@@ -472,8 +468,8 @@ static ABIArgInfo *x86_classify_argument(CallABI call, Regs *regs, Type *type)
 			return x86_classify_vector(regs, type);
 		case TYPE_STRUCT:
 		case TYPE_UNION:
-		case TYPE_SUBARRAY:
-		case TYPE_ANYPTR:
+		case TYPE_SLICE:
+		case TYPE_ANY:
 		case TYPE_ARRAY:
 			return x86_classify_aggregate(call, regs, type);
 			UNREACHABLE
diff --git a/src/compiler/codegen_general.c b/src/compiler/codegen_general.c
index 4b4ae6e35..7c9731efd 100644
--- a/src/compiler/codegen_general.c
+++ b/src/compiler/codegen_general.c
@@ -172,14 +172,12 @@ bool type_is_homogenous_aggregate(Type *type, Type **base, unsigned *elements)
 	switch (type->type_kind)
 	{
 		case LOWERED_TYPES:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			UNREACHABLE;
 		case TYPE_VOID:
 		case TYPE_FUNC:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return false;
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			*base = type_iptr->canonical;
 			*elements = 2;
 			return true;
diff --git a/src/compiler/codegen_internal.h b/src/compiler/codegen_internal.h
index 83266ff63..cd860f8e2 100644
--- a/src/compiler/codegen_internal.h
+++ b/src/compiler/codegen_internal.h
@@ -36,8 +36,8 @@ static inline Type *type_lowering(Type *type)
 			case TYPE_ENUM:
 				type = type->decl->enums.type_info->type;
 				continue;
-			case TYPE_INFPTR:
-				return type_anyptr;
+			case TYPE_INTERFACE:
+				return type_any;
 			case TYPE_ANYFAULT:
 			case TYPE_TYPEID:
 			case TYPE_FAULTTYPE:
@@ -55,7 +55,7 @@ static inline Type *type_lowering(Type *type)
 				if (flat == pointer) return type;
 				return type_get_ptr(flat);
 			}
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 			case TYPE_ARRAY:
 			case TYPE_VECTOR:
 			case TYPE_FLEXIBLE_ARRAY:
@@ -65,8 +65,8 @@ static inline Type *type_lowering(Type *type)
 				if (flat == arr_type) return type;
 				switch (type->type_kind)
 				{
-					case TYPE_SUBARRAY:
-						return type_get_subarray(flat);
+					case TYPE_SLICE:
+						return type_get_slice(flat);
 					case TYPE_ARRAY:
 						return type_get_array(flat, type->array.len);
 					case TYPE_VECTOR:
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
index 9af22d7c8..1f02c82a5 100644
--- a/src/compiler/compiler.c
+++ b/src/compiler/compiler.c
@@ -316,6 +316,15 @@ void compiler_parse(void)
 	compiler_parsing_time = bench_mark();
 }
 
+static void create_output_dir(const char *dir)
+{
+	if (!file_exists(dir))
+	{
+		if (!dir_make(dir)) error_exit("Failed to create output directory %s.", dir);
+	}
+	if (!file_is_dir(dir)) error_exit("Output directory is not a directory %s.", dir);
+}
+
 void compiler_compile(void)
 {
 	sema_analysis_run();
@@ -498,11 +507,16 @@ void compiler_compile(void)
 
 	if (output_exe)
 	{
-		if (active_target.output_dir) output_exe = file_append_path(active_target.output_dir, output_exe);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_exe = file_append_path(active_target.output_dir, output_exe);
+		}
 		if (file_is_dir(output_exe))
 		{
 			error_exit("Cannot create exe with the name '%s' - there is already a directory with that name.", output_exe);
 		}
+
 		bool system_linker_available = link_libc() && platform_target.os != OS_TYPE_WIN32;
 		bool use_system_linker = system_linker_available && active_target.arch_os_target == default_target;
 		switch (active_target.linker_type)
@@ -569,7 +583,7 @@ void compiler_compile(void)
 			}
 			else
 			{
-				scratch_buffer_append("./");
+				if (name[0] != '/') scratch_buffer_append("./");
 				scratch_buffer_append(name);
 			}
 			name = scratch_buffer_to_string();
@@ -604,7 +618,11 @@ void compiler_compile(void)
 	}
 	else if (output_static)
 	{
-		if (active_target.output_dir) output_static = file_append_path(active_target.output_dir, output_static);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_static = file_append_path(active_target.output_dir, output_static);
+		}
 		if (file_is_dir(output_static))
 		{
 			error_exit("Cannot create a static library with the name '%s' - there is already a directory with that name.", output_exe);
@@ -620,7 +638,11 @@ void compiler_compile(void)
 	}
 	else if (output_dynamic)
 	{
-		if (active_target.output_dir) output_dynamic = file_append_path(active_target.output_dir, output_dynamic);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_dynamic = file_append_path(active_target.output_dir, output_dynamic);
+		}
 		if (file_is_dir(output_dynamic))
 		{
 			error_exit("Cannot create a dynamic library with the name '%s' - there is already a directory with that name.", output_exe);
@@ -784,7 +806,7 @@ void print_syntax(BuildOptions *options)
 			if (name[0] == '$' || (name[0] >= 'a' && name[0] <= 'z'))
 			{
 				if (name[1] == '$' || name[1] == '\0') continue;
-				printf("%3d %s\n", index++, name);
+				printf("%s\n", name);
 			}
 		}
 	}
@@ -802,33 +824,32 @@ void print_syntax(BuildOptions *options)
 			{
 				continue;
 			}
-			printf("%2d %s\n", index++, name);
+			printf("%s\n", name);
 		}
 	}
 	if (options->print_attributes)
 	{
 		for (int i = 0; i < NUMBER_OF_ATTRIBUTES; i++)
 		{
-			printf("%2d %s\n", i + 1, attribute_list[i]);
+			printf("%s\n", attribute_list[i]);
 		}
 	}
 	if (options->print_builtins)
 	{
 		for (int i = 0; i < NUMBER_OF_BUILTINS; i++)
 		{
-			printf("%3d $$%s\n", i + 1, builtin_list[i]);
+			printf("$$%s\n", builtin_list[i]);
 		}
-		puts("---");
 		for (int i = 0; i < NUMBER_OF_BUILTIN_DEFINES; i++)
 		{
-			printf("%2d $$%s\n", i + 1, builtin_defines[i]);
+			printf("$$%s\n", builtin_defines[i]);
 		}
 	}
 	if (options->print_type_properties)
 	{
 		for (int i = 0; i < NUMBER_OF_TYPE_PROPERTIES; i++)
 		{
-			printf("%2d .%s\n", i + 1, type_property_list[i]);
+			printf("%s\n", type_property_list[i]);
 		}
 	}
 	if (options->print_project_properties)
@@ -838,14 +859,14 @@ void print_syntax(BuildOptions *options)
 		puts("------------------");
 		for (int i = 0; i < project_default_keys_count; i++)
 		{
-			printf("%2d %-*s%s\n", i + 1, 35, project_default_keys[i][0], project_default_keys[i][1]);
+			printf("%-*s%s\n", 35, project_default_keys[i][0], project_default_keys[i][1]);
 		}
 		puts("");
 		puts("Target properties");
 		puts("-----------------");
 		for (int i = 0; i < project_target_keys_count; i++)
 		{
-			printf("%2d %-*s%s\n", i + 1, 35, project_target_keys[i][0], project_target_keys[i][1]);
+			printf("%-*s%s\n", 35, project_target_keys[i][0], project_target_keys[i][1]);
 		}
 		puts("");
 	}
@@ -985,6 +1006,7 @@ void compile()
 	setup_int_define("C_INT_SIZE", platform_target.width_c_int, type_int);
 	setup_int_define("C_LONG_SIZE", platform_target.width_c_long, type_int);
 	setup_int_define("C_LONG_LONG_SIZE", platform_target.width_c_long_long, type_int);
+	setup_int_define("REGISTER_SIZE", platform_target.width_register, type_int);
 	setup_bool_define("C_CHAR_IS_SIGNED", platform_target.signed_c_char);
 	setup_bool_define("PLATFORM_BIG_ENDIAN", platform_target.big_endian);
 	setup_bool_define("PLATFORM_I128_SUPPORTED", platform_target.int128);
diff --git a/src/compiler/compiler_internal.h b/src/compiler/compiler_internal.h
index 7b4f5c95e..9370ab61e 100644
--- a/src/compiler/compiler_internal.h
+++ b/src/compiler/compiler_internal.h
@@ -105,12 +105,11 @@ typedef enum
 {
 	RESOLVE_TYPE_DEFAULT,
 	RESOLVE_TYPE_ALLOW_INFER    = 0x01,
-	RESOLVE_TYPE_ALLOW_ANY      = 0x02,
-	RESOLVE_TYPE_IS_POINTEE     = 0x04,
-	RESOLVE_TYPE_ALLOW_FLEXIBLE = 0x08,
-	RESOLVE_TYPE_PTR            = RESOLVE_TYPE_ALLOW_ANY | RESOLVE_TYPE_IS_POINTEE,
-	RESOLVE_TYPE_MACRO_METHOD   = RESOLVE_TYPE_ALLOW_ANY | RESOLVE_TYPE_ALLOW_INFER,
-	RESOLVE_TYPE_FUNC_METHOD    = RESOLVE_TYPE_ALLOW_ANY
+	RESOLVE_TYPE_IS_POINTEE     = 0x02,
+	RESOLVE_TYPE_ALLOW_FLEXIBLE = 0x04,
+	RESOLVE_TYPE_PTR            = RESOLVE_TYPE_IS_POINTEE,
+	RESOLVE_TYPE_MACRO_METHOD   = RESOLVE_TYPE_ALLOW_INFER,
+	RESOLVE_TYPE_FUNC_METHOD    = RESOLVE_TYPE_DEFAULT
 } ResolveTypeKind;
 
 struct ConstInitializer_
@@ -447,7 +446,6 @@ typedef struct
 typedef struct VarDecl_
 {
 	VarDeclKind kind : 8;
-	bool unwrap : 1;
 	bool shadow : 1;
 	bool vararg : 1;
 	bool is_static : 1;
@@ -567,7 +565,6 @@ typedef struct
 			bool attr_finalizer : 1;
 			bool attr_interface_method : 1;
 			bool attr_dynamic : 1;
-			bool attr_default : 1;
 			bool is_lambda : 1;
 			union
 			{
@@ -691,8 +688,8 @@ typedef struct Decl_
 		SectionId section_id;
 		uint16_t va_index;
 	};
-	AlignSize offset : 32;
-	AlignSize padding : 32;
+	AlignSize offset;
+	AlignSize padding;
 	struct CompilationUnit_ *unit;
 	Attr **attributes;
 	Type *type;
@@ -1019,13 +1016,6 @@ typedef struct
 	void *block_return_out;
 } BlockExit;
 
-typedef struct
-{
-	AstId first_stmt;
-	BlockExit **block_exit_ref;
-} ExprFuncBlock;
-
-
 typedef struct
 {
 	AstId first_stmt;
@@ -1033,12 +1023,9 @@ typedef struct
 	bool is_must_use : 1;
 	bool is_optional_return : 1;
 	bool had_optional_arg : 1;
-	Decl **params;
-	Decl *macro;
+	DeclId macro_id;
 	BlockExit **block_exit;
-} ExprMacroBlock;
-
-
+} ExprBlock;
 
 typedef struct
 {
@@ -1179,7 +1166,6 @@ struct Expr_
 		ExprEmbedExpr embed_expr;                   // 16
 		Expr** exec_expr;                           // 8
 		ExprAsmArg expr_asm_arg;                    // 24
-		ExprFuncBlock expr_block;                   // 4
 		ExprCompoundLiteral expr_compound_literal;  // 16
 		Expr** expression_list;                     // 8
 		ExprGenericIdent generic_ident_expr;
@@ -1188,7 +1174,7 @@ struct Expr_
 		Expr** initializer_list;                    // 8
 		Expr *inner_expr;                           // 8
 		Decl *lambda_expr;                          // 8
-		ExprMacroBlock macro_block;                 // 24
+		ExprBlock expr_block;                     // 24
 		ExprMacroBody macro_body_expr;              // 16;
 		OperatorOverload overload_expr;             // 4
 		ExprPointerOffset pointer_offset_expr;
@@ -1234,6 +1220,7 @@ typedef struct
 	bool no_exit : 1;
 	bool skip_first : 1;
 	bool if_chain : 1;
+	bool jump : 1;
 } FlowCommon;
 
 
@@ -1273,20 +1260,31 @@ typedef struct
 typedef struct
 {
 	FlowCommon flow;
+	Ast **cases;
 	union
 	{
 		struct
 		{
 			ExprId cond;
 			AstId defer;
-			Ast **cases;
 			Ast *scope_defer;
 		};
 		struct
 		{
-			void *retry_block;
 			void *exit_block;
-			void *retry_var;
+			union
+			{
+				struct {
+					void *block;
+					void *var;
+				} retry;
+				struct {
+					uint16_t count;
+					int16_t min_index;
+					int16_t default_index;
+					void *jmptable;
+				} jump;
+			};
 		} codegen;
 	};
 } AstSwitchStmt;
@@ -1506,7 +1504,7 @@ typedef struct Ast_
 
 
 //static_assert(sizeof(AstContinueBreakStmt) == 24, "Ooops");
-static_assert(sizeof(Ast) == 48, "Not expected size on 64 bit");
+static_assert(sizeof(Ast) == 56, "Not expected size on 64 bit");
 
 typedef struct Module_
 {
@@ -1543,6 +1541,7 @@ typedef struct DynamicScope_
 	ScopeId scope_id;
 	bool allow_dead_code : 1;
 	bool jump_end : 1;
+	bool is_dead : 1;
 	ScopeFlags flags;
 	unsigned label_start;
 	unsigned current_local;
@@ -1677,6 +1676,12 @@ typedef struct
 	};
 } CallEnv;
 
+typedef struct InliningSpan_
+{
+	SourceSpan span;
+	struct InliningSpan_ *prev;
+} InliningSpan;
+
 struct SemaContext_
 {
 	Module *core_module;
@@ -1686,7 +1691,7 @@ struct SemaContext_
 	CompilationUnit *compilation_unit;
 	CallEnv call_env;
 	Decl *current_macro;
-	SourceSpan inlining_span;
+	InliningSpan *inlined_at;
 	ScopeId scope_id;
 	unsigned macro_call_depth;
 	Ast *break_target;
@@ -1882,12 +1887,12 @@ extern TypeInfo *poisoned_type_info;
 
 
 extern Type *type_bool, *type_void, *type_voidptr;
-extern Type *type_float16, *type_float, *type_double, *type_f128;
+extern Type *type_float16, *type_bfloat, *type_float, *type_double, *type_f128;
 extern Type *type_ichar, *type_short, *type_int, *type_long, *type_isz;
 extern Type *type_char, *type_ushort, *type_uint, *type_ulong, *type_usz;
 extern Type *type_iptr, *type_uptr;
 extern Type *type_u128, *type_i128;
-extern Type *type_typeid, *type_anyfault, *type_anyptr, *type_typeinfo, *type_member;
+extern Type *type_typeid, *type_anyfault, *type_any, *type_typeinfo, *type_member;
 extern Type *type_untypedlist;
 extern Type *type_wildcard;
 extern Type *type_cint;
@@ -1916,6 +1921,7 @@ extern const char *kw_at_param;
 extern const char *kw_at_pure;
 extern const char *kw_at_require;
 extern const char *kw_at_return;
+extern const char *kw_at_jump;
 extern const char *kw_check_assign;
 extern const char *kw_deprecated;
 extern const char *kw_in;
@@ -2281,12 +2287,12 @@ Decl **parse_include_file(File *file, CompilationUnit *unit);
 bool parse_stdin(void);
 Path *path_create_from_string(const char *string, uint32_t len, SourceSpan span);
 
-#define SEMA_ERROR_HERE(...) sema_error_at(c->span, __VA_ARGS__)
-#define RETURN_SEMA_ERROR_HERE(...) do { sema_error_at(c->span, __VA_ARGS__); return false; } while (0)
-#define SEMA_ERROR_LAST(...) sema_error_at(c->prev_span, __VA_ARGS__)
-#define RETURN_SEMA_ERROR_LAST(...) do { sema_error_at(c->prev_span, __VA_ARGS__); return false; } while (0)
-#define SEMA_ERROR(_node, ...) sema_error_at((_node)->span, __VA_ARGS__)
-#define RETURN_SEMA_ERROR(_node, ...) do { sema_error_at((_node)->span, __VA_ARGS__); return false; } while (0)
+#define PRINT_ERROR_AT(_node, ...) print_error_at((_node)->span, __VA_ARGS__)
+#define RETURN_PRINT_ERROR_AT(_val, _node, ...) do { print_error_at((_node)->span, __VA_ARGS__); return _val; } while (0)
+#define PRINT_ERROR_HERE(...) print_error_at(c->span, __VA_ARGS__)
+#define RETURN_PRINT_ERROR_HERE(...) do { print_error_at(c->span, __VA_ARGS__); return false; } while (0)
+#define PRINT_ERROR_LAST(...) print_error_at(c->prev_span, __VA_ARGS__)
+#define RETURN_PRINT_ERROR_LAST(...) do { print_error_at(c->prev_span, __VA_ARGS__); return false; } while (0)
 #define SEMA_NOTE(_node, ...) sema_error_prev_at((_node)->span, __VA_ARGS__)
 #define EXPAND_EXPR_STRING(str_) (str_)->const_expr.bytes.len, (str_)->const_expr.bytes.ptr
 #define TABLE_MAX_LOAD 0.5
@@ -2297,18 +2303,20 @@ Decl *sema_decl_stack_find_decl_member(Decl *decl_owner, const char *symbol);
 Decl *sema_decl_stack_resolve_symbol(const char *symbol);
 void sema_decl_stack_restore(Decl **state);
 void sema_decl_stack_push(Decl *decl);
-bool sema_error_failed_cast(Expr *expr, Type *from, Type *to);
+
+bool sema_error_failed_cast(SemaContext *context, Expr *expr, Type *from, Type *to);
 bool sema_add_local(SemaContext *context, Decl *decl);
 void sema_unwrap_var(SemaContext *context, Decl *decl);
 void sema_rewrap_var(SemaContext *context, Decl *decl);
 void sema_erase_var(SemaContext *context, Decl *decl);
 void sema_erase_unwrapped(SemaContext *context, Decl *decl);
-bool sema_analyse_cond_expr(SemaContext *context, Expr *expr);
+bool sema_analyse_cond_expr(SemaContext *context, Expr *expr, CondResult *result);
 
 bool sema_analyse_expr_rhs(SemaContext *context, Type *to, Expr *expr, bool allow_optional, bool *no_match_ref);
 MemberIndex sema_get_initializer_const_array_size(SemaContext *context, Expr *initializer, bool *may_be_array, bool *is_const_size);
 bool sema_analyse_expr(SemaContext *context, Expr *expr);
-bool sema_expr_check_discard(Expr *expr);
+
+bool sema_expr_check_discard(SemaContext *context, Expr *expr);
 bool sema_analyse_inferred_expr(SemaContext *context, Type *to, Expr *expr);
 bool sema_analyse_decl(SemaContext *context, Decl *decl);
 bool sema_resolve_type_structure(SemaContext *context, Type *type, SourceSpan span);
@@ -2344,15 +2352,16 @@ bool sema_resolve_array_like_len(SemaContext *context, TypeInfo *type_info, Arra
 
 bool sema_resolve_type_info(SemaContext *context, TypeInfo *type_info, ResolveTypeKind kind);
 
-void sema_error_at(SourceSpan loc, const char *message, ...);
-void sema_error_at_after(SourceSpan loc, const char *message, ...);
+void print_error_at(SourceSpan loc, const char *message, ...);
+void print_error_after(SourceSpan loc, const char *message, ...);
 void sema_error_prev_at(SourceSpan loc, const char *message, ...);
 void sema_verror_range(SourceSpan location, const char *message, va_list args);
-void sema_error(ParseContext *context, const char *message, ...);
+void print_error(ParseContext *context, const char *message, ...);
 
 void sema_warning_at(SourceSpan loc, const char *message, ...);
-void sema_shadow_error(Decl *decl, Decl *old);
-bool sema_type_error_on_binop(Expr *expr);
+void sema_shadow_error(SemaContext *context, Decl *decl, Decl *old);
+
+bool sema_type_error_on_binop(SemaContext *context, Expr *expr);
 
 File *source_file_by_id(FileId file);
 File *source_file_load(const char *filename, bool *already_loaded, const char **error);
@@ -2422,7 +2431,7 @@ Type *type_get_array(Type *arr_type, ArraySize len);
 Type *type_get_indexed_type(Type *type);
 Type *type_get_ptr(Type *ptr_type);
 Type *type_get_ptr_recurse(Type *ptr_type);
-Type *type_get_subarray(Type *arr_type);
+Type *type_get_slice(Type *arr_type);
 Type *type_get_inferred_array(Type *arr_type);
 Type *type_get_inferred_vector(Type *arr_type);
 Type *type_get_flexible_array(Type *arr_type);
@@ -2600,7 +2609,7 @@ INLINE bool type_len_is_inferred(Type *type)
 				type = type->optional;
 				continue;
 			case TYPE_ARRAY:
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 			case TYPE_FLEXIBLE_ARRAY:
 			case TYPE_VECTOR:
 				type = type->array.base;
@@ -2635,26 +2644,13 @@ INLINE bool type_is_any_raw(Type *type)
 	}
 }
 
-INLINE bool type_is_any_interface_ptr(Type *type)
-{
-	switch (type->canonical->type_kind)
-	{
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
-			return true;
-		default:
-			return false;
-	}
-}
+
 INLINE bool type_is_any(Type *type)
 {
-	return type->canonical == type_anyptr;
+	return type->canonical == type_any;
 }
 
-INLINE bool type_is_anyfault(Type *type)
-{
-	return type->canonical == type_anyfault;
-}
+
 
 INLINE bool type_is_optional(Type *type)
 {
@@ -2838,29 +2834,50 @@ INLINE const char *type_invalid_storage_type_name(Type *type)
 			return "an untyped list";
 		case TYPE_TYPEINFO:
 			return "a type";
+		case TYPE_WILDCARD:
+			return "an empty value";
 		default:
 			UNREACHABLE;
 	}
 }
 
-INLINE bool type_is_invalid_storage_type(Type *type)
+typedef enum
 {
-	if (!type) return false;
+	STORAGE_NORMAL,
+	STORAGE_VOID,
+	STORAGE_COMPILE_TIME,
+	STORAGE_WILDCARD,
+	STORAGE_UNKNOWN
+} StorageType;
+
+static inline StorageType type_storage_type(Type *type)
+{
+	if (!type) return STORAGE_NORMAL;
+	bool is_distinct = false;
 	RETRY:
-	if (type == type_wildcard_optional) return true;
+	if (type == type_wildcard_optional) return STORAGE_WILDCARD;
 	switch (type->type_kind)
 	{
 		case TYPE_VOID:
+			return is_distinct ? STORAGE_UNKNOWN : STORAGE_VOID;
+		case TYPE_WILDCARD:
+			return STORAGE_WILDCARD;
 		case TYPE_MEMBER:
 		case TYPE_UNTYPED_LIST:
 		case TYPE_TYPEINFO:
-		case TYPE_WILDCARD:
-			return true;
+			return STORAGE_COMPILE_TIME;
+		case TYPE_OPTIONAL:
+			type = type->optional;
+			goto RETRY;
 		case TYPE_TYPEDEF:
 			type = type->canonical;
 			goto RETRY;
+		case TYPE_DISTINCT:
+			is_distinct = true;
+			type = type->decl->distinct->type;
+			goto RETRY;
 		default:
-			return false;
+			return STORAGE_NORMAL;
 	}
 }
 
@@ -2956,7 +2973,7 @@ static inline Type *type_base(Type *type)
 		}
 	}
 }
-static inline Type *type_flat_inline(Type *type)
+static inline Type *type_flat_distinct_inline(Type *type)
 {
 	do
 	{
@@ -3436,6 +3453,8 @@ INLINE void expr_rewrite_const_float(Expr *expr, Type *type, Real d)
 	Real real;
 	switch (kind)
 	{
+		case TYPE_F16:
+		case TYPE_BF16:
 		case TYPE_F32:
 			real = (float)d;
 			break;
@@ -3607,3 +3626,5 @@ INLINE const char *section_from_id(SectionId id)
 {
 	return id ? global_context.section_list[id - 1] + SECTION_PREFIX_LEN : NULL;
 }
+
+extern char swizzle[256];
diff --git a/src/compiler/context.c b/src/compiler/context.c
index ee08794fa..75eedcec7 100644
--- a/src/compiler/context.c
+++ b/src/compiler/context.c
@@ -4,7 +4,6 @@
 
 #include "compiler_internal.h"
 
-
 CompilationUnit *unit_create(File *file)
 {
 	CompilationUnit *unit = CALLOCS(CompilationUnit);
@@ -26,11 +25,11 @@ static inline bool create_module_or_check_name(CompilationUnit *unit, Path *modu
 	{
 		if (unit->module->name->module != module_name->module)
 		{
-			SEMA_ERROR(module_name,
-					   "Module name here '%s' did not match actual module '%s'.",
-					   module_name->module,
-					   module->name->module);
-			return false;
+			RETURN_PRINT_ERROR_AT(false,
+			                      module_name,
+			                      "Module name here '%s' did not match actual module '%s'.",
+			                      module_name->module,
+			                      module->name->module);
 		}
 	}
 
@@ -72,7 +71,9 @@ bool context_set_module_from_filename(ParseContext *context)
 	File *file = context->unit->file;
 	if (!filename_to_module_in_buffer(file->full_path))
 	{
-		sema_error(context, "The filename '%s' could not be converted to a valid module name, try using an explicit module name.", file->full_path);
+		print_error(context,
+		            "The filename '%s' could not be converted to a valid module name, try using an explicit module name.",
+		            file->full_path);
 		return false;
 	}
 
@@ -84,8 +85,8 @@ bool context_set_module_from_filename(ParseContext *context)
 
 	if (type != TOKEN_IDENT)
 	{
-		sema_error(context, "Generating a filename from the file '%s' resulted in a name that is a reserved keyword, "
-							"try using an explicit module name.", file->full_path);
+		print_error(context, "Generating a filename from the file '%s' resulted in a name that is a reserved keyword, "
+		                     "try using an explicit module name.", file->full_path);
 		return false;
 	}
 	Path *path = CALLOCS(Path);
@@ -100,8 +101,7 @@ bool context_set_module(ParseContext *context, Path *path, const char **generic_
 	// Note that we allow the illegal name for now, to be able to parse further.
 	if (!str_has_no_uppercase(path->module))
 	{
-		SEMA_ERROR(path, "A module name may not have any uppercase characters.");
-		return false;
+		RETURN_PRINT_ERROR_AT(false, path, "A module name may not have any uppercase characters.");
 	}
 
 	return create_module_or_check_name(context->unit, path, generic_parameters);
@@ -258,7 +258,7 @@ void unit_register_global_decl(CompilationUnit *unit, Decl *decl)
 	return;
 ERR:
 	assert(decl != old);
-	sema_shadow_error(decl, old);
+	sema_shadow_error(NULL, decl, old);
 	decl_poison(decl);
 	decl_poison(old);
 }
@@ -269,8 +269,7 @@ bool unit_add_import(CompilationUnit *unit, Path *path, bool private_import)
 
 	if (!str_has_no_uppercase(path->module))
 	{
-		SEMA_ERROR(path, "A module is not expected to have any uppercase characters, please change it.");
-		return false;
+		RETURN_PRINT_ERROR_AT(false, path, "A module is not expected to have any uppercase characters, please change it.");
 	}
 
 	Decl *import = decl_calloc();
diff --git a/src/compiler/copying.c b/src/compiler/copying.c
index 38f382390..2470bf8b5 100644
--- a/src/compiler/copying.c
+++ b/src/compiler/copying.c
@@ -449,18 +449,13 @@ Expr *copy_expr(CopyStruct *c, Expr *source_expr)
 		case EXPR_COND:
 			MACRO_COPY_EXPR_LIST(expr->cond_expr);
 			return expr;
-		case EXPR_MACRO_BLOCK:
-			MACRO_COPY_DECL_LIST(expr->macro_block.params);
-			MACRO_COPY_ASTID(expr->macro_block.first_stmt);
-			MACRO_COPY_DECL(expr->macro_block.macro);
+		case EXPR_EXPR_BLOCK:
+			MACRO_COPY_ASTID(expr->expr_block.first_stmt);
 			return expr;
 		case EXPR_COMPOUND_LITERAL:
 			MACRO_COPY_EXPR(expr->expr_compound_literal.initializer);
 			MACRO_COPY_TYPE(expr->expr_compound_literal.type_info);
 			return expr;
-		case EXPR_EXPR_BLOCK:
-			MACRO_COPY_ASTID(expr->expr_block.first_stmt);
-			return expr;
 		case EXPR_POISONED:
 			return source_expr;
 		case EXPR_RETHROW:
@@ -840,7 +835,7 @@ TypeInfo *copy_type_info(CopyStruct *c, TypeInfo *source)
 			copy->array.base = copy_type_info(c, source->array.base);
 			return copy;
 		case TYPE_INFO_INFERRED_ARRAY:
-		case TYPE_INFO_SUBARRAY:
+		case TYPE_INFO_SLICE:
 		case TYPE_INFO_INFERRED_VECTOR:
 			assert(source->resolve_status == RESOLVE_NOT_DONE);
 			copy->array.base = copy_type_info(c, source->array.base);
diff --git a/src/compiler/diagnostics.c b/src/compiler/diagnostics.c
index b194e001a..a60e80d91 100644
--- a/src/compiler/diagnostics.c
+++ b/src/compiler/diagnostics.c
@@ -17,7 +17,7 @@ typedef enum
 #define LINES_SHOWN 4
 #define MAX_WIDTH 120
 
-static void print_error(SourceSpan location, const char *message, PrintType print_type)
+static void print_error_type_at(SourceSpan location, const char *message, PrintType print_type)
 {
 	if (!location.a)
 	{
@@ -154,7 +154,7 @@ static void print_error(SourceSpan location, const char *message, PrintType prin
 
 static void vprint_error(SourceSpan location, const char *message, va_list args)
 {
-	print_error(location, str_vprintf(message, args), PRINT_TYPE_ERROR);
+	print_error_type_at(location, str_vprintf(message, args), PRINT_TYPE_ERROR);
 }
 
 
@@ -168,12 +168,12 @@ void sema_warning_at(SourceSpan loc, const char *message, ...)
 {
 	va_list list;
 	va_start(list, message);
-	print_error(loc, str_vprintf(message, list), PRINT_TYPE_NOTE);
+	print_error_type_at(loc, str_vprintf(message, list), PRINT_TYPE_NOTE);
 	va_end(list);
 }
 
 
-void sema_error_at(SourceSpan loc, const char *message, ...)
+void print_error_at(SourceSpan loc, const char *message, ...)
 {
 	va_list list;
 	va_start(list, message);
@@ -181,7 +181,7 @@ void sema_error_at(SourceSpan loc, const char *message, ...)
 	va_end(list);
 }
 
-void sema_error_at_after(SourceSpan loc, const char *message, ...)
+void print_error_after(SourceSpan loc, const char *message, ...)
 {
 	loc.col += loc.length;
 	loc.length = 1;
@@ -201,14 +201,14 @@ void sema_error_prev_at(SourceSpan loc, const char *message, ...)
 	// Ignore errors
 	if (written <= MAX_ERROR_LEN - 2)
 	{
-		print_error(loc, buffer, PRINT_TYPE_NOTE);
+		print_error_type_at(loc, buffer, PRINT_TYPE_NOTE);
 	}
 	va_end(args);
 	return;
 }
 
 
-void sema_error(ParseContext *context, const char *message, ...)
+void print_error(ParseContext *context, const char *message, ...)
 {
 	global_context.errors_found++;
 	File *file = context->unit->file;
diff --git a/src/compiler/enums.h b/src/compiler/enums.h
index 17ff750a5..1f8c8f61e 100644
--- a/src/compiler/enums.h
+++ b/src/compiler/enums.h
@@ -4,6 +4,13 @@
 
 // Only include this from compiler_common.h
 
+typedef enum
+{
+	COND_MISSING = -1,
+	COND_TRUE = 1,
+	COND_FALSE = 0,
+} CondResult;
+
 typedef enum
 {
 	BINARYOP_ERROR,
@@ -110,10 +117,10 @@ typedef enum
 	CAST_PTRBOOL,
 	CAST_PTRPTR,
 	CAST_PTRINT,
-	CAST_SABOOL,
+	CAST_SLBOOL,
 	CAST_SAPTR,
-	CAST_SASA,
-	CAST_SAARR,
+	CAST_SLSL,
+	CAST_SLARR,
 	CAST_STRPTR,
 	CAST_STINLINE,
 	CAST_VECARR,
@@ -197,7 +204,7 @@ typedef enum
 	INTROSPECT_TYPE_FUNC = 13,
 	INTROSPECT_TYPE_OPTIONAL = 14,
 	INTROSPECT_TYPE_ARRAY = 15,
-	INTROSPECT_TYPE_SUBARRAY = 16,
+	INTROSPECT_TYPE_SLICE = 16,
 	INTROSPECT_TYPE_VECTOR = 17,
 	INTROSPECT_TYPE_DISTINCT = 18,
 	INTROSPECT_TYPE_POINTER = 19,
@@ -244,7 +251,6 @@ typedef enum
 	EXPR_INITIALIZER_LIST,
 	EXPR_LAMBDA,
 	EXPR_LAST_FAULT,
-	EXPR_MACRO_BLOCK,
 	EXPR_MACRO_BODY_EXPANSION,
 	EXPR_NOP,
 	EXPR_OPERATOR_CHARS,
@@ -389,7 +395,7 @@ typedef enum
 	TYPE_INFO_VECTOR,
 	TYPE_INFO_INFERRED_ARRAY,
 	TYPE_INFO_INFERRED_VECTOR,
-	TYPE_INFO_SUBARRAY,
+	TYPE_INFO_SLICE,
 	TYPE_INFO_POINTER,
 	TYPE_INFO_GENERIC,
 } TypeInfoKind;
@@ -503,6 +509,7 @@ typedef enum
 	TOKEN_DOUBLE,
 	TOKEN_FLOAT,
 	TOKEN_FLOAT16,
+	TOKEN_BFLOAT,
 	TOKEN_INT128,
 	TOKEN_ICHAR,
 	TOKEN_INT,
@@ -617,7 +624,7 @@ typedef enum
 
 #define NON_VOID_TYPE_TOKENS \
   TOKEN_BOOL: case TOKEN_CHAR: case TOKEN_DOUBLE: case TOKEN_FLOAT: \
-  case TOKEN_FLOAT16: case TOKEN_INT128: case TOKEN_ICHAR: case TOKEN_INT: \
+  case TOKEN_FLOAT16: case TOKEN_BFLOAT: case TOKEN_INT128: case TOKEN_ICHAR: case TOKEN_INT: \
   case TOKEN_IPTR: case TOKEN_LONG: \
   case TOKEN_SHORT: case TOKEN_UINT128: case TOKEN_UINT: case TOKEN_ULONG:  \
   case TOKEN_UPTR: case TOKEN_USHORT: case TOKEN_USZ: \
@@ -662,8 +669,7 @@ typedef enum
 	TYPE_FLOAT_LAST = TYPE_F128,
 	TYPE_NUM_LAST = TYPE_FLOAT_LAST,
 	TYPE_ANY,
-	TYPE_ANYPTR,
-	TYPE_INFPTR,
+	TYPE_INTERFACE,
 	TYPE_ANYFAULT,
 	TYPE_TYPEID,
 	TYPE_POINTER,
@@ -671,12 +677,11 @@ typedef enum
 	TYPE_FUNC,
 	TYPE_STRUCT,
 	TYPE_UNION,
-	TYPE_INTERFACE,
 	TYPE_BITSTRUCT,
 	TYPE_FAULTTYPE,
 	TYPE_TYPEDEF,
 	TYPE_DISTINCT,
-	TYPE_SUBARRAY,
+	TYPE_SLICE,
 	TYPE_ARRAY,
 	TYPE_FIRST_ARRAYLIKE = TYPE_ARRAY,
 	TYPE_FLEXIBLE_ARRAY,
@@ -695,7 +700,7 @@ typedef enum
 #define FLATTENED_TYPES TYPE_DISTINCT: case TYPE_OPTIONAL: case TYPE_TYPEDEF
 #define LOWERED_TYPES CT_TYPES: case TYPE_ENUM: case TYPE_TYPEDEF: case TYPE_TYPEID: \
   case TYPE_DISTINCT: case TYPE_ANYFAULT: case TYPE_FAULTTYPE: case TYPE_BITSTRUCT: \
-  case TYPE_OPTIONAL: case TYPE_INFPTR
+  case TYPE_OPTIONAL: case TYPE_INTERFACE
 #define CT_TYPES TYPE_TYPEINFO: case TYPE_INFERRED_ARRAY: case TYPE_INFERRED_VECTOR: case TYPE_UNTYPED_LIST: \
 case TYPE_POISONED: case TYPE_MEMBER: case TYPE_WILDCARD
 #define ALL_INTS TYPE_I8: case TYPE_I16: case TYPE_I32: case TYPE_I64: case TYPE_I128: \
@@ -766,7 +771,8 @@ typedef enum
 	ATTR_MACRO = 1 << 14,
 	ATTR_DISTINCT = 1 << 15,
 	ATTR_ENUM_VALUE = 1 << 16,
-	ATTR_INTERFACE_METHOD = 1 << 17
+	ATTR_INTERFACE_METHOD = 1 << 17,
+	ATTR_PARAM = 1 << 18,
 } AttributeDomain;
 
 typedef enum
@@ -784,7 +790,6 @@ typedef enum
 	ATTRIBUTE_BIGENDIAN,
 	ATTRIBUTE_BUILTIN,
 	ATTRIBUTE_CALLCONV,
-	ATTRIBUTE_DEFAULT,
 	ATTRIBUTE_DEPRECATED,
 	ATTRIBUTE_DYNAMIC,
 	ATTRIBUTE_EXPORT,
@@ -1069,7 +1074,7 @@ typedef enum
 	CONV_INT,
 	CONV_FLOAT,
 	CONV_POINTER,
-	CONV_SUBARRAY,
+	CONV_SLICE,
 	CONV_VECTOR,
 	CONV_BITSTRUCT,
 	CONV_DISTINCT,
diff --git a/src/compiler/expr.c b/src/compiler/expr.c
index 2da569cc3..88bea93af 100644
--- a/src/compiler/expr.c
+++ b/src/compiler/expr.c
@@ -104,7 +104,6 @@ bool expr_may_addr(Expr *expr)
 		case EXPR_EXPR_BLOCK:
 		case EXPR_OPTIONAL:
 		case EXPR_FORCE_UNWRAP:
-		case EXPR_MACRO_BLOCK:
 		case EXPR_MACRO_BODY_EXPANSION:
 		case EXPR_NOP:
 		case EXPR_OPERATOR_CHARS:
@@ -219,7 +218,6 @@ bool expr_is_constant_eval(Expr *expr, ConstantEvalKind eval_kind)
 		case EXPR_POST_UNARY:
 		case EXPR_SLICE_ASSIGN:
 		case EXPR_SLICE_COPY:
-		case EXPR_MACRO_BLOCK:
 		case EXPR_RETHROW:
 			return false;
 		case EXPR_IDENTIFIER:
@@ -360,7 +358,7 @@ static inline bool expr_cast_is_constant_eval(Expr *expr, ConstantEvalKind eval_
 		case CAST_FPFP:
 		case CAST_FPINT:
 		case CAST_INTFP:
-		case CAST_SABOOL:
+		case CAST_SLBOOL:
 		case CAST_STINLINE:
 		case CAST_VECARR:
 		case CAST_ARRVEC:
@@ -372,7 +370,7 @@ static inline bool expr_cast_is_constant_eval(Expr *expr, ConstantEvalKind eval_
 		case CAST_PTRPTR:
 		case CAST_APTSA:
 		case CAST_SAPTR:
-		case CAST_SASA:
+		case CAST_SLSL:
 		case CAST_VOID:
 		case CAST_ANYBOOL:
 		case CAST_ERPTR:
@@ -388,7 +386,7 @@ static inline bool expr_cast_is_constant_eval(Expr *expr, ConstantEvalKind eval_
 		case CAST_IDINT:
 		case CAST_INTARRBS:
 		case CAST_BSINTARR:
-		case CAST_SAARR:
+		case CAST_SLARR:
 			if (eval_kind == CONSTANT_EVAL_CONSTANT_VALUE) return false;
 			return exprid_is_constant_eval(expr->cast_expr.expr, eval_kind);
 
@@ -494,7 +492,7 @@ bool expr_may_splat_as_vararg(Expr *expr, Type *variadic_base_type)
 	switch (canonical->type_kind)
 	{
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return canonical->array.base == base_type;
 		case TYPE_POINTER:
 			if (canonical->pointer->type_kind == TYPE_ARRAY) return canonical->pointer->array.base == base_type;
@@ -510,9 +508,9 @@ bool expr_is_compile_time(Expr *expr)
 	{
 		case EXPR_CONST:
 			return true;
-		case EXPR_MACRO_BLOCK:
+		case EXPR_EXPR_BLOCK:
 		{
-			AstId current = expr->macro_block.first_stmt;
+			AstId current = expr->expr_block.first_stmt;
 			while (current)
 			{
 				if (!ast_is_compile_time(ast_next(&current))) return false;
@@ -576,8 +574,6 @@ void expr_rewrite_to_const_zero(Expr *expr, Type *type)
 		case TYPE_VOID:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_WILDCARD:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			UNREACHABLE
 		case ALL_INTS:
 			expr_rewrite_const_int(expr, type, 0);
@@ -590,8 +586,8 @@ void expr_rewrite_to_const_zero(Expr *expr, Type *type)
 			return;
 		case TYPE_POINTER:
 		case TYPE_FAULTTYPE:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 			expr_rewrite_const_null(expr, type);
@@ -611,7 +607,7 @@ void expr_rewrite_to_const_zero(Expr *expr, Type *type)
 		case TYPE_UNION:
 		case TYPE_BITSTRUCT:
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_UNTYPED_LIST:
@@ -744,7 +740,6 @@ bool expr_is_pure(Expr *expr)
 		case EXPR_OPTIONAL:
 		case EXPR_RETHROW:
 		case EXPR_HASH_IDENT:
-		case EXPR_MACRO_BLOCK:
 		case EXPR_INITIALIZER_LIST:
 		case EXPR_DESIGNATED_INITIALIZER_LIST:
 		case EXPR_POST_UNARY:
diff --git a/src/compiler/float.c b/src/compiler/float.c
index b1b333a03..cb035d0dc 100644
--- a/src/compiler/float.c
+++ b/src/compiler/float.c
@@ -9,8 +9,8 @@ UNUSED static int precision_bits(TypeKind kind)
 	{
 		case TYPE_F16:
 			return 11;
-			/*case TYPE_BF16:
-				return 8;*/
+		case TYPE_BF16:
+			return 8;
 		case TYPE_F32:
 			return 24;
 		case TYPE_F64:
@@ -28,8 +28,8 @@ UNUSED static int max_exponent(TypeKind kind)
 	{
 		case TYPE_F16:
 			return 15;
-			/*case TYPE_BF16:
-					return 127;*/
+		case TYPE_BF16:
+			return 127;
 		case TYPE_F32:
 			return 127;
 		case TYPE_F64:
@@ -47,8 +47,8 @@ UNUSED static int min_exponent(TypeKind kind)
 	{
 		case TYPE_F16:
 			return -14;
-			/*case TYPE_BF16:
-					return -126;*/
+		case TYPE_BF16:
+			return -126;
 		case TYPE_F32:
 			return -126;
 		case TYPE_F64:
@@ -101,6 +101,43 @@ static char *err_invalid_float_width = "The float width is not valid, it must be
 static char *err_float_out_of_range = "The float value is out of range.";
 static char *err_float_format_invalid = "The float format is invalid.";
 
+TypeKind float_suffix(char c, const char **index_ref, char** error_ref)
+{
+	if (c == 'b' && (*index_ref)[0] == 'f' && (*index_ref)[1] == '1' && (*index_ref)[1] == '6')
+	{
+		(*index_ref) += 4;
+		return TYPE_BF16;
+	}
+	if (c == 'f')
+	{
+		int i = 0;
+		while ((c = *((*index_ref)++)) && (c >= '0' && c <= '9'))
+		{
+			if (i > 100)
+			{
+				if (error_ref) *error_ref = err_invalid_float_width;
+				return TYPE_POISONED;
+			}
+			i = i * 10 + c - '0';
+		}
+		switch (i)
+		{
+			case 0:
+			case 32:
+				return TYPE_F32;
+			case 16:
+				return TYPE_F16;
+			case 64:
+				return TYPE_F64;
+			case 128:
+				return TYPE_F128;
+			default:
+				if (error_ref) *error_ref = err_invalid_float_width;
+				return TYPE_POISONED;
+		}
+	}
+	return TYPE_F64;
+}
 /**
  * This parses a float from a string. Unfortunately it is limited to parsing doubles as of now.
  *
@@ -141,39 +178,8 @@ Float float_from_string(const char *string, char **error)
 			scratch_buffer_append_char(c);
 		}
 	}
-	TypeKind kind = TYPE_F64;
-	if (c == 'f')
-	{
-		int i = 0;
-		while ((c = *(index++)) && (c >= '0' && c <= '9'))
-		{
-			if (i > 100)
-			{
-				if (error) *error = err_invalid_float_width;
-				return (Float){ .type = TYPE_POISONED };
-			}
-			i = i * 10 + c - '0';
-		}
-		switch (i)
-		{
-			case 0:
-			case 32:
-				kind = TYPE_F32;
-				break;
-			case 16:
-				kind = TYPE_F16;
-				break;
-			case 64:
-				kind = TYPE_F64;
-				break;
-			case 128:
-				kind = TYPE_F128;
-				break;
-			default:
-				if (error) *error = err_invalid_float_width;
-				return (Float){ .type = TYPE_POISONED };
-		}
-	}
+	TypeKind kind = float_suffix(c, &index, error);
+	if (kind == TYPE_POISONED) return (Float){ .type = TYPE_POISONED };
 
 	const char *str = scratch_buffer_to_string();
 	char *end = NULL;
@@ -234,39 +240,8 @@ Float float_from_hex(const char *string, char **error)
 			scratch_buffer_append_char(c);
 		}
 	}
-	TypeKind kind = TYPE_F64;
-	if (c == 'f')
-	{
-		int i = 0;
-		while ((c = *(index++)) && (c >= '0' && c <= '9'))
-		{
-			if (i > 100)
-			{
-				if (error) *error = err_invalid_float_width;
-				return (Float){ .type = TYPE_POISONED };
-			}
-			i = i * 10 + c - '0';
-		}
-		switch (i)
-		{
-			case 0:
-			case 32:
-				kind = TYPE_F32;
-				break;
-			case 16:
-				kind = TYPE_F16;
-				break;
-			case 64:
-				kind = TYPE_F64;
-				break;
-			case 128:
-				kind = TYPE_F128;
-				break;
-			default:
-				if (error) *error = err_invalid_float_width;
-				return (Float){ .type = TYPE_POISONED };
-		}
-	}
+	TypeKind kind = float_suffix(c, &index, error);
+	if (kind == TYPE_POISONED) return (Float){ .type = TYPE_POISONED };
 
 	const char *str = scratch_buffer_to_string();
 	char *end = NULL;
diff --git a/src/compiler/headers.c b/src/compiler/headers.c
index d66ed3bbf..ba48302ad 100644
--- a/src/compiler/headers.c
+++ b/src/compiler/headers.c
@@ -47,8 +47,6 @@ static void header_print_type(FILE *file, Type *type)
 	{
 		case CT_TYPES:
 		case TYPE_OPTIONAL:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			UNREACHABLE
 		case TYPE_VOID:
 			OUTPUT("void");
@@ -135,11 +133,11 @@ static void header_print_type(FILE *file, Type *type)
 			header_print_type(file, type->array.base);
 			OUTPUT(" arr[%d]; }", type->array.len);
 			return;
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 			OUTPUT("c3any_t");
 			return;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			OUTPUT("c3slice_t");
 			return;
 		case TYPE_VECTOR:
@@ -370,8 +368,6 @@ static void header_gen_maybe_generate_type(FILE *file, HTable *table, Type *type
 		case TYPE_MEMBER:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_WILDCARD:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			UNREACHABLE
 		case TYPE_VOID:
 		case TYPE_BOOL:
@@ -381,9 +377,9 @@ static void header_gen_maybe_generate_type(FILE *file, HTable *table, Type *type
 		case TYPE_TYPEID:
 		case TYPE_BITSTRUCT:
 		case TYPE_FAULTTYPE:
-		case TYPE_SUBARRAY:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_SLICE:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 			return;
 		case TYPE_POINTER:
 			type = type->pointer;
@@ -435,7 +431,7 @@ static void header_gen_maybe_generate_type(FILE *file, HTable *table, Type *type
 			if (htable_get(table, type)) return;
 			{
 				Decl *decl = type->decl;
-				OUTPUT("typedef struct %s__subarray__ %s;\n", decl_get_extname(decl), decl_get_extname(decl));
+				OUTPUT("typedef struct %s__slice__ %s;\n", decl_get_extname(decl), decl_get_extname(decl));
 				htable_set(table, type, type);
 				header_ensure_member_types_exist(file, table, decl->strukt.members);
 				OUTPUT("%s %s__\n", struct_union_str(decl), decl->extname);
diff --git a/src/compiler/json_output.c b/src/compiler/json_output.c
index ca2ae27d1..6c3a64a0a 100644
--- a/src/compiler/json_output.c
+++ b/src/compiler/json_output.c
@@ -135,7 +135,7 @@ void print_type(FILE *file, TypeInfo *type)
 			print_type(file, type->array.base);
 			fputs("[<>]", file);
 			break;
-		case TYPE_INFO_SUBARRAY:
+		case TYPE_INFO_SLICE:
 			print_type(file, type->array.base);
 			fputs("[]", file);
 			break;
diff --git a/src/compiler/llvm_codegen.c b/src/compiler/llvm_codegen.c
index 904c57252..6506fd4f9 100644
--- a/src/compiler/llvm_codegen.c
+++ b/src/compiler/llvm_codegen.c
@@ -400,10 +400,10 @@ void llvm_emit_ptr_from_array(GenContext *c, BEValue *value)
 		case TYPE_VECTOR:
 		case TYPE_FLEXIBLE_ARRAY:
 			return;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		{
 			BEValue member;
-			llvm_emit_subarray_pointer(c, value, &member);
+			llvm_emit_slice_pointer(c, value, &member);
 			llvm_value_rvalue(c, &member);
 			llvm_value_set_address(value,
 								   member.value,
@@ -543,16 +543,8 @@ void llvm_emit_global_variable_init(GenContext *c, Decl *decl)
 	}
 	else
 	{
-		if (decl->var.kind == VARDECL_CONST || decl->var.kind == VARDECL_GLOBAL)
-		{
-			LLVMSetVisibility(global_ref, LLVMProtectedVisibility);
-			if (optional_ref) LLVMSetVisibility(optional_ref, LLVMProtectedVisibility);
-		}
-		else
-		{
-			LLVMSetLinkage(global_ref, LLVMInternalLinkage);
-			if (optional_ref) LLVMSetLinkage(optional_ref, LLVMInternalLinkage);
-		}
+		LLVMSetLinkage(global_ref, LLVMInternalLinkage);
+		if (optional_ref) LLVMSetLinkage(optional_ref, LLVMInternalLinkage);
 	}
 
 	decl->backend_ref = global_ref;
@@ -865,6 +857,19 @@ void llvm_value_set_decl(GenContext *c, BEValue *value, Decl *decl)
 	llvm_value_set_decl_address(c, value, decl);
 }
 
+LLVMBuilderRef llvm_create_function_entry(GenContext *c, LLVMValueRef func, LLVMBasicBlockRef *entry_block_ref)
+{
+	LLVMBasicBlockRef entry = llvm_append_basic_block(c, func, "entry");
+	LLVMBuilderRef builder = llvm_create_builder(c);
+	LLVMPositionBuilderAtEnd(builder, entry);
+	if (entry_block_ref) *entry_block_ref = entry;
+	return builder;
+}
+
+LLVMBasicBlockRef llvm_append_basic_block(GenContext *c, LLVMValueRef function, const char *name)
+{
+	return LLVMAppendBasicBlockInContext(c->context, function, name);
+}
 
 LLVMBasicBlockRef llvm_basic_block_new(GenContext *c, const char *name)
 {
@@ -982,7 +987,6 @@ void llvm_add_global_decl(GenContext *c, Decl *decl)
 	bool same_module = decl_module(decl) == c->code_module;
 	const char *name = same_module ? "temp_global" : decl_get_extname(decl);
 	decl->backend_ref = llvm_add_global(c, name, decl->type, decl->alignment);
-	llvm_set_alignment(decl->backend_ref, decl->alignment);
 	if (!same_module)
 	{
 		LLVMSetLinkage(decl->backend_ref, LLVMExternalLinkage);
@@ -1211,9 +1215,7 @@ static void llvm_gen_test_main(GenContext *c)
 	LLVMTypeRef runner_type = LLVMFunctionType(c->byte_type, NULL, 0, true);
 	LLVMValueRef func = LLVMAddFunction(c->module, kw_main, main_type);
 	LLVMValueRef other_func = LLVMAddFunction(c->module, test_runner->extname, runner_type);
-	LLVMBasicBlockRef entry = LLVMAppendBasicBlockInContext(c->context, func, "entry");
-	LLVMBuilderRef builder = llvm_create_builder(c);
-	LLVMPositionBuilderAtEnd(builder, entry);
+	LLVMBuilderRef builder = llvm_create_function_entry(c, func, NULL);
 	LLVMValueRef val = LLVMBuildCall2(builder, runner_type, other_func, NULL, 0, "");
 	val = LLVMBuildSelect(builder, LLVMBuildTrunc(builder, val, c->bool_type, ""),
 						  LLVMConstNull(cint), LLVMConstInt(cint, 1, false), "");
@@ -1273,11 +1275,11 @@ INLINE GenContext *llvm_gen_tests(Module** modules, unsigned module_count, LLVMC
 		decl_ref = LLVMConstNull(c->ptr_type);
 	}
 	LLVMValueRef count = llvm_const_int(c, type_usz, test_count);
-	Type *chars_array = type_get_subarray(type_chars);
+	Type *chars_array = type_get_slice(type_chars);
 	LLVMValueRef name_list = llvm_add_global(c, test_names_var_name, chars_array, type_alloca_alignment(chars_array));
 	LLVMSetGlobalConstant(name_list, 1);
 	LLVMSetInitializer(name_list, llvm_emit_aggregate_two(c, chars_array, name_ref, count));
-	Type *decls_array_type = type_get_subarray(type_voidptr);
+	Type *decls_array_type = type_get_slice(type_voidptr);
 	LLVMValueRef decl_list = llvm_add_global(c, test_fns_var_name, decls_array_type, type_alloca_alignment(decls_array_type));
 	LLVMSetGlobalConstant(decl_list, 1);
 	LLVMSetInitializer(decl_list, llvm_emit_aggregate_two(c, decls_array_type, decl_ref, count));
@@ -1309,9 +1311,7 @@ static void llvm_gen_benchmark_main(GenContext *c)
 	LLVMTypeRef runner_type = LLVMFunctionType(c->byte_type, NULL, 0, true);
 	LLVMValueRef func = LLVMAddFunction(c->module, kw_main, main_type);
 	LLVMValueRef other_func = LLVMAddFunction(c->module, benchmark_runner->extname, runner_type);
-	LLVMBasicBlockRef entry = LLVMAppendBasicBlockInContext(c->context, func, "entry");
-	LLVMBuilderRef builder = llvm_create_builder(c);
-	LLVMPositionBuilderAtEnd(builder, entry);
+	LLVMBuilderRef builder = llvm_create_function_entry(c, func, NULL);
 	LLVMValueRef val = LLVMBuildCall2(builder, runner_type, other_func, NULL, 0, "");
 	val = LLVMBuildSelect(builder, LLVMBuildTrunc(builder, val, c->bool_type, ""),
 						  LLVMConstNull(cint), LLVMConstInt(cint, 1, false), "");
@@ -1371,11 +1371,11 @@ INLINE GenContext *llvm_gen_benchmarks(Module** modules, unsigned module_count,
 		decl_ref = LLVMConstNull(c->ptr_type);
 	}
 	LLVMValueRef count = llvm_const_int(c, type_usz, benchmark_count);
-	Type *chars_array = type_get_subarray(type_chars);
+	Type *chars_array = type_get_slice(type_chars);
 	LLVMValueRef name_list = llvm_add_global(c, benchmark_names_var_name, chars_array, type_alloca_alignment(chars_array));
 	LLVMSetGlobalConstant(name_list, 1);
 	LLVMSetInitializer(name_list, llvm_emit_aggregate_two(c, chars_array, name_ref, count));
-	Type *decls_array_type = type_get_subarray(type_voidptr);
+	Type *decls_array_type = type_get_slice(type_voidptr);
 	LLVMValueRef decl_list = llvm_add_global(c, benchmark_fns_var_name, decls_array_type, type_alloca_alignment(decls_array_type));
 	LLVMSetGlobalConstant(decl_list, 1);
 	LLVMSetInitializer(decl_list, llvm_emit_aggregate_two(c, decls_array_type, decl_ref, count));
@@ -1492,9 +1492,7 @@ static GenContext *llvm_gen_module(Module *module, LLVMContextRef shared_context
 
 		gencontext_init_file_emit(gen_context, unit);
 		gen_context->debug.compile_unit = unit->llvm.debug_compile_unit;
-		gen_context->debug.file = (DebugFile){
-				.debug_file = unit->llvm.debug_file,
-				.file_id = unit->file->file_id };
+		gen_context->debug.file = (DebugFile){ .debug_file = unit->llvm.debug_file, .file_id = unit->file->file_id };
 
 		FOREACH_BEGIN(Decl *method, unit->methods)
 			if (only_used && !method->is_live) continue;
@@ -1681,13 +1679,6 @@ LLVMValueRef llvm_emit_memcpy(GenContext *c, LLVMValueRef dest, unsigned dest_al
 	return LLVMBuildMemCpy(c->builder, dest, dest_align, source, src_align, llvm_const_int(c, type_ulong, len));
 }
 
-void llvm_emit_memcpy_to_decl(GenContext *c, Decl *decl, LLVMValueRef source, unsigned source_alignment)
-{
-	if (source_alignment == 0) source_alignment = type_abi_alignment(decl->type);
-	assert(!decl->is_value);
-	llvm_emit_memcpy(c, decl->backend_ref, decl->alignment, source, source_alignment, type_size(decl->type));
-}
-
 TypeSize llvm_store_size(GenContext *c, LLVMTypeRef type)
 {
 	return (TypeSize)LLVMStoreSizeOfType(c->target_data, type);
diff --git a/src/compiler/llvm_codegen_builtins.c b/src/compiler/llvm_codegen_builtins.c
index 66efd6c44..38b1fd3f9 100644
--- a/src/compiler/llvm_codegen_builtins.c
+++ b/src/compiler/llvm_codegen_builtins.c
@@ -115,14 +115,8 @@ INLINE void llvm_emit_compare_exchange(GenContext *c, BEValue *result_value, Exp
 		assert(is_power_of_two(alignment));
 		LLVMSetAlignment(result, alignment);
 	}
-	if (is_volatile)
-	{
-		LLVMSetVolatile(result, true);
-	}
-	if (is_weak)
-	{
-		LLVMSetWeak(result, true);
-	}
+	if (is_volatile) LLVMSetVolatile(result, true);
+	if (is_weak) LLVMSetWeak(result, true);
 
 	llvm_value_set(result_value, llvm_emit_extract_value(c, result, 0), type);
 }
@@ -131,9 +125,6 @@ INLINE void llvm_emit_unreachable_stmt(GenContext *c, BEValue *result_value, Exp
 {
 	llvm_value_set(result_value, LLVMBuildUnreachable(c->builder), type_void);
 	c->current_block = NULL;
-	c->current_block_is_target = false;
-	LLVMBasicBlockRef after_unreachable = llvm_basic_block_new(c, "after.unreachable");
-	llvm_emit_block(c, after_unreachable);
 }
 
 INLINE void llvm_emit_volatile_store(GenContext *c, BEValue *result_value, Expr *expr)
@@ -754,7 +745,7 @@ static inline void llvm_emit_any_make(GenContext *c, BEValue *value, Expr *expr)
 	Expr *typeid = args[1];
 	if (expr_is_const(typeid) && typeid->const_expr.typeid == type_void)
 	{
-		llvm_value_set(value, llvm_get_zero(c, type_anyptr), type_anyptr);
+		llvm_value_set(value, llvm_get_zero(c, type_any), type_any);
 		return;
 	}
 	BEValue ptr;
@@ -763,11 +754,11 @@ static inline void llvm_emit_any_make(GenContext *c, BEValue *value, Expr *expr)
 	BEValue typeid_value;
 	llvm_emit_expr(c, &typeid_value, typeid);
 	llvm_value_rvalue(c, &typeid_value);
-	LLVMValueRef var = llvm_get_undef(c, type_anyptr);
+	LLVMValueRef var = llvm_get_undef(c, type_any);
 	var = llvm_emit_insert_value(c, var, ptr.value, 0);
 	var = llvm_emit_insert_value(c, var, typeid_value.value, 1);
 	assert(!LLVMIsConstant(ptr.value) || !LLVMIsConstant(typeid_value.value) || LLVMIsConstant(var));
-	llvm_value_set(value, var, type_anyptr);
+	llvm_value_set(value, var, type_any);
 }
 
 
diff --git a/src/compiler/llvm_codegen_debug_info.c b/src/compiler/llvm_codegen_debug_info.c
index 726af2068..238568407 100644
--- a/src/compiler/llvm_codegen_debug_info.c
+++ b/src/compiler/llvm_codegen_debug_info.c
@@ -18,10 +18,15 @@ static LLVMMetadataRef llvm_debug_vector_type(GenContext *c, Type *type);
 static LLVMMetadataRef llvm_debug_typedef_type(GenContext *c, Type *type);
 static LLVMMetadataRef llvm_debug_array_type(GenContext *c, Type *type);
 static LLVMMetadataRef llvm_debug_errunion_type(GenContext *c, Type *type);
-static LLVMMetadataRef llvm_debug_subarray_type(GenContext *c, Type *type);
+static LLVMMetadataRef llvm_debug_slice_type(GenContext *c, Type *type);
 static LLVMMetadataRef llvm_debug_any_type(GenContext *c, Type *type);
 static LLVMMetadataRef llvm_debug_enum_type(GenContext *c, Type *type, LLVMMetadataRef scope);
 
+INLINE LLVMMetadataRef llvm_create_debug_location_with_inline(GenContext *c, unsigned row, unsigned col, LLVMMetadataRef scope)
+{
+	return LLVMDIBuilderCreateDebugLocation(c->context, row, col,
+	                                 scope, c->debug.block_stack->inline_loc ? c->debug.block_stack->inline_loc : NULL);
+}
 static inline LLVMMetadataRef llvm_get_debug_struct(GenContext *c, Type *type, const char *external_name, LLVMMetadataRef *elements, unsigned element_count, SourceSpan *loc, LLVMMetadataRef scope, LLVMDIFlags flags)
 {
 	LLVMMetadataRef file = NULL;
@@ -40,11 +45,12 @@ static inline LLVMMetadataRef llvm_get_debug_struct(GenContext *c, Type *type, c
 														 row,
 														 type_size(type) * 8,
 														 (uint32_t)(type_abi_alignment(type) * 8),
-														 flags, NULL,
+														 flags,
+														 NULL, // Derived from
 														 elements, element_count,
 														 c->debug.runtime_version,
 														 NULL, // VTable
-														 external_name, strlen(external_name));
+														 external_name, external_name_len);
 	if (type->backend_debug_type)
 	{
 		LLVMMetadataReplaceAllUsesWith(type->backend_debug_type, real);
@@ -67,22 +73,10 @@ static inline LLVMMetadataRef llvm_get_debug_member(GenContext *c, Type *type, c
 }
 
 
-void llvm_debug_scope_push(GenContext *context, LLVMMetadataRef debug_scope)
-{
-	vec_add(context->debug.lexical_block_stack, debug_scope);
-}
-
-void llvm_debug_scope_pop(GenContext *context)
-{
-	vec_pop(context->debug.lexical_block_stack);
-}
 
 LLVMMetadataRef llvm_debug_current_scope(GenContext *context)
 {
-	if (vec_size(context->debug.lexical_block_stack) > 0)
-	{
-		return VECLAST(context->debug.lexical_block_stack);
-	}
+	if (context->debug.block_stack) return context->debug.block_stack->lexical_block;
 	return context->debug.compile_unit;
 }
 
@@ -108,8 +102,8 @@ void llvm_emit_debug_global_var(GenContext *c, Decl *global)
 
 void llvm_emit_debug_function(GenContext *c, Decl *decl)
 {
-	LLVMDIFlags flags = LLVMDIFlagZero;
 	if (!decl->func_decl.body) return;
+	LLVMDIFlags flags = LLVMDIFlagZero;
 	flags |= LLVMDIFlagPrototyped;
 	if (decl->func_decl.signature.attrs.noreturn) flags |= LLVMDIFlagNoReturn;
 
@@ -159,13 +153,11 @@ void llvm_emit_debug_local_var(GenContext *c, Decl *decl)
 			decl->alignment);
 	decl->var.backend_debug_ref = var;
 
-	LLVMMetadataRef inline_at = NULL;
 	assert(!decl->is_value);
 	LLVMDIBuilderInsertDeclareAtEnd(c->debug.builder,
 									decl->backend_ref, var,
 									LLVMDIBuilderCreateExpression(c->debug.builder, NULL, 0),
-									LLVMDIBuilderCreateDebugLocation(c->context, row, col,
-																	 scope, inline_at),
+									llvm_create_debug_location_with_inline(c, row, col, scope),
 									LLVMGetInsertBlock(c->builder));
 }
 
@@ -197,14 +189,11 @@ void llvm_emit_debug_parameter(GenContext *c, Decl *parameter, unsigned index)
 			llvm_get_debug_type(c, parameter->type),
 			always_preserve,
 			LLVMDIFlagZero);
-	LLVMMetadataRef inline_at = NULL;
-
 	if (parameter->is_value)
 	{
 		LLVMDIBuilderInsertDbgValueAtEnd(c->debug.builder, parameter->backend_value, parameter->var.backend_debug_ref,
 		                                 LLVMDIBuilderCreateExpression(c->debug.builder, NULL, 0),
-		                                 LLVMDIBuilderCreateDebugLocation(c->context, row, col, c->debug.function,
-		                                                                  inline_at),
+		                                 llvm_create_debug_location_with_inline(c, row, col, c->debug.function),
 		                                 LLVMGetInsertBlock(c->builder));
 		return;
 	}
@@ -213,8 +202,7 @@ void llvm_emit_debug_parameter(GenContext *c, Decl *parameter, unsigned index)
 									parameter->backend_ref,
 									parameter->var.backend_debug_ref,
 									LLVMDIBuilderCreateExpression(c->debug.builder, NULL, 0),
-									LLVMDIBuilderCreateDebugLocation(c->context, row, col, c->debug.function,
-																	 inline_at),
+									llvm_create_debug_location_with_inline(c, row, col, c->debug.function),
 									LLVMGetInsertBlock(c->builder));
 
 
@@ -230,11 +218,7 @@ void llvm_emit_debug_location(GenContext *c, SourceSpan location)
 	unsigned row = location.row;
 	unsigned col = location.col;
 	c->last_emitted_loc.a = location.a;
-	LLVMMetadataRef loc = LLVMDIBuilderCreateDebugLocation(c->context,
-														   row ? row : 1,
-														   col ? col : 1,
-														   scope, /* inlined at */ 0);
-
+	LLVMMetadataRef loc = llvm_create_debug_location_with_inline(c, row ? row : 1, col ? col : 1, scope);
 	LLVMSetCurrentDebugLocation2(c->builder, loc);
 }
 
@@ -258,16 +242,34 @@ static LLVMMetadataRef llvm_debug_forward_comp(GenContext *c, Type *type, const
 													   strlen(external_name));
 
 }
-void llvm_debug_push_lexical_scope(GenContext *context, SourceSpan location)
+
+LLVMMetadataRef llvm_debug_create_macro(GenContext *c, Decl *macro)
+{
+	SourceSpan location = macro->span;
+	const char *name = macro->name;
+	size_t namelen = strlen(name);
+	LLVMMetadataRef file = llvm_get_debug_file(c, location.file_id);
+	LLVMMetadataRef macro_type = NULL;
+	return LLVMDIBuilderCreateFunction(c->debug.builder, file, name, namelen, name, namelen,
+	                            file, location.row, macro_type, true, true, location.row, LLVMDIFlagZero, false);
+}
+
+DebugScope llvm_debug_create_lexical_scope(GenContext *context, SourceSpan location)
 {
 	LLVMMetadataRef scope;
-	if (vec_size(context->debug.lexical_block_stack) > 0)
+	LLVMMetadataRef inline_at;
+	DebugScope *outline_at;
+	if (context->debug.block_stack)
 	{
-		scope = VECLAST(context->debug.lexical_block_stack);
+		scope = context->debug.block_stack->lexical_block;
+		inline_at = context->debug.block_stack->inline_loc;
+		outline_at = context->debug.block_stack->outline_loc;
 	}
 	else
 	{
 		scope = context->debug.compile_unit;
+		inline_at = NULL;
+		outline_at = NULL;
 	}
 
 	unsigned row = location.row;
@@ -277,15 +279,13 @@ void llvm_debug_push_lexical_scope(GenContext *context, SourceSpan location)
 	{
 		debug_file = llvm_get_debug_file(context, location.file_id);
 	}
-	LLVMMetadataRef block =
-			LLVMDIBuilderCreateLexicalBlock(context->debug.builder, scope, debug_file,
-											row ? row : 1,
-											col ? col : 1);
+	LLVMMetadataRef block = LLVMDIBuilderCreateLexicalBlock(context->debug.builder, scope, debug_file, row ? row : 1, col ? col : 1);
 
-	llvm_debug_scope_push(context, block);
+	return (DebugScope) { .lexical_block = block, .inline_loc = inline_at, .outline_loc = outline_at };
 }
 
 
+
 static LLVMMetadataRef llvm_debug_typeid_type(GenContext *context, Type *type)
 {
 	return type->backend_debug_type = LLVMDIBuilderCreateBasicType(context->debug.builder,
@@ -402,7 +402,7 @@ static LLVMMetadataRef llvm_debug_structlike_type(GenContext *c, Type *type, LLV
 	return llvm_get_debug_struct(c, type, decl->name ? decl->extname : "", elements, vec_size(elements), &decl->span, scope, LLVMDIFlagZero);
 }
 
-static LLVMMetadataRef llvm_debug_subarray_type(GenContext *c, Type *type)
+static LLVMMetadataRef llvm_debug_slice_type(GenContext *c, Type *type)
 {
 	LLVMMetadataRef forward = llvm_debug_forward_comp(c, type, type->name, NULL, NULL, LLVMDIFlagZero);
 	type->backend_debug_type = forward;
@@ -564,8 +564,6 @@ static inline LLVMMetadataRef llvm_get_debug_type_internal(GenContext *c, Type *
 	switch (type->type_kind)
 	{
 		case CT_TYPES:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			UNREACHABLE
 		case TYPE_BITSTRUCT:
 		case TYPE_OPTIONAL:
@@ -615,12 +613,12 @@ static inline LLVMMetadataRef llvm_get_debug_type_internal(GenContext *c, Type *
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_ARRAY:
 			return type->backend_debug_type = llvm_debug_array_type(c, type);
-		case TYPE_SUBARRAY:
-			return type->backend_debug_type = llvm_debug_subarray_type(c, type);
+		case TYPE_SLICE:
+			return type->backend_debug_type = llvm_debug_slice_type(c, type);
 		case TYPE_ANYFAULT:
 			return type->backend_debug_type = llvm_debug_errunion_type(c, type);
-		case TYPE_INFPTR:
-		case TYPE_ANYPTR:
+		case TYPE_INTERFACE:
+		case TYPE_ANY:
 			return type->backend_debug_type = llvm_debug_any_type(c, type);
 	}
 	UNREACHABLE
diff --git a/src/compiler/llvm_codegen_expr.c b/src/compiler/llvm_codegen_expr.c
index e4522abe8..dd7c40250 100644
--- a/src/compiler/llvm_codegen_expr.c
+++ b/src/compiler/llvm_codegen_expr.c
@@ -17,15 +17,13 @@ static inline void llvm_emit_builtin_access(GenContext *c, BEValue *be_value, Ex
 static inline void llvm_emit_const_initialize_reference(GenContext *c, BEValue *ref, Expr *expr);
 static inline void llvm_emit_expr_block(GenContext *context, BEValue *be_value, Expr *expr);
 static inline void llvm_emit_optional(GenContext *c, BEValue *be_value, Expr *expr);
-static inline void
-llvm_emit_inc_dec_change(GenContext *c, BEValue *addr, BEValue *after, BEValue *before, Expr *expr, int diff,
+static inline void llvm_emit_inc_dec_change(GenContext *c, BEValue *addr, BEValue *after, BEValue *before, Expr *expr, int diff,
                          bool allow_wrap);
 static inline void llvm_emit_initialize_reference(GenContext *c, BEValue *ref, Expr *expr);
 static inline void llvm_emit_initialize_reference_bitstruct(GenContext *c, BEValue *ref, Decl *bitstruct, Expr** elements);
 static inline void llvm_emit_initialize_reference_list(GenContext *c, BEValue *ref, Expr *expr);
 static inline void llvm_emit_initialize_reference_vector(GenContext *c, BEValue *ref, Type *real_type, Expr **elements);
 static inline void llvm_emit_initializer_list_expr(GenContext *c, BEValue *value, Expr *expr);
-static inline void llvm_emit_macro_block(GenContext *c, BEValue *be_value, Expr *expr);
 static inline void llvm_emit_post_inc_dec(GenContext *c, BEValue *value, Expr *expr, int diff, bool allow_wrap);
 static inline void llvm_emit_pre_inc_dec(GenContext *c, BEValue *value, Expr *expr, int diff, bool allow_wrap);
 static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type *type, AstId current, BlockExit **block_exit);
@@ -73,14 +71,17 @@ LLVMValueRef llvm_emit_exprid_to_rvalue(GenContext *c, ExprId expr_id)
 	return value.value;
 }
 
-void llvm_emit_assume_raw(GenContext *c, LLVMValueRef assume_true)
+void llvm_emit_assume_true(GenContext *c, BEValue *assume_true)
 {
-	llvm_emit_call_intrinsic(c, intrinsic_id.assume, NULL, 0, &assume_true, 1);
+	assert(llvm_value_is_bool(assume_true));
+	LLVMValueRef value = assume_true->value;
+	llvm_emit_call_intrinsic(c, intrinsic_id.assume, NULL, 0, &value, 1);
 }
 
-LLVMValueRef llvm_emit_expect_false_raw(GenContext *c, LLVMValueRef expect_false)
+LLVMValueRef llvm_emit_expect_false(GenContext *c, BEValue *expect_false)
 {
-	LLVMValueRef values[2] = { expect_false, LLVMConstNull(c->bool_type) };
+	assert(llvm_value_is_bool(expect_false));
+	LLVMValueRef values[2] = { expect_false->value, LLVMConstNull(c->bool_type) };
 	return llvm_emit_call_intrinsic(c, intrinsic_id.expect, &c->bool_type, 1, values, 2);
 }
 
@@ -89,38 +90,40 @@ LLVMValueRef llvm_emit_expect_raw(GenContext *c, LLVMValueRef expect_true)
 	LLVMValueRef values[2] = { expect_true, LLVMConstInt(c->bool_type, 1, false) };
 	return llvm_emit_call_intrinsic(c, intrinsic_id.expect, &c->bool_type, 1, values, 2);
 }
+
 BEValue llvm_emit_assign_expr(GenContext *c, BEValue *ref, Expr *expr, LLVMValueRef optional)
 {
-	assert(ref->kind == BE_ADDRESS || ref->kind == BE_ADDRESS_OPTIONAL);
+	assert(llvm_value_is_addr(ref));
+
+	assert((optional || !IS_OPTIONAL(expr)) && "Assumed an optional address if it's an optional expression.");
 
-	assert(optional || !IS_OPTIONAL(expr));
 	// Special optimization of handling of optional
 	if (expr->expr_kind == EXPR_OPTIONAL)
 	{
-		PUSH_OPT();
 
-		c->opt_var = NULL;
-		c->catch_block = NULL;
+		PUSH_CLEAR_CATCH();
+
 		BEValue result;
 		// Emit the fault type.
 		llvm_emit_expr(c, &result, expr->inner_expr);
+		llvm_value_rvalue(c, &result);
+
 		LLVMValueRef err_val = result.value;
 		// Store it in the optional
 		llvm_store_to_ptr(c, optional, &result);
 		// Set the result to an undef value
 		llvm_value_set(&result, llvm_get_undef(c, ref->type), ref->type);
 
-		POP_OPT();
+		POP_CATCH();
 
 		// If we had a catch block outside then we want to jump to that exit.
-		if (c->catch_block) llvm_emit_jump_to_optional_exit(c, err_val);
+		if (c->catch.block) llvm_emit_jump_to_optional_exit(c, err_val);
 
 		// This return value will not be used.
 		return result;
 	}
 
-	PUSH_OPT();
-
+	PUSH_CATCH();
 
 	LLVMBasicBlockRef assign_block = NULL;
 	LLVMBasicBlockRef rejump_block = NULL;
@@ -129,20 +132,19 @@ BEValue llvm_emit_assign_expr(GenContext *c, BEValue *ref, Expr *expr, LLVMValue
 	{
 		assign_block = llvm_basic_block_new(c, "after_assign");
 		assert(optional);
-		if (c->opt_var)
+		if (c->catch.fault)
 		{
-			c->catch_block = rejump_block = llvm_basic_block_new(c, "optional_assign_jump");
+			c->catch.block = rejump_block = llvm_basic_block_new(c, "optional_assign_jump");
 		}
 		else
 		{
-			c->catch_block = assign_block;
+			c->catch.block = assign_block;
 		}
-		c->opt_var = optional;
+		c->catch.fault = optional;
 	}
 	else
 	{
-		c->opt_var = NULL;
-		c->catch_block = NULL;
+		c->catch = NO_CATCH;
 	}
 
 	BEValue value;
@@ -179,7 +181,7 @@ BEValue llvm_emit_assign_expr(GenContext *c, BEValue *ref, Expr *expr, LLVMValue
 	{
 		llvm_store_to_ptr_raw(c, optional, llvm_get_zero(c, type_anyfault), type_anyfault);
 	}
-	POP_OPT();
+	POP_CATCH();
 
 	if (assign_block)
 	{
@@ -188,8 +190,8 @@ BEValue llvm_emit_assign_expr(GenContext *c, BEValue *ref, Expr *expr, LLVMValue
 		{
 			llvm_emit_block(c, rejump_block);
 			LLVMValueRef error = llvm_load_abi_alignment(c, type_anyfault, optional, "reload_err");
-			llvm_store_to_ptr_raw(c, c->opt_var, error, type_anyfault);
-			llvm_emit_br(c, c->catch_block);
+			llvm_store_to_ptr_raw(c, c->catch.fault, error, type_anyfault);
+			llvm_emit_br(c, c->catch.block);
 		}
 		llvm_emit_block(c, assign_block);
 	}
@@ -534,7 +536,8 @@ void llvm_emit_coerce_store(GenContext *c, LLVMValueRef addr, AlignSize alignmen
 		return;
 	}
 
-	// TODO for scalable vectors this is not true.
+	assert(coerced_type_kind != LLVMScalableVectorTypeKind && "Scalable vectors are not supported.");
+
 	ByteSize target_size = llvm_alloc_size(c, target_type);
 	if (src_size <= target_size && coerced_type_kind != LLVMScalableVectorTypeKind && source_type_kind != LLVMScalableVectorTypeKind)
 	{
@@ -627,7 +630,7 @@ static inline void llvm_emit_subscript_addr_with_base(GenContext *c, BEValue *re
 			llvm_value_set_address(result, ptr, type->array.base, alignment);
 			return;
 		}
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			{
 				LLVMValueRef ptr = llvm_emit_pointer_inbounds_gep_raw(c, llvm_get_type(c, type->array.base), parent->value, index->value);
 				llvm_value_set_address(result, ptr, type->array.base, type_abi_alignment(type->array.base));
@@ -659,20 +662,14 @@ static inline void llvm_emit_vector_subscript(GenContext *c, BEValue *value, Exp
 
 
 /**
- * Expand foo[123] or someCall()[n] or some such.
+ * Expand &foo[123] or &someCall()[n] or some such.
  * Evaluation order is left to right.
  */
-static inline void gencontext_emit_subscript(GenContext *c, BEValue *value, Expr *expr)
+static inline void llvm_emit_subscript_addr(GenContext *c, BEValue *value, Expr *expr)
 {
-	bool is_value = expr->expr_kind == EXPR_SUBSCRIPT;
 	Expr *parent_expr = exprptr(expr->subscript_expr.expr);
 	Expr *index_expr = exprptr(expr->subscript_expr.range.start);
 	Type *parent_type = type_lowering(parent_expr->type);
-	if (is_value && parent_type->type_kind == TYPE_VECTOR)
-	{
-		llvm_emit_vector_subscript(c, value, expr);
-		return;
-	}
 	BEValue ref;
 	// First, get thing being subscripted.
 	llvm_emit_expr(c, value, parent_expr);
@@ -681,7 +678,7 @@ static inline void gencontext_emit_subscript(GenContext *c, BEValue *value, Expr
 
 	// See if we need the length.
 	bool needs_len = false;
-	if (parent_type_kind == TYPE_SUBARRAY)
+	if (parent_type_kind == TYPE_SLICE)
 	{
 		needs_len = safe_mode_enabled() || expr->subscript_expr.range.start_from_end;
 	}
@@ -715,13 +712,24 @@ static inline void gencontext_emit_subscript(GenContext *c, BEValue *value, Expr
 		llvm_emit_array_bounds_check(c, &index, len.value, index_expr->span);
 	}
 	llvm_emit_subscript_addr_with_base(c, value, value, &index, index_expr->span);
-	if (!is_value)
+	assert(llvm_value_is_addr(value));
+	llvm_value_fold_optional(c, value);
+}
+
+/**
+ * Expand foo[123] or someCall()[n] or some such.
+ * Evaluation order is left to right.
+ */
+static inline void llvm_emit_subscript(GenContext *c, BEValue *value, Expr *expr)
+{
+	Expr *parent_expr = exprptr(expr->subscript_expr.expr);
+	Type *parent_type = type_lowering(parent_expr->type);
+	if (parent_type->type_kind == TYPE_VECTOR)
 	{
-		assert(llvm_value_is_addr(value));
-		llvm_value_fold_optional(c, value);
-		value->kind = BE_VALUE;
-		value->type = type_get_ptr(value->type);
+		llvm_emit_vector_subscript(c, value, expr);
+		return;
 	}
+	llvm_emit_subscript_addr(c, value, expr);
 }
 
 static inline void llvm_emit_pointer_offset(GenContext *c, BEValue *value, Expr *expr)
@@ -948,7 +956,6 @@ static inline void llvm_extract_bitvalue(GenContext *c, BEValue *be_value, Expr
 	unsigned start = (unsigned)member->var.start_bit;
 	unsigned end = (unsigned)member->var.end_bit;
 	Type *member_type = type_lowering(member->type);
-	ByteSize member_type_size = type_size(member_type);
 	if (type_is_signed(member_type))
 	{
 		// Shift all the way left, so top bit is to the top.
@@ -962,14 +969,7 @@ static inline void llvm_extract_bitvalue(GenContext *c, BEValue *be_value, Expr
 		{
 			value = llvm_emit_ashr_fixed(c, value, right_shift);
 		}
-		if (member_type_size < container_bit_size)
-		{
-			value = LLVMBuildTrunc(c->builder, value, llvm_get_type(c, member_type), "");
-		}
-		else if (member_type_size > container_bit_size)
-		{
-			value = LLVMBuildSExt(c->builder, value, llvm_get_type(c, member_type), "");
-		}
+		value = llvm_sext_trunc(c, value, llvm_get_type(c, member_type));
 	}
 	else
 	{
@@ -1192,24 +1192,32 @@ static inline void llvm_emit_access_addr(GenContext *c, BEValue *be_value, Expr
 	llvm_emit_member_addr(c, be_value, type_lowering(parent->type)->decl, member);
 }
 
-static inline void llvm_set_phi(LLVMValueRef phi, LLVMValueRef val1, LLVMBasicBlockRef block1, LLVMValueRef val2, LLVMBasicBlockRef block2)
+void llvm_set_phi(LLVMValueRef phi, LLVMValueRef val1, LLVMBasicBlockRef block1, LLVMValueRef val2, LLVMBasicBlockRef block2)
 {
 	LLVMValueRef vals[2] = { val1, val2 };
 	LLVMBasicBlockRef blocks[2] = { block1, block2 };
 	LLVMAddIncoming(phi, vals, blocks, 2);
 }
 
+void llvm_new_phi(GenContext *c, BEValue *value, const char *name, Type *type, LLVMValueRef val1, LLVMBasicBlockRef block1, LLVMValueRef val2, LLVMBasicBlockRef block2)
+{
+	LLVMValueRef phi = LLVMBuildPhi(c->builder, LLVMTypeOf(val1), name);
+	llvm_set_phi(phi, val1, block1, val2, block2);
+	llvm_value_set(value, phi, type);
+}
+
+
 static inline void llvm_emit_initialize_reference(GenContext *c, BEValue *value, Expr *expr);
 
 /**
- * Here we are converting an array to a subarray.
+ * Here we are converting an array to a slice.
  * int[] x = &the_array;
  * @param c
  * @param value
  * @param to_type
  * @param from_type
  */
-static void llvm_emit_arr_to_subarray_cast(GenContext *c, BEValue *value, Type *to_type)
+static void llvm_emit_arr_to_slice_cast(GenContext *c, BEValue *value, Type *to_type)
 {
 	ByteSize size = value->type->pointer->array.len;
 	LLVMValueRef pointer;
@@ -1253,12 +1261,12 @@ void llvm_emit_array_to_vector_cast(GenContext *c, BEValue *value, Type *to_type
 }
 
 
-void llvm_emit_subarray_to_vec_array_cast(GenContext *c, BEValue *value, Type *to_type, Type *from_type)
+void llvm_emit_slice_to_vec_array_cast(GenContext *c, BEValue *value, Type *to_type, Type *from_type)
 {
 	BEValue pointer;
 	Type *base = type_lowering(from_type)->array.base;
 	AlignSize element_alignment = type_abi_alignment(base);
-	llvm_emit_subarray_pointer(c, value, &pointer);
+	llvm_emit_slice_pointer(c, value, &pointer);
 	llvm_value_rvalue(c, &pointer);
 	LLVMTypeRef type = llvm_get_type(c, to_type);
 	AlignSize alignment = llvm_abi_alignment(c, type);
@@ -1347,7 +1355,6 @@ static void llvm_prune_optional(GenContext *c, LLVMBasicBlockRef discard_fail)
 	}
 	// Update the context
 	c->current_block = prev_block;
-	c->current_block_is_target = LLVMGetFirstBasicBlock(c->function) == prev_block;
 	LLVMPositionBuilderAtEnd(c->builder, prev_block);
 }
 
@@ -1357,10 +1364,8 @@ void llvm_emit_ignored_expr(GenContext *c, Expr *expr)
 	// For a standalone catch, we can ignore storing the value.
 	if (IS_OPTIONAL(expr))
 	{
-		PUSH_OPT();
 		LLVMBasicBlockRef discard_fail = llvm_basic_block_new(c, "voiderr");
-		c->catch_block = discard_fail;
-		c->opt_var = NULL;
+		PUSH_CATCH_VAR_BLOCK(NULL, discard_fail);
 		llvm_emit_expr(c, &value, expr);
 		llvm_value_fold_optional(c, &value);
 		EMIT_LOC(c, expr);
@@ -1374,7 +1379,7 @@ void llvm_emit_ignored_expr(GenContext *c, Expr *expr)
 			llvm_emit_br(c, discard_fail);
 			llvm_emit_block(c, discard_fail);
 		}
-		POP_OPT();
+		POP_CATCH();
 		return;
 	}
 	llvm_emit_expr(c, &value, expr);
@@ -1389,8 +1394,8 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 
 	switch (cast_kind)
 	{
-		case CAST_SAARR:
-			llvm_emit_subarray_to_vec_array_cast(c, value, to_type, from_type);
+		case CAST_SLARR:
+			llvm_emit_slice_to_vec_array_cast(c, value, to_type, from_type);
 			return;
 		case CAST_EXPVEC:
 			llvm_emit_expand_to_vec_cast(c, value, to_type, from_type);
@@ -1453,11 +1458,11 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 			value->value = LLVMBuildPtrToInt(c->builder, value->value, llvm_get_type(c, to_type), "ptrxi");
 			break;
 		case CAST_APTSA:
-			llvm_emit_arr_to_subarray_cast(c, value, to_type);
+			llvm_emit_arr_to_slice_cast(c, value, to_type);
 			break;
 		case CAST_SAPTR:
 			llvm_value_fold_optional(c, value);
-			llvm_emit_subarray_pointer(c, value, value);
+			llvm_emit_slice_pointer(c, value, value);
 			break;
 		case CAST_EREU:
 			// This is a no op.
@@ -1542,8 +1547,9 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 			llvm_value_rvalue(c, value);
 			value->value = LLVMBuildIntToPtr(c->builder, value->value, llvm_get_type(c, to_type), "intptr");
 			break;
-		case CAST_SASA:
+		case CAST_SLSL:
 			// Improve this
+			break;
 		case CAST_STINLINE:
 			llvm_value_addr(c, value);
 			value->type = to_type;
@@ -1561,13 +1567,13 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 					scratch_buffer_printf("Attempt to convert a negative value (%%d) to enum '%s' failed.", decl->name);
 					llvm_emit_int_comp_zero(c, &check, value, BINARYOP_LT);
 					BEValue val;
-					llvm_emit_panic_on_true(c, check.value, "Attempt to convert negative value to enum failed.", expr->span, scratch_buffer_to_string(), value, NULL);
+					llvm_emit_panic_on_true(c, check.value, "Attempt to convert negative value to enum failed.", expr->span, scratch_buffer_copy(), value, NULL);
 				}
 				scratch_buffer_clear();
 				scratch_buffer_printf("Attempting to convert %%d to enum '%s' failed as the value exceeds the max ordinal (%u).", decl->name, max - 1);
 				LLVMValueRef val = llvm_const_int(c, value->type, max);
 				llvm_emit_int_comp_raw(c, &check, value->type, value->type, value->value, val, BINARYOP_GE);
-				llvm_emit_panic_on_true(c, check.value, "Failed integer to enum conversion", expr->span, scratch_buffer_to_string(), value, NULL);
+				llvm_emit_panic_on_true(c, check.value, "Failed integer to enum conversion", expr->span, scratch_buffer_copy(), value, NULL);
 			}
 			// We might need to extend or truncate.
 			if (type_size(to_type) != type_size(from_type))
@@ -1578,7 +1584,7 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 			}
 			value->type = type_lowering(to_type);
 			return;
-		case CAST_SABOOL:
+		case CAST_SLBOOL:
 			llvm_value_fold_optional(c, value);
 			if (llvm_value_is_addr(value))
 			{
@@ -2524,20 +2530,27 @@ static inline void llvm_emit_pre_inc_dec(GenContext *c, BEValue *value, Expr *ex
 
 static inline void llvm_emit_deref(GenContext *c, BEValue *value, Expr *inner, Type *type)
 {
-	if (inner->expr_kind == EXPR_UNARY)
+	switch (inner->expr_kind)
 	{
-		switch (inner->unary_expr.operator)
-		{
-			case UNARYOP_ADDR:
-				llvm_emit_expr(c, value, inner->unary_expr.expr);
-				return;
-			case UNARYOP_TADDR:
-				llvm_emit_expr(c, value, inner->unary_expr.expr);
-				llvm_value_addr(c, value);
-				return;
-			default:
-				break;
-		}
+		case EXPR_UNARY:
+			switch (inner->unary_expr.operator)
+			{
+				case UNARYOP_ADDR:
+					llvm_emit_expr(c, value, inner->unary_expr.expr);
+					return;
+				case UNARYOP_TADDR:
+					llvm_emit_expr(c, value, inner->unary_expr.expr);
+					llvm_value_addr(c, value);
+					return;
+				default:
+					break;
+			}
+			break;
+		case EXPR_SUBSCRIPT_ADDR:
+			llvm_emit_subscript_addr(c, value, inner);
+			return;
+		default:
+			break;
 	}
 	llvm_emit_expr(c, value, inner);
 	llvm_value_rvalue(c, value);
@@ -2637,7 +2650,7 @@ static void llvm_emit_unary_expr(GenContext *c, BEValue *value, Expr *expr)
 					llvm_value_rvalue(c, value);
 					llvm_value = LLVMBuildNot(c->builder, value->value, "not");
 					break;
-				case TYPE_SUBARRAY:
+				case TYPE_SLICE:
 					if (value->kind != BE_VALUE)
 					{
 						llvm_emit_len_for_expr(c, value, value);
@@ -2655,8 +2668,8 @@ static void llvm_emit_unary_expr(GenContext *c, BEValue *value, Expr *expr)
 					llvm_value_rvalue(c, value);
 					llvm_value = LLVMBuildIsNull(c->builder, value->value, "not");
 					break;
-				case TYPE_ANYPTR:
-				case TYPE_INFPTR:
+				case TYPE_ANY:
+				case TYPE_INTERFACE:
 					llvm_emit_any_pointer(c, value, value);
 					llvm_value_rvalue(c, value);
 					llvm_value = LLVMBuildIsNull(c->builder, value->value, "not");
@@ -2738,7 +2751,7 @@ void llvm_emit_len_for_expr(GenContext *c, BEValue *be_value, BEValue *expr_to_l
 {
 	switch (expr_to_len->type->type_kind)
 	{
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			llvm_value_fold_optional(c, be_value);
 			if (expr_to_len->kind == BE_VALUE)
 			{
@@ -2746,14 +2759,14 @@ void llvm_emit_len_for_expr(GenContext *c, BEValue *be_value, BEValue *expr_to_l
 			}
 			else
 			{
-				LLVMTypeRef subarray_type = llvm_get_type(c, expr_to_len->type);
+				LLVMTypeRef slice_type = llvm_get_type(c, expr_to_len->type);
 				AlignSize alignment;
 				LLVMValueRef len_addr = llvm_emit_struct_gep_raw(c,
-																 expr_to_len->value,
-																 subarray_type,
-																 1,
-																 expr_to_len->alignment,
-																 &alignment);
+				                                                 expr_to_len->value,
+				                                                 slice_type,
+				                                                 1,
+				                                                 expr_to_len->alignment,
+				                                                 &alignment);
 				llvm_value_set_address(be_value, len_addr, type_usz, alignment);
 			}
 			break;
@@ -2875,7 +2888,7 @@ static void llvm_emit_slice_values(GenContext *c, Expr *slice, BEValue *parent_r
 		case TYPE_POINTER:
 			parent_load_value = parent_base = LLVMBuildLoad2(c->builder, llvm_get_type(c, parent_type), parent_addr, "");
 			break;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			parent_load_value = LLVMBuildLoad2(c->builder, llvm_get_type(c, parent_type), parent_addr, "");
 			parent_base = llvm_emit_extract_value(c, parent_load_value, 0);
 			break;
@@ -2907,7 +2920,7 @@ static void llvm_emit_slice_values(GenContext *c, Expr *slice, BEValue *parent_r
 				len.value = NULL;
 				check_end = false;
 				break;
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 				assert(parent_load_value);
 				llvm_value_set(&len, llvm_emit_extract_value(c, parent_load_value, 1), type_usz);
 				break;
@@ -3039,7 +3052,7 @@ static void gencontext_emit_slice(GenContext *c, BEValue *be_value, Expr *expr)
 			start_pointer = llvm_emit_array_gep_raw_index(c, parent.value, llvm_get_type(c, parent.type), &start, type_abi_alignment(parent.type), &alignment);
 			break;
 		}
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			start_pointer = llvm_emit_pointer_inbounds_gep_raw(c, llvm_get_type(c, parent.type->array.base), parent.value, start.value);
 			break;
 		case TYPE_POINTER:
@@ -3049,7 +3062,7 @@ static void gencontext_emit_slice(GenContext *c, BEValue *be_value, Expr *expr)
 			UNREACHABLE
 	}
 
-	// Create a new subarray type
+	// Create a new slice type
 	llvm_value_aggregate_two(c, be_value, type_lowering(expr->type), start_pointer, size);
 }
 
@@ -3063,23 +3076,23 @@ static void llvm_emit_slice_copy(GenContext *c, BEValue *be_value, Expr *expr)
 	llvm_value_rvalue(c, &assigned_to);
 
 	BEValue to_pointer;
-	llvm_emit_subarray_pointer(c, &assigned_to, &to_pointer);
+	llvm_emit_slice_pointer(c, &assigned_to, &to_pointer);
 	llvm_value_rvalue(c, &to_pointer);
 
 	BEValue from_pointer;
 	BEValue from_len;
-	llvm_emit_subarray_pointer(c, be_value, &from_pointer);
+	llvm_emit_slice_pointer(c, be_value, &from_pointer);
 	llvm_value_rvalue(c, &from_pointer);
-	llvm_emit_subarray_len(c, be_value, &from_len);
+	llvm_emit_slice_len(c, be_value, &from_len);
 	llvm_value_rvalue(c, &from_len);
 
 	if (safe_mode_enabled())
 	{
 		BEValue to_len;
-		llvm_emit_subarray_len(c, &assigned_to, &to_len);
+		llvm_emit_slice_len(c, &assigned_to, &to_len);
 		BEValue comp;
 		llvm_emit_int_comp(c, &comp, &to_len, &from_len, BINARYOP_NE);
-		llvm_emit_panic_if_true(c, &comp, "Length mismatch", expr->span, "Subarray copy length mismatch (%d != %d).", &to_len, &from_len);
+		llvm_emit_panic_if_true(c, &comp, "Length mismatch", expr->span, "Slice copy length mismatch (%d != %d).", &to_len, &from_len);
 	}
 
 
@@ -3199,9 +3212,7 @@ static void llvm_emit_slice_assign(GenContext *c, BEValue *be_value, Expr *expr)
 	llvm_emit_br(c, cond_block);
 
 	// Finally set up our phi
-	LLVMValueRef logic_values[2] = { start.value, next_offset };
-	LLVMBasicBlockRef blocks[2] = { start_block, assign_block };
-	LLVMAddIncoming(offset, logic_values, blocks, 2);
+	llvm_set_phi(offset, start.value, start_block, next_offset, assign_block);
 
 	// And emit the exit block.
 	llvm_emit_block(c, exit_block);
@@ -3262,12 +3273,7 @@ static void llvm_emit_logical_and_or(GenContext *c, BEValue *be_value, Expr *exp
 		llvm_value_set(be_value, result_on_skip, type_bool);
 		return;
 	}
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "val");
-	LLVMValueRef logic_values[2] = { result_on_skip, rhs_value.value };
-	LLVMBasicBlockRef blocks[2] = { lhs_end_block, rhs_end_block };
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-
-	llvm_value_set(be_value, phi, type_bool);
+	llvm_new_phi(c, be_value, "val", type_bool, result_on_skip, lhs_end_block, rhs_value.value, rhs_end_block);
 }
 
 void llvm_emit_int_comp_zero(GenContext *c, BEValue *result, BEValue *lhs, BinaryOp binary_op)
@@ -3569,7 +3575,7 @@ static inline LLVMValueRef llvm_emit_mult_int(GenContext *c, Type *type, LLVMVal
 	return LLVMBuildMul(c->builder, left, right, "mul");
 }
 
-static void llvm_emit_subarray_comp(GenContext *c, BEValue *be_value, BEValue *lhs, BEValue *rhs, BinaryOp binary_op)
+static void llvm_emit_slice_comp(GenContext *c, BEValue *be_value, BEValue *lhs, BEValue *rhs, BinaryOp binary_op)
 {
 	bool want_match = binary_op == BINARYOP_EQ;
 
@@ -3577,10 +3583,10 @@ static void llvm_emit_subarray_comp(GenContext *c, BEValue *be_value, BEValue *l
 	Type *array_base_pointer = type_get_ptr(array_base_type);
 	LLVMTypeRef llvm_base_type = llvm_get_type(c, array_base_type);
 
-	LLVMBasicBlockRef exit = llvm_basic_block_new(c, "subarray_cmp_exit");
-	LLVMBasicBlockRef value_cmp = llvm_basic_block_new(c, "subarray_cmp_values");
-	LLVMBasicBlockRef loop_begin = llvm_basic_block_new(c, "subarray_loop_start");
-	LLVMBasicBlockRef comparison = llvm_basic_block_new(c, "subarray_loop_comparison");
+	LLVMBasicBlockRef exit = llvm_basic_block_new(c, "slice_cmp_exit");
+	LLVMBasicBlockRef value_cmp = llvm_basic_block_new(c, "slice_cmp_values");
+	LLVMBasicBlockRef loop_begin = llvm_basic_block_new(c, "slice_loop_start");
+	LLVMBasicBlockRef comparison = llvm_basic_block_new(c, "slice_loop_comparison");
 	LLVMBasicBlockRef no_match_block;
 	LLVMBasicBlockRef all_match_block;
 	LLVMBasicBlockRef match_fail_block;
@@ -3637,7 +3643,7 @@ static void llvm_emit_subarray_comp(GenContext *c, BEValue *be_value, BEValue *l
 	llvm_emit_cond_br(c, &cmp, loop_begin, exit);
 	llvm_emit_block(c, exit);
 
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "subarray_cmp_phi");
+	LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "slice_cmp_phi");
 
 	LLVMValueRef success = LLVMConstInt(c->bool_type, want_match ? 1 : 0, false);
 	LLVMValueRef failure = LLVMConstInt(c->bool_type, want_match ? 0 : 1, false);
@@ -3658,7 +3664,7 @@ INLINE bool should_inline_array_comp(ArraySize len, Type *base_type_lowered)
 			len *= base_type_lowered->array.len;
 			base_type_lowered = type_lowering(base_type_lowered->array.base);
 			goto RETRY;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return len <= 4;
 		default:
 			return len <= 16;
@@ -3746,14 +3752,9 @@ static void llvm_emit_array_comp(GenContext *c, BEValue *be_value, BEValue *lhs,
 	comparison_phi = c->current_block;
 	llvm_emit_cond_br(c, &comp, loop_begin, exit);
 	llvm_emit_block(c, exit);
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "array_cmp_phi");
-
 	LLVMValueRef success = LLVMConstInt(c->bool_type, want_match ? 1 : 0, false);
 	LLVMValueRef failure = LLVMConstInt(c->bool_type, want_match ? 0 : 1, false);
-	LLVMValueRef logic_values[3] = { success, failure };
-	LLVMBasicBlockRef blocks[3] = { comparison_phi, loop_begin_phi };
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-	llvm_value_set(be_value, phi, type_bool);
+	llvm_new_phi(c, be_value, "array_cmp_phi", type_bool, success, comparison_phi, failure, loop_begin_phi);
 }
 
 static void llvm_emit_float_comp(GenContext *c, BEValue *be_value, BEValue *lhs, BEValue *rhs, BinaryOp binary_op, Type *vector_type)
@@ -3822,9 +3823,7 @@ void llvm_emit_lhs_is_subtype(GenContext *c, BEValue *result, BEValue *lhs, BEVa
 	llvm_emit_cond_br_raw(c, is_zero, result_block, retry_block);
 	llvm_set_phi(phi, rhs->value, start_block, parent_value, parent_type_block);
 	llvm_emit_block(c, result_block);
-	LLVMValueRef phi2 = LLVMBuildPhi(c->builder, c->bool_type, "");
-	llvm_set_phi(phi2, LLVMConstNull(c->bool_type), parent_type_block, LLVMConstAllOnes(c->bool_type), retry_block);
-	llvm_value_set(result, phi2, type_bool);
+	llvm_new_phi(c, result, "", type_bool, LLVMConstNull(c->bool_type), parent_type_block, LLVMConstAllOnes(c->bool_type), retry_block);
 }
 
 void llvm_emit_comp(GenContext *c, BEValue *result, BEValue *lhs, BEValue *rhs, BinaryOp binary_op)
@@ -3852,18 +3851,16 @@ void llvm_emit_comp(GenContext *c, BEValue *result, BEValue *lhs, BEValue *rhs,
 			return;
 		case TYPE_FUNC:
 			break;
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			llvm_emit_any_comparison(c, result, lhs, rhs, binary_op);
 			return;
 		case LOWERED_TYPES:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 		case TYPE_STRUCT:
 		case TYPE_UNION:
 		case TYPE_FLEXIBLE_ARRAY:
 			UNREACHABLE
-		case TYPE_SUBARRAY:
-			llvm_emit_subarray_comp(c, result, lhs, rhs, binary_op);
+		case TYPE_SLICE:
+			llvm_emit_slice_comp(c, result, lhs, rhs, binary_op);
 			return;
 		case TYPE_VECTOR:
 			if (type_is_float(type_vector_type(lhs->type)))
@@ -3887,11 +3884,7 @@ static void llvm_emit_else(GenContext *c, BEValue *be_value, Expr *expr)
 	LLVMBasicBlockRef phi_block = llvm_basic_block_new(c, "phi_block");
 
 	// Store catch/opt var
-	PUSH_OPT();
-
-	// Set the catch/opt var
-	c->opt_var = NULL;
-	c->catch_block = else_block;
+	PUSH_CATCH_VAR_BLOCK(NULL, else_block);
 
 	// Emit the real value, this will cause an implicit jump to the else block on failure.
 	BEValue real_value;
@@ -3899,7 +3892,7 @@ static void llvm_emit_else(GenContext *c, BEValue *be_value, Expr *expr)
 	llvm_value_rvalue(c, &real_value);
 
 	// Restore.
-	POP_OPT();
+	POP_CATCH();
 
 	// Emit success and jump to phi.
 	LLVMBasicBlockRef success_end_block = llvm_get_current_block_if_in_use(c);
@@ -3937,20 +3930,7 @@ static void llvm_emit_else(GenContext *c, BEValue *be_value, Expr *expr)
 		return;
 	}
 
-	LLVMValueRef logic_values[2] = { real_value.value, else_value.value };
-	LLVMBasicBlockRef blocks[2] = { success_end_block, else_block_exit };
-
-	// Special handling of bool, since we need the "set_bool" function.
-	if (real_value.type == type_bool)
-	{
-		LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "val");
-		LLVMAddIncoming(phi, logic_values, blocks, 2);
-		llvm_value_set(be_value, phi, type_bool);
-		return;
-	}
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, llvm_get_type(c, expr->type), "val");
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-	llvm_value_set(be_value, phi, expr->type);
+	llvm_new_phi(c, be_value, "val", expr->type, real_value.value, success_end_block, else_value.value, else_block_exit);
 }
 
 typedef enum {
@@ -4313,14 +4293,11 @@ void llvm_emit_try_assign_try_catch(GenContext *c, bool is_try, BEValue *be_valu
 	LLVMBasicBlockRef catch_block = llvm_basic_block_new(c, "catch_landing");
 	LLVMBasicBlockRef phi_catch = llvm_basic_block_new(c, "phi_try_catch");
 
-	// 2. Push the error state.
-	PUSH_OPT();
+	// 2. If we have a catch *and* we want to store it, set the catch variable
+	LLVMValueRef catch_var = catch_addr ? catch_addr->value : NULL;
 
-	// 3. If we have a catch *and* we want to store it, set the catch variable
-	c->opt_var = catch_addr ? catch_addr->value : NULL;
-
-	// 4. After catch, we want to end up in the landing, because otherwise we don't know the value for the phi.
-	c->catch_block = catch_block;
+	// 3. After catch, we want to end up in the landing, because otherwise we don't know the value for the phi.
+	PUSH_CATCH_VAR_BLOCK(catch_var, catch_block);
 
 	// 5. Emit the init part.
 	llvm_emit_expr(c, be_value, rhs);
@@ -4336,7 +4313,7 @@ void llvm_emit_try_assign_try_catch(GenContext *c, bool is_try, BEValue *be_valu
 	}
 
 	// 8. Restore the error stack.
-	POP_OPT();
+	POP_CATCH();
 
 	// 9. Store the success block.
 	LLVMBasicBlockRef success_block = c->current_block;
@@ -4352,15 +4329,9 @@ void llvm_emit_try_assign_try_catch(GenContext *c, bool is_try, BEValue *be_valu
 	llvm_emit_block(c, phi_catch);
 
 	// 13. Use a phi to pick true / false.
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, c->bool_type, "val");
 	LLVMValueRef from_try = LLVMConstInt(c->bool_type, is_try ? 1 : 0, false);
 	LLVMValueRef from_catch = LLVMConstInt(c->bool_type, is_try ? 0 : 1, false);
-	LLVMValueRef logic_values[2] = { from_try, from_catch };
-	LLVMBasicBlockRef blocks[2] = { success_block, catch_block };
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-
-	llvm_value_set(be_value, phi, type_bool);
-
+	llvm_new_phi(c, be_value, "val", type_bool, from_try, success_block, from_catch, catch_block);
 }
 
 
@@ -4372,14 +4343,10 @@ static inline void llvm_emit_rethrow_expr(GenContext *c, BEValue *be_value, Expr
 	LLVMBasicBlockRef guard_block = llvm_basic_block_new(c, "guard_block");
 	LLVMBasicBlockRef no_err_block = llvm_basic_block_new(c, "noerr_block");
 
-	// Store catch/error var
-	PUSH_OPT();
-
 	// Set the catch/error var
 	LLVMValueRef error_var = llvm_emit_alloca_aligned(c, type_anyfault, "error_var");
 
-	c->opt_var = error_var;
-	c->catch_block = guard_block;
+	PUSH_CATCH_VAR_BLOCK(error_var, guard_block);
 
 	llvm_emit_expr(c, be_value, expr->rethrow_expr.inner);
 
@@ -4387,7 +4354,7 @@ static inline void llvm_emit_rethrow_expr(GenContext *c, BEValue *be_value, Expr
 	llvm_value_fold_optional(c, be_value);
 
 	// Restore.
-	POP_OPT();
+	POP_CATCH();
 
 	// Emit success and to end.
 	llvm_emit_br(c, no_err_block);
@@ -4409,14 +4376,10 @@ static inline void llvm_emit_rethrow_expr(GenContext *c, BEValue *be_value, Expr
 				llvm_store_to_ptr(c, exit->block_error_var, &value);
 			}
 			llvm_emit_br(c, exit->block_optional_exit);
-			c->current_block = NULL;
-			c->current_block_is_target = false;
 		}
 		else
 		{
 			llvm_emit_return_abi(c, NULL, &value);
-			c->current_block = NULL;
-			c->current_block_is_target = false;
 		}
 	}
 
@@ -4433,25 +4396,21 @@ static inline void llvm_emit_force_unwrap_expr(GenContext *c, BEValue *be_value,
 	LLVMBasicBlockRef panic_block = llvm_basic_block_new(c, "panic_block");
 	LLVMBasicBlockRef no_err_block = llvm_basic_block_new(c, "noerr_block");
 
-	// Store catch/error var
-	PUSH_OPT();
-
 	// Set the catch/error var
 	LLVMValueRef error_var = llvm_emit_alloca_aligned(c, type_anyfault, "error_var");
 
-	c->opt_var = error_var;
-	c->catch_block = panic_block;
+	PUSH_CATCH_VAR_BLOCK(error_var, panic_block);
 
 	llvm_emit_expr(c, be_value, expr->inner_expr);
 	llvm_value_rvalue(c, be_value);
 
 	// Restore.
-	POP_OPT();
+	POP_CATCH();
 
 	// Emit success and to end.
 	llvm_emit_br(c, no_err_block);
 
-	POP_OPT();
+	POP_CATCH();
 
 	// Emit panic
 	llvm_emit_block(c, panic_block);
@@ -4509,37 +4468,56 @@ static void llvm_emit_vector_assign_expr(GenContext *c, BEValue *be_value, Expr
 static void llvm_emit_binary_expr(GenContext *c, BEValue *be_value, Expr *expr)
 {
 	BinaryOp binary_op = expr->binary_expr.operator;
+	// Vector assign is handled separately.
 	if (binary_op >= BINARYOP_ASSIGN && expr_is_vector_index(exprptr(expr->binary_expr.left)))
 	{
 		llvm_emit_vector_assign_expr(c, be_value, expr);
 		return;
 	}
+
+	// Operation + assign
 	if (binary_op > BINARYOP_ASSIGN)
 	{
+		// Finde the base op.
 		BinaryOp base_op = binaryop_assign_base_op(binary_op);
 		assert(base_op != BINARYOP_ERROR);
+
+		// Get the left hand side, which must be an address.
 		BEValue addr;
 		llvm_emit_expr(c, &addr, exprptr(expr->binary_expr.left));
-		llvm_value_addr(c, &addr);
+		assert(llvm_value_is_addr(&addr));
+
+		// Fold the optional.
+		llvm_value_fold_optional(c, &addr);
+
+		// Perform the binary operation, using the already loaded LHS.
 		llvm_emit_binary(c, be_value, expr, &addr, base_op);
+
+		// Store it.
 		llvm_store(c, &addr, be_value);
 		return;
 	}
+
 	if (binary_op == BINARYOP_ASSIGN)
 	{
 		Expr *left = exprptr(expr->binary_expr.left);
 		llvm_emit_expr(c, be_value, left);
 		assert(llvm_value_is_addr(be_value));
 		LLVMValueRef optional_ref = NULL;
+
+		// If the LHS is an identifier, then we're assigning the optional value to that.
 		if (left->expr_kind == EXPR_IDENTIFIER)
 		{
 			optional_ref = decl_optional_ref(left->identifier_expr.decl);
 			be_value->kind = BE_ADDRESS;
 		}
+
+		// Emit the result.
 		*be_value = llvm_emit_assign_expr(c, be_value, exprptr(expr->binary_expr.right), optional_ref);
 		return;
 	}
 
+	// Emit binary, LHS is not loaded.
 	llvm_emit_binary(c, be_value, expr, NULL, binary_op);
 }
 
@@ -4552,7 +4530,6 @@ static inline void llvm_emit_elvis_expr(GenContext *c, BEValue *value, Expr *exp
 	llvm_value_rvalue(c, value);
 
 	LLVMValueRef lhs_value = value->value;
-
 	if (value->kind != BE_BOOLEAN)
 	{
 		CastKind cast = cast_to_bool_kind(value->type);
@@ -4598,21 +4575,13 @@ static inline void llvm_emit_elvis_expr(GenContext *c, BEValue *value, Expr *exp
 		llvm_value_set(value, lhs_value, expr->type);
 		return;
 	}
-
 	if (!lhs_exit)
 	{
 		if (!rhs_value) rhs_value = LLVMGetUndef(llvm_get_type(c, expr->type));
 		llvm_value_set(value, rhs_value, expr->type);
 		return;
 	}
-
-	Type *expr_type = type_flatten(expr->type);
-	LLVMTypeRef type = expr_type == type_bool ? c->bool_type : llvm_get_type(c, expr_type);
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, type, "val");
-	LLVMValueRef logic_values[2] = { lhs_value, rhs_value };
-	LLVMBasicBlockRef blocks[2] = { lhs_exit, rhs_exit };
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-	llvm_value_set(value, phi, expr_type);
+	llvm_new_phi(c, value, "val", expr->type, lhs_value, lhs_exit, rhs_value, rhs_exit);
 }
 
 void gencontext_emit_ternary_expr(GenContext *c, BEValue *value, Expr *expr)
@@ -4729,13 +4698,7 @@ void gencontext_emit_ternary_expr(GenContext *c, BEValue *value, Expr *expr)
 		return;
 	}
 
-	Type *expr_type = type_flatten(expr->type);
-	LLVMTypeRef type = expr_type == type_bool ? c->bool_type : llvm_get_type(c, expr_type);
-	LLVMValueRef phi = LLVMBuildPhi(c->builder, type, "val");
-	LLVMValueRef logic_values[2] = { lhs_value, rhs_value };
-	LLVMBasicBlockRef blocks[2] = { lhs_exit, rhs_exit };
-	LLVMAddIncoming(phi, logic_values, blocks, 2);
-	llvm_value_set(value, phi, expr_type);
+	llvm_new_phi(c, value, "val", expr->type, lhs_value, lhs_exit, rhs_value, rhs_exit);
 }
 static LLVMValueRef llvm_emit_real(LLVMTypeRef type, Float f)
 {
@@ -4841,10 +4804,10 @@ static void llvm_emit_const_expr(GenContext *c, BEValue *be_value, Expr *expr)
 				llvm_value_set(be_value, string, type);
 				return;
 			}
-			// local case or creating a pointer / subarray.
+			// local case or creating a pointer / slice.
 			// In this case we first create the constant.
 			ArraySize len = expr->const_expr.bytes.len;
-			if (len == 0 && str_type->type_kind == TYPE_SUBARRAY)
+			if (len == 0 && str_type->type_kind == TYPE_SLICE)
 			{
 				llvm_value_set(be_value, llvm_get_zero(c, expr->type), expr->type);
 				return;
@@ -4883,7 +4846,7 @@ static void llvm_emit_const_expr(GenContext *c, BEValue *be_value, Expr *expr)
 			}
 			else
 			{
-				if (str_type->type_kind == TYPE_SUBARRAY)
+				if (str_type->type_kind == TYPE_SLICE)
 				{
 					LLVMValueRef len_value = llvm_const_int(c, type_usz, len);
 					llvm_value_aggregate_two(c, be_value, str_type, global_name, len_value);
@@ -4954,8 +4917,6 @@ static void llvm_expand_type_to_args(GenContext *context, Type *param_type, LLVM
 		case LOWERED_TYPES:
 		case TYPE_VOID:
 		case TYPE_FUNC:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 		case TYPE_FLEXIBLE_ARRAY:
 			UNREACHABLE
 			break;
@@ -4976,9 +4937,9 @@ static void llvm_expand_type_to_args(GenContext *context, Type *param_type, LLVM
 			llvm_expand_array_to_args(context, param_type, expand_ptr, args, arg_count_ref, alignment);
 			break;
 		case TYPE_UNION:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_VECTOR:
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			TODO
 			break;
 	}
@@ -5102,31 +5063,31 @@ LLVMValueRef llvm_emit_const_ptradd_inbounds_raw(GenContext *c, LLVMValueRef ptr
 	return llvm_emit_ptradd_inbounds_raw(c, ptr, LLVMConstInt(c->size_type, offset, false), 1);
 }
 
-void llvm_emit_subarray_len(GenContext *c, BEValue *subarray, BEValue *len)
+void llvm_emit_slice_len(GenContext *c, BEValue *slice, BEValue *len)
 {
-	llvm_value_addr(c, subarray);
+	llvm_value_addr(c, slice);
 	AlignSize alignment = 0;
 	LLVMValueRef len_addr = llvm_emit_struct_gep_raw(c,
-													 subarray->value,
-													 llvm_get_type(c, subarray->type),
-													 1,
-													 subarray->alignment,
-													 &alignment);
+	                                                 slice->value,
+	                                                 llvm_get_type(c, slice->type),
+	                                                 1,
+	                                                 slice->alignment,
+	                                                 &alignment);
 	llvm_value_set_address(len, len_addr, type_usz, alignment);
 }
 
-void llvm_emit_subarray_pointer(GenContext *c, BEValue *value, BEValue *pointer)
+void llvm_emit_slice_pointer(GenContext *context, BEValue *slice, BEValue *pointer)
 {
-	assert(value->type->type_kind == TYPE_SUBARRAY);
-	Type *ptr_type = type_get_ptr(value->type->array.base);
-	if (value->kind == BE_ADDRESS)
+	assert(slice->type->type_kind == TYPE_SLICE);
+	Type *ptr_type = type_get_ptr(slice->type->array.base);
+	if (slice->kind == BE_ADDRESS)
 	{
 		AlignSize alignment;
-		LLVMValueRef ptr = llvm_emit_struct_gep_raw(c, value->value, llvm_get_type(c, value->type), 0, value->alignment, &alignment);
+		LLVMValueRef ptr = llvm_emit_struct_gep_raw(context, slice->value, llvm_get_type(context, slice->type), 0, slice->alignment, &alignment);
 		llvm_value_set_address(pointer, ptr, ptr_type, alignment);
 		return;
 	}
-	LLVMValueRef ptr = llvm_emit_extract_value(c, value->value, 0);
+	LLVMValueRef ptr = llvm_emit_extract_value(context, slice->value, 0);
 	llvm_value_set(pointer, ptr, ptr_type);
 }
 
@@ -5509,20 +5470,20 @@ void llvm_emit_raw_call(GenContext *c, BEValue *result_value, FunctionPrototype
 		BEValue error_holder = *result_value;
 		if (error_var)
 		{
-			llvm_value_set_address_abi_aligned(&error_holder, c->opt_var, type_anyfault);
+			llvm_value_set_address_abi_aligned(&error_holder, c->catch.fault, type_anyfault);
 		}
 
 		LLVMValueRef stored_error;
 
 		if (error_var)
 		{
-			stored_error = c->opt_var;
-			c->opt_var = NULL;
+			stored_error = c->catch.fault;
+			c->catch.fault = NULL;
 		}
 		llvm_emit_jump_to_optional_exit(c, llvm_load_value(c, &error_holder));
 		if (error_var)
 		{
-			c->opt_var = stored_error;
+			c->catch.fault = stored_error;
 		}
 
 
@@ -5555,10 +5516,9 @@ static LLVMValueRef llvm_emit_dynamic_search(GenContext *c, LLVMValueRef type_id
 		LLVMSetUnnamedAddress(func, LLVMGlobalUnnamedAddr);
 		LLVMSetLinkage(func, LLVMWeakODRLinkage);
 		llvm_set_comdat(c, func);
-		LLVMBuilderRef builder = llvm_create_builder(c);
 
-		LLVMBasicBlockRef entry = LLVMAppendBasicBlockInContext(c->context, func, "entry");
-		LLVMPositionBuilderAtEnd(builder, entry);
+		LLVMBasicBlockRef entry;
+		LLVMBuilderRef builder = llvm_create_function_entry(c, func, &entry);
 
 		AlignSize align;
 		LLVMValueRef dtable_ptr_in = LLVMGetParam(func, 0);
@@ -5621,10 +5581,7 @@ static LLVMValueRef llvm_emit_dynamic_search(GenContext *c, LLVMValueRef type_id
 		// goto check
 		LLVMBuildBr(builder, check);
 
-		LLVMBasicBlockRef block_in[2] = { entry, no_match };
-		LLVMValueRef value_in[2] = { dtable_ptr_in, next };
-		LLVMAddIncoming(dtable_ptr, value_in, block_in, 2);
-
+		llvm_set_phi(dtable_ptr, dtable_ptr_in, entry, next, no_match);
 		LLVMDisposeBuilder(builder);
 	}
 	// Insert cache.
@@ -5726,9 +5683,9 @@ INLINE void llvm_emit_call_invocation(GenContext *c, BEValue *result_value,
 	{
 		case ABI_ARG_INDIRECT:
 			// 6a. We can use the stored error var if there is no redirect.
-			if (prototype->is_optional && c->opt_var && !ret_info->attributes.realign)
+			if (prototype->is_optional && c->catch.fault && !ret_info->attributes.realign)
 			{
-				error_var = c->opt_var;
+				error_var = c->catch.fault;
 				arg_values[arg_count++] = error_var;
 				break;
 			}
@@ -5875,7 +5832,7 @@ INLINE void llvm_emit_vasplat_expr(GenContext *c, BEValue *value_ref, Expr *vasp
 			llvm_value_rvalue(c, value_ref);
 			llvm_value_aggregate_two(c, value_ref, param, value_ref->value, llvm_const_int(c, type_usz, type->pointer->array.len));
 			return;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return;
 		default:
 			UNREACHABLE
@@ -6044,9 +6001,7 @@ static void llvm_emit_call_expr(GenContext *c, BEValue *result_value, Expr *expr
 			llvm_emit_block(c, after);
 			if (normal_val)
 			{
-				LLVMValueRef phi = LLVMBuildPhi(c->builder, LLVMTypeOf(normal_val), "result");
-				llvm_set_phi(phi, default_val, default_block, normal_val, normal_block);
-				llvm_value_set(result_value, phi, default_res.type);
+				llvm_new_phi(c, result_value, "result", default_res.type, default_val, default_block, normal_val, normal_block);
 			}
 			else
 			{
@@ -6109,8 +6064,8 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 	}
 
 	LLVMValueRef old_ret_out = c->return_out;
-	LLVMValueRef error_out = c->opt_var;
-	LLVMBasicBlockRef error_block = c->catch_block;
+	LLVMValueRef error_out = c->catch.fault;
+	LLVMBasicBlockRef error_block = c->catch.block;
 	LLVMValueRef return_out = NULL;
 	LLVMBasicBlockRef expr_block = llvm_basic_block_new(c, "expr_block.exit");
 	LLVMBasicBlockRef cleanup_error_block = error_block;
@@ -6127,8 +6082,8 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 	{
 		exit.block_return_out = llvm_emit_alloca_aligned(c, type_lowered, "blockret");
 	}
-	c->opt_var = NULL;
-	c->catch_block = NULL;
+	c->catch.fault = NULL;
+	c->catch.block = NULL;
 
 	// Process all but the last statement.
 	while (value->next)
@@ -6167,8 +6122,8 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 
 		// Restore
 		c->return_out = old_ret_out;
-		c->catch_block = error_block;
-		c->opt_var = error_out;
+		c->catch.block = error_block;
+		c->catch.fault = error_out;
 
 		// Output directly to a value
 		llvm_emit_expr(c, be_value, ret_expr);
@@ -6176,8 +6131,12 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 
 	} while (0);
 
-	// Emit the last statement
-	llvm_emit_stmt(c, value);
+	bool has_current_block = llvm_get_current_block_if_in_use(c) != NULL;
+	if (has_current_block)
+	{
+		// Emit the last statement
+		llvm_emit_stmt(c, value);
+	}
 
 	// In the case of a void with no return, then this may be true.
 	if (llvm_basic_block_is_unused(expr_block))
@@ -6187,7 +6146,10 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 		goto DONE;
 	}
 
-	llvm_emit_br(c, expr_block);
+	if (has_current_block)
+	{
+		llvm_emit_br(c, expr_block);
+	}
 
 	// Emit the exit block.
 	llvm_emit_block(c, expr_block);
@@ -6204,65 +6166,36 @@ static inline void llvm_emit_return_block(GenContext *c, BEValue *be_value, Type
 DONE:
 
 	c->return_out = old_ret_out;
-	c->catch_block = error_block;
-	c->opt_var = error_out;
-
-}
+	c->catch.block = error_block;
+	c->catch.fault = error_out;
 
-static inline void llvm_emit_expr_block(GenContext *context, BEValue *be_value, Expr *expr)
-{
-	llvm_emit_return_block(context, be_value, expr->type, expr->expr_block.first_stmt, expr->expr_block.block_exit_ref);
 }
 
-static inline void llvm_emit_macro_block(GenContext *c, BEValue *be_value, Expr *expr)
+static inline void llvm_emit_expr_block(GenContext *c, BEValue *be_value, Expr *expr)
 {
-	FOREACH_BEGIN(Decl *val, expr->macro_block.params)
-		// Skip vararg
-		if (!val) continue;
-		// In case we have a constant, we never do an emit. The value is already folded.
-		switch (val->var.kind)
-		{
-			case VARDECL_CONST:
-			case VARDECL_GLOBAL:
-			case VARDECL_LOCAL:
-			case VARDECL_MEMBER:
-			case VARDECL_LOCAL_CT:
-			case VARDECL_LOCAL_CT_TYPE:
-			case VARDECL_UNWRAPPED:
-			case VARDECL_REWRAPPED:
-			case VARDECL_ERASE:
-			case VARDECL_BITMEMBER:
-				UNREACHABLE
-			case VARDECL_PARAM_CT:
-			case VARDECL_PARAM_CT_TYPE:
-			case VARDECL_PARAM_EXPR:
-				continue;
-			case VARDECL_PARAM_REF:
-			case VARDECL_PARAM:
-				break;
-		}
-
-		Expr *init_expr = val->var.init_expr;
-		BEValue value;
-		llvm_emit_expr(c, &value, init_expr);
-		if (llvm_value_is_addr(&value) || val->var.is_written || val->var.is_addr || llvn_use_accurate_debug_info(c))
-		{
-			llvm_emit_and_set_decl_alloca(c, val);
-			llvm_store_decl(c, val, &value);
-			continue;
-		}
-		val->is_value = true;
-		val->backend_value = value.value;
-	FOREACH_END();
+	DebugScope *old_inline_location = c->debug.block_stack;
+	DebugScope updated;
+	if (expr->expr_block.macro_id && llvm_use_debug(c))
+	{
+		SourceSpan span = expr->span;
+		Decl *macro = declptr(expr->expr_block.macro_id);
+		LLVMMetadataRef macro_def = llvm_debug_create_macro(c, macro);
+		LLVMMetadataRef loc = LLVMDIBuilderCreateDebugLocation(c->context, span.row, span.col,
+		                                                       llvm_debug_current_scope(c),
+		                                                       old_inline_location ? old_inline_location->inline_loc : NULL);
 
-	DEBUG_PUSH_LEXICAL_SCOPE(c, astptr(expr->macro_block.first_stmt)->span);
-	llvm_emit_return_block(c, be_value, expr->type, expr->macro_block.first_stmt, expr->macro_block.block_exit);
-	bool is_unreachable = expr->macro_block.is_noreturn && c->current_block && c->current_block_is_target;
+		updated = (DebugScope) { .lexical_block = macro_def, .inline_loc = loc, .outline_loc = old_inline_location };
+		c->debug.block_stack = &updated;
+	}
+	DEBUG_PUSH_LEXICAL_SCOPE(c, astptr(expr->expr_block.first_stmt)->span);
+	llvm_emit_return_block(c, be_value, expr->type, expr->expr_block.first_stmt, expr->expr_block.block_exit);
+	bool is_unreachable = expr->expr_block.is_noreturn && c->current_block;
 	if (is_unreachable)
 	{
 		llvm_emit_unreachable(c);
 	}
 	DEBUG_POP_LEXICAL_SCOPE(c);
+	c->debug.block_stack = old_inline_location;
 }
 
 LLVMValueRef llvm_emit_call_intrinsic(GenContext *context, unsigned intrinsic, LLVMTypeRef *types, unsigned type_count,
@@ -6277,14 +6210,14 @@ static inline void llvm_emit_optional(GenContext *c, BEValue *be_value, Expr *ex
 {
 	Expr *fail = expr->inner_expr;
 	// If there is an error value, assign to it.
-	if (c->opt_var)
+	if (c->catch.fault)
 	{
-		assert(c->opt_var);
+		assert(c->catch.fault);
 		llvm_emit_expr(c, be_value, fail);
-		llvm_store_to_ptr(c, c->opt_var, be_value);
+		llvm_store_to_ptr(c, c->catch.fault, be_value);
 	}
 	// Branch to the catch
-	llvm_emit_br(c, c->catch_block);
+	llvm_emit_br(c, c->catch.block);
 	// Create an empty block
 	LLVMBasicBlockRef ignored_block = llvm_basic_block_new(c, "postfailed");
 	llvm_emit_block(c, ignored_block);
@@ -6371,7 +6304,7 @@ static inline void llvm_emit_initializer_list_expr(GenContext *c, BEValue *value
 		llvm_emit_vector_initializer_list(c, value, expr);
 		return;
 	}
-	assert(!IS_OPTIONAL(expr) || c->catch_block);
+	assert(!IS_OPTIONAL(expr) || c->catch.block);
 	llvm_value_set_address_abi_aligned(value, llvm_emit_alloca_aligned(c, type, "literal"), type);
 	llvm_emit_initialize_reference(c, value, expr);
 }
@@ -6381,6 +6314,8 @@ static void llvm_emit_macro_body_expansion(GenContext *c, BEValue *value, Expr *
 	Decl **declarations = body_expr->body_expansion_expr.declarations;
 	Expr **values = body_expr->body_expansion_expr.values;
 
+	DebugScope  *old_inline_loc = c->debug.block_stack;
+	c->debug.block_stack = old_inline_loc ? old_inline_loc->outline_loc : NULL;
 	// Create backend refs on demand.
 	VECEACH(declarations, i)
 	{
@@ -6396,6 +6331,7 @@ static void llvm_emit_macro_body_expansion(GenContext *c, BEValue *value, Expr *
 	}
 	AstId body = body_expr->body_expansion_expr.first_stmt;
 	if (body) llvm_emit_stmt(c, astptr(body));
+	c->debug.block_stack = old_inline_loc;
 }
 
 static inline void llvm_emit_try_unwrap(GenContext *c, BEValue *value, Expr *expr)
@@ -6449,12 +6385,9 @@ void llvm_emit_catch_unwrap(GenContext *c, BEValue *value, Expr *expr)
 		llvm_value_set_address_abi_aligned(&addr, temp_err, type_anyfault);
 	}
 
-	PUSH_OPT();
-
 	LLVMBasicBlockRef catch_block = llvm_basic_block_new(c, "end_block");
 
-	c->opt_var = addr.value;
-	c->catch_block = catch_block;
+	PUSH_CATCH_VAR_BLOCK(addr.value, catch_block);
 
 	VECEACH(expr->catch_unwrap_expr.exprs, i)
 	{
@@ -6466,7 +6399,7 @@ void llvm_emit_catch_unwrap(GenContext *c, BEValue *value, Expr *expr)
 		llvm_value_fold_optional(c, &val);
 	}
 
-	POP_OPT();
+	POP_CATCH();
 
 	llvm_store_raw(c, &addr, llvm_get_zero(c, type_anyfault));
 	llvm_emit_br(c, catch_block);
@@ -6513,8 +6446,8 @@ static inline void llvm_emit_typeid_info(GenContext *c, BEValue *value, Expr *ex
 				LLVMBasicBlockRef exit = llvm_basic_block_new(c, "check_type_ok");
 				IntrospectType checks[8] = { INTROSPECT_TYPE_ARRAY, INTROSPECT_TYPE_POINTER,
 											 INTROSPECT_TYPE_VECTOR, INTROSPECT_TYPE_ENUM,
-											 INTROSPECT_TYPE_SUBARRAY, INTROSPECT_TYPE_DISTINCT,
-											 INTROSPECT_TYPE_OPTIONAL, INTROSPECT_TYPE_SUBARRAY };
+											 INTROSPECT_TYPE_SLICE, INTROSPECT_TYPE_DISTINCT,
+											 INTROSPECT_TYPE_OPTIONAL, INTROSPECT_TYPE_BITSTRUCT };
 				for (int i = 0; i < 8; i++)
 				{
 					llvm_emit_int_comp_raw(c,
@@ -6565,8 +6498,8 @@ static inline void llvm_emit_typeid_info(GenContext *c, BEValue *value, Expr *ex
 				LLVMValueRef len = llvm_emit_struct_gep_raw(c, ref, c->introspect_type, INTROSPECT_INDEX_LEN, align, &alignment);
 				len = llvm_load(c, c->size_type, len, alignment, "namelen");
 				LLVMValueRef val = llvm_emit_struct_gep_raw(c, ref, c->introspect_type, INTROSPECT_INDEX_ADDITIONAL, align, &alignment);
-				Type *subarray = type_get_subarray(type_chars);
-				llvm_value_set(value, llvm_emit_aggregate_two(c, subarray, val, len), subarray);
+				Type *slice = type_get_slice(type_chars);
+				llvm_value_set(value, llvm_emit_aggregate_two(c, slice, val, len), slice);
 				return;
 			}
 		case TYPEID_INFO_LEN:
@@ -6576,7 +6509,7 @@ static inline void llvm_emit_typeid_info(GenContext *c, BEValue *value, Expr *ex
 				LLVMBasicBlockRef exit = llvm_basic_block_new(c, "check_type_ok");
 				IntrospectType checks[4] = { INTROSPECT_TYPE_ARRAY, INTROSPECT_TYPE_VECTOR,
 											 INTROSPECT_TYPE_ENUM,
-											 INTROSPECT_TYPE_SUBARRAY };
+											 INTROSPECT_TYPE_SLICE };
 				for (int i = 0; i < 4; i++)
 				{
 					llvm_emit_int_comp_raw(c,
@@ -6653,13 +6586,8 @@ void llvm_emit_try_unwrap_chain(GenContext *c, BEValue *value, Expr *expr)
 
 	// Finally set up our phi
 	llvm_emit_block(c, end_block);
-	LLVMValueRef chain_result = LLVMBuildPhi(c->builder, c->bool_type, "chain.phi");
-	LLVMValueRef logic_values[2] = { LLVMConstInt(c->bool_type, 1, 0), llvm_get_zero_raw(c->bool_type) };
-	LLVMBasicBlockRef blocks[2] = { next_block, fail_block };
-	LLVMAddIncoming(chain_result, logic_values, blocks, 2);
-
-	llvm_value_set(value, chain_result, type_bool);
-
+	llvm_new_phi(c, value, "chain.phi", type_bool, LLVMConstInt(c->bool_type, 1, 0),
+				 next_block, llvm_get_zero_raw(c->bool_type), fail_block);
 }
 
 void llvm_emit_any_from_value(GenContext *c, BEValue *value, Type *type)
@@ -6668,10 +6596,10 @@ void llvm_emit_any_from_value(GenContext *c, BEValue *value, Type *type)
 	BEValue typeid;
 	llvm_emit_typeid(c, &typeid, type);
 	llvm_value_rvalue(c, &typeid);
-	LLVMValueRef var = llvm_get_undef(c, type_anyptr);
+	LLVMValueRef var = llvm_get_undef(c, type_any);
 	var = llvm_emit_insert_value(c, var, value->value, 0);
 	var = llvm_emit_insert_value(c, var, typeid.value, 1);
-	llvm_value_set(value, var, type_anyptr);
+	llvm_value_set(value, var, type_any);
 }
 
 
@@ -6682,7 +6610,7 @@ static inline void llvm_emit_type_from_any(GenContext *c, BEValue *be_value)
 		AlignSize alignment = 0;
 		LLVMValueRef pointer_addr = llvm_emit_struct_gep_raw(c,
 															 be_value->value,
-															 llvm_get_type(c, type_anyptr),
+															 llvm_get_type(c, type_any),
 															 1,
 															 be_value->alignment,
 															 &alignment);
@@ -6710,8 +6638,8 @@ static inline void llvm_emit_builtin_access(GenContext *c, BEValue *be_value, Ex
 				llvm_emit_any_pointer(c, be_value, be_value);
 				return;
 			}
-			assert(be_value->type->type_kind == TYPE_SUBARRAY);
-			llvm_emit_subarray_pointer(c, be_value, be_value);
+			assert(be_value->type->type_kind == TYPE_SLICE);
+			llvm_emit_slice_pointer(c, be_value, be_value);
 			return;
 		case ACCESS_FAULTORDINAL:
 		{
@@ -6737,11 +6665,7 @@ static inline void llvm_emit_builtin_access(GenContext *c, BEValue *be_value, Ex
 			LLVMValueRef ordinal = llvm_load_abi_alignment(c, type_usz, ptr, "");
 			llvm_emit_br(c, exit_block);
 			llvm_emit_block(c, exit_block);
-			LLVMValueRef phi = LLVMBuildPhi(c->builder, c->size_type, "faultname");
-			LLVMValueRef values[] = { llvm_const_int(c, type_usz, 0), ordinal };
-			LLVMBasicBlockRef blocks[] = { current_block, ok_block };
-			LLVMAddIncoming(phi, values, blocks, 2);
-			llvm_value_set(be_value, phi, type_usz);
+			llvm_new_phi(c, be_value, "faultname", type_usz, llvm_const_int(c, type_usz, 0), current_block, ordinal, ok_block);
 			return;
 		}
 		case ACCESS_FAULTNAME:
@@ -6768,9 +6692,7 @@ static inline void llvm_emit_builtin_access(GenContext *c, BEValue *be_value, Ex
 			llvm_emit_br(c, exit_block);
 			llvm_emit_block(c, exit_block);
 			LLVMValueRef phi = LLVMBuildPhi(c->builder, c->ptr_type, "faultname");
-			LLVMValueRef values[] = { zero.value, ptr };
-			LLVMBasicBlockRef blocks[] = { zero_block, ok_block };
-			LLVMAddIncoming(phi, values, blocks, 2);
+			llvm_set_phi(phi, zero.value, zero_block, ptr, ok_block);
 			llvm_value_set_address_abi_aligned(be_value, phi, type_chars);
 			return;
 		}
@@ -6779,14 +6701,14 @@ static inline void llvm_emit_builtin_access(GenContext *c, BEValue *be_value, Ex
 			Type *inner_type = type_no_optional(inner->type)->canonical;
 			assert(inner_type->canonical->type_kind == TYPE_ENUM);
 			llvm_value_rvalue(c, be_value);
-			LLVMTypeRef subarray = llvm_get_type(c, type_chars);
+			LLVMTypeRef slice = llvm_get_type(c, type_chars);
 
 			LLVMValueRef to_introspect = LLVMBuildIntToPtr(c->builder, inner_type->backend_typeid,
 														  c->ptr_type, "");
 			LLVMValueRef ptr = LLVMBuildStructGEP2(c->builder, c->introspect_type, to_introspect, INTROSPECT_INDEX_ADDITIONAL, "");
 			LLVMValueRef val = llvm_zext_trunc(c, be_value->value, c->size_type);
-			llvm_value_set_address(be_value, llvm_emit_pointer_gep_raw(c, subarray, ptr, val),
-								   type_chars, llvm_abi_alignment(c, subarray));
+			llvm_value_set_address(be_value, llvm_emit_pointer_gep_raw(c, slice, ptr, val),
+								   type_chars, llvm_abi_alignment(c, slice));
 			return;
 		}
 		case ACCESS_TYPEOFANYFAULT:
@@ -6880,10 +6802,9 @@ static void llvm_emit_swizzle(GenContext *c, BEValue *value, Expr *expr)
 	LLVMValueRef mask_val[4];
 	assert(vec_len <= 4);
 	const char *sw_ptr = expr->swizzle_expr.swizzle;
-	char ch;
 	for (unsigned i = 0; i < vec_len; i++)
 	{
-		int index = (sw_ptr[i] + 3 - 'w') % 4;
+		int index = (swizzle[(int)sw_ptr[i]] - 1) & 0xF;
 		mask_val[i] = llvm_const_int(c, type_uint, index);
 	}
 	LLVMValueRef res = LLVMBuildShuffleVector(c->builder, parent, LLVMGetUndef(LLVMTypeOf(parent)), LLVMConstVector(mask_val, vec_len), sw_ptr);
@@ -6960,8 +6881,8 @@ void llvm_emit_expr(GenContext *c, BEValue *value, Expr *expr)
 		case EXPR_NOP:
 			llvm_value_set(value, NULL, type_void);
 			return;
-		case EXPR_MACRO_BLOCK:
-			llvm_emit_macro_block(c, value, expr);
+		case EXPR_EXPR_BLOCK:
+			llvm_emit_expr_block(c, value, expr);
 			return;
 		case EXPR_COMPOUND_LITERAL:
 		case EXPR_OPERATOR_CHARS:
@@ -6970,9 +6891,6 @@ void llvm_emit_expr(GenContext *c, BEValue *value, Expr *expr)
 		case EXPR_DESIGNATED_INITIALIZER_LIST:
 			llvm_emit_initializer_list_expr(c, value, expr);
 			return;
-		case EXPR_EXPR_BLOCK:
-			llvm_emit_expr_block(c, value, expr);
-			return;
 		case EXPR_UNARY:
 			llvm_emit_unary_expr(c, value, expr);
 			return;
@@ -7009,8 +6927,14 @@ void llvm_emit_expr(GenContext *c, BEValue *value, Expr *expr)
 			llvm_value_set_decl(c, value, expr->identifier_expr.decl);
 			return;
 		case EXPR_SUBSCRIPT:
+			llvm_emit_subscript(c, value, expr);
+			return;
 		case EXPR_SUBSCRIPT_ADDR:
-			gencontext_emit_subscript(c, value, expr);
+			llvm_emit_subscript_addr(c, value, expr);
+			assert(llvm_value_is_addr(value));
+			llvm_value_fold_optional(c, value);
+			value->kind = BE_VALUE;
+			value->type = type_get_ptr(value->type);
 			return;
 		case EXPR_ACCESS:
 			llvm_emit_access_addr(c, value, expr);
diff --git a/src/compiler/llvm_codegen_function.c b/src/compiler/llvm_codegen_function.c
index eb3591afa..1acb62cad 100644
--- a/src/compiler/llvm_codegen_function.c
+++ b/src/compiler/llvm_codegen_function.c
@@ -5,16 +5,12 @@
 
 #include "llvm_codegen_internal.h"
 
-static LLVMValueRef llvm_add_xxlizer(GenContext *c, unsigned priority, bool is_finalizer);
 static void llvm_append_xxlizer(GenContext *c, unsigned  priority, bool is_initializer, LLVMValueRef function);
-static void llvm_emit_param_attributes(GenContext *c, LLVMValueRef function, ABIArgInfo *info, bool is_return, int index, int last_index);
 static inline void llvm_emit_return_value(GenContext *context, LLVMValueRef value);
 static void llvm_expand_from_args(GenContext *c, Type *type, LLVMValueRef ref, unsigned *index, AlignSize alignment);
 static inline void llvm_process_parameter_value(GenContext *c, Decl *decl, ABIArgInfo *info, unsigned *index);
 static inline void llvm_emit_func_parameter(GenContext *context, Decl *decl, ABIArgInfo *abi_info, unsigned *index, unsigned real_index);
-static inline void
-llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *prototype, Signature *signature, Ast *body,
-               Decl *decl);
+static inline void llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *prototype, Signature *signature, Ast *body, Decl *decl);
 
 
 /**
@@ -49,7 +45,7 @@ bool llvm_emit_check_block_branch(GenContext *c)
 	// But this leaves us with blocks that have no parent.
 	// Consequently, we will delete those and realize that
 	// we then have no need for emitting a br.
-	if (!c->current_block_is_target
+	if (c->current_block != c->first_block
 		&& !LLVMGetFirstUse(LLVMBasicBlockAsValue(c->current_block)))
 	{
 		LLVMDeleteBasicBlock(c->current_block);
@@ -67,13 +63,12 @@ void llvm_emit_br(GenContext *c, LLVMBasicBlockRef next_block)
 }
 
 
-void llvm_emit_block(GenContext *context, LLVMBasicBlockRef next_block)
+void llvm_emit_block(GenContext *c, LLVMBasicBlockRef next_block)
 {
-	assert(context->current_block == NULL);
-	LLVMAppendExistingBasicBlock(context->function, next_block);
-	LLVMPositionBuilderAtEnd(context->builder, next_block);
-	context->current_block = next_block;
-	context->current_block_is_target = false;
+	assert(c->current_block == NULL);
+	LLVMAppendExistingBasicBlock(c->cur_func.ref, next_block);
+	LLVMPositionBuilderAtEnd(c->builder, next_block);
+	c->current_block = next_block;
 }
 
 static void llvm_expand_from_args(GenContext *c, Type *type, LLVMValueRef ref, unsigned *index, AlignSize alignment)
@@ -116,9 +111,9 @@ static void llvm_expand_from_args(GenContext *c, Type *type, LLVMValueRef ref, u
 	}
 }
 
-LLVMValueRef llvm_get_next_param(GenContext *context, unsigned *index)
+LLVMValueRef llvm_get_next_param(GenContext *c, unsigned *index)
 {
-	return LLVMGetParam(context->function, (*index)++);
+	return LLVMGetParam(c->cur_func.ref, (*index)++);
 }
 
 
@@ -196,7 +191,7 @@ static inline void llvm_process_parameter_value(GenContext *c, Decl *decl, ABIAr
 										decl->span,
 										NULL, NULL, NULL);
 			}
-			if (!decl->var.is_written && !decl->var.is_addr && !llvn_use_accurate_debug_info(c))
+			if (!decl->var.is_written && !decl->var.is_addr && !llvm_use_accurate_debug_info(c))
 			{
 				decl->backend_value = param_value;
 				decl->is_value = true;
@@ -285,7 +280,6 @@ static inline void llvm_emit_return_value(GenContext *context, LLVMValueRef valu
 		LLVMBuildRet(context->builder, value);
 	}
 	context->current_block = NULL;
-	context->current_block_is_target = false;
 }
 
 
@@ -428,27 +422,26 @@ void llvm_emit_function_body(GenContext *c, Decl *decl)
 void llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *prototype, Signature *signature, Ast *body,
                     Decl *decl)
 {
+	assert(prototype && function && body);
+	// Signature is NULL if the function is naked.
+
 	bool emit_debug = llvm_use_debug(c);
-	LLVMValueRef prev_function = c->function;
+	LLVMValueRef prev_function = c->cur_func.ref;
 	LLVMBuilderRef prev_builder = c->builder;
 
-	c->opt_var = NULL;
-	c->catch_block = NULL;
+	c->catch = NO_CATCH;
 
-	c->function = function;
 	if (emit_debug)
 	{
 		c->debug.function = LLVMGetSubprogram(function);
 	}
 
 	c->panic_blocks = NULL;
+	c->cur_func.ref = function;
 	c->cur_func.name = decl->name;
 	c->cur_func.prototype = prototype;
-	LLVMBasicBlockRef entry = LLVMAppendBasicBlockInContext(c->context, c->function, "entry");
-	c->current_block = entry;
-	c->current_block_is_target = true;
-	c->builder = llvm_create_builder(c);
-	LLVMPositionBuilderAtEnd(c->builder, entry);
+	c->builder = llvm_create_function_entry(c, function, &c->current_block);
+	c->first_block = c->current_block;
 
 	LLVMValueRef alloca_point = LLVMBuildAlloca(c->builder, LLVMInt32TypeInContext(c->context), "alloca_point");
 	c->alloca_point = alloca_point;
@@ -456,29 +449,31 @@ void llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *pro
 	unsigned arg = 0;
 
 
+	DebugScope scope;
 	if (emit_debug)
 	{
-		llvm_debug_scope_push(c, c->debug.function);
+		scope = (DebugScope) { .lexical_block = c->debug.function, NULL, NULL };
+		c->debug.block_stack = &scope;
 		EMIT_LOC(c, body);
 	}
 
 	c->optional_out = NULL;
 	c->return_out = NULL;
-	if (prototype && prototype->ret_abi_info->kind == ABI_ARG_INDIRECT)
+	if (prototype->ret_abi_info->kind == ABI_ARG_INDIRECT)
 	{
 		if (prototype->is_optional)
 		{
-			c->optional_out = LLVMGetParam(c->function, arg++);
+			c->optional_out = llvm_get_next_param(c, &arg);
 		}
 		else
 		{
-			c->return_out = LLVMGetParam(c->function, arg++);
+			c->return_out = llvm_get_next_param(c, &arg);
 		}
 	}
-	if (prototype && prototype->ret_by_ref_abi_info)
+	if (prototype->ret_by_ref_abi_info)
 	{
 		assert(!c->return_out);
-		c->return_out = LLVMGetParam(c->function, arg++);
+		c->return_out = llvm_get_next_param(c, &arg);
 	}
 
 
@@ -498,20 +493,15 @@ void llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *pro
 		llvm_emit_stmt(c, ast_next(&current));
 	}
 
-	if (c->current_block && llvm_basic_block_is_unused(c->current_block))
-	{
-		LLVMBasicBlockRef prev_block = LLVMGetPreviousBasicBlock(c->current_block);
-		LLVMDeleteBasicBlock(c->current_block);
-		c->current_block = prev_block;
-		LLVMPositionBuilderAtEnd(c->builder, c->current_block);
-	}
+	llvm_delete_current_if_unused(c);
+
 	// Insert a return (and defer) if needed.
 	if (c->current_block && !LLVMGetBasicBlockTerminator(c->current_block))
 	{
 		llvm_emit_return_implicit(c);
 	}
 
-	LLVMBasicBlockRef last_block = LLVMGetLastBasicBlock(c->function);
+	LLVMBasicBlockRef last_block = LLVMGetLastBasicBlock(c->cur_func.ref);
 
 	// Move panic blocks last, this is just overall nicer to read, and might be better from
 	// a performance POV
@@ -533,12 +523,12 @@ void llvm_emit_body(GenContext *c, LLVMValueRef function, FunctionPrototype *pro
 
 	if (llvm_use_debug(c))
 	{
-		llvm_debug_scope_pop(c);
+		c->debug.block_stack = NULL;
 		LLVMDIBuilderFinalizeSubprogram(c->debug.builder, c->debug.function);
 	}
 
 	c->builder = prev_builder;
-	c->function = prev_function;
+	c->cur_func.ref = prev_function;
 }
 
 static void llvm_append_xxlizer(GenContext *c, unsigned  priority, bool is_initializer, LLVMValueRef function)
@@ -557,7 +547,6 @@ void llvm_emit_dynamic_functions(GenContext *c, Decl **funcs)
 	{
 		LLVMTypeRef types[3] = { c->ptr_type, c->ptr_type, c->typeid_type };
 		LLVMTypeRef entry_type = LLVMStructType(types, 3, false);
-		c->dyn_section_type = entry_type;
 		LLVMValueRef *entries = VECNEW(LLVMValueRef, len);
 		FOREACH_BEGIN(Decl *func, funcs)
 			Type *type = typeget(func->func_decl.type_parent);
@@ -587,10 +576,8 @@ void llvm_emit_dynamic_functions(GenContext *c, Decl **funcs)
 	LLVMValueRef vals_fn[3] = { llvm_const_int(c, type_int, 1), initializer, llvm_get_zero(c, type_voidptr) };
 	vec_add(c->constructors, LLVMConstNamedStruct(c->xtor_entry_type, vals_fn, 3));
 
-	LLVMBasicBlockRef entry = LLVMAppendBasicBlockInContext(c->context, initializer, "entry");
-	LLVMBuilderRef builder = llvm_create_builder(c);
-	LLVMPositionBuilderAtEnd(builder, entry);
-	LLVMBasicBlockRef last_block = entry;
+	LLVMBasicBlockRef last_block;
+	LLVMBuilderRef builder = llvm_create_function_entry(c, initializer, &last_block);
 	FOREACH_BEGIN(Decl *decl, funcs)
 		Type *type = typeget(decl->func_decl.type_parent);
 		scratch_buffer_clear();
@@ -615,9 +602,7 @@ void llvm_emit_dynamic_functions(GenContext *c, Decl **funcs)
 		LLVMAppendExistingBasicBlock(initializer, next);
 		LLVMPositionBuilderAtEnd(builder, next);
 		LLVMValueRef next_ptr = LLVMBuildStructGEP2(builder, c->dtable_type, load_dtable, 2, "next_dtable_ref");
-		LLVMValueRef phi_in[2] = { dtable_ref, next_ptr };
-		LLVMBasicBlockRef phi_in_block[2] = { last_block, next };
-		LLVMAddIncoming(phi, phi_in, phi_in_block, 2);
+		llvm_set_phi(phi, dtable_ref, last_block, next_ptr, next);
 		LLVMBuildBr(builder, check);
 		LLVMAppendExistingBasicBlock(initializer, after_check);
 		LLVMPositionBuilderAtEnd(builder, after_check);
diff --git a/src/compiler/llvm_codegen_instr.c b/src/compiler/llvm_codegen_instr.c
index c3de5d8c6..ce98d2f8c 100644
--- a/src/compiler/llvm_codegen_instr.c
+++ b/src/compiler/llvm_codegen_instr.c
@@ -8,9 +8,7 @@ void llvm_emit_cond_br_raw(GenContext *context, LLVMValueRef b, LLVMBasicBlockRe
 {
 	assert(context->current_block);
 	LLVMBuildCondBr(context->builder, b, then_block, else_block);
-	LLVMClearInsertionPosition(context->builder);
 	context->current_block = NULL;
-	context->current_block_is_target = false;
 }
 
 void llvm_emit_cond_br(GenContext *context, BEValue *value, LLVMBasicBlockRef then_block, LLVMBasicBlockRef else_block)
@@ -18,9 +16,7 @@ void llvm_emit_cond_br(GenContext *context, BEValue *value, LLVMBasicBlockRef th
 	assert(context->current_block);
 	assert(value->kind == BE_BOOLEAN);
 	LLVMBuildCondBr(context->builder, value->value, then_block, else_block);
-	LLVMClearInsertionPosition(context->builder);
 	context->current_block = NULL;
-	context->current_block_is_target = false;
 }
 
 LLVMValueRef llvm_emit_lshr_fixed(GenContext *c, LLVMValueRef data, int shift)
diff --git a/src/compiler/llvm_codegen_internal.h b/src/compiler/llvm_codegen_internal.h
index 955f951d7..13b32dbf4 100644
--- a/src/compiler/llvm_codegen_internal.h
+++ b/src/compiler/llvm_codegen_internal.h
@@ -36,19 +36,19 @@ typedef struct
 	LLVMValueRef optional;
 } BEValue;
 
-typedef struct
-{
-	LLVMBasicBlockRef continue_block;
-	LLVMBasicBlockRef break_block;
-	LLVMBasicBlockRef next_block;
-}  BreakContinue;
-
 typedef struct DebugFile_
 {
 	FileId file_id;
 	LLVMMetadataRef debug_file;
 } DebugFile;
 
+typedef struct DebugScope_
+{
+	LLVMMetadataRef lexical_block;
+	LLVMMetadataRef inline_loc;
+	struct DebugScope_ *outline_loc;
+} DebugScope;
+
 typedef struct
 {
 	unsigned runtime_version : 8;
@@ -58,8 +58,7 @@ typedef struct
 	DebugFile file;
 	LLVMMetadataRef compile_unit;
 	LLVMMetadataRef function;
-	LLVMMetadataRef *lexical_block_stack;
-	LLVMMetadataRef inlined_at;
+	DebugScope *block_stack;
 } DebugContext;
 
 
@@ -70,6 +69,15 @@ typedef struct ReusableConstant_
 	const char *name;
 	LLVMValueRef value;
 } ReusableConstant;
+
+typedef struct OptionalCatch_
+{
+	LLVMValueRef fault;
+	LLVMBasicBlockRef block;
+} OptionalCatch;
+
+
+#define NO_CATCH (OptionalCatch) { NULL, NULL }
 typedef struct GenContext_
 {
 	bool shared_context;
@@ -78,21 +86,12 @@ typedef struct GenContext_
 	LLVMTargetMachineRef machine;
 	LLVMTargetDataRef target_data;
 	LLVMContextRef context;
-	LLVMValueRef function;
-	LLVMValueRef alloca_point;
-	LLVMBuilderRef builder;
-	LLVMValueRef defer_error_var;
-	LLVMBasicBlockRef current_block;
-	LLVMBasicBlockRef catch_block;
-	LLVMBasicBlockRef *panic_blocks;
 	LLVMValueRef *constructors;
 	LLVMValueRef *destructors;
 	ReusableConstant *reusable_constants;
 	const char *ir_filename;
 	const char *object_filename;
 	const char *asm_filename;
-	// The recipient of the error value in a catch err = ... expression.
-	LLVMValueRef opt_var;
 	LLVMTypeRef bool_type;
 	LLVMTypeRef byte_type;
 	LLVMTypeRef introspect_type;
@@ -108,23 +107,43 @@ typedef struct GenContext_
 	Decl *panicf;
 	struct
 	{
+		LLVMValueRef ref;
 		const char *name;
 		FunctionPrototype *prototype;
 		Type *rtype;
 	} cur_func;
-	int block_global_unique_count;
+	struct {
+		LLVMBuilderRef builder;
+		// The alloca point for any allocas.
+		LLVMValueRef alloca_point;
+		// The recipient of the error value in a catch err = ... expression.
+		OptionalCatch catch;
+		// If the return is by ref, this is the pointer
+		LLVMValueRef return_out;
+		// If the optional is returned by ref, this is the pointer
+		LLVMValueRef optional_out;
+		// Used for return in docs
+		BEValue retval;
+		// The entry block in the function
+		LLVMBasicBlockRef first_block;
+		// The last emitted location.
+		SourceSpan last_emitted_loc;
+		// Used for defer (catch err)
+		LLVMValueRef defer_error_var;
+		// The current block
+		LLVMBasicBlockRef current_block;
+		// The panic blocks to emit at the end.
+		LLVMBasicBlockRef *panic_blocks;
+		// Debug data
+		DebugContext debug;
+	};
 	int ast_alloca_addr_space;
-	DebugContext debug;
 	Module *code_module;
-	LLVMValueRef return_out;
-	LLVMValueRef optional_out;
-	BEValue retval;
-	bool current_block_is_target : 1;
-	SourceSpan last_emitted_loc;
 	Decl **dynamic_functions;
+	// The dynamic find function, if one has been emitted yet.
 	LLVMValueRef dyn_find_function;
+	// The type of the find function.
 	LLVMTypeRef dyn_find_function_type;
-	LLVMTypeRef dyn_section_type;
 } GenContext;
 
 // LLVM Intrinsics
@@ -294,8 +313,6 @@ INLINE bool llvm_is_local_eval(GenContext *c);
 
 // -- BE value --
 void llvm_value_addr(GenContext *c, BEValue *value);
-static inline bool llvm_value_is_addr(BEValue *value) { return value->kind == BE_ADDRESS || value->kind == BE_ADDRESS_OPTIONAL; }
-static inline bool llvm_value_is_bool(BEValue *value) { return value->kind == BE_BOOLEAN; }
 bool llvm_value_is_const(BEValue *value);
 void llvm_value_rvalue(GenContext *context, BEValue *value);
 void llvm_value_deref(GenContext *c, BEValue *value);
@@ -307,6 +324,8 @@ void llvm_value_set_decl_address(GenContext *c, BEValue *value, Decl *decl);
 void llvm_value_set_decl(GenContext *c, BEValue *value, Decl *decl);
 void llvm_value_fold_optional(GenContext *c, BEValue *value);
 void llvm_value_struct_gep(GenContext *c, BEValue *element, BEValue *struct_pointer, unsigned index);
+INLINE bool llvm_value_is_addr(BEValue *value) { return value->kind == BE_ADDRESS || value->kind == BE_ADDRESS_OPTIONAL; }
+INLINE bool llvm_value_is_bool(BEValue *value) { return value->kind == BE_BOOLEAN; }
 INLINE void llvm_value_bitcast(GenContext *c, BEValue *value, Type *type);
 void llvm_value_aggregate_two(GenContext *c, BEValue *value, Type *type, LLVMValueRef value1, LLVMValueRef value2);
 
@@ -366,7 +385,7 @@ LLVMValueRef llvm_emit_const_initializer(GenContext *c, ConstInitializer *const_
 LLVMValueRef llvm_emit_const_padding(GenContext *c, AlignSize size);
 LLVMValueRef llvm_emit_string_const(GenContext *c, const char *str, const char *extname);
 LLVMValueRef llvm_emit_empty_string_const(GenContext *c);
-UNUSED LLVMValueRef llvm_emit_zstring(GenContext *c, const char *str);
+
 LLVMValueRef llvm_emit_zstring_named(GenContext *c, const char *str, const char *extname);
 INLINE LLVMValueRef llvm_const_int(GenContext *c, Type *type, uint64_t val);
 INLINE LLVMValueRef llvm_get_zero(GenContext *c, Type *type);
@@ -393,6 +412,8 @@ void llvm_emit_return_implicit(GenContext *c);
 
 // -- Blocks --
 LLVMBasicBlockRef llvm_basic_block_new(GenContext *c, const char *name);
+LLVMBuilderRef llvm_create_function_entry(GenContext *c, LLVMValueRef func, LLVMBasicBlockRef *entry_block_ref);
+LLVMBasicBlockRef llvm_append_basic_block(GenContext *c, LLVMValueRef func, const char *name);
 void llvm_emit_block(GenContext *c, LLVMBasicBlockRef next_block);
 static inline LLVMBasicBlockRef llvm_get_current_block_if_in_use(GenContext *context);
 INLINE bool llvm_basic_block_is_unused(LLVMBasicBlockRef block);
@@ -404,6 +425,8 @@ void llvm_emit_comp(GenContext *c, BEValue *result, BEValue *lhs, BEValue *rhs,
 void llvm_emit_int_comp(GenContext *c, BEValue *result, BEValue *lhs, BEValue *rhs, BinaryOp binary_op);
 void llvm_emit_int_comp_zero(GenContext *c, BEValue *result, BEValue *lhs, BinaryOp binary_op);
 void llvm_emit_int_comp_raw(GenContext *c, BEValue *result, Type *lhs_type, Type *rhs_type, LLVMValueRef lhs_value, LLVMValueRef rhs_value, BinaryOp binary_op);
+void llvm_new_phi(GenContext *c, BEValue *value, const char *name, Type *type, LLVMValueRef val1, LLVMBasicBlockRef block1, LLVMValueRef val2, LLVMBasicBlockRef block2);
+void llvm_set_phi(LLVMValueRef phi, LLVMValueRef val1, LLVMBasicBlockRef block1, LLVMValueRef val2, LLVMBasicBlockRef block2);
 INLINE bool llvm_is_const_null(LLVMValueRef value);
 INLINE bool llvm_is_const(LLVMValueRef value);
 
@@ -445,7 +468,6 @@ void llvm_emit_ptr_from_array(GenContext *c, BEValue *value);
 void llvm_emit_struct_member_ref(GenContext *c, BEValue *struct_ref, BEValue *member_ref, unsigned member_id);
 INLINE LLVMValueRef llvm_emit_extract_value(GenContext *c, LLVMValueRef agg, unsigned index);
 
-
 // -- Int operations ---
 LLVMValueRef llvm_emit_shl_fixed(GenContext *c, LLVMValueRef data, int shift);
 LLVMValueRef llvm_emit_lshr_fixed(GenContext *c, LLVMValueRef data, int shift);
@@ -453,7 +475,7 @@ LLVMValueRef llvm_emit_ashr_fixed(GenContext *c, LLVMValueRef data, int shift);
 INLINE LLVMValueRef llvm_emit_ashr(GenContext *c, LLVMValueRef value, LLVMValueRef shift);
 INLINE LLVMValueRef llvm_emit_shl(GenContext *c, LLVMValueRef value, LLVMValueRef shift);
 INLINE LLVMValueRef llvm_emit_lshr(GenContext *c, LLVMValueRef value, LLVMValueRef shift);
-INLINE UNUSED LLVMValueRef llvm_emit_trunc(GenContext *c, LLVMValueRef value, Type *type);
+
 INLINE LLVMValueRef llvm_emit_trunc_bool(GenContext *c, LLVMValueRef value);
 INLINE LLVMValueRef llvm_emit_and(GenContext *c, BEValue *lhs, BEValue *rhs);
 INLINE LLVMValueRef llvm_emit_and_raw(GenContext *c, LLVMValueRef lhs, LLVMValueRef rhs);
@@ -462,11 +484,10 @@ INLINE LLVMValueRef llvm_emit_or_raw(GenContext *c, LLVMValueRef lhs, LLVMValueR
 // -- Mem ops --
 LLVMValueRef llvm_emit_memclear_size_align(GenContext *c, LLVMValueRef ptr, uint64_t size, AlignSize align);
 LLVMValueRef llvm_emit_memcpy(GenContext *c, LLVMValueRef dest, unsigned dest_align, LLVMValueRef source, unsigned src_align, uint64_t len);
-void llvm_emit_memcpy_to_decl(GenContext *c, Decl *decl, LLVMValueRef source, unsigned source_alignment);
 
 // -- ABI --
 LLVMTypeRef llvm_get_coerce_type(GenContext *c, ABIArgInfo *arg_info);
-LLVMValueRef llvm_get_next_param(GenContext *context, unsigned *index);
+LLVMValueRef llvm_get_next_param(GenContext *c, unsigned *index);
 void llvm_emit_convert_value_from_coerced(GenContext *c, BEValue *result, LLVMTypeRef coerced, LLVMValueRef value, Type *original_type);
 void llvm_emit_coerce_store(GenContext *c, LLVMValueRef addr, AlignSize alignment, LLVMTypeRef coerced, LLVMValueRef value, LLVMTypeRef target_type);
 LLVMValueRef llvm_emit_coerce(GenContext *c, LLVMTypeRef coerced, BEValue *value, Type *original_type);
@@ -490,12 +511,12 @@ void llvm_emit_panic_if_true(GenContext *c, BEValue *value, const char *panic_na
 							 BEValue *value_2);
 void llvm_emit_panic(GenContext *c, const char *message, SourceSpan loc, const char *fmt, BEValue *args);
 void llvm_emit_unreachable(GenContext *c);
-void llvm_emit_assume_raw(GenContext *c, LLVMValueRef assume_true);
+void llvm_emit_assume_true(GenContext *c, BEValue *assume_true);
 LLVMValueRef llvm_emit_expect_raw(GenContext *c, LLVMValueRef expect_true);
-LLVMValueRef llvm_emit_expect_false_raw(GenContext *c, LLVMValueRef expect_false);
+LLVMValueRef llvm_emit_expect_false(GenContext *c, BEValue *expect_false);
 void llvm_emit_any_from_value(GenContext *c, BEValue *value, Type *type);
-void llvm_emit_subarray_len(GenContext *context, BEValue *subarray, BEValue *len);
-void llvm_emit_subarray_pointer(GenContext *context, BEValue *subarray, BEValue *pointer);
+void llvm_emit_slice_len(GenContext *c, BEValue *slice, BEValue *len);
+void llvm_emit_slice_pointer(GenContext *context, BEValue *slice, BEValue *pointer);
 void llvm_emit_compound_stmt(GenContext *c, Ast *ast);
 LLVMValueRef llvm_emit_const_bitstruct(GenContext *c, ConstInitializer *initializer);
 void llvm_emit_function_body(GenContext *context, Decl *decl);
@@ -511,22 +532,29 @@ void llvm_emit_cast(GenContext *c, CastKind cast_kind, Expr *expr, BEValue *valu
 void llvm_emit_local_var_alloca(GenContext *c, Decl *decl);
 void llvm_emit_local_decl(GenContext *c, Decl *decl, BEValue *value);
 void llvm_emit_builtin_call(GenContext *c, BEValue *result_value, Expr *expr);
+LLVMMetadataRef llvm_debug_create_macro(GenContext *c, Decl *macro);
 
 // -- Optional --
 LLVMValueRef llvm_emit_is_no_opt(GenContext *c, LLVMValueRef error_value);
 LLVMValueRef llvm_get_opt_ref(GenContext *c, Decl *decl);
 
-#define PUSH_OPT() LLVMBasicBlockRef _old_catch = c->catch_block; LLVMValueRef _old_opt_var = c->opt_var
-#define POP_OPT() c->catch_block = _old_catch; c->opt_var = _old_opt_var
+#define PUSH_CATCH() OptionalCatch _old_catch = c->catch
+#define PUSH_CATCH_VAR_BLOCK(fault_, block_) OptionalCatch _old_catch = c->catch; c->catch = (OptionalCatch) { fault_, block_ }
+#define PUSH_CLEAR_CATCH() OptionalCatch _old_catch = c->catch; c->catch = (OptionalCatch) { NULL, NULL }
+#define POP_CATCH() c->catch = _old_catch
 
 // -- Debug --
 LLVMMetadataRef llvm_get_debug_file(GenContext *c, FileId file_id);
-#define DEBUG_PUSH_LEXICAL_SCOPE(c__, span__) do { if (llvm_use_debug(c__)) llvm_debug_push_lexical_scope(c__, span__); } while (0)
-#define DEBUG_POP_LEXICAL_SCOPE(c__) do { if (llvm_use_debug(c__)) llvm_debug_scope_pop(c__); } while (0)
+LLVMMetadataRef lexical_block;
+LLVMMetadataRef inline_loc;
+struct DebugScope_ *outline_loc;
+#define DEBUG_PUSH_LEXICAL_SCOPE(c__, span__) DebugScope *old_scope = c__->debug.block_stack; \
+	DebugScope new_scope; do { if (llvm_use_debug(c__))                                          \
+	{ new_scope = llvm_debug_create_lexical_scope(c__, span__);                                  \
+	c__->debug.block_stack = &new_scope; } } while (0)
+#define DEBUG_POP_LEXICAL_SCOPE(c__) do { c__->debug.block_stack = old_scope; } while (0)
 INLINE bool llvm_use_debug(GenContext *context);
-void llvm_debug_scope_push(GenContext *context, LLVMMetadataRef debug_scope);
-void llvm_debug_scope_pop(GenContext *context);
-void llvm_debug_push_lexical_scope(GenContext *context, SourceSpan location);
+DebugScope llvm_debug_create_lexical_scope(GenContext *context, SourceSpan location);
 LLVMMetadataRef llvm_debug_current_scope(GenContext *context);
 void llvm_emit_debug_function(GenContext *c, Decl *decl);
 void llvm_emit_debug_location(GenContext *c, SourceSpan location);
diff --git a/src/compiler/llvm_codegen_internal_impl.h b/src/compiler/llvm_codegen_internal_impl.h
index ad1254031..af01eca33 100644
--- a/src/compiler/llvm_codegen_internal_impl.h
+++ b/src/compiler/llvm_codegen_internal_impl.h
@@ -152,11 +152,6 @@ INLINE LLVMValueRef llvm_emit_trunc_bool(GenContext *c, LLVMValueRef value)
 	return LLVMBuildTrunc(c->builder, value, c->bool_type, "");
 }
 
-INLINE LLVMValueRef llvm_emit_trunc(GenContext *c, LLVMValueRef value, Type *type)
-{
-	return LLVMBuildTrunc(c->builder, value, llvm_get_type(c, type), "");
-}
-
 INLINE LLVMValueRef llvm_emit_extract_value(GenContext *c, LLVMValueRef agg, unsigned index)
 {
 	if (LLVMGetTypeKind(LLVMTypeOf(agg)) == LLVMVectorTypeKind)
@@ -166,7 +161,7 @@ INLINE LLVMValueRef llvm_emit_extract_value(GenContext *c, LLVMValueRef agg, uns
 	return LLVMBuildExtractValue(c->builder, agg, index, "");
 }
 
-INLINE bool llvn_use_accurate_debug_info(GenContext *context)
+INLINE bool llvm_use_accurate_debug_info(GenContext *context)
 {
 	return context->debug.builder && active_target.optlevel <= OPTIMIZATION_NONE;
 }
@@ -178,15 +173,24 @@ INLINE bool llvm_basic_block_is_unused(LLVMBasicBlockRef block)
 	return !LLVMGetFirstInstruction(block) && !LLVMGetFirstUse(LLVMBasicBlockAsValue(block));
 }
 
+static inline bool llvm_delete_current_if_unused(GenContext *c)
+{
+	LLVMBasicBlockRef current = c->current_block;
+	if (!current || !llvm_basic_block_is_unused(current)) return false;
+	LLVMBasicBlockRef prev_block = LLVMGetPreviousBasicBlock(current);
+	LLVMDeleteBasicBlock(current);
+	c->current_block = prev_block;
+	LLVMPositionBuilderAtEnd(c->builder, prev_block);
+	return true;
+}
+
 static inline LLVMBasicBlockRef llvm_get_current_block_if_in_use(GenContext *context)
 {
 	LLVMBasicBlockRef block = context->current_block;
-	if (llvm_basic_block_is_unused(block))
+	if (block && llvm_basic_block_is_unused(block))
 	{
 		LLVMDeleteBasicBlock(block);
-		context->current_block = NULL;
-		context->current_block_is_target = false;
-		return NULL;
+		return context->current_block = NULL;
 	}
 	return block;
 }
diff --git a/src/compiler/llvm_codegen_module.c b/src/compiler/llvm_codegen_module.c
index 0bd3dffbf..15f230889 100644
--- a/src/compiler/llvm_codegen_module.c
+++ b/src/compiler/llvm_codegen_module.c
@@ -97,7 +97,6 @@ void gencontext_begin_module(GenContext *c)
 	// We need to remove the context from the cache after this.
 	// This would seem to indicate that we should change Type / actual type.
 
-	c->block_global_unique_count = 0;
 	c->ast_alloca_addr_space = target_alloca_addr_space();
 	VECEACH(global_context.type, i)
 	{
diff --git a/src/compiler/llvm_codegen_stmt.c b/src/compiler/llvm_codegen_stmt.c
index 0eb2545b2..e10325643 100644
--- a/src/compiler/llvm_codegen_stmt.c
+++ b/src/compiler/llvm_codegen_stmt.c
@@ -17,46 +17,96 @@ void llvm_emit_compound_stmt(GenContext *c, Ast *ast)
 	// Emit the statement chain
 	llvm_emit_statement_chain(c, ast->compound_stmt.first_stmt);
 
+	// Pop lexical scope.
 	DEBUG_POP_LEXICAL_SCOPE(c);
 }
 
+void llvm_emit_local_static(GenContext *c, Decl *decl, BEValue *value)
+{
+	// In defers we might already have generated this variable.
+	if (decl->backend_ref)
+	{
+		llvm_value_set_decl(c, value, decl);
+		return;
+	}
+
+	// Push the builder
+	void *builder = c->builder;
+	c->builder = c->global_builder;
+
+	// Emit the global.
+	decl->backend_ref = llvm_add_global(c, "temp", type_lowering(decl->type), decl->alignment);
+	if (IS_OPTIONAL(decl))
+	{
+		scratch_buffer_clear();
+		scratch_buffer_append(decl_get_extname(decl));
+		scratch_buffer_append(".f");
+		decl->var.optional_ref = llvm_add_global(c, scratch_buffer_to_string(), type_anyfault, 0);
+	}
+	llvm_emit_global_variable_init(c, decl);
+
+	// Pop the builder
+	c->builder = builder;
+	llvm_value_set_decl(c, value, decl);
+}
 /**
  * This emits a local declaration.
  */
 void llvm_emit_local_decl(GenContext *c, Decl *decl, BEValue *value)
 {
-	// 1. Get the declaration and the LLVM type.
-	Type *var_type = type_lowering(decl->type);
-	LLVMTypeRef alloc_type = llvm_get_type(c, var_type);
-
-	// 2. In the case we have a static variable or constant,
-	//    then we essentially treat this as a global.
-	if (decl->var.is_static || decl->var.kind == VARDECL_CONST)
+	switch (decl->var.kind)
 	{
-		// In defers we might already have generated this variable.
-		if (decl->backend_ref)
-		{
-			llvm_value_set_decl(c, value, decl);
+		case VARDECL_CONST:
+			llvm_emit_local_static(c, decl, value);
 			return;
-		}
-		void *builder = c->builder;
-		c->builder = c->global_builder;
-		decl->backend_ref = llvm_add_global(c, "temp", var_type, decl->alignment);
-		if (IS_OPTIONAL(decl))
+		case VARDECL_LOCAL:
+			if (decl->var.is_static)
+			{
+				llvm_emit_local_static(c, decl, value);
+				return;
+			}
+			break;
+		case VARDECL_PARAM_CT:
+		case VARDECL_PARAM_CT_TYPE:
+		case VARDECL_PARAM_EXPR:
+		case VARDECL_GLOBAL:
+		case VARDECL_MEMBER:
+		case VARDECL_BITMEMBER:
+			UNREACHABLE;
+		case VARDECL_PARAM:
+		case VARDECL_PARAM_REF:
 		{
-			scratch_buffer_clear();
-			scratch_buffer_append(decl_get_extname(decl));
-			scratch_buffer_append(".f");
-			decl->var.optional_ref = llvm_add_global(c, scratch_buffer_to_string(), type_anyfault, 0);
+			Expr *init_expr = decl->var.init_expr;
+			llvm_emit_expr(c, value, init_expr);
+			if (llvm_value_is_addr(value) || decl->var.is_written || decl->var.is_addr || llvm_use_accurate_debug_info(c))
+			{
+				llvm_emit_and_set_decl_alloca(c, decl);
+				llvm_store_decl(c, decl, value);
+				return;
+			}
+
+			decl->is_value = true;
+			decl->backend_value = value->value;
+			return;
 		}
-		llvm_emit_global_variable_init(c, decl);
-		c->builder = builder;
-		llvm_value_set_decl(c, value, decl);
-		return;
+		case VARDECL_UNWRAPPED:
+		case VARDECL_ERASE:
+		case VARDECL_REWRAPPED:
+			return;
+		case VARDECL_LOCAL_CT:
+		case VARDECL_LOCAL_CT_TYPE:
+			UNREACHABLE
 	}
+
+	// Get the declaration and the LLVM type.
+	Type *var_type = type_lowering(decl->type);
+	LLVMTypeRef alloc_type = llvm_get_type(c, var_type);
+
+	// Create a local alloca
 	assert(!decl->backend_ref);
 	llvm_emit_local_var_alloca(c, decl);
-	Expr *init = decl->var.init_expr;
+
+	// Create optional storage
 	bool is_optional = IS_OPTIONAL(decl);
 	if (is_optional)
 	{
@@ -67,96 +117,94 @@ void llvm_emit_local_decl(GenContext *c, Decl *decl, BEValue *value)
 		// Only clear out the result if the assignment isn't an optional.
 	}
 
+	// Grab the init expression
+	Expr *init = decl->var.init_expr;
 	if (init)
 	{
 		llvm_value_set_decl_address(c, value, decl);
 		value->kind = BE_ADDRESS;
 		BEValue res = llvm_emit_assign_expr(c, value, decl->var.init_expr, decl->var.optional_ref);
 		if (!is_optional) *value = res;
+		return;
 	}
-	else if (decl->var.no_init)
+
+	// If the variable has a no-init, then set the value to undef.
+	if (decl->var.no_init)
 	{
 		llvm_value_set(value, LLVMGetUndef(alloc_type), decl->type);
-		if (decl->var.optional_ref)
+		if (is_optional)
 		{
 			llvm_store_to_ptr_raw(c, decl->var.optional_ref, llvm_get_undef(c, type_anyfault), type_anyfault);
 		}
+		return;
 	}
-	else
+
+
+	// Normal case, zero init.
+	llvm_value_set_decl_address(c, value, decl);
+	if (is_optional)
 	{
-		if (decl->var.optional_ref)
-		{
-			llvm_store_to_ptr_zero(c, decl->var.optional_ref, type_anyfault);
-		}
+		llvm_store_to_ptr_zero(c, decl->var.optional_ref, type_anyfault);
 
-		Type *type = type_lowering(decl->type);
-		// Normal case, zero init.
-		if (type_is_builtin(type->type_kind) || type->type_kind == TYPE_POINTER)
-		{
-			LLVMValueRef zero = llvm_get_zero(c, var_type);
-			llvm_value_set(value, zero, type);
-			llvm_store_decl(c, decl, value);
-		}
-		else
-		{
-			llvm_value_set_decl_address(c, value, decl);
-			value->kind = BE_ADDRESS;
-			llvm_store_zero(c, value);
-			llvm_value_set(value, llvm_get_zero(c, type), type);
-		}
+		// Prevent accidental optional folding in "llvm_store_zero"!
+		value->kind = BE_ADDRESS;
 	}
-}
-
 
+	llvm_store_zero(c, value);
+	llvm_value_set(value, llvm_get_zero(c, var_type), var_type);
+}
 
-static void llvm_emit_decl_expr_list(GenContext *context, BEValue *be_value, Expr *expr, bool bool_cast)
+/**
+ * Emit the 'cond' in something like: "while (int a = foo(), int bar = a * a, bar > baz)"
+ * But also the switch value in switches.
+ *
+ * @param c the context to use
+ * @param be_value the value to return the value of the cond
+ * @param expr the expression of type EXPR_COND
+ * @param bool_cast true if in while/for/etc false if it is a switch
+ */
+static void llvm_emit_cond(GenContext *c, BEValue *be_value, Expr *expr, bool bool_cast)
 {
 	assert(expr->expr_kind == EXPR_COND);
 	ByteSize size = vec_size(expr->cond_expr);
+
+	// First emit everything up to the last element.
 	ByteSize last_index = size - 1;
 	for (ByteSize i = 0; i < last_index; i++)
 	{
 		BEValue value;
-		llvm_emit_expr(context, &value, expr->cond_expr[i]);
+		llvm_emit_expr(c, &value, expr->cond_expr[i]);
 	}
+
+	// Emit the last element.
 	Expr *last = expr->cond_expr[last_index];
-	Type *type = last->type;
-	llvm_emit_expr(context, be_value, last);
+	llvm_emit_expr(c, be_value, last);
+
+	// If it is a declaration, set it to the address of the variable.
 	if (last->expr_kind == EXPR_DECL)
 	{
-		type = typeget(last->decl_expr->var.type_info);
-
-		LLVMValueRef decl_value = llvm_get_ref(context, last->decl_expr);
-		if (bool_cast && last->decl_expr->var.unwrap)
-		{
-			llvm_value_set(be_value, LLVMConstInt(context->bool_type, 1, false), type_bool);
-			return;
-		}
-		llvm_value_set_address_abi_aligned(be_value, decl_value, type);
+		llvm_value_set_decl_address(c, be_value, last->decl_expr);
 	}
-	if (bool_cast)
+
+	// Cast the result to bool if needed.
+	if (bool_cast && be_value->type != type_bool)
 	{
-		type = type_lowering(type);
-		if (type->type_kind != TYPE_BOOL)
-		{
-			CastKind cast = cast_to_bool_kind(type);
-			llvm_emit_cast(context, cast, last, be_value, type_bool, type);
-		}
+		Type *type = be_value->type;
+		CastKind cast = cast_to_bool_kind(type);
+		llvm_emit_cast(c, cast, last, be_value, type_bool, type);
 	}
 }
 
 void llvm_emit_jmp(GenContext *context, LLVMBasicBlockRef block)
 {
 	llvm_emit_br(context, block);
-	LLVMBasicBlockRef post_jump_block = llvm_basic_block_new(context, "jmp");
+	LLVMBasicBlockRef post_jump_block = llvm_basic_block_new(context, "unreachable");
 	llvm_emit_block(context, post_jump_block);
 }
 
 static inline void llvm_emit_return(GenContext *c, Ast *ast)
 {
 
-	PUSH_OPT();
-
 	Expr *expr = ast->return_stmt.expr;
 	if (expr && expr->expr_kind == EXPR_OPTIONAL)
 	{
@@ -171,14 +219,15 @@ static inline void llvm_emit_return(GenContext *c, Ast *ast)
 		return;
 	}
 
+	PUSH_CATCH();
+
 	LLVMBasicBlockRef error_return_block = NULL;
 	LLVMValueRef error_out = NULL;
 	if (c->cur_func.prototype && type_is_optional(c->cur_func.prototype->rtype))
 	{
 		error_return_block = llvm_basic_block_new(c, "err_retblock");
 		error_out = llvm_emit_alloca_aligned(c, type_anyfault, "reterr");
-		c->opt_var = error_out;
-		c->catch_block = error_return_block;
+		c->catch = (OptionalCatch) { error_out, error_return_block };
 	}
 
 	bool has_return_value = ast->return_stmt.expr != NULL;
@@ -190,7 +239,7 @@ static inline void llvm_emit_return(GenContext *c, Ast *ast)
 		c->retval = return_value;
 	}
 
-	POP_OPT();
+	POP_CATCH();
 
 	if (ast->return_stmt.cleanup || ast->return_stmt.cleanup_fail)
 	{
@@ -198,16 +247,18 @@ static inline void llvm_emit_return(GenContext *c, Ast *ast)
 		llvm_emit_statement_chain(c, ast->return_stmt.cleanup);
 	}
 
-	// Are we in an expression block?
-	if (!has_return_value)
+	if (llvm_get_current_block_if_in_use(c))
 	{
-		llvm_emit_return_implicit(c);
-	}
-	else
-	{
-		llvm_emit_return_abi(c, &return_value, NULL);
+		// Are we in an expression block?
+		if (!has_return_value)
+		{
+			llvm_emit_return_implicit(c);
+		}
+		else
+		{
+			llvm_emit_return_abi(c, &return_value, NULL);
+		}
 	}
-	c->current_block = NULL;
 	if (error_return_block && LLVMGetFirstUse(LLVMBasicBlockAsValue(error_return_block)))
 	{
 		llvm_emit_block(c, error_return_block);
@@ -216,22 +267,17 @@ static inline void llvm_emit_return(GenContext *c, Ast *ast)
 		BEValue value;
 		llvm_value_set_address_abi_aligned(&value, error_out, type_anyfault);
 		llvm_emit_return_abi(c, NULL, &value);
-		c->current_block = NULL;
 	}
-	LLVMBasicBlockRef post_ret_block = llvm_basic_block_new(c, "postreturn");
-	llvm_emit_block(c, post_ret_block);
 }
 
 static inline void llvm_emit_block_exit_return(GenContext *c, Ast *ast)
 {
 
-	PUSH_OPT();
-
 	LLVMBasicBlockRef error_return_block = NULL;
 	LLVMValueRef error_out = NULL;
 	BlockExit *exit = *ast->return_stmt.block_exit_ref;
-	c->opt_var = exit->block_error_var;
-	c->catch_block = exit->block_optional_exit;
+
+	PUSH_CATCH_VAR_BLOCK(exit->block_error_var, exit->block_optional_exit);
 
 	LLVMBasicBlockRef err_cleanup_block = NULL;
 	Expr *ret_expr = ast->return_stmt.expr;
@@ -241,15 +287,15 @@ static inline void llvm_emit_block_exit_return(GenContext *c, Ast *ast)
 	{
 		if (ast->return_stmt.cleanup_fail && IS_OPTIONAL(ret_expr))
 		{
-			assert(c->catch_block);
+			assert(c->catch.block);
 			err_cleanup_block = llvm_basic_block_new(c, "opt_block_cleanup");
-			c->catch_block = err_cleanup_block;
+			c->catch.block = err_cleanup_block;
 		}
 		llvm_emit_expr(c, &return_value, ast->return_stmt.expr);
 		llvm_value_fold_optional(c, &return_value);
 	}
 
-	POP_OPT();
+	POP_CATCH();
 
 	AstId cleanup = ast->return_stmt.cleanup;
 	AstId cleanup_fail = ast->return_stmt.cleanup_fail;
@@ -323,7 +369,7 @@ static void llvm_emit_if_stmt(GenContext *c, Ast *ast)
 
 	if (then_body->ast_kind == AST_IF_CATCH_SWITCH_STMT)
 	{
-		llvm_emit_decl_expr_list(c, &be_value, cond, false);
+		llvm_emit_cond(c, &be_value, cond, false);
 		llvm_value_rvalue(c, &be_value);
 		BEValue comp;
 		llvm_emit_int_comp_zero(c, &comp, &be_value, BINARYOP_NE);
@@ -335,7 +381,7 @@ static void llvm_emit_if_stmt(GenContext *c, Ast *ast)
 		goto EMIT_ELSE;
 	}
 
-	llvm_emit_decl_expr_list(c, &be_value, cond, true);
+	llvm_emit_cond(c, &be_value, cond, true);
 
 	llvm_value_rvalue(c, &be_value);
 
@@ -516,7 +562,7 @@ void llvm_emit_for_stmt(GenContext *c, Ast *ast)
 		assert(cond);
 		if (cond->expr_kind == EXPR_COND)
 		{
-			llvm_emit_decl_expr_list(c, &be_value, cond, true);
+			llvm_emit_cond(c, &be_value, cond, true);
 		}
 		else
 		{
@@ -585,8 +631,11 @@ void llvm_emit_for_stmt(GenContext *c, Ast *ast)
 			// The inc block might also be the end of the body block.
 			llvm_emit_block(c, inc_block);
 		}
-		BEValue dummy;
-		llvm_emit_expr(c, &dummy, incr ? exprptr(incr) : NULL);
+		if (llvm_get_current_block_if_in_use(c))
+		{
+			BEValue dummy;
+			llvm_emit_expr(c, &dummy, incr ? exprptr(incr) : NULL);
+		}
 	}
 
 	// Loop back.
@@ -662,7 +711,6 @@ static void llvm_emit_switch_body_if_chain(GenContext *c,
 		if (case_stmt->case_stmt.body)
 		{
 			llvm_emit_block(c, block);
-			c->current_block_is_target = true;
 			llvm_emit_stmt(c, case_stmt->case_stmt.body);
 			llvm_emit_br(c, exit_block);
 		}
@@ -672,7 +720,6 @@ static void llvm_emit_switch_body_if_chain(GenContext *c,
 	{
 		llvm_emit_br(c, default_case->case_stmt.backend_block);
 		llvm_emit_block(c, default_case->case_stmt.backend_block);
-		c->current_block_is_target = true;
 		llvm_emit_stmt(c, default_case->case_stmt.body);
 		llvm_emit_br(c, exit_block);
 	}
@@ -684,22 +731,59 @@ static void llvm_emit_switch_body_if_chain(GenContext *c,
 	return;
 }
 
+static LLVMValueRef llvm_emit_switch_jump_stmt(GenContext *c,
+                                       Ast *switch_ast,
+                                       Ast **cases,
+									   uint64_t count,
+									   int min_index,
+									   LLVMValueRef jump_table,
+									   LLVMBasicBlockRef default_block,
+									   BEValue *switch_value)
+{
+	unsigned case_count = vec_size(cases);
+	BEValue min_val;
+	llvm_emit_expr(c, &min_val, exprptr(cases[min_index]->case_stmt.expr));
+	assert(llvm_value_is_const(&min_val));
+	switch_value->value = LLVMBuildSub(c->builder, switch_value->value, min_val.value, "");
+	LLVMValueRef is_valid = LLVMBuildICmp(c->builder, LLVMIntUGT, switch_value->value, llvm_const_int(c, switch_value->type, count - 1), "");
+	LLVMBasicBlockRef switch_block = llvm_basic_block_new(c, "jumpblock");
+	LLVMBuildCondBr(c->builder, is_valid, default_block, switch_block);
+	c->current_block = NULL;
+	llvm_emit_block(c, switch_block);
+	AlignSize align;
+	LLVMTypeRef type = LLVMArrayType(c->ptr_type, count);
+	LLVMValueRef index = llvm_emit_array_gep_raw_index(c, jump_table, type, switch_value, llvm_abi_alignment(c, type), &align);
+	LLVMValueRef addr = llvm_load(c, c->ptr_type, index, align, "target");
+	LLVMValueRef instr = LLVMBuildIndirectBr(c->builder, addr, case_count);
+	c->current_block = NULL;
+	return instr;
+}
+
 static void llvm_emit_switch_jump_table(GenContext *c,
+										Ast *switch_ast,
 										Ast **cases,
 										Ast *default_case,
 										BEValue *switch_value,
 										LLVMBasicBlockRef exit_block)
 {
-#ifdef jump_table_done
-	c->current_block = NULL;
 	unsigned case_count = vec_size(cases);
+	if (!case_count) return;
 	Int min = { .type = TYPE_VOID };
 	Int max = { .type = TYPE_VOID };
+	int min_index = -1;
+	int default_index = -1;
+	LLVMBasicBlockRef default_block = exit_block;
 	for (unsigned i = 0; i < case_count; i++)
 	{
 		Ast *case_ast = cases[i];
-		Expr *from = case_ast->case_stmt.expr;
-		Expr *to = case_ast->case_stmt.to_expr;
+		if (case_ast->ast_kind == AST_DEFAULT_STMT)
+		{
+			default_block = case_ast->case_stmt.backend_block;
+			default_index = i;
+			continue;
+		}
+		Expr *from = exprptr(case_ast->case_stmt.expr);
+		Expr *to = exprptrzero(case_ast->case_stmt.to_expr);
 		assert(type_is_integer(from->type) && expr_is_const(from));
 		Int value = from->const_expr.ixx;
 		Int to_value = to ? to->const_expr.ixx : value;
@@ -707,55 +791,81 @@ static void llvm_emit_switch_jump_table(GenContext *c,
 		{
 			min = value;
 			max = to_value;
+			min_index = i;
 		}
 		else if (int_comp(value, min, BINARYOP_LT))
 		{
 			min = value;
+			min_index = i;
 		}
 		else if (int_comp(to_value, max, BINARYOP_GT))
 		{
 			max = to_value;
 		}
 	}
-	switch_value->value = LLVMBuildSub(c->builder, switch_value->value, llvm_const_int(c, switch_value->type, min.i.low), "");
+	switch_ast->switch_stmt.codegen.jump.default_index = default_index;
+	switch_ast->switch_stmt.codegen.jump.min_index = min_index;
 	max = int_sub(max, min);
-	Type *create_array = type_get_array(type_voidptr, max.i.low);
-	LLVMTypeRef llvm_array_type = llvm_get_type(c, create_array);
+	assert(max.i.low <= 0xFFFF);
+	uint64_t count = switch_ast->switch_stmt.codegen.jump.count = max.i.low + 1;
+	assert(!max.i.high && "Should never exceed 64 bytes");
+
+	Type *goto_array_type = type_get_array(type_voidptr, count);
+	LLVMTypeRef llvm_array_type = llvm_get_type(c, goto_array_type);
 	AlignSize alignment = type_alloca_alignment(switch_value->type);
-	LLVMValueRef array_ref = llvm_emit_alloca(c, llvm_array_type, alignment, "");
+
+	LLVMValueRef jmptable = llvm_add_global_raw(c, "jumptable", llvm_array_type, alignment);
+	switch_ast->switch_stmt.codegen.jump.jmptable = jmptable;
+
+	llvm_set_private_linkage(jmptable);
+	LLVMSetGlobalConstant(jmptable, 1);
 	BEValue array_value;
-	llvm_value_set_address(&array_value, array_ref, create_array);
-	for (int i = 0; i < max.i.low; i++)
-	{
-		AlignSize align;
-		LLVMValueRef ptr = llvm_emit_array_gep_raw(c, array_ref, llvm_array_type, i, alignment, &align);
 
-	}
+	LLVMValueRef instr = llvm_emit_switch_jump_stmt(c, switch_ast, cases, count, min_index, jmptable, default_block, switch_value);
+
+	static LLVMValueRef refs[DEFAULT_SWITCHRANGE_MAX_SIZE];
+	LLVMValueRef default_block_address = LLVMBlockAddress(c->cur_func.ref, default_block);
+	assert(count < DEFAULT_SWITCHRANGE_MAX_SIZE);
+	memset(refs, 0, sizeof(LLVMValueRef) * count);
 	for (unsigned i = 0; i < case_count; i++)
 	{
 		Ast *case_stmt = cases[i];
 		LLVMBasicBlockRef block = case_stmt->case_stmt.backend_block;
-		if (case_stmt != default_case)
+		if (case_stmt->ast_kind != AST_DEFAULT_STMT)
 		{
-			LLVMValueRef case_value;
-			BEValue be_value;
-			llvm_emit_expr(c, &be_value, case_stmt->case_stmt.expr);
-			llvm_value_rvalue(c, &be_value);
-			case_value = be_value.value;
+			Expr *from = exprptr(case_stmt->case_stmt.expr);
+			Expr *to = exprptrzero(case_stmt->case_stmt.to_expr);
+			assert(type_is_integer(from->type) && expr_is_const(from));
+			Int value = int_sub(from->const_expr.ixx, min);
+			Int to_value = to ? int_sub(to->const_expr.ixx, min) : value;
+			uint64_t from_val = value.i.low;
+			uint64_t to_val = to_value.i.low;
+			for (uint64_t j = from_val; j <= to_val; j++)
+			{
+				refs[j] = LLVMBlockAddress(c->cur_func.ref, block);
+			}
+			// No fallthrough
+			if (!case_stmt->case_stmt.body) continue;
+			LLVMAddDestination(instr, block);
 		}
 
-		// Skip fallthroughs.
-		if (!case_stmt->case_stmt.body) continue;
-
 		llvm_emit_block(c, block);
-		// IMPORTANT!
-		c->current_block_is_target = true;
-
 		llvm_emit_stmt(c, case_stmt->case_stmt.body);
 		llvm_emit_br(c, exit_block);
 	}
+
+	bool found = false;
+	for (uint64_t i = 0; i < count; i++)
+	{
+		if (refs[i]) continue;
+		refs[i] = default_block_address;
+		if (found) continue;
+		found = true;
+		LLVMAddDestination(instr, default_block);
+	}
+
+	LLVMSetInitializer(jmptable, LLVMConstArray(c->ptr_type, refs, count));
 	llvm_emit_block(c, exit_block);
- #endif
 }
 
 static void llvm_emit_switch_body(GenContext *c, BEValue *switch_value, Ast *switch_ast, bool is_typeid)
@@ -790,7 +900,7 @@ static void llvm_emit_switch_body(GenContext *c, BEValue *switch_value, Ast *swi
 
 	LLVMBasicBlockRef exit_block = llvm_basic_block_new(c, "switch.exit");
 	LLVMBasicBlockRef switch_block = llvm_basic_block_new(c, "switch.entry");
-	switch_ast->switch_stmt.codegen.retry_block = switch_block;
+	switch_ast->switch_stmt.codegen.retry.block = switch_block;
 	switch_ast->switch_stmt.codegen.exit_block = exit_block;
 
 	// We will now treat the fallthrough cases:
@@ -815,7 +925,7 @@ static void llvm_emit_switch_body(GenContext *c, BEValue *switch_value, Ast *swi
 
 	BEValue switch_var;
 	llvm_value_set_address_abi_aligned(&switch_var, llvm_emit_alloca_aligned(c, switch_type, "switch"), switch_type);
-	switch_ast->switch_stmt.codegen.retry_var = &switch_var;
+	switch_ast->switch_stmt.codegen.retry.var = &switch_var;
 	llvm_store(c, &switch_var, switch_value);
 
 	llvm_emit_br(c, switch_block);
@@ -829,10 +939,16 @@ static void llvm_emit_switch_body(GenContext *c, BEValue *switch_value, Ast *swi
 		llvm_emit_switch_body_if_chain(c, cases, default_case, &switch_current_val, exit_block, is_typeid);
 		return;
 	}
+
+	if (switch_ast->switch_stmt.flow.jump)
+	{
+		llvm_emit_switch_jump_table(c, switch_ast, cases, default_case, &switch_current_val, exit_block);
+		return;
+	}
 	assert(!is_typeid);
 
-	c->current_block = NULL;
 	LLVMValueRef switch_stmt = LLVMBuildSwitch(c->builder, switch_current_val.value, default_case ? default_case->case_stmt.backend_block : exit_block, case_count);
+	c->current_block = NULL;
 	for (unsigned i = 0; i < case_count; i++)
 	{
 		Ast *case_stmt = cases[i];
@@ -868,8 +984,6 @@ static void llvm_emit_switch_body(GenContext *c, BEValue *switch_value, Ast *swi
 		if (!case_stmt->case_stmt.body) continue;
 
 		llvm_emit_block(c, block);
-		// IMPORTANT!
-		c->current_block_is_target = true;
 
 		llvm_emit_stmt(c, case_stmt->case_stmt.body);
 		llvm_emit_br(c, exit_block);
@@ -886,7 +1000,7 @@ void llvm_emit_switch(GenContext *c, Ast *ast)
 	if (expr)
 	{
 		// Regular switch
-		llvm_emit_decl_expr_list(c, &switch_value, expr, false);
+		llvm_emit_cond(c, &switch_value, expr, false);
 	}
 	else
 	{
@@ -954,9 +1068,31 @@ void gencontext_emit_next_stmt(GenContext *context, Ast *ast)
 	}
 	BEValue be_value;
 	llvm_emit_expr(context, &be_value, ast->nextcase_stmt.switch_expr);
-	llvm_store(context, jump_target->switch_stmt.codegen.retry_var, &be_value);
+	if (jump_target->switch_stmt.flow.jump)
+	{
+		llvm_emit_statement_chain(context, ast->nextcase_stmt.defer_id);
+		Ast **cases = jump_target->switch_stmt.cases;
+		int default_index = jump_target->switch_stmt.codegen.jump.default_index;
+		LLVMBasicBlockRef exit_block = jump_target->switch_stmt.codegen.exit_block;
+		LLVMValueRef instr = llvm_emit_switch_jump_stmt(context, jump_target, cases,
+		                                                jump_target->switch_stmt.codegen.jump.count,
+		                                                jump_target->switch_stmt.codegen.jump.min_index,
+		                                                jump_target->switch_stmt.codegen.jump.jmptable,
+		                                                default_index < 0
+														? exit_block
+		                                                : cases[default_index]->case_stmt.backend_block,
+		                                                &be_value);
+		FOREACH_BEGIN(Ast *case_ast, cases)
+			if (!case_ast->case_stmt.body) continue;
+			LLVMAddDestination(instr, case_ast->case_stmt.backend_block);
+		FOREACH_END();
+		if (default_index < 0) LLVMAddDestination(instr, exit_block);
+
+		return;
+	}
+	llvm_store(context, jump_target->switch_stmt.codegen.retry.var, &be_value);
 	llvm_emit_statement_chain(context, ast->nextcase_stmt.defer_id);
-	llvm_emit_jmp(context, jump_target->switch_stmt.codegen.retry_block);
+	llvm_emit_jmp(context, jump_target->switch_stmt.codegen.retry.block);
 }
 
 
@@ -998,7 +1134,7 @@ static inline void llvm_emit_assume(GenContext *c, Expr *expr)
 		llvm_value_rvalue(c, &value);
 		assert(value.kind == BE_BOOLEAN);
 		EMIT_LOC(c, expr);
-		llvm_emit_assume_raw(c, value.value);
+		llvm_emit_assume_true(c, &value);
 	}
 }
 
@@ -1274,11 +1410,6 @@ LLVMValueRef llvm_emit_empty_string_const(GenContext *c)
 	return LLVMConstNull(c->chars_type);
 }
 
-LLVMValueRef llvm_emit_zstring(GenContext *c, const char *str)
-{
-	return llvm_emit_zstring_named(c, str, ".zstr");
-}
-
 LLVMValueRef llvm_emit_zstring_named(GenContext *c, const char *str, const char *extname)
 {
 	VECEACH(c->reusable_constants, i)
@@ -1306,7 +1437,6 @@ void llvm_emit_unreachable(GenContext *c)
 {
 	LLVMBuildUnreachable(c->builder);
 	c->current_block = NULL;
-	c->current_block_is_target = false;
 }
 
 void llvm_emit_panic(GenContext *c, const char *message, SourceSpan loc, const char *fmt, BEValue *varargs)
@@ -1348,8 +1478,8 @@ void llvm_emit_panic(GenContext *c, const char *message, SourceSpan loc, const c
 	if (panicf)
 	{
 		unsigned elements = vec_size(varargs);
-		Type *any_subarray = type_get_subarray(type_anyptr);
-		Type *any_array = type_get_array(type_anyptr, elements);
+		Type *any_slice = type_get_slice(type_any);
+		Type *any_array = type_get_array(type_any, elements);
 		LLVMTypeRef llvm_array_type = llvm_get_type(c, any_array);
 		AlignSize alignment = type_alloca_alignment(any_array);
 		LLVMValueRef array_ref = llvm_emit_alloca(c, llvm_array_type, alignment, varargslots_name);
@@ -1365,10 +1495,10 @@ void llvm_emit_panic(GenContext *c, const char *message, SourceSpan loc, const c
 			llvm_store_to_ptr_aligned(c, slot, &varargs[i], store_alignment);
 		}
 		BEValue value;
-		llvm_value_aggregate_two(c, &value, any_subarray, array_ref, llvm_const_int(c, type_usz, elements));
+		llvm_value_aggregate_two(c, &value, any_slice, array_ref, llvm_const_int(c, type_usz, elements));
 		LLVMSetValueName2(value.value, temp_name, 6);
 
-		llvm_emit_parameter(c, actual_args, &count, abi_args[4], &value, any_subarray);
+		llvm_emit_parameter(c, actual_args, &count, abi_args[4], &value, any_slice);
 
 		BEValue res;
 		if (c->debug.builder) llvm_emit_debug_location(c, loc);
@@ -1399,8 +1529,7 @@ void llvm_emit_panic_if_true(GenContext *c, BEValue *value, const char *panic_na
 	}
 	LLVMBasicBlockRef panic_block = llvm_basic_block_new(c, "panic");
 	LLVMBasicBlockRef ok_block = llvm_basic_block_new(c, "checkok");
-	assert(llvm_value_is_bool(value));
-	value->value = llvm_emit_expect_false_raw(c, value->value);
+	value->value = llvm_emit_expect_false(c, value);
 	llvm_emit_cond_br(c, value, panic_block, ok_block);
 
 	llvm_emit_block(c, panic_block);
diff --git a/src/compiler/llvm_codegen_storeload.c b/src/compiler/llvm_codegen_storeload.c
index 117849434..f2be4186c 100644
--- a/src/compiler/llvm_codegen_storeload.c
+++ b/src/compiler/llvm_codegen_storeload.c
@@ -105,7 +105,7 @@ LLVMValueRef llvm_store_zero(GenContext *c, BEValue *ref)
 {
 	llvm_value_addr(c, ref);
 	Type *type = ref->type;
-	if (!type_is_abi_aggregate(type))
+	if (!type_is_abi_aggregate(type) || type_is_builtin(type->type_kind))
 	{
 		return llvm_store_raw(c, ref, llvm_get_zero(c, type));
 	}
diff --git a/src/compiler/llvm_codegen_type.c b/src/compiler/llvm_codegen_type.c
index 87f012c3f..a24796f39 100644
--- a/src/compiler/llvm_codegen_type.c
+++ b/src/compiler/llvm_codegen_type.c
@@ -315,9 +315,6 @@ LLVMTypeRef llvm_get_type(GenContext *c, Type *any_type)
 		case LOWERED_TYPES:
 			// If this is reachable, then we're not doing the proper lowering.
 			UNREACHABLE
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
-			UNREACHABLE
 		case TYPE_STRUCT:
 		case TYPE_UNION:
 			return any_type->backend_type = llvm_type_from_decl(c, any_type->decl);
@@ -346,14 +343,14 @@ LLVMTypeRef llvm_get_type(GenContext *c, Type *any_type)
 		case TYPE_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
 			return any_type->backend_type = llvm_type_from_array(c, any_type);
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		{
 			LLVMTypeRef array_type = LLVMStructCreateNamed(c->context, any_type->name);
 			LLVMTypeRef types[2] = { c->ptr_type, c->size_type };
 			LLVMStructSetBody(array_type, types, 2, false);
 			return any_type->backend_type = array_type;
 		}
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 		{
 			LLVMTypeRef virtual_type = LLVMStructCreateNamed(c->context, any_type->name);
 			LLVMTypeRef types[2] = { c->ptr_type, c->typeid_type };
@@ -640,11 +637,11 @@ LLVMValueRef llvm_get_typeid(GenContext *c, Type *type)
 			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_VECTOR, type->array.base, type->array.len, NULL, false);
 		case TYPE_ARRAY:
 			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_ARRAY, type->array.base, type->array.len, NULL, false);
-		case TYPE_SUBARRAY:
-			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_SUBARRAY, type->array.base, 0, NULL, false);
-		case TYPE_ANYPTR:
+		case TYPE_SLICE:
+			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_SLICE, type->array.base, 0, NULL, false);
+		case TYPE_ANY:
 			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_ANY, NULL, 0, NULL, false);
-		case TYPE_INFPTR:
+		case TYPE_INTERFACE:
 			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_INTERFACE, NULL, 0, NULL, false);
 		case TYPE_POINTER:
 			return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_POINTER, type->pointer, 0, NULL, false);
@@ -667,13 +664,11 @@ LLVMValueRef llvm_get_typeid(GenContext *c, Type *type)
 		case TYPE_BITSTRUCT:
 		{
 			LLVMValueRef ref = llvm_generate_temp_introspection_global(c, type);
-			return llvm_generate_introspection_global(c, ref, type, INTROSPECT_TYPE_BITSTRUCT, NULL, 0, NULL, false);
+			return llvm_generate_introspection_global(c, ref, type, INTROSPECT_TYPE_BITSTRUCT, type->decl->bitstruct.base_type->type, 0, NULL, false);
 		}
 		case TYPE_TYPEDEF:
 			return llvm_get_typeid(c, type->canonical);
 		case CT_TYPES:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			UNREACHABLE
 		case TYPE_VOID:
 			return llvm_get_introspection_for_builtin_type(c, type, INTROSPECT_TYPE_VOID, 0);
diff --git a/src/compiler/llvm_codegen_value.c b/src/compiler/llvm_codegen_value.c
index 56fb296a0..2869e68c0 100644
--- a/src/compiler/llvm_codegen_value.c
+++ b/src/compiler/llvm_codegen_value.c
@@ -111,7 +111,7 @@ void llvm_value_rvalue(GenContext *c, BEValue *value)
 
 void llvm_emit_jump_to_optional_exit(GenContext *c, LLVMValueRef opt_value)
 {
-	assert(c->catch_block && "unexpected emit");
+	assert(c->catch.block && "unexpected emit");
 	bool is_constant_opt = llvm_is_const(opt_value);
 
 	// Maybe we don't need to emit anything?
@@ -119,16 +119,16 @@ void llvm_emit_jump_to_optional_exit(GenContext *c, LLVMValueRef opt_value)
 
 	LLVMBasicBlockRef after_block = llvm_basic_block_new(c, "after_check");
 	// No error variable
-	if (!c->opt_var)
+	if (!c->catch.fault)
 	{
 		// No error var and a constant error means jumping to the "catch" block
 		if (is_constant_opt)
 		{
-			llvm_emit_br(c, c->catch_block);
+			llvm_emit_br(c, c->catch.block);
 		}
 		else
 		{
-			llvm_emit_cond_br_raw(c, llvm_emit_is_no_opt(c, opt_value), after_block, c->catch_block);
+			llvm_emit_cond_br_raw(c, llvm_emit_is_no_opt(c, opt_value), after_block, c->catch.block);
 		}
 		llvm_emit_block(c, after_block);
 		return;
@@ -143,8 +143,8 @@ void llvm_emit_jump_to_optional_exit(GenContext *c, LLVMValueRef opt_value)
 		llvm_emit_block(c, error_block);
 	}
 
-	llvm_store_to_ptr_raw(c, c->opt_var, opt_value, type_anyfault);
-	llvm_emit_br(c, c->catch_block);
+	llvm_store_to_ptr_raw(c, c->catch.fault, opt_value, type_anyfault);
+	llvm_emit_br(c, c->catch.block);
 	llvm_emit_block(c, after_block);
 }
 
diff --git a/src/compiler/module.c b/src/compiler/module.c
index 589ab4d1d..ddc3a1ba6 100644
--- a/src/compiler/module.c
+++ b/src/compiler/module.c
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the GNU LGPLv3.0 license
 // a copy of which can be found in the LICENSE file.
 
-#include "compiler_internal.h"
+#include "sema_internal.h"
 
 Decl *module_find_symbol(Module *module, const char *symbol)
 {
@@ -44,7 +44,7 @@ Path *path_create_from_string(const char *string, uint32_t len, SourceSpan span)
 	path->len = len;
 	if (type != TOKEN_IDENT)
 	{
-		SEMA_ERROR(path, "A module name was expected here.");
+		PRINT_ERROR_AT(path, "A module name was expected here.");
 		return NULL;
 	}
 	return path;
diff --git a/src/compiler/number.c b/src/compiler/number.c
index 44f301bbb..283dd7b3d 100644
--- a/src/compiler/number.c
+++ b/src/compiler/number.c
@@ -7,7 +7,7 @@
 #define FLOAT32_LIMIT 340282346638528859811704183484516925440.0000000000000000
 #define FLOAT64_LIMIT 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0000000000000000
 #define FLOAT16_LIMIT 65504
-
+#define BFLOAT_LIMIT  338953138925153547590470800371487866880.0000000000000000
 
 static inline bool compare_bool(bool left, bool right, BinaryOp op)
 {
@@ -155,6 +155,9 @@ bool expr_const_float_fits_type(const ExprConst *expr_const, TypeKind kind)
 	Real lo_limit;
 	switch (kind)
 	{
+		case TYPE_BF16:
+			lo_limit = hi_limit = BFLOAT_LIMIT;
+			break;
 		case TYPE_F16:
 			lo_limit = hi_limit = FLOAT16_LIMIT;
 			break;
diff --git a/src/compiler/parse_expr.c b/src/compiler/parse_expr.c
index f53972a57..1b29b0cc6 100644
--- a/src/compiler/parse_expr.c
+++ b/src/compiler/parse_expr.c
@@ -65,7 +65,7 @@ bool parse_range(ParseContext *c, Range *range)
 	// Otherwise we have [1..] or [3:]
 	if (range->is_len)
 	{
-		sema_error_at(extend_span_with_token(start, c->prev_span), "Length-ranges using ':' may not elide the length.");
+		print_error_at(extend_span_with_token(start, c->prev_span), "Length-ranges using ':' may not elide the length.");
 		return false;
 	}
 
@@ -108,7 +108,7 @@ inline Expr *parse_precedence_with_left_side(ParseContext *c, Expr *left_side, P
 		// Otherwise we ran into a symbol that can't appear in this position.
 		if (!infix_rule)
 		{
-			SEMA_ERROR_HERE("'%s' can't appear in this position, did you forget something before the operator?", token_type_to_string(tok));
+			PRINT_ERROR_HERE("'%s' can't appear in this position, did you forget something before the operator?", token_type_to_string(tok));
 			return poisoned_expr;
 		}
 		// The rule exists, so run it.
@@ -128,7 +128,7 @@ static Expr *parse_precedence(ParseContext *c, Precedence precedence)
 	// or it is a token that can't be in a prefix position.
 	if (!prefix_rule)
 	{
-		SEMA_ERROR_HERE("An expression was expected.");
+		PRINT_ERROR_HERE("An expression was expected.");
 		return poisoned_expr;
 	}
 	// Get the expression
@@ -139,17 +139,18 @@ static Expr *parse_precedence(ParseContext *c, Precedence precedence)
 	return parse_precedence_with_left_side(c, left_side, precedence);
 }
 
+
 /*
- * Parse anything with higher precedence than &&, that means <= >= etc are ok.
+ * Parse anything with higher precedence than && etc.
  */
-static inline Expr *parse_relational_expr(ParseContext *c)
+static inline Expr *parse_try_chain_expr(ParseContext *c)
 {
 	return parse_precedence(c, PREC_RELATIONAL);
 }
 
 /**
  * catch_unwrap ::= CATCH (IDENT | type? IDENT '=' catch_chain) | catch_chain
- * catch_chain ::= try_rhs_expr (',' try_rhs_expr)*
+ * catch_chain ::= parse_try_catch_rhs_expr (',' parse_try_catch_rhs_expr)*
  */
 static inline Expr *parse_catch_unwrap(ParseContext *c)
 {
@@ -158,7 +159,7 @@ static inline Expr *parse_catch_unwrap(ParseContext *c)
 	Expr **exprs = NULL;
 
 	// First, try parsing as single expression
-	ASSIGN_EXPR_OR_RET(Expr *sub_expr, parse_relational_expr(c), poisoned_expr);
+	ASSIGN_EXPR_OR_RET(Expr *sub_expr, parse_try_chain_expr(c), poisoned_expr);
 
 	// Check if we have a chain.
 	if (try_consume(c, TOKEN_COMMA))
@@ -167,7 +168,7 @@ static inline Expr *parse_catch_unwrap(ParseContext *c)
 		vec_add(exprs, sub_expr);
 		do
 		{
-			ASSIGN_EXPR_OR_RET(sub_expr, parse_relational_expr(c), poisoned_expr);
+			ASSIGN_EXPR_OR_RET(sub_expr, parse_try_chain_expr(c), poisoned_expr);
 			vec_add(exprs, sub_expr);
 		} while (try_consume(c, TOKEN_COMMA));
 		// We're done.
@@ -181,7 +182,7 @@ static inline Expr *parse_catch_unwrap(ParseContext *c)
 		// Assign the type
 		expr->catch_unwrap_expr.type = sub_expr->type_expr;
 		// Assign the variable
-		ASSIGN_EXPR_OR_RET(expr->catch_unwrap_expr.variable, parse_relational_expr(c), poisoned_expr);
+		ASSIGN_EXPR_OR_RET(expr->catch_unwrap_expr.variable, parse_try_chain_expr(c), poisoned_expr);
 	}
 	else
 	{
@@ -195,7 +196,7 @@ static inline Expr *parse_catch_unwrap(ParseContext *c)
 		// If we had "anyfault f", then we MUST have '='
 		if (expr->catch_unwrap_expr.type)
 		{
-			SEMA_ERROR_HERE("Expected a '=' here.");
+			PRINT_ERROR_HERE("Expected a '=' here.");
 			return poisoned_expr;
 		}
 		// We just have `catch foo`, so we add the "variable" as an expression
@@ -207,7 +208,7 @@ static inline Expr *parse_catch_unwrap(ParseContext *c)
 	// After '=' we have a chain of expressions.
 	do
 	{
-		ASSIGN_EXPR_OR_RET(sub_expr, parse_relational_expr(c), poisoned_expr);
+		ASSIGN_EXPR_OR_RET(sub_expr, parse_try_chain_expr(c), poisoned_expr);
 		vec_add(exprs, sub_expr);
 	} while (try_consume(c, TOKEN_COMMA));
 	expr->catch_unwrap_expr.exprs = exprs;
@@ -222,11 +223,11 @@ static inline Expr *parse_try_unwrap(ParseContext *c)
 {
 	Expr *expr = EXPR_NEW_TOKEN(EXPR_TRY_UNWRAP);
 	advance_and_verify(c, TOKEN_TRY);
-	ASSIGN_EXPR_OR_RET(Expr *lhs, parse_relational_expr(c), poisoned_expr);
+	ASSIGN_EXPR_OR_RET(Expr *lhs, parse_try_chain_expr(c), poisoned_expr);
 	if (lhs->expr_kind == EXPR_TYPEINFO)
 	{
 		expr->try_unwrap_expr.type = lhs->type_expr;
-		ASSIGN_EXPR_OR_RET(expr->try_unwrap_expr.variable, parse_relational_expr(c), poisoned_expr);
+		ASSIGN_EXPR_OR_RET(expr->try_unwrap_expr.variable, parse_try_chain_expr(c), poisoned_expr);
 	}
 	else
 	{
@@ -234,19 +235,18 @@ static inline Expr *parse_try_unwrap(ParseContext *c)
 	}
 	if (lhs->expr_kind == EXPR_TYPEINFO && expr->try_unwrap_expr.variable->expr_kind != EXPR_IDENTIFIER)
 	{
-		SEMA_ERROR(expr->try_unwrap_expr.variable, "A new variable was expected.");
-		return poisoned_expr;
+		RETURN_PRINT_ERROR_AT(poisoned_expr, expr->try_unwrap_expr.variable, "A new variable was expected.");
 	}
 	if (try_consume(c, TOKEN_EQ))
 	{
-		ASSIGN_EXPR_OR_RET(expr->try_unwrap_expr.init, parse_relational_expr(c), poisoned_expr);
+		ASSIGN_EXPR_OR_RET(expr->try_unwrap_expr.init, parse_try_chain_expr(c), poisoned_expr);
 	}
 	RANGE_EXTEND_PREV(expr);
 	return expr;
 }
 
 /**
- * try_unwrap_chain ::= try_unwrap ('&&' (try_unwrap | try_rhs_expr))*
+ * try_unwrap_chain ::= try_unwrap ('&&' (try_unwrap | try_chain_expr))*
  */
 static inline Expr *parse_try_unwrap_chain(ParseContext *c)
 {
@@ -261,7 +261,7 @@ static inline Expr *parse_try_unwrap_chain(ParseContext *c)
 			vec_add(unwraps, expr);
 			continue;
 		}
-		ASSIGN_EXPR_OR_RET(Expr * next_unwrap, parse_relational_expr(c), poisoned_expr);
+		ASSIGN_EXPR_OR_RET(Expr * next_unwrap, parse_try_chain_expr(c), poisoned_expr);
 		vec_add(unwraps, next_unwrap);
 	}
 	Expr *try_unwrap_chain = expr_new_expr(EXPR_TRY_UNWRAP_CHAIN, first_unwrap);
@@ -287,8 +287,7 @@ Expr *parse_cond(ParseContext *c)
 			vec_add(decl_expr->cond_expr, try_unwrap);
 			if (tok_is(c, TOKEN_COMMA))
 			{
-				SEMA_ERROR(try_unwrap, "The 'try' must be placed last, can you change it?");
-				return poisoned_expr;
+				RETURN_PRINT_ERROR_AT(poisoned_expr, try_unwrap, "The 'try' must be placed last, can you change it?");
 			}
 			break;
 		}
@@ -298,8 +297,7 @@ Expr *parse_cond(ParseContext *c)
 			vec_add(decl_expr->cond_expr, catch_unwrap);
 			if (tok_is(c, TOKEN_COMMA))
 			{
-				SEMA_ERROR(catch_unwrap, "The 'catch' must be placed last, can you change it?");
-				return poisoned_expr;
+				RETURN_PRINT_ERROR_AT(poisoned_expr, catch_unwrap, "The 'catch' must be placed last, can you change it?");
 			}
 			break;
 		}
@@ -414,7 +412,7 @@ static Expr *parse_lambda(ParseContext *c, Expr *left)
 	}
 	else
 	{
-		SEMA_ERROR_HERE("Expected the beginning of a block or a short statement.");
+		PRINT_ERROR_HERE("Expected the beginning of a block or a short statement.");
 	}
 	expr->lambda_expr = func;
 	return expr;
@@ -485,7 +483,7 @@ bool parse_arg_list(ParseContext *c, Expr ***result, TokenType param_end, bool *
 		if (tok_is(c, param_end)) return true;
 		if (splat && *splat)
 		{
-			SEMA_ERROR_HERE("'...' is only allowed on the last argument in a call.");
+			PRINT_ERROR_HERE("'...' is only allowed on the last argument in a call.");
 			return false;
 		}
 	}
@@ -505,7 +503,7 @@ Expr *parse_expression_list(ParseContext *c, bool allow_decl)
 		{
 			if (!allow_decl)
 			{
-				SEMA_ERROR_HERE("This looks like a declaration, which isn't allowed here.");
+				PRINT_ERROR_HERE("This looks like a declaration, which isn't allowed here.");
 				return poisoned_expr;
 			}
 			expr = expr_new(EXPR_DECL, decl->span);
@@ -528,7 +526,7 @@ Expr *parse_ct_expression_list(ParseContext *c, bool allow_decl)
 			ASSIGN_DECL_OR_RET(Decl *decl, parse_var_decl(c), poisoned_expr);
 			if (!allow_decl)
 			{
-				SEMA_ERROR_HERE("This looks like a declaration, which isn't allowed here.");
+				PRINT_ERROR_HERE("This looks like a declaration, which isn't allowed here.");
 				return poisoned_expr;
 			}
 			expr = expr_new(EXPR_DECL, decl->span);
@@ -570,7 +568,7 @@ static Expr *parse_type_expr(ParseContext *c, Expr *left)
 	expr->type_expr = type;
 	if (tok_is(c, TOKEN_SCOPE))
 	{
-		SEMA_ERROR_HERE("A type is never followed by '::', did you mean '.'?");
+		PRINT_ERROR_HERE("A type is never followed by '::', did you mean '.'?");
 		return poisoned_expr;
 	}
 	return expr;
@@ -709,7 +707,7 @@ static Expr *parse_grouping_expr(ParseContext *c, Expr *left)
 		TypeInfo *info = expr->inner_expr->type_expr;
 		if (tok_is(c, TOKEN_LBRACE) && info->resolve_status != RESOLVE_DONE)
 		{
-			SEMA_ERROR_HERE("Unexpected start of a block '{' here. If you intended a compound literal, remove the () around the type.");
+			PRINT_ERROR_HERE("Unexpected start of a block '{' here. If you intended a compound literal, remove the () around the type.");
 			return poisoned_expr;
 		}
 		// Create a cast expr
@@ -756,16 +754,14 @@ Expr *parse_initializer_list(ParseContext *c, Expr *left)
 			{
 				if (designated == 0)
 				{
-					SEMA_ERROR(expr, "Designated initialization with '[] = ...' and '.param = ...' cannot be mixed with normal initialization.");
-					return poisoned_expr;
+					RETURN_PRINT_ERROR_AT(poisoned_expr, expr, "Designated initialization with '[] = ...' and '.param = ...' cannot be mixed with normal initialization.");
 				}
 				designated = 1;
 				continue;
 			}
 			if (designated == 1)
 			{
-				SEMA_ERROR(expr, "Normal initialization cannot be mixed with designated initialization.");
-				return poisoned_expr;
+				RETURN_PRINT_ERROR_AT(poisoned_expr, expr, "Normal initialization cannot be mixed with designated initialization.");
 			}
 			designated = 0;
 		}
@@ -851,14 +847,14 @@ static Expr *parse_call_expr(ParseContext *c, Expr *left)
 	{
 		if (!parse_next_may_be_type_or_ident(c))
 		{
-			SEMA_ERROR_LAST("Expected an ending ')'. Did you forget a ')' before this ';'?");
+			PRINT_ERROR_LAST("Expected an ending ')'. Did you forget a ')' before this ';'?");
 			return poisoned_expr;
 		}
 		if (!parse_parameters(c, &body_args, NULL, NULL, NULL, PARAM_PARSE_CALL)) return poisoned_expr;
 	}
 	if (!tok_is(c, TOKEN_RPAREN))
 	{
-		SEMA_ERROR_LAST("Expected the ending ')' here.");
+		PRINT_ERROR_LAST("Expected the ending ')' here.");
 		return poisoned_expr;
 	}
 	advance(c);
@@ -870,7 +866,7 @@ static Expr *parse_call_expr(ParseContext *c, Expr *left)
 	RANGE_EXTEND_PREV(call);
 	if (body_args && !tok_is(c, TOKEN_LBRACE))
 	{
-		SEMA_ERROR_HERE("Expected a macro body here.");
+		PRINT_ERROR_HERE("Expected a macro body here.");
 		return poisoned_expr;
 	}
 	Attr *attr;
@@ -887,8 +883,7 @@ static Expr *parse_call_expr(ParseContext *c, Expr *left)
 			case ATTRIBUTE_PURE:
 				if (call->call_expr.attr_pure)
 				{
-					SEMA_ERROR(attr, "Repeat of the same attribute is not allowed.");
-					return poisoned_expr;
+					RETURN_PRINT_ERROR_AT(poisoned_expr, attr, "Repeat of the same attribute is not allowed.");
 				}
 				call->call_expr.attr_pure = true;
 				continue;
@@ -896,19 +891,16 @@ static Expr *parse_call_expr(ParseContext *c, Expr *left)
 			case ATTRIBUTE_NOINLINE:
 				if (force_inline == new_inline)
 				{
-					SEMA_ERROR(attr, "Repeat of the same attribute is not allowed.");
-					return poisoned_expr;
+					RETURN_PRINT_ERROR_AT(poisoned_expr, attr, "Repeat of the same attribute is not allowed.");
 				}
 				if (force_inline != -1)
 				{
-					SEMA_ERROR(attr, "@inline and @noinline cannot be combined");
-					return poisoned_expr;
+					RETURN_PRINT_ERROR_AT(poisoned_expr, attr, "@inline and @noinline cannot be combined");
 				}
 				force_inline = new_inline;
 				continue;
 			default:
-				SEMA_ERROR(attr, "Only '@pure', '@inline' and '@noinline' are valid attributes for calls.");
-				return poisoned_expr;
+				RETURN_PRINT_ERROR_AT(poisoned_expr, attr, "Only '@pure', '@inline' and '@noinline' are valid attributes for calls.");
 		}
 	}
 	if (force_inline != -1)
@@ -994,7 +986,7 @@ static Expr *parse_ct_ident(ParseContext *c, Expr *left)
 	assert(!left && "Unexpected left hand side");
 	if (try_consume(c, TOKEN_CT_CONST_IDENT))
 	{
-		SEMA_ERROR_LAST("Compile time identifiers may not be constants.");
+		PRINT_ERROR_LAST("Compile time identifiers may not be constants.");
 		return poisoned_expr;
 	}
 	Expr *expr = EXPR_NEW_TOKEN(EXPR_CT_IDENT);
@@ -1229,7 +1221,7 @@ static Expr *parse_identifier_starting_expression(ParseContext *c, Expr *left)
 		case TOKEN_TYPE_IDENT:
 			return parse_type_expression_with_path(c, path);
 		default:
-			SEMA_ERROR_HERE("Expected a type, function or constant.");
+			PRINT_ERROR_HERE("Expected a type, function or constant.");
 			return poisoned_expr;
 	}
 }
@@ -1260,7 +1252,7 @@ static Expr *parse_builtin(ParseContext *c, Expr *left)
 	Expr *expr = EXPR_NEW_TOKEN(EXPR_BUILTIN);
 	if (!token_is_some_ident(peek(c)))
 	{
-		SEMA_ERROR_HERE("Unexpected '$$', did you mean to write a builtin?");
+		PRINT_ERROR_HERE("Unexpected '$$', did you mean to write a builtin?");
 		return poisoned_expr;
 	}
 	advance_and_verify(c, TOKEN_BUILTIN);
@@ -1436,7 +1428,7 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 EXIT:
 	if (wrapped)
 	{
-		SEMA_ERROR_HERE("Integer size exceeded 128 bits, max 128 bits are supported.");
+		PRINT_ERROR_HERE("Integer size exceeded 128 bits, max 128 bits are supported.");
 		return poisoned_expr;
 	}
 	expr_int->const_expr.const_kind = CONST_INTEGER;
@@ -1447,7 +1439,7 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 	{
 		if (type_bits < 0 || !is_power_of_two((uint64_t)type_bits) || type_bits > 128)
 		{
-			SEMA_ERROR_HERE("Integer type suffix should be i8, i16, i32, i64 or i128.");
+			PRINT_ERROR_HERE("Integer type suffix should be i8, i16, i32, i64 or i128.");
 			return poisoned_expr;
 		}
 	}
@@ -1458,7 +1450,7 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 			type_bits = 4 * hex_characters;
 			if (type_bits > 128)
 			{
-				SEMA_ERROR_HERE("%d hex digits indicates a bit width over 128, which is not supported.", hex_characters);
+				PRINT_ERROR_HERE("%d hex digits indicates a bit width over 128, which is not supported.", hex_characters);
 				return poisoned_expr;
 			}
 		}
@@ -1467,7 +1459,7 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 			type_bits = 3 * oct_characters;
 			if (type_bits > 128)
 			{
-				SEMA_ERROR_HERE("%d octal digits indicates a bit width over 128, which is not supported.", oct_characters);
+				PRINT_ERROR_HERE("%d octal digits indicates a bit width over 128, which is not supported.", oct_characters);
 				return poisoned_expr;
 			}
 		}
@@ -1476,7 +1468,7 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 			type_bits = binary_characters;
 			if (type_bits > 128)
 			{
-				SEMA_ERROR_HERE("%d binary digits indicates a bit width over 128, which is not supported.", binary_characters);
+				PRINT_ERROR_HERE("%d binary digits indicates a bit width over 128, which is not supported.", binary_characters);
 				return poisoned_expr;
 			}
 		}
@@ -1516,13 +1508,13 @@ Expr *parse_integer(ParseContext *c, Expr *left)
 		if (binary_characters) radix = 2;
 		if (type_bits)
 		{
-			SEMA_ERROR_HERE("'%s' does not fit in a '%c%d' literal.",
-							i128_to_string(i, radix, true), is_unsigned ? 'u' : 'i', type_bits);
+			PRINT_ERROR_HERE("'%s' does not fit in a '%c%d' literal.",
+			                 i128_to_string(i, radix, true), is_unsigned ? 'u' : 'i', type_bits);
 		}
 		else
 		{
-			SEMA_ERROR_HERE("'%s' does not fit in an %s literal.",
-							i128_to_string(i, radix, true), is_unsigned ? "unsigned int" : "int");
+			PRINT_ERROR_HERE("'%s' does not fit in an %s literal.",
+			                 i128_to_string(i, radix, true), is_unsigned ? "unsigned int" : "int");
 		}
 		return poisoned_expr;
 	}
@@ -1688,7 +1680,7 @@ static Expr *parse_double(ParseContext *c, Expr *left)
 	Float f = is_hex ? float_from_hex(original, &err) : float_from_string(original, &err);
 	if (f.type == TYPE_POISONED)
 	{
-		SEMA_ERROR_HERE(err);
+		PRINT_ERROR_HERE(err);
 		return poisoned_expr;
 	}
 	number->const_expr.fxx = f;
@@ -1707,7 +1699,8 @@ static Expr *parse_double(ParseContext *c, Expr *left)
 			number->type = type_float16;
 			break;
 		case TYPE_BF16:
-			TODO
+			number->type = type_bfloat;
+			break;
 		default:
 			UNREACHABLE
 	}
@@ -1752,7 +1745,7 @@ static Expr *parse_string_literal(ParseContext *c, Expr *left)
 	}
 	if (len > UINT32_MAX)
 	{
-		SEMA_ERROR_HERE("String exceeded max size.");
+		PRINT_ERROR_HERE("String exceeded max size.");
 		return poisoned_expr;
 	}
 	assert(str);
@@ -1834,7 +1827,7 @@ Expr *parse_type_expression_with_path(ParseContext *c, Path *path)
 	expr->type_expr = type;
 	if (tok_is(c, TOKEN_SCOPE))
 	{
-		SEMA_ERROR_HERE("A type is never followed by '::', did you mean '.'?");
+		PRINT_ERROR_HERE("A type is never followed by '::', did you mean '.'?");
 		return poisoned_expr;
 	}
 	return expr;
@@ -1879,6 +1872,7 @@ ParseRule rules[TOKEN_EOF + 1] = {
 		[TOKEN_UPTR] = { parse_type_identifier, NULL, PREC_NONE },
 		[TOKEN_FLOAT] = { parse_type_identifier, NULL, PREC_NONE },
 		[TOKEN_DOUBLE] = { parse_type_identifier, NULL, PREC_NONE },
+		[TOKEN_BFLOAT] = { parse_type_identifier, NULL, PREC_NONE },
 		[TOKEN_FLOAT16] = { parse_type_identifier, NULL, PREC_NONE },
 		[TOKEN_FLOAT128] = { parse_type_identifier, NULL, PREC_NONE },
 		[TOKEN_VOID] = { parse_type_identifier, NULL, PREC_NONE },
diff --git a/src/compiler/parse_global.c b/src/compiler/parse_global.c
index 000cf1bb4..04b4dd5b1 100644
--- a/src/compiler/parse_global.c
+++ b/src/compiler/parse_global.c
@@ -101,15 +101,15 @@ static inline Path *parse_module_path(ParseContext *c)
 		{
 			if (token_is_keyword_ident(c->tok))
 			{
-				SEMA_ERROR_HERE("The module path cannot contain a reserved keyword, try another name.");
+				PRINT_ERROR_HERE("The module path cannot contain a reserved keyword, try another name.");
 				return NULL;
 			}
 			if (token_is_some_ident(c->tok))
 			{
-				SEMA_ERROR_HERE("The elements of a module path must consist of only lower case letters, 0-9 and '_'.");
+				PRINT_ERROR_HERE("The elements of a module path must consist of only lower case letters, 0-9 and '_'.");
 				return NULL;
 			}
-			SEMA_ERROR_HERE("Each '::' must be followed by a regular lower case sub module name.");
+			PRINT_ERROR_HERE("Each '::' must be followed by a regular lower case sub module name.");
 			return NULL;
 		}
 		scratch_buffer_append(string);
@@ -142,7 +142,7 @@ static inline bool parse_optional_module_params(ParseContext *c, const char ***t
 
 	if (!try_consume(c, TOKEN_LGENPAR)) return true;
 
-	if (try_consume(c, TOKEN_RGENPAR)) RETURN_SEMA_ERROR_HERE("Generic parameter list cannot be empty.");
+	if (try_consume(c, TOKEN_RGENPAR)) RETURN_PRINT_ERROR_HERE("Generic parameter list cannot be empty.");
 
 	// No params
 	while (1)
@@ -153,14 +153,14 @@ static inline bool parse_optional_module_params(ParseContext *c, const char ***t
 			case TOKEN_CONST_IDENT:
 				break;
 			case TOKEN_COMMA:
-				RETURN_SEMA_ERROR_HERE("Unexpected ','");
+				RETURN_PRINT_ERROR_HERE("Unexpected ','");
 			case TOKEN_IDENT:
-				RETURN_SEMA_ERROR_HERE("The module parameter must be a type or a constant.");
+				RETURN_PRINT_ERROR_HERE("The module parameter must be a type or a constant.");
 			case TOKEN_CT_IDENT:
 			case TOKEN_CT_TYPE_IDENT:
-				RETURN_SEMA_ERROR_HERE("The module parameter cannot be a $-prefixed name.");
+				RETURN_PRINT_ERROR_HERE("The module parameter cannot be a $-prefixed name.");
 			default:
-				RETURN_SEMA_ERROR_HERE("Only generic parameters are allowed here as parameters to the module.");
+				RETURN_PRINT_ERROR_HERE("Only generic parameters are allowed here as parameters to the module.");
 		}
 		vec_add(*tokens_ref, symstr(c));
 		advance(c);
@@ -178,20 +178,20 @@ bool parse_module(ParseContext *c, AstId contracts)
 {
 	if (tok_is(c, TOKEN_STRING))
 	{
-		RETURN_SEMA_ERROR_HERE("'module' should be followed by a plain identifier, not a string. Did you accidentally put the module name between \"\"?");
+		RETURN_PRINT_ERROR_HERE("'module' should be followed by a plain identifier, not a string. Did you accidentally put the module name between \"\"?");
 	}
 
 	if (!tok_is(c, TOKEN_IDENT))
 	{
 		if (token_is_keyword_ident(c->tok))
 		{
-			RETURN_SEMA_ERROR_HERE("The module name cannot contain a reserved keyword, try another name.");
+			RETURN_PRINT_ERROR_HERE("The module name cannot contain a reserved keyword, try another name.");
 		}
 		if (token_is_some_ident(c->tok))
 		{
-			RETURN_SEMA_ERROR_HERE("The module name must consist of only lower case letters, 0-9 and '_'.");
+			RETURN_PRINT_ERROR_HERE("The module name must consist of only lower case letters, 0-9 and '_'.");
 		}
-		RETURN_SEMA_ERROR_HERE("'module' should be followed by a module name.");
+		RETURN_PRINT_ERROR_HERE("'module' should be followed by a module name.");
 	}
 
 	Path *path = parse_module_path(c);
@@ -214,7 +214,7 @@ bool parse_module(ParseContext *c, AstId contracts)
 	{
 		if (!context_set_module(c, path, NULL)) return false;
 		recover_top_level(c);
-		if (contracts) RETURN_SEMA_ERROR(astptr(contracts), "Contracts cannot be use with non-generic modules.");
+		if (contracts) RETURN_PRINT_ERROR_AT(false, astptr(contracts), "Contracts cannot be use with non-generic modules.");
 		return true;
 	}
 	if (!context_set_module(c, path, generic_parameters)) return false;
@@ -246,7 +246,7 @@ bool parse_module(ParseContext *c, AstId contracts)
 				case CONTRACT_REQUIRE:
 					continue;
 			}
-			RETURN_SEMA_ERROR(current, "Invalid constraint - only '@require' is valid for modules.");
+			RETURN_PRINT_ERROR_AT(false, current, "Invalid constraint - only '@require' is valid for modules.");
 		}
 	}
 	Visibility visibility = VISIBLE_PUBLIC;
@@ -254,18 +254,18 @@ bool parse_module(ParseContext *c, AstId contracts)
 	bool is_cond;
 	if (!parse_attributes(c, &attrs, &visibility, NULL, &is_cond)) return false;
 	FOREACH_BEGIN(Attr *attr, attrs)
-		if (attr->is_custom) RETURN_SEMA_ERROR(attr, "Custom attributes cannot be used with 'module'.");
+		if (attr->is_custom) RETURN_PRINT_ERROR_AT(false, attr, "Custom attributes cannot be used with 'module'.");
 		switch (attr->attr_kind)
 		{
 			case ATTRIBUTE_LINK:
 				{
 					unsigned args = vec_size(attr->exprs);
-					if (args < 1) RETURN_SEMA_ERROR(attr, "'@link' needs at least 1 argument.");
+					if (args < 1) RETURN_PRINT_ERROR_AT(false, attr, "'@link' needs at least 1 argument.");
 				}
 				vec_add(c->unit->attr_links, attr);
 				continue;
 			case ATTRIBUTE_IF:
-				if (c->unit->if_attr) RETURN_SEMA_ERROR(attr, "'@if' appeared more than once.");
+				if (c->unit->if_attr) RETURN_PRINT_ERROR_AT(false, attr, "'@if' appeared more than once.");
 				c->unit->if_attr = attr;
 				continue;
 			case ATTRIBUTE_BENCHMARK:
@@ -275,21 +275,21 @@ bool parse_module(ParseContext *c, AstId contracts)
 				c->unit->test_by_default = true;
 				continue;
 			case ATTRIBUTE_EXPORT:
-				if (attr->exprs) RETURN_SEMA_ERROR(attr, "Expected no arguments to '@export'");
-				if (c->unit->export_by_default) RETURN_SEMA_ERROR(attr, "'@export' appeared more than once.");
+				if (attr->exprs) RETURN_PRINT_ERROR_AT(false, attr, "Expected no arguments to '@export'");
+				if (c->unit->export_by_default) RETURN_PRINT_ERROR_AT(false, attr, "'@export' appeared more than once.");
 				c->unit->export_by_default = true;
 				continue;
 			case ATTRIBUTE_EXTERN:
 			{
 				if (vec_size(attr->exprs) != 1)
 				{
-					RETURN_SEMA_ERROR(attr, "Expected 1 argument to '@extern(..), not %d'.", vec_size(attr->exprs));
+					RETURN_PRINT_ERROR_AT(false, attr, "Expected 1 argument to '@extern(..), not %d'.", vec_size(attr->exprs));
 				}
 				Expr *expr = attr->exprs[0];
-				if (!expr_is_const_string(expr)) RETURN_SEMA_ERROR(expr, "Expected a constant string.");
+				if (!expr_is_const_string(expr)) RETURN_PRINT_ERROR_AT(false, expr, "Expected a constant string.");
 				if (c->unit->module->extname)
 				{
-					RETURN_SEMA_ERROR(attr, "External name for the module may only be declared in one location.");
+					RETURN_PRINT_ERROR_AT(false, attr, "External name for the module may only be declared in one location.");
 				}
 				c->unit->module->extname = expr->const_expr.bytes.ptr;
 				continue;
@@ -297,7 +297,7 @@ bool parse_module(ParseContext *c, AstId contracts)
 			default:
 				break;
 		}
-		RETURN_SEMA_ERROR(attr, "'%s' cannot be used after a module declaration.", attr->name);
+		RETURN_PRINT_ERROR_AT(false, attr, "'%s' cannot be used after a module declaration.", attr->name);
 	FOREACH_END();
 	c->unit->default_visibility = visibility;
 	CONSUME_EOS_OR_RET(false);
@@ -309,11 +309,11 @@ static bool consume_type_name(ParseContext *c, const char* type)
 {
 	if (tok_is(c, TOKEN_IDENT) || token_is_keyword_ident(c->tok))
 	{
-		RETURN_SEMA_ERROR_HERE("Names of %ss must start with an uppercase letter.", type);
+		RETURN_PRINT_ERROR_HERE("Names of %ss must start with an uppercase letter.", type);
 	}
 	if (tok_is(c, TOKEN_CONST_IDENT))
 	{
-		RETURN_SEMA_ERROR_HERE("Names of %ss cannot be all uppercase.", type);
+		RETURN_PRINT_ERROR_HERE("Names of %ss cannot be all uppercase.", type);
 	}
 	return consume(c, TOKEN_TYPE_IDENT, "'%s' should be followed by the name of the %s.", type, type);
 }
@@ -322,7 +322,7 @@ bool consume_const_name(ParseContext *c, const char* type)
 {
 	if (tok_is(c, TOKEN_IDENT) || tok_is(c, TOKEN_TYPE_IDENT) || token_is_keyword_ident(c->tok))
 	{
-		RETURN_SEMA_ERROR_HERE("Names of %ss must be all uppercase.", type);
+		RETURN_PRINT_ERROR_HERE("Names of %ss must be all uppercase.", type);
 	}
 	return consume(c, TOKEN_CONST_IDENT, "A constant name was expected here, did you forget it?");
 }
@@ -362,7 +362,7 @@ bool parse_path_prefix(ParseContext *c, Path** path_ref)
 	path->module = symtab_add(scratch_ptr, offset, fnv1a(scratch_ptr, offset), &type);
 	if (type != TOKEN_IDENT)
 	{
-		RETURN_SEMA_ERROR(path, "A module name was expected here.");
+		RETURN_PRINT_ERROR_AT(false, path, "A module name was expected here.");
 	}
 	path->len = offset;
 	*path_ref = path;
@@ -471,11 +471,11 @@ static inline TypeInfo *parse_base_type(ParseContext *c)
 		default:
 			if (c->tok == TOKEN_IDENT)
 			{
-				SEMA_ERROR_HERE("A type name was expected, but this looks a variable or function name (as it doesn't start with an uppercase letter).");
+				PRINT_ERROR_HERE("A type name was expected, but this looks a variable or function name (as it doesn't start with an uppercase letter).");
 			}
 			else
 			{
-				SEMA_ERROR_HERE("A type name was expected here.");
+				PRINT_ERROR_HERE("A type name was expected here.");
 			}
 			return poisoned_type_info;
 	}
@@ -536,7 +536,7 @@ static inline TypeInfo *parse_array_type_index(ParseContext *c, TypeInfo *type)
 	if (try_consume(c, TOKEN_RBRACKET))
 	{
 		bool is_resolved = type->resolve_status == RESOLVE_DONE;
-		if (is_resolved && !type_is_valid_for_array(type->type)) goto DIRECT_SUBARRAY;
+		if (is_resolved && !type_is_valid_for_array(type->type)) goto DIRECT_SLICE;
 		switch (type->subtype)
 		{
 			case TYPE_COMPRESSED_NONE:
@@ -549,20 +549,20 @@ static inline TypeInfo *parse_array_type_index(ParseContext *c, TypeInfo *type)
 				type->subtype = TYPE_COMPRESSED_SUBSUB;
 				break;
 			default:
-				goto DIRECT_SUBARRAY;
+				goto DIRECT_SLICE;
 		}
 		if (is_resolved)
 		{
-			type->type = type_get_subarray(type->type);
+			type->type = type_get_slice(type->type);
 		}
 		RANGE_EXTEND_PREV(type);
 		return type;
-DIRECT_SUBARRAY:;
-		TypeInfo *subarray = type_info_new(TYPE_INFO_SUBARRAY, type->span);
-		subarray->array.base = type;
-		subarray->array.len = NULL;
-		RANGE_EXTEND_PREV(subarray);
-		return subarray;
+DIRECT_SLICE:;
+		TypeInfo *slice = type_info_new(TYPE_INFO_SLICE, type->span);
+		slice->array.base = type;
+		slice->array.len = NULL;
+		RANGE_EXTEND_PREV(slice);
+		return slice;
 	}
 	TypeInfo *array = type_info_new(TYPE_INFO_ARRAY, type->span);
 	array->array.base = type;
@@ -725,7 +725,7 @@ Decl *parse_local_decl_after_type(ParseContext *c, TypeInfo *type)
 {
 	if (tok_is(c, TOKEN_LPAREN))
 	{
-		SEMA_ERROR_HERE("Expected '{'.");
+		PRINT_ERROR_HERE("Expected '{'.");
 		return poisoned_decl;
 	}
 
@@ -750,7 +750,7 @@ Decl *parse_local_decl_after_type(ParseContext *c, TypeInfo *type)
 	{
 		if (!decl)
 		{
-			SEMA_ERROR_HERE("Expected an identifier before '='.");
+			PRINT_ERROR_HERE("Expected an identifier before '='.");
 			return poisoned_decl;
 		}
 		advance_and_verify(c, TOKEN_EQ);
@@ -833,14 +833,14 @@ Decl *parse_var_decl(ParseContext *c)
 	switch (c->tok)
 	{
 		case TOKEN_CONST_IDENT:
-			SEMA_ERROR_HERE("Constants must be declared using 'const' not 'var'.");
+			PRINT_ERROR_HERE("Constants must be declared using 'const' not 'var'.");
 			return poisoned_decl;
 		case TOKEN_IDENT:
 			decl = decl_new_var_current(c, NULL, VARDECL_LOCAL);
 			advance(c);
 			if (!tok_is(c, TOKEN_EQ))
 			{
-				SEMA_ERROR_HERE("'var' must always have an initial value, or the type cannot be inferred.");
+				PRINT_ERROR_HERE("'var' must always have an initial value, or the type cannot be inferred.");
 				return false;
 			}
 			advance_and_verify(c, TOKEN_EQ);
@@ -863,7 +863,7 @@ Decl *parse_var_decl(ParseContext *c)
 			}
 			break;
 		default:
-			SEMA_ERROR_HERE("Expected a compile time variable name ('$Foo' or '$foo').");
+			PRINT_ERROR_HERE("Expected a compile time variable name ('$Foo' or '$foo').");
 			return poisoned_decl;
 	}
 	return decl;
@@ -893,10 +893,10 @@ bool parse_attribute(ParseContext *c, Attr **attribute_ref, bool expect_eos)
 		{
 			if (expect_eos)
 			{
-				sema_error_at_after(start_span, "Expected a ';' here.");
+				print_error_after(start_span, "Expected a ';' here.");
 				return false;
 			}
-			RETURN_SEMA_ERROR_HERE("Expected an attribute name.");
+			RETURN_PRINT_ERROR_HERE("Expected an attribute name.");
 		}
 
 		// Otherwise assume no attributes
@@ -914,11 +914,11 @@ bool parse_attribute(ParseContext *c, Attr **attribute_ref, bool expect_eos)
 	if (tok_is(c, TOKEN_AT_IDENT))
 	{
 		// Error for foo::bar::@inline
-		if (path) RETURN_SEMA_ERROR_HERE("Only user-defined attribute names can have a module path prefix.");
+		if (path) RETURN_PRINT_ERROR_HERE("Only user-defined attribute names can have a module path prefix.");
 
 		// Check attribute it exists, theoretically we could defer this to semantic analysis
 		AttributeType type = attribute_by_name(attr->name);
-		if (type == ATTRIBUTE_NONE) RETURN_SEMA_ERROR_HERE("This is not a known valid attribute name.");
+		if (type == ATTRIBUTE_NONE) RETURN_PRINT_ERROR_HERE("This is not a known valid attribute name.");
 		attr->attr_kind = type;
 	}
 	else
@@ -1027,7 +1027,7 @@ bool parse_attributes(ParseContext *c, Attr ***attributes_ref, Visibility *visib
 					parsed_builtin = true;
 					break;
 				case ATTRIBUTE_IF:
-					if (!cond_ref) RETURN_SEMA_ERROR(attr, "'%s' cannot be used here.", attr->name);
+					if (!cond_ref) RETURN_PRINT_ERROR_AT(false, attr, "'%s' cannot be used here.", attr->name);
 					*cond_ref = true;
 					break;
 				default:
@@ -1035,21 +1035,21 @@ bool parse_attributes(ParseContext *c, Attr ***attributes_ref, Visibility *visib
 			}
 			if (parsed_builtin)
 			{
-				if (!builtin_ref) RETURN_SEMA_ERROR(attr, "'@builtin' cannot be used here.");
+				if (!builtin_ref) RETURN_PRINT_ERROR_AT(false, attr, "'@builtin' cannot be used here.");
 				*builtin_ref = true;
 				continue;
 			}
 			if (parsed_visibility != -1)
 			{
-				if (!visibility_ref) RETURN_SEMA_ERROR(attr, "'%s' cannot be used here.", attr->name);
-				if (visibility != -1) RETURN_SEMA_ERROR(attr, "Only a single visibility attribute may be added.");
+				if (!visibility_ref) RETURN_PRINT_ERROR_AT(false, attr, "'%s' cannot be used here.", attr->name);
+				if (visibility != -1) RETURN_PRINT_ERROR_AT(false, attr, "Only a single visibility attribute may be added.");
 				*visibility_ref = visibility = parsed_visibility;
 				continue;
 			}
 		}
 		const char *name = attr->name;
 		FOREACH_BEGIN(Attr *other_attr, *attributes_ref)
-			if (other_attr->name == name) RETURN_SEMA_ERROR(attr, "Repeat of attribute '%s' here.", name);
+			if (other_attr->name == name) RETURN_PRINT_ERROR_AT(false, attr, "Repeat of attribute '%s' here.", name);
 		FOREACH_END();
 		vec_add(*attributes_ref, attr);
 	}
@@ -1070,7 +1070,7 @@ static inline Decl *parse_global_declaration(ParseContext *c)
 
 	if (tok_is(c, TOKEN_CONST_IDENT))
 	{
-		SEMA_ERROR_HERE("This looks like a constant variable, did you forget 'const'?");
+		PRINT_ERROR_HERE("This looks like a constant variable, did you forget 'const'?");
 		return poisoned_decl;
 	}
 
@@ -1086,10 +1086,10 @@ static inline Decl *parse_global_declaration(ParseContext *c)
 		{
 			if (token_is_some_ident(c->tok))
 			{
-				SEMA_ERROR_HERE("I expected a variable name here, but global variables need to start with lower case.");
+				PRINT_ERROR_HERE("I expected a variable name here, but global variables need to start with lower case.");
 				return poisoned_decl;
 			}
-			SEMA_ERROR_HERE("The name of a global variable was expected here");
+			PRINT_ERROR_HERE("The name of a global variable was expected here");
 			return poisoned_decl;
 		}
 		if (!try_consume(c, TOKEN_COMMA)) break;
@@ -1105,7 +1105,7 @@ static inline Decl *parse_global_declaration(ParseContext *c)
 	{
 		if (decls)
 		{
-			SEMA_ERROR_HERE("Initialization is not allowed with multiple declarations.");
+			PRINT_ERROR_HERE("Initialization is not allowed with multiple declarations.");
 			return poisoned_decl;
 		}
 		if (!parse_decl_initializer(c, decl)) return poisoned_decl;
@@ -1113,7 +1113,7 @@ static inline Decl *parse_global_declaration(ParseContext *c)
 	else if (!decl->attributes && tok_is(c, TOKEN_LPAREN) && !threadlocal)
 	{
 		// Guess we forgot `fn`? -> improve error reporting.
-		sema_error_at(type->span, "This looks like the beginning of a function declaration but it's missing the initial `fn`. Did you forget it?");
+		print_error_at(type->span, "This looks like the beginning of a function declaration but it's missing the initial `fn`. Did you forget it?");
 		return poisoned_decl;
 	}
 	CONSUME_EOS_OR_RET(poisoned_decl);
@@ -1140,23 +1140,20 @@ static inline Decl *parse_global_declaration(ParseContext *c)
 
 
 /**
- * enum_param_decl ::= type IDENT ('=' expr)?
+ * enum_param_decl ::= type IDENT attributes?
  */
 static inline bool parse_enum_param_decl(ParseContext *c, Decl*** parameters)
 {
 	ASSIGN_TYPE_OR_RET(TypeInfo *type, parse_optional_type(c), false);
-	if (type->optional) RETURN_SEMA_ERROR(type, "Parameters may not be optional.");
+	if (type->optional) RETURN_PRINT_ERROR_AT(false, type, "Parameters may not be optional.");
 	Decl *param = decl_new_var_current(c, type, VARDECL_PARAM);
 	if (!try_consume(c, TOKEN_IDENT))
 	{
-		if (token_is_keyword_ident(c->tok)) RETURN_SEMA_ERROR_HERE("Keywords cannot be used as member names.");
-		if (token_is_some_ident(c->tok)) RETURN_SEMA_ERROR_HERE("Expected a name starting with a lower-case letter.");
-		RETURN_SEMA_ERROR_HERE("Expected a member name here.");
-	}
-	if (try_consume(c, TOKEN_EQ))
-	{
-		if (!parse_decl_initializer(c, param)) return poisoned_decl;
+		if (token_is_keyword_ident(c->tok)) RETURN_PRINT_ERROR_HERE("Keywords cannot be used as member names.");
+		if (token_is_some_ident(c->tok)) RETURN_PRINT_ERROR_HERE("Expected a name starting with a lower-case letter.");
+		RETURN_PRINT_ERROR_HERE("Expected a member name here.");
 	}
+	if (!parse_attributes(c, &param->attributes, NULL, NULL, NULL)) return false;
 	vec_add(*parameters, param);
 	RANGE_EXTEND_PREV(param);
 	return true;
@@ -1209,19 +1206,19 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 			// In the future maybe this
 			if (!is_end_of_param_list(c) && !tok_is(c, TOKEN_COMMA))
 			{
-				SEMA_ERROR_HERE("Expected ')' here.");
+				PRINT_ERROR_HERE("Expected ')' here.");
 				return false;
 			}
 			// Variadics might not be allowed
 			if (!variadic)
 			{
-				SEMA_ERROR_LAST("Variadic parameters are not allowed.");
+				PRINT_ERROR_LAST("Variadic parameters are not allowed.");
 				return false;
 			}
 			// Check that we only have one variadic parameter.
 			if (var_arg_found)
 			{
-				SEMA_ERROR_LAST("Only a single variadic parameter is allowed.");
+				PRINT_ERROR_LAST("Only a single variadic parameter is allowed.");
 				return false;
 			}
 			// Set the variadic type and insert a dummy argument.
@@ -1245,18 +1242,17 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 			{
 				if (!variadic)
 				{
-					SEMA_ERROR_HERE("Variadic arguments are not allowed.");
+					PRINT_ERROR_HERE("Variadic arguments are not allowed.");
 					return false;
 				}
 				if (var_arg_found)
 				{
-					sema_error_at(extend_span_with_token(type->span, c->prev_span), "Only a single variadic parameter is allowed.");
+					print_error_at(extend_span_with_token(type->span, c->prev_span), "Only a single variadic parameter is allowed.");
 					return false;
 				}
 				*variadic = VARIADIC_TYPED;
 			}
 		}
-
 		// We have parsed the optional type, next get the optional variable name
 		VarDeclKind param_kind;
 		const char *name = NULL;
@@ -1267,7 +1263,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 			case TOKEN_CONST_IDENT:
 			case TOKEN_CT_CONST_IDENT:
 				// We reserve upper case constants for globals.
-				SEMA_ERROR_HERE("Parameter names may not be all uppercase.");
+				PRINT_ERROR_HERE("Parameter names may not be all uppercase.");
 				return false;
 			case TOKEN_IDENT:
 				// normal "foo"
@@ -1280,25 +1276,25 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 					// Did we get Foo... foo...
 					if (ellipsis)
 					{
-						SEMA_ERROR_HERE("Unexpected '...' following a vararg declaration.");
+						PRINT_ERROR_HERE("Unexpected '...' following a vararg declaration.");
 						return false;
 					}
 					ellipsis = true;
 					if (!variadic)
 					{
-						sema_error_at(extend_span_with_token(span, c->span), "Variadic parameters are not allowed.");
+						print_error_at(extend_span_with_token(span, c->span), "Variadic parameters are not allowed.");
 						return false;
 					}
 					// Did we get Foo foo...? If so then that's an error.
 					if (type)
 					{
-						SEMA_ERROR_HERE("For typed varargs '...', needs to appear after the type.");
+						PRINT_ERROR_HERE("For typed varargs '...', needs to appear after the type.");
 						return false;
 					}
 					// This is "foo..."
 					*variadic = VARIADIC_ANY;
 					// We generate the type as type_any
-					type = type_info_new_base(type_anyptr, c->span);
+					type = type_info_new_base(type_any, c->span);
 				}
 				break;
 			case TOKEN_CT_IDENT:
@@ -1308,7 +1304,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				// This will catch Type... $foo and $foo..., neither is allowed.
 				if (ellipsis || peek(c) == TOKEN_ELLIPSIS)
 				{
-					SEMA_ERROR_HERE("Compile time parameters may not be varargs, use untyped macro varargs '...' instead.");
+					PRINT_ERROR_HERE("Compile time parameters may not be varargs, use untyped macro varargs '...' instead.");
 					return false;
 				}
 				param_kind = VARDECL_PARAM_CT;
@@ -1319,13 +1315,13 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				name = symstr(c);
 				if (!try_consume(c, TOKEN_IDENT))
 				{
-					SEMA_ERROR_HERE("A regular variable name, e.g. 'foo' was expected after the '&'.");
+					PRINT_ERROR_HERE("A regular variable name, e.g. 'foo' was expected after the '&'.");
 					return false;
 				}
 				// This will catch Type... &foo and &foo..., neither is allowed.
 				if (ellipsis || try_consume(c, TOKEN_ELLIPSIS))
 				{
-					SEMA_ERROR_HERE("Reference parameters may not be varargs, use untyped macro varargs '...' instead.");
+					PRINT_ERROR_HERE("Reference parameters may not be varargs, use untyped macro varargs '...' instead.");
 					return false;
 				}
 				// Span includes the "&"
@@ -1334,7 +1330,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				break;
 			case TOKEN_HASH_TYPE_IDENT:
 				// #Foo (not allowed)
-				SEMA_ERROR_HERE("An unevaluated expression can never be a type, did you mean to use $Type?");
+				PRINT_ERROR_HERE("An unevaluated expression can never be a type, did you mean to use $Type?");
 				return false;
 			case TOKEN_HASH_IDENT:
 				// expression #foo
@@ -1342,7 +1338,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				advance_and_verify(c, TOKEN_HASH_IDENT);
 				if (ellipsis || try_consume(c, TOKEN_ELLIPSIS))
 				{
-					SEMA_ERROR_HERE("Expression parameters may not be varargs, use untyped macro varargs '...' instead.");
+					PRINT_ERROR_HERE("Expression parameters may not be varargs, use untyped macro varargs '...' instead.");
 					return false;
 				}
 				param_kind = VARDECL_PARAM_EXPR;
@@ -1353,7 +1349,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				advance_and_verify(c, TOKEN_CT_TYPE_IDENT);
 				if (ellipsis || try_consume(c, TOKEN_ELLIPSIS))
 				{
-					SEMA_ERROR_HERE("Expression parameters may not be varargs, use untyped macro varargs '...' instead.");
+					PRINT_ERROR_HERE("Expression parameters may not be varargs, use untyped macro varargs '...' instead.");
 					return false;
 				}
 				param_kind = VARDECL_PARAM_CT_TYPE;
@@ -1364,7 +1360,7 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				// Handle "Type..." and "Type"
 				if (!type && !ellipsis)
 				{
-					sema_error_at_after(c->prev_span, "Expected a parameter.");
+					print_error_after(c->prev_span, "Expected a parameter.");
 					return false;
 				}
 				no_name = true;
@@ -1372,13 +1368,11 @@ bool parse_parameters(ParseContext *c, Decl ***params_ref, Decl **body_params,
 				param_kind = VARDECL_PARAM;
 				break;
 			default:
-				SEMA_ERROR_HERE("Expected a parameter.");
-				return false;
+				RETURN_PRINT_ERROR_HERE("Expected a parameter.");
 		}
 		if (type && type->optional)
 		{
-			SEMA_ERROR(type, "Parameters may not be optional.");
-			return false;
+			RETURN_PRINT_ERROR_AT(false, type, "Parameters may not be optional.");
 		}
 		Decl *param = decl_new_var(name, span, type, param_kind);
 		param->var.type_info = type ? type_infoid(type) : 0;
@@ -1483,7 +1477,7 @@ bool parse_struct_body(ParseContext *c, Decl *parent)
 			index++;
 			if (index > MAX_MEMBERS)
 			{
-				RETURN_SEMA_ERROR(member, "Can't add another member: the count would exceed maximum of %d elements.", MAX_MEMBERS);
+				RETURN_PRINT_ERROR_AT(false, member, "Can't add another member: the count would exceed maximum of %d elements.", MAX_MEMBERS);
 			}
 			continue;
 		}
@@ -1492,11 +1486,11 @@ bool parse_struct_body(ParseContext *c, Decl *parent)
 		{
 			if (parent->decl_kind != DECL_STRUCT)
 			{
-				RETURN_SEMA_ERROR_HERE("Only structs may have 'inline' elements, did you make a mistake?");
+				RETURN_PRINT_ERROR_HERE("Only structs may have 'inline' elements, did you make a mistake?");
 			}
 			if (index > 0)
 			{
-				RETURN_SEMA_ERROR_LAST("Only the first element may be 'inline', did you order your fields wrong?");
+				RETURN_PRINT_ERROR_LAST("Only the first element may be 'inline', did you order your fields wrong?");
 			}
 			parent->is_substruct = true;
 			was_inline = true;
@@ -1506,14 +1500,14 @@ bool parse_struct_body(ParseContext *c, Decl *parent)
 
 		while (1)
 		{
-			if (!tok_is(c, TOKEN_IDENT)) RETURN_SEMA_ERROR_HERE("A valid member name was expected here.");
+			if (!tok_is(c, TOKEN_IDENT)) RETURN_PRINT_ERROR_HERE("A valid member name was expected here.");
 
 			Decl *member = decl_new_var_current(c, type, VARDECL_MEMBER);
 			vec_add(parent->strukt.members, member);
 			index++;
 			if (index > MAX_MEMBERS)
 			{
-				RETURN_SEMA_ERROR(member, "Can't add another member: the count would exceed maximum of %d elements.", MAX_MEMBERS);
+				RETURN_PRINT_ERROR_AT(false, member, "Can't add another member: the count would exceed maximum of %d elements.", MAX_MEMBERS);
 			}
 			advance(c);
 			bool is_cond;
@@ -1522,7 +1516,7 @@ bool parse_struct_body(ParseContext *c, Decl *parent)
 			if (!try_consume(c, TOKEN_COMMA)) break;
 			if (was_inline)
 			{
-				RETURN_SEMA_ERROR(member, "'inline' can only be applied to a single member, so please define it on its own line.");
+				RETURN_PRINT_ERROR_AT(false, member, "'inline' can only be applied to a single member, so please define it on its own line.");
 			}
 		}
 		CONSUME_EOS_OR_RET(false);
@@ -1605,10 +1599,10 @@ static inline bool parse_bitstruct_body(ParseContext *c, Decl *decl)
 		{
 			if (try_consume(c, TOKEN_CONST_IDENT) || try_consume(c, TOKEN_TYPE_IDENT))
 			{
-				SEMA_ERROR_LAST("Expected a field name with an initial lower case.");
+				PRINT_ERROR_LAST("Expected a field name with an initial lower case.");
 				return false;
 			}
-			SEMA_ERROR_HERE("Expected a field name at this position.");
+			PRINT_ERROR_HERE("Expected a field name at this position.");
 			return false;
 		}
 		if (tok_is(c, TOKEN_EOS))
@@ -1617,8 +1611,7 @@ static inline bool parse_bitstruct_body(ParseContext *c, Decl *decl)
 			{
 				if (decl->bitstruct.members)
 				{
-					SEMA_ERROR(member_decl, "Bitstructs either have bit ranges for all members, or no members have ranges – mixing is not permitted. Either add a range to this member or remove ranges from the other member(s).");
-					return false;
+					RETURN_PRINT_ERROR_AT(false, member_decl, "Bitstructs either have bit ranges for all members, or no members have ranges – mixing is not permitted. Either add a range to this member or remove ranges from the other member(s).");
 				}
 				is_consecutive = true;
 			}
@@ -1643,8 +1636,7 @@ static inline bool parse_bitstruct_body(ParseContext *c, Decl *decl)
 		CONSUME_EOS_OR_RET(false);
 		if (is_consecutive)
 		{
-			SEMA_ERROR(member_decl->var.start, "Bitstructs either have bit ranges for all members, or no members have ranges – mixing is not permitted. Either remove this range, or add ranges to all other members.");
-			return false;
+			RETURN_PRINT_ERROR_AT(false, member_decl->var.start, "Bitstructs either have bit ranges for all members, or no members have ranges – mixing is not permitted. Either remove this range, or add ranges to all other members.");
 		}
 		vec_add(decl->bitstruct.members, member_decl);
 	}
@@ -1801,16 +1793,16 @@ static inline Decl *parse_def_type(ParseContext *c)
 	{
 		if (token_is_any_type(c->tok))
 		{
-			SEMA_ERROR_HERE("'%s' is the name of a built-in type and can't be used as an alias.",
-							token_type_to_string(c->tok));
+			PRINT_ERROR_HERE("'%s' is the name of a built-in type and can't be used as an alias.",
+			                 token_type_to_string(c->tok));
 			return poisoned_decl;
 		}
 		if (token_is_some_ident(c->tok))
 		{
-			SEMA_ERROR_HERE("The type name must start with an uppercase letter followed by at least 1 lowercase letter.");
+			PRINT_ERROR_HERE("The type name must start with an uppercase letter followed by at least 1 lowercase letter.");
 			return poisoned_decl;
 		}
-		SEMA_ERROR_HERE("A type name was expected here.");
+		PRINT_ERROR_HERE("A type name was expected here.");
 		return poisoned_decl;
 	}
 
@@ -1870,15 +1862,15 @@ static inline Decl *parse_def_ident(ParseContext *c)
 	{
 		if (token_is_keyword_ident(alias_type) && alias_type != TOKEN_FN)
 		{
-			SEMA_ERROR_HERE("'%s' is a reserved keyword, try another name.", token_type_to_string(alias_type));
+			PRINT_ERROR_HERE("'%s' is a reserved keyword, try another name.", token_type_to_string(alias_type));
 		}
 		else if (alias_type == TOKEN_TYPE_IDENT)
 		{
-			SEMA_ERROR_HERE("A variable, constant or attribute name was expected here. If you want to define a new type, use 'typedef' instead.");
+			PRINT_ERROR_HERE("A variable, constant or attribute name was expected here. If you want to define a new type, use 'typedef' instead.");
 		}
 		else
 		{
-			SEMA_ERROR_HERE("A type, variable, constant or attribute name was expected here.");
+			PRINT_ERROR_HERE("A type, variable, constant or attribute name was expected here.");
 		}
 		return poisoned_decl;
 	}
@@ -1889,8 +1881,7 @@ static inline Decl *parse_def_ident(ParseContext *c)
 
 	if (decl->name == kw_main)
 	{
-		SEMA_ERROR(decl, "'main' is reserved and cannot be used as an alias.");
-		return poisoned_decl;
+		RETURN_PRINT_ERROR_AT(poisoned_decl, decl, "'main' is reserved and cannot be used as an alias.");
 	}
 	// 4. Advance and consume the '='
 	advance(c);
@@ -1911,25 +1902,22 @@ static inline Decl *parse_def_ident(ParseContext *c)
 	{
 		if (token_is_any_type(c->tok) || tok_is(c, TOKEN_TYPE_IDENT))
 		{
-			SEMA_ERROR(decl, "A type alias must start with an uppercase letter and contain at least one lower case letter.");
-			return poisoned_decl;
+			RETURN_PRINT_ERROR_AT(poisoned_decl, decl, "A type alias must start with an uppercase letter and contain at least one lower case letter.");
 		}
 		if (alias_type == TOKEN_CONST_IDENT)
 		{
-			SEMA_ERROR_HERE("Expected a constant name here.");
+			PRINT_ERROR_HERE("Expected a constant name here.");
 			return poisoned_decl;
 		}
 		if (alias_type == TOKEN_IDENT && c->tok == TOKEN_AT_IDENT)
 		{
-			SEMA_ERROR(decl, "A name with '@' prefix cannot be aliased to a name without '@', try adding a '@' before '%s'.", decl->name);
-			return poisoned_decl;
+			RETURN_PRINT_ERROR_AT(poisoned_decl, decl, "A name with '@' prefix cannot be aliased to a name without '@', try adding a '@' before '%s'.", decl->name);
 		}
 		if (alias_type == TOKEN_AT_IDENT && c->tok == TOKEN_IDENT)
 		{
-			SEMA_ERROR(decl, "An alias cannot use '@' if the aliased identifier doesn't, please remove the '@' symbol.");
-			return poisoned_decl;
+			RETURN_PRINT_ERROR_AT(poisoned_decl, decl, "An alias cannot use '@' if the aliased identifier doesn't, please remove the '@' symbol.");
 		}
-		SEMA_ERROR_HERE("Expected a function or variable name here.");
+		PRINT_ERROR_HERE("Expected a function or variable name here.");
 		return poisoned_decl;
 	}
 
@@ -1968,7 +1956,7 @@ static inline Decl *parse_def_attribute(ParseContext *c)
 	{
 		if (tok_is(c, TOKEN_RPAREN))
 		{
-			sema_error_at(c->prev_span, "At least one parameter was expected after '(' - try removing the '()'.");
+			print_error_at(c->prev_span, "At least one parameter was expected after '(' - try removing the '()'.");
 			return poisoned_decl;
 		}
 		if (!parse_parameters(c, &decl->attr_decl.params, NULL, NULL, NULL, PARAM_PARSE_ATTR)) return poisoned_decl;
@@ -2047,7 +2035,7 @@ static inline bool parse_func_macro_header(ParseContext *c, Decl *decl)
 			// 5b. If the rtype is not optional or the return type was an optional, then this is an error.
 			if (!is_macro || rtype->optional)
 			{
-				SEMA_ERROR_LAST("This looks like you are declaring a method without a return type?");
+				PRINT_ERROR_LAST("This looks like you are declaring a method without a return type?");
 				return false;
 			}
 			method_type = rtype;
@@ -2057,20 +2045,19 @@ static inline bool parse_func_macro_header(ParseContext *c, Decl *decl)
 	else if (method_type)
 	{
 		// 5d. A method type but no dot is also wrong.
-		SEMA_ERROR(method_type, "There is unexpectedly a type after the return type, did you forget a '.'?");
-		return false;
+		RETURN_PRINT_ERROR_AT(false, method_type, "There is unexpectedly a type after the return type, did you forget a '.'?");
 	}
 	RESULT:
 	decl->name = symstr(c);
 	decl->span = c->span;
 	if (is_macro && c->tok != TOKEN_IDENT && c->tok != TOKEN_AT_IDENT)
 	{
-		sema_error_at(c->span, "Expected a macro name here, e.g. '@someName' or 'someName'.");
+		print_error_at(c->span, "Expected a macro name here, e.g. '@someName' or 'someName'.");
 		return false;
 	}
 	else if (!is_macro && c->tok != TOKEN_IDENT)
 	{
-		sema_error_at(c->span, "Expected a function name here, e.g. 'someName'.");
+		print_error_at(c->span, "Expected a function name here, e.g. 'someName'.");
 		return false;
 	}
 	advance(c);
@@ -2142,7 +2129,7 @@ static inline Decl *parse_fault_declaration(ParseContext *c)
 			Decl *other_constant = decl->enums.values[i];
 			if (other_constant->name == name)
 			{
-				SEMA_ERROR(fault_const, "This fault value was declared twice.");
+				PRINT_ERROR_AT(fault_const, "This fault value was declared twice.");
 				SEMA_NOTE(other_constant, "The previous declaration was here.");
 				return poisoned_decl;
 			}
@@ -2156,7 +2143,7 @@ static inline Decl *parse_fault_declaration(ParseContext *c)
 	}
 	if (ordinal == 0)
 	{
-		sema_error_at(c->prev_span, "Declaration of '%s' contains no values, at least one value is required.", decl->name);
+		print_error_at(c->prev_span, "Declaration of '%s' contains no values, at least one value is required.", decl->name);
 		return poisoned_decl;
 	}
 	return decl;
@@ -2170,7 +2157,6 @@ static inline bool parse_enum_param_list(ParseContext *c, Decl*** parameters_ref
 	// If no left parenthesis we're done.
 	if (!try_consume(c, TOKEN_LPAREN)) return true;
 
-	// We allow (), but we might consider making it an error later on.
 	while (!try_consume(c, TOKEN_RPAREN))
 	{
 		if (!parse_enum_param_decl(c, parameters_ref)) return false;
@@ -2189,7 +2175,7 @@ static inline bool parse_enum_param_list(ParseContext *c, Decl*** parameters_ref
 /**
  * Parse an enum declaration (after "enum")
  *
- * enum ::= ENUM TYPE_IDENT opt_interfaces (':' type enum_param_list)? opt_attributes '{' enum_body '}'
+ * enum ::= ENUM TYPE_IDENT opt_interfaces (':' type? enum_param_list?)? opt_attributes '{' enum_body '}'
  * enum_body ::= enum_def (',' enum_def)* ','?
  * enum_def ::= CONST_IDENT ('(' arg_list ')')?
  */
@@ -2202,20 +2188,22 @@ static inline Decl *parse_enum_declaration(ParseContext *c)
 	if (!parse_interface_impls(c, &decl->interfaces)) return poisoned_decl;
 
 	TypeInfo *type = NULL;
-	// Parse the spec
+
 	if (try_consume(c, TOKEN_COLON))
 	{
-		ASSIGN_TYPE_OR_RET(type, parse_optional_type(c), poisoned_decl);
-		if (type->optional)
+		if (!tok_is(c, TOKEN_LPAREN) && !tok_is(c, TOKEN_LBRACE))
 		{
-			SEMA_ERROR(type, "An enum can't have an optional type.");
-			return poisoned_decl;
+			ASSIGN_TYPE_OR_RET(type, parse_optional_type(c), poisoned_decl);
+			if (type->optional)
+			{
+				RETURN_PRINT_ERROR_AT(poisoned_decl, type, "An enum can't have an optional type.");
+			}
 		}
 		if (!parse_enum_param_list(c, &decl->enums.parameters)) return poisoned_decl;
 	}
 
 	if (!parse_attributes_for_global(c, decl)) return poisoned_decl;
-
+	unsigned expected_parameters = vec_size(decl->enums.parameters);
 	Visibility visibility = decl->visibility;
 	CONSUME_OR_RET(TOKEN_LBRACE, poisoned_decl);
 
@@ -2234,20 +2222,27 @@ static inline Decl *parse_enum_declaration(ParseContext *c)
 			Decl *other_constant = decl->enums.values[i];
 			if (other_constant->name == name)
 			{
-				SEMA_ERROR(enum_const, "This enum constant is declared twice.");
+				PRINT_ERROR_AT(enum_const, "This enum constant is declared twice.");
 				SEMA_NOTE(other_constant, "The previous declaration was here.");
 				decl_poison(enum_const);
 				break;
 			}
 		}
-		if (try_consume(c, TOKEN_LPAREN))
+		if (!parse_attributes_for_global(c, enum_const)) return poisoned_decl;
+		if (try_consume(c, TOKEN_EQ))
 		{
-			Expr **result = NULL;
-			if (!parse_arg_list(c, &result, TOKEN_RPAREN, NULL, false)) return poisoned_decl;
-			enum_const->enum_constant.args = result;
-			CONSUME_OR_RET(TOKEN_RPAREN, poisoned_decl);
+			if (expected_parameters == 1 || !tok_is(c, TOKEN_LBRACE))
+			{
+				ASSIGN_EXPR_OR_RET(Expr *single, parse_expr(c), poisoned_decl);
+				vec_add(enum_const->enum_constant.args, single);
+			}
+			else
+			{
+				CONSUME_OR_RET(TOKEN_LBRACE, poisoned_decl);
+				if (!parse_arg_list(c, &enum_const->enum_constant.args, TOKEN_RBRACE, NULL, false)) return poisoned_decl;
+				CONSUME_OR_RET(TOKEN_RBRACE, poisoned_decl);
+			}
 		}
-		if (!parse_attributes_for_global(c, enum_const)) return poisoned_decl;
 		vec_add(decl->enums.values, enum_const);
 		// Allow trailing ','
 		if (!try_consume(c, TOKEN_COMMA))
@@ -2290,8 +2285,7 @@ static inline Decl *parse_func_definition(ParseContext *c, AstId contracts, bool
 	if (!parse_func_macro_header(c, func)) return poisoned_decl;
 	if (func->name[0] == '@')
 	{
-		SEMA_ERROR(func, "Function names may not use '@'.");
-		return false;
+		RETURN_PRINT_ERROR_AT(false, func, "Function names may not use '@'.");
 	}
 	if (!parse_fn_parameter_list(c, &(func->func_decl.signature), is_interface)) return poisoned_decl;
 	if (!parse_attributes_for_global(c, func)) return poisoned_decl;
@@ -2301,11 +2295,11 @@ static inline Decl *parse_func_definition(ParseContext *c, AstId contracts, bool
 		{
 			if (c->unit->is_interface_file)
 			{
-				SEMA_ERROR_HERE("An interface file may not contain function bodies.");
+				PRINT_ERROR_HERE("An interface file may not contain function bodies.");
 			}
 			else
 			{
-				SEMA_ERROR_HERE("An 'extern' function may not have a body.");
+				PRINT_ERROR_HERE("An 'extern' function may not have a body.");
 			}
 			return poisoned_decl;
 		}
@@ -2329,7 +2323,7 @@ static inline Decl *parse_func_definition(ParseContext *c, AstId contracts, bool
 	}
 	else
 	{
-		SEMA_ERROR_HERE("Expected the beginning of a block or a short statement.");
+		PRINT_ERROR_HERE("Expected the beginning of a block or a short statement.");
 	}
 
 	DEBUG_LOG("Finished parsing function %s", func->name);
@@ -2355,15 +2349,15 @@ static inline bool parse_import(ParseContext *c)
 		{
 			if (is_not_first)
 			{
-				SEMA_ERROR_LAST("Another module name was expected after the comma.");
+				PRINT_ERROR_LAST("Another module name was expected after the comma.");
 				return false;
 			}
 			if (tok_is(c, TOKEN_STRING))
 			{
-				SEMA_ERROR_HERE("An import should be followed by a plain identifier, not a string. Did you accidentally put the module name between \"\"?");
+				PRINT_ERROR_HERE("An import should be followed by a plain identifier, not a string. Did you accidentally put the module name between \"\"?");
 				return false;
 			}
-			SEMA_ERROR_HERE("Import statement should be followed by the name of the module to import.");
+			PRINT_ERROR_HERE("Import statement should be followed by the name of the module to import.");
 			return false;
 		}
 		is_not_first = true;
@@ -2374,7 +2368,7 @@ static inline bool parse_import(ParseContext *c)
 		{
 			if (symstr(c) != attribute_list[ATTRIBUTE_PUBLIC])
 			{
-				SEMA_ERROR_HERE("Only '@public' is a valid attribute here.");
+				PRINT_ERROR_HERE("Only '@public' is a valid attribute here.");
 				return false;
 			}
 			private = true;
@@ -2383,7 +2377,7 @@ static inline bool parse_import(ParseContext *c)
 		unit_add_import(c->unit, path, private);
 		if (tok_is(c, TOKEN_COLON) && peek(c) == TOKEN_IDENT)
 		{
-			SEMA_ERROR_HERE("'::' was expected here, did you make a mistake?");
+			PRINT_ERROR_HERE("'::' was expected here, did you make a mistake?");
 			return false;
 		}
 		if (!try_consume(c, TOKEN_COMMA)) break;
@@ -2434,7 +2428,7 @@ static inline bool parse_doc_contract(ParseContext *c, AstId *docs, AstId **docs
 	{
 		if (!tok_is(c, TOKEN_STRING))
 		{
-			sema_error_at(c->prev_span, "Expected a string after ':'");
+			print_error_at(c->prev_span, "Expected a string after ':'");
 			return false;
 		}
 	}
@@ -2487,7 +2481,7 @@ static inline bool parse_contract_param(ParseContext *c, AstId *docs, AstId **do
 		}
 		else
 		{
-			RETURN_SEMA_ERROR_LAST("'in', 'out' or 'inout' were expected.");
+			RETURN_PRINT_ERROR_LAST("'in', 'out' or 'inout' were expected.");
 		}
 		CONSUME_OR_RET(TOKEN_RBRACKET, false);
 	}
@@ -2505,7 +2499,7 @@ static inline bool parse_contract_param(ParseContext *c, AstId *docs, AstId **do
 		case TOKEN_HASH_IDENT:
 			break;
 		default:
-			SEMA_ERROR_HERE("Expected a parameter name here.");
+			PRINT_ERROR_HERE("Expected a parameter name here.");
 			return false;
 	}
 	ast->contract_stmt.param.name = symstr(c);
@@ -2538,8 +2532,7 @@ static inline bool parse_doc_optreturn(ParseContext *c, AstId *docs, AstId **doc
 		ASSIGN_TYPE_OR_RET(ret->contract_fault.type, parse_base_type(c), false);
 		if (ret->contract_fault.type->kind != TYPE_INFO_IDENTIFIER)
 		{
-			SEMA_ERROR(ret->contract_fault.type, "Expected a fault type.");
-			return false;
+			RETURN_PRINT_ERROR_AT(false, ret->contract_fault.type, "Expected a fault type.");
 		}
 		if (try_consume(c, TOKEN_DOT))
 		{
@@ -2629,10 +2622,10 @@ static bool parse_contracts(ParseContext *c, AstId *contracts_ref)
 			default:
 				if (row_last_row == row)
 				{
-					SEMA_ERROR_HERE("Expected end of line.");
+					PRINT_ERROR_HERE("Expected end of line.");
 					return false;
 				}
-				SEMA_ERROR_HERE("Expected a directive or a comment.");
+				PRINT_ERROR_HERE("Expected a directive or a comment.");
 				return false;
 		}
 		row_last_row = row;
@@ -2712,7 +2705,7 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 					decl = parse_global_declaration(c);
 					break;
 				default:
-					SEMA_ERROR_HERE("Expected 'extern' to be followed by a function, constant or global variable.");
+					PRINT_ERROR_HERE("Expected 'extern' to be followed by a function, constant or global variable.");
 					return poisoned_decl;
 			}
 			if (!decl_ok(decl)) return decl;
@@ -2721,7 +2714,7 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 		case TOKEN_MODULE:
 			if (!c_ref)
 			{
-				SEMA_ERROR_HERE("'module' is not valid inside an include.");
+				PRINT_ERROR_HERE("'module' is not valid inside an include.");
 				return poisoned_decl;
 			}
 			advance(c);
@@ -2736,7 +2729,7 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 			if (!parse_module(c, contracts)) return poisoned_decl;
 			return NULL;
 		case TOKEN_DOCS_START:
-			SEMA_ERROR_HERE("There are more than one doc comment in a row, that is not allowed.");
+			PRINT_ERROR_HERE("There are more than one doc comment in a row, that is not allowed.");
 			return poisoned_decl;
 		case TOKEN_DEF:
 			if (contracts) goto CONTRACT_NOT_ALLOWED;
@@ -2773,7 +2766,7 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 			if (contracts) goto CONTRACT_NOT_ALLOWED;
 			if (!c_ref)
 			{
-				SEMA_ERROR_HERE("'import' may not appear inside a compile time statement.");
+				PRINT_ERROR_HERE("'import' may not appear inside a compile time statement.");
 				return poisoned_decl;
 			}
 			if (!parse_import(c)) return poisoned_decl;
@@ -2823,19 +2816,19 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 			decl = parse_global_declaration(c);
 			break;
 		case TOKEN_EOF:
-			SEMA_ERROR_LAST("Expected a top level declaration.");
+			PRINT_ERROR_LAST("Expected a top level declaration.");
 			return poisoned_decl;
 		case TOKEN_STATIC:
-			SEMA_ERROR_HERE("'static' is only used with local variable declarations.");
+			PRINT_ERROR_HERE("'static' is only used with local variable declarations.");
 			return poisoned_decl;
 		case TOKEN_CT_CONST_IDENT:
 			if (peek(c) == TOKEN_EQ)
 			{
-				SEMA_ERROR_HERE("Did you forget a 'const' before the name of this compile time constant?");
+				PRINT_ERROR_HERE("Did you forget a 'const' before the name of this compile time constant?");
 			}
 			else
 			{
-				SEMA_ERROR_HERE("Compile time constant unexpectedly found.");
+				PRINT_ERROR_HERE("Compile time constant unexpectedly found.");
 			}
 			return poisoned_decl;
 		case TOKEN_TLOCAL:
@@ -2844,17 +2837,16 @@ Decl *parse_top_level_statement(ParseContext *c, ParseContext **c_ref)
 			decl = parse_global_declaration(c);
 			break;
 		case TOKEN_EOS:
-			SEMA_ERROR_HERE("';' wasn't expected here, try removing it.");
+			PRINT_ERROR_HERE("';' wasn't expected here, try removing it.");
 			return poisoned_decl;
 		default:
-			SEMA_ERROR_HERE("Expected the start of a global declaration here.");
+			PRINT_ERROR_HERE("Expected the start of a global declaration here.");
 			return poisoned_decl;
 	}
 	if (!decl_ok(decl)) return decl;
 	assert(decl);
 	return decl;
 CONTRACT_NOT_ALLOWED:
-	SEMA_ERROR(astptr(contracts), "Contracts are only used for modules, functions and macros.");
-	return poisoned_decl;
+	RETURN_PRINT_ERROR_AT(poisoned_decl, astptr(contracts), "Contracts are only used for modules, functions and macros.");
 }
 
diff --git a/src/compiler/parse_stmt.c b/src/compiler/parse_stmt.c
index 5f528fd4a..4c7223929 100644
--- a/src/compiler/parse_stmt.c
+++ b/src/compiler/parse_stmt.c
@@ -24,13 +24,13 @@ static Ast *parse_decl_stmt_after_type(ParseContext *c, TypeInfo *type)
 		{
 			if (decl->var.init_expr)
 			{
-				SEMA_ERROR(decl->var.init_expr, "Multiple variable declarations cannot use initialization.");
+				PRINT_ERROR_AT(decl->var.init_expr, "Multiple variable declarations cannot use initialization.");
 				return poisoned_ast;
 			}
 			if (decl->attributes)
 			{
 				assert(VECLAST(decl->attributes));
-				SEMA_ERROR(VECLAST(decl->attributes), "Multiple variable declarations must have attributes at the end.");
+				PRINT_ERROR_AT(VECLAST(decl->attributes), "Multiple variable declarations must have attributes at the end.");
 				return poisoned_ast;
 			}
 		}
@@ -45,7 +45,7 @@ static Ast *parse_decl_stmt_after_type(ParseContext *c, TypeInfo *type)
 		ASSIGN_DECL_OR_RET(decl, parse_local_decl_after_type(c, copy_type_info_single(type)), poisoned_ast);
 		if (decl->var.init_expr)
 		{
-			SEMA_ERROR(decl->var.init_expr, "Multiple variable declarations cannot use initialization.");
+			PRINT_ERROR_AT(decl->var.init_expr, "Multiple variable declarations cannot use initialization.");
 			return poisoned_ast;
 		}
 		if (decl->attributes)
@@ -53,7 +53,7 @@ static Ast *parse_decl_stmt_after_type(ParseContext *c, TypeInfo *type)
 			if (tok_is(c, TOKEN_COMMA))
 			{
 				assert(VECLAST(decl->attributes));
-				SEMA_ERROR(VECLAST(decl->attributes), "Multiple variable declarations must have attributes at the end.");
+				PRINT_ERROR_AT(VECLAST(decl->attributes), "Multiple variable declarations must have attributes at the end.");
 				return poisoned_ast;
 			}
 			attributes = decl->attributes;
@@ -121,7 +121,7 @@ static inline Decl *parse_optional_label(ParseContext *c, Ast *parent)
 	advance_and_verify(c, TOKEN_CONST_IDENT);
 	if (!try_consume(c, TOKEN_COLON))
 	{
-		SEMA_ERROR(decl, "The name must be followed by a ':', did you forget it?");
+		PRINT_ERROR_AT(decl, "The name must be followed by a ':', did you forget it?");
 		return poisoned_decl;
 	}
 	return decl;
@@ -141,7 +141,7 @@ static inline bool parse_asm_offset(ParseContext *c, ExprAsmArg *asm_arg)
 {
 	if (!tok_is(c, TOKEN_INTEGER))
 	{
-		SEMA_ERROR_HERE("Expected an integer value.");
+		PRINT_ERROR_HERE("Expected an integer value.");
 		return false;
 	}
 	Expr *offset = parse_integer(c, NULL);
@@ -149,7 +149,7 @@ static inline bool parse_asm_offset(ParseContext *c, ExprAsmArg *asm_arg)
 	Int i = offset->const_expr.ixx;
 	if (i.i.high)
 	{
-		SEMA_ERROR_HERE("The value is too high for an offset.");
+		PRINT_ERROR_HERE("The value is too high for an offset.");
 		return false;
 	}
 	asm_arg->offset = i.i.low;
@@ -160,7 +160,7 @@ static inline bool parse_asm_scale(ParseContext *c, ExprAsmArg *asm_arg)
 {
 	if (!tok_is(c, TOKEN_INTEGER))
 	{
-		SEMA_ERROR_HERE("Expected an integer value.");
+		PRINT_ERROR_HERE("Expected an integer value.");
 		return false;
 	}
 	Expr *value = parse_integer(c, NULL);
@@ -168,7 +168,7 @@ static inline bool parse_asm_scale(ParseContext *c, ExprAsmArg *asm_arg)
 	Int i = value->const_expr.ixx;
 	if (i.i.high)
 	{
-		SEMA_ERROR_HERE("The value is too high for a scale: %s", int_to_str(i, 10));
+		PRINT_ERROR_HERE("The value is too high for a scale: %s", int_to_str(i, 10));
 		return false;
 	}
 	switch (i.i.low)
@@ -186,7 +186,7 @@ static inline bool parse_asm_scale(ParseContext *c, ExprAsmArg *asm_arg)
 			asm_arg->offset_type = ASM_SCALE_8;
 			break;
 		default:
-			SEMA_ERROR_HERE("Expected 1, 2, 4 or 8.");
+			PRINT_ERROR_HERE("Expected 1, 2, 4 or 8.");
 			return false;
 	}
 	return true;
@@ -222,7 +222,7 @@ static inline bool parse_asm_addr(ParseContext *c, ExprAsmArg *asm_arg)
 			advance(c);
 			break;
 		default:
-			SEMA_ERROR_HERE("Expected + or - here.");
+			PRINT_ERROR_HERE("Expected + or - here.");
 			return false;
 	}
 	if (type == TOKEN_MINUS) asm_arg->neg_offset = true;
@@ -267,7 +267,7 @@ static inline bool parse_asm_addr(ParseContext *c, ExprAsmArg *asm_arg)
 
 	if (asm_arg->neg_offset)
 	{
-		SEMA_ERROR_HERE("Addressing cannot both have a negated index and an offset.");
+		PRINT_ERROR_HERE("Addressing cannot both have a negated index and an offset.");
 		return false;
 	}
 
@@ -279,7 +279,7 @@ static inline bool parse_asm_addr(ParseContext *c, ExprAsmArg *asm_arg)
 		case TOKEN_PLUS:
 			break;
 		default:
-			SEMA_ERROR_HERE("Expected + or - here.");
+			PRINT_ERROR_HERE("Expected + or - here.");
 			return false;
 	}
 	advance(c);
@@ -311,7 +311,7 @@ static inline Expr *parse_asm_expr(ParseContext *c)
 			advance(c);
 			return expr;
 		case TOKEN_HASH_IDENT:
-			SEMA_ERROR_HERE("Compile time variables need to be wrapped in () inside an asm block.");
+			PRINT_ERROR_HERE("Compile time variables need to be wrapped in () inside an asm block.");
 			return poisoned_expr;
 		case TOKEN_IDENT:
 			expr->expr_asm_arg.kind = ASM_ARG_REGVAR;
@@ -324,7 +324,7 @@ static inline Expr *parse_asm_expr(ParseContext *c)
 			expr->expr_asm_arg.ident.name = c->data.string;
 			if (!try_consume(c, TOKEN_IDENT))
 			{
-				SEMA_ERROR_HERE("Expected a variable name after '&', like '&foo'.");
+				PRINT_ERROR_HERE("Expected a variable name after '&', like '&foo'.");
 				return poisoned_expr;
 			}
 			return expr;
@@ -342,7 +342,7 @@ static inline Expr *parse_asm_expr(ParseContext *c)
 			RANGE_EXTEND_PREV(expr);
 			return expr;
 		default:
-			SEMA_ERROR_HERE("This doesn't look like an asm argument.");
+			PRINT_ERROR_HERE("This doesn't look like an asm argument.");
 			return poisoned_expr;
 	}
 }
@@ -352,7 +352,7 @@ static inline Ast *parse_asm_stmt(ParseContext *c)
 	Ast *asm_stmt = ast_new_curr(c, AST_ASM_STMT);
 	if (!tok_is(c, TOKEN_IDENT) && !tok_is(c, TOKEN_INT))
 	{
-		SEMA_ERROR_HERE("Expected an asm instruction here.");
+		PRINT_ERROR_HERE("Expected an asm instruction here.");
 		return poisoned_ast;
 	}
 	asm_stmt->asm_stmt.instruction = symstr(c);
@@ -361,7 +361,7 @@ static inline Ast *parse_asm_stmt(ParseContext *c)
 	{
 		if (!tok_is(c, TOKEN_IDENT))
 		{
-			SEMA_ERROR_HERE("Expected asm instruction variant.");
+			PRINT_ERROR_HERE("Expected asm instruction variant.");
 			return poisoned_ast;
 		}
 		asm_stmt->asm_stmt.variant = symstr(c);
@@ -400,13 +400,13 @@ static inline Ast* parse_asm_block_stmt(ParseContext *c)
 		}
 		else
 		{
-			SEMA_ERROR_HERE("Only the '@pure' attribute is allowed.");
+			PRINT_ERROR_HERE("Only the '@pure' attribute is allowed.");
 			return false;
 		}
 		advance_and_verify(c, TOKEN_AT_IDENT);
 		if (!tok_is(c, TOKEN_LBRACE))
 		{
-			SEMA_ERROR_HERE("Expected '{' after the attribute.");
+			PRINT_ERROR_HERE("Expected '{' after the attribute.");
 		}
 	}
 	if (try_consume(c, TOKEN_LBRACE))
@@ -435,7 +435,7 @@ static inline Ast* parse_asm_block_stmt(ParseContext *c)
 		}
 		else
 		{
-			SEMA_ERROR_HERE("Only the '@pure' attribute is allowed.");
+			PRINT_ERROR_HERE("Only the '@pure' attribute is allowed.");
 			return false;
 		}
 		advance_and_verify(c, TOKEN_AT_IDENT);
@@ -554,7 +554,7 @@ static inline Ast* parse_while_stmt(ParseContext *c)
 	ASSIGN_AST_OR_RET(Ast *body, parse_stmt(c), poisoned_ast);
 	if (body->ast_kind != AST_COMPOUND_STMT && row != c->prev_span.row)
 	{
-		SEMA_ERROR(body, "A single statement after 'while' must be placed on the same line, or be enclosed in {}.");
+		PRINT_ERROR_AT(body, "A single statement after 'while' must be placed on the same line, or be enclosed in {}.");
 		return poisoned_ast;
 	}
 	while_ast->for_stmt.body = astid(body);
@@ -577,7 +577,6 @@ static inline Ast* parse_if_stmt(ParseContext *c)
 	ASSIGN_EXPRID_OR_RET(if_ast->if_stmt.cond, parse_cond(c), poisoned_ast);
 	unsigned row = c->span.row;
 	CONSUME_OR_RET(TOKEN_RPAREN, poisoned_ast);
-
 	// Special case, we might have if ( ) { case ... }
 	if (tok_is(c, TOKEN_LBRACE) && (peek(c) == TOKEN_CASE || peek(c) == TOKEN_DEFAULT))
 	{
@@ -586,6 +585,7 @@ static inline Ast* parse_if_stmt(ParseContext *c)
 		if (!parse_switch_body(c, &cases, TOKEN_CASE, TOKEN_DEFAULT)) return poisoned_ast;
 		stmt->switch_stmt.cases = cases;
 		if_ast->if_stmt.then_body = astid(stmt);
+
 	}
 	else
 	{
@@ -630,7 +630,7 @@ static inline Ast *parse_case_stmt(ParseContext *c, TokenType case_type, TokenTy
 	}
 	if (!try_consume(c, TOKEN_COLON))
 	{
-		sema_error_at(c->prev_span, "Missing ':' after case");
+		print_error_at(c->prev_span, "Missing ':' after case");
 		return poisoned_ast;
 	}
 	RANGE_EXTEND_PREV(ast);
@@ -678,7 +678,7 @@ bool parse_switch_body(ParseContext *c, Ast ***cases, TokenType case_type, Token
 		}
 		else
 		{
-			SEMA_ERROR_HERE("A 'case' or 'default' would be needed here.");
+			PRINT_ERROR_HERE("A 'case' or 'default' would be needed here.");
 			return false;
 		}
 		vec_add((*cases), result);
@@ -704,6 +704,16 @@ static inline Ast* parse_switch_stmt(ParseContext *c)
 		ASSIGN_EXPRID_OR_RET(switch_ast->switch_stmt.cond, parse_cond(c), poisoned_ast);
 		CONSUME_OR_RET(TOKEN_RPAREN, poisoned_ast);
 	}
+	if (tok_is(c, TOKEN_AT_IDENT))
+	{
+		if (symstr(c) != kw_at_jump)
+		{
+			PRINT_ERROR_HERE("Only '@jump' is allowed after a switch.");
+			return poisoned_ast;
+		}
+		switch_ast->switch_stmt.flow.jump = true;
+		advance(c);
+	}
 
 	if (!parse_switch_body(c, &switch_ast->switch_stmt.cases, TOKEN_CASE, TOKEN_DEFAULT)) return poisoned_ast;
 	return switch_ast;
@@ -782,8 +792,8 @@ static inline bool parse_foreach_var(ParseContext *c, Ast *foreach)
 	Decl *var = decl_new_var(symstr(c), c->span, type, VARDECL_LOCAL);
 	if (!try_consume(c, TOKEN_IDENT))
 	{
-		if (type) RETURN_SEMA_ERROR_HERE("Expected an identifier after the type.");
-		RETURN_SEMA_ERROR_HERE("Expected an identifier or type.");
+		if (type) RETURN_PRINT_ERROR_HERE("Expected an identifier after the type.");
+		RETURN_PRINT_ERROR_HERE("Expected an identifier or type.");
 	}
 	foreach->foreach_stmt.variable = declid(var);
 	return true;
@@ -924,8 +934,7 @@ static inline Ast *parse_decl_or_expr_stmt(ParseContext *c)
 	ast->expr_stmt = expr;
 	if (tok_is(c, TOKEN_IDENT) && expr->expr_kind == EXPR_IDENTIFIER)
 	{
-		SEMA_ERROR(expr, "Expected a type here.");
-		return poisoned_ast;
+		RETURN_PRINT_ERROR_AT(poisoned_ast, expr, "Expected a type here.");
 	}
 	CONSUME_EOS_OR_RET(poisoned_ast);
 	return ast;
@@ -1110,7 +1119,7 @@ static inline Ast* parse_ct_switch_stmt(ParseContext *c)
 		}
 		else
 		{
-			SEMA_ERROR_HERE("A '$case' or '$default' would be needed here.");
+			PRINT_ERROR_HERE("A '$case' or '$default' would be needed here.");
 			return poisoned_ast;
 		}
 		vec_add(cases, result);
@@ -1123,7 +1132,7 @@ static inline Ast *consume_eos(ParseContext *c, Ast *ast)
 {
 	if (!try_consume(c, TOKEN_EOS))
 	{
-		sema_error_at_after(c->prev_span, "Expected a ';' here.");
+		print_error_after(c->prev_span, "Expected a ';' here.");
 		advance(c);
 		return poisoned_ast;
 	}
@@ -1234,7 +1243,7 @@ Ast *parse_stmt(ParseContext *c)
 		case TOKEN_CONTINUE:
 			return parse_continue_stmt(c);
 		case TOKEN_CASE:
-			SEMA_ERROR_HERE("'case' was found outside of 'switch', did you mismatch a '{ }' pair?");
+			PRINT_ERROR_HERE("'case' was found outside of 'switch', did you mismatch a '{ }' pair?");
 			advance(c);
 			return poisoned_ast;
 		case TOKEN_BREAK:
@@ -1244,7 +1253,7 @@ Ast *parse_stmt(ParseContext *c)
 		case TOKEN_ASM:
 			return parse_asm_block_stmt(c);
 		case TOKEN_DEFAULT:
-			SEMA_ERROR_HERE("'default' was found outside of 'switch', did you mismatch a '{ }' pair?");
+			PRINT_ERROR_HERE("'default' was found outside of 'switch', did you mismatch a '{ }' pair?");
 			advance(c);
 			return poisoned_ast;
 		case TOKEN_CT_ECHO:
@@ -1385,30 +1394,30 @@ Ast *parse_stmt(ParseContext *c)
 		case TOKEN_CT_EXEC:
 		case TOKEN_LGENPAR:
 		case TOKEN_INTERFACE:
-			SEMA_ERROR_HERE("Unexpected '%s' found when expecting a statement.",
-							token_type_to_string(c->tok));
+			PRINT_ERROR_HERE("Unexpected '%s' found when expecting a statement.",
+			                 token_type_to_string(c->tok));
 			advance(c);
 			return poisoned_ast;
 		case TOKEN_RPAREN:
 		case TOKEN_RBRACE:
 		case TOKEN_RBRACKET:
 		case TOKEN_RGENPAR:
-			SEMA_ERROR_HERE("Mismatched '%s' found.", token_type_to_string(c->tok));
+			PRINT_ERROR_HERE("Mismatched '%s' found.", token_type_to_string(c->tok));
 			advance(c);
 			return poisoned_ast;
 		case TOKEN_TRY:
 		case TOKEN_CATCH:
-			SEMA_ERROR_HERE("'%s' can only be used when unwrapping an optional, did you mean '%s?'?", token_type_to_string(c->tok), token_type_to_string(c->tok));
+			PRINT_ERROR_HERE("'%s' can only be used when unwrapping an optional, did you mean '%s?'?", token_type_to_string(c->tok), token_type_to_string(c->tok));
 			advance(c);
 			return poisoned_ast;
 		case TOKEN_EOS:
 			advance(c);
 			return ast_new_curr(c, AST_NOP_STMT);
 		case TOKEN_EOF:
-			SEMA_ERROR_HERE("Reached the end of the file when expecting a statement.");
+			PRINT_ERROR_HERE("Reached the end of the file when expecting a statement.");
 			return poisoned_ast;
 		case TOKEN_DOC_DIRECTIVE:
-			SEMA_ERROR_HERE("Unexpectedly encountered doc directives.");
+			PRINT_ERROR_HERE("Unexpectedly encountered doc directives.");
 			return poisoned_ast;
 	}
 	UNREACHABLE
diff --git a/src/compiler/parser_internal.h b/src/compiler/parser_internal.h
index 62f2d44a7..243187d10 100644
--- a/src/compiler/parser_internal.h
+++ b/src/compiler/parser_internal.h
@@ -18,7 +18,7 @@ typedef enum
 #define EXPECT_IDENT_FOR_OR(_name, _res) do { if (!expect_ident(c, _name)) return _res; } while(0)
 #define EXPECT_OR_RET(_tok, _res) do { if (!expect(c, _tok)) return _res; } while(0)
 #define CONSUME_OR_RET(_tok, _res) do { if (!expect(c, _tok)) return _res; advance(c); } while(0)
-#define CONSUME_EOS_OR_RET(_res) do { if (!tok_is(c, TOKEN_EOS)) { sema_error_at_after(c->prev_span, "Expected ';'"); return _res; } advance(c); } while(0)
+#define CONSUME_EOS_OR_RET(_res) do { if (!tok_is(c, TOKEN_EOS)) { print_error_after(c->prev_span, "Expected ';'"); return _res; } advance(c); } while(0)
 #define TRY_CONSUME_OR_RET(_tok, _message, _type) do { if (!consume(c, _tok, _message)) return _type; } while(0)
 #define CHECK_EXPR_OR_RET(_expr) do { if (!expr_ok(_expr)) return _expr; } while(0)
 
@@ -109,7 +109,7 @@ INLINE bool expect(ParseContext *c, TokenType token_type)
 {
 	if (tok_is(c, token_type)) return true;
 
-	SEMA_ERROR_HERE("Expected '%s'.", token_type_to_string(token_type));
+	PRINT_ERROR_HERE("Expected '%s'.", token_type_to_string(token_type));
 	return false;
 }
 
@@ -139,10 +139,10 @@ static inline bool expect_ident(ParseContext *c, const char* name)
 			return true;
 		case TOKEN_TYPE_IDENT:
 		case TOKEN_CONST_IDENT:
-			SEMA_ERROR_HERE("A %s cannot start with a capital letter.", name);
+			PRINT_ERROR_HERE("A %s cannot start with a capital letter.", name);
 			return false;
 		default:
-			SEMA_ERROR_HERE("A %s was expected.", name);
+			PRINT_ERROR_HERE("A %s was expected.", name);
 			return false;
 	}
 }
diff --git a/src/compiler/sema_builtins.c b/src/compiler/sema_builtins.c
index 90c6bb160..09cf80cb6 100644
--- a/src/compiler/sema_builtins.c
+++ b/src/compiler/sema_builtins.c
@@ -27,17 +27,17 @@ typedef enum
 	BA_TYPEID,
 } BuiltinArg;
 
-static bool sema_check_builtin_args_match(Expr **args, size_t arg_len);
-static bool sema_check_builtin_args_const(Expr **args, size_t arg_len);
-static bool sema_check_builtin_args(Expr **args, BuiltinArg *arg_type, size_t arg_len);
+static bool sema_check_builtin_args_match(SemaContext *context, Expr **args, size_t arg_len);
+static bool sema_check_builtin_args_const(SemaContext *context, Expr **args, size_t arg_len);
+static bool sema_check_builtin_args(SemaContext *context, Expr **args, BuiltinArg *arg_type, size_t arg_len);
 static bool sema_expr_analyse_compare_exchange(SemaContext *context, Expr *expr);
 static bool sema_expr_analyse_syscall(SemaContext *context, Expr *expr);
 static inline bool sema_expr_analyse_swizzle(SemaContext *context, Expr *expr, bool swizzle_two);
 static inline int builtin_expected_args(BuiltinFunction func);
-static inline bool is_valid_atomicity(Expr* expr);
+static inline bool is_valid_atomicity(SemaContext *context, Expr *expr);
 static bool sema_check_alignment_expression(SemaContext *context, Expr *align);
 
-static bool sema_expr_is_valid_mask_for_value(Expr *expr, Expr *value)
+static bool sema_expr_is_valid_mask_for_value(SemaContext *context, Expr *expr, Expr *value)
 {
 	if (type_flatten(value->type)->array.len != type_flatten(expr->type)->array.len)
 	{
@@ -50,7 +50,7 @@ static bool sema_expr_is_valid_mask_for_value(Expr *expr, Expr *value)
  * Used for when we have a builtin that has a constraint between argument types that
  * they should be the same.
  */
-static bool sema_check_builtin_args_match(Expr **args, size_t arg_len)
+static bool sema_check_builtin_args_match(SemaContext *context, Expr **args, size_t arg_len)
 {
 	assert(arg_len > 1);
 	Type *first = type_no_optional(args[0]->type->canonical);
@@ -58,8 +58,7 @@ static bool sema_check_builtin_args_match(Expr **args, size_t arg_len)
 	{
 		if (first != type_no_optional(args[i]->type->canonical))
 		{
-			SEMA_ERROR(args[i], "Expected an expression of type %s.", type_quoted_error_string(args[0]->type));
-			return false;
+			RETURN_SEMA_ERROR(args[i], "Expected an expression of type %s.", type_quoted_error_string(args[0]->type));
 		}
 	}
 	return true;
@@ -68,7 +67,7 @@ static bool sema_check_builtin_args_match(Expr **args, size_t arg_len)
 /**
  * Check the constraint that the arguments are constant.
  */
-static bool sema_check_builtin_args_const(Expr **args, size_t arg_len)
+static bool sema_check_builtin_args_const(SemaContext *context, Expr **args, size_t arg_len)
 {
 	for (size_t i = 0; i < arg_len; i++)
 	{
@@ -89,7 +88,7 @@ static bool sema_check_alignment_expression(SemaContext *context, Expr *align)
 	return true;
 }
 
-static bool sema_check_builtin_args(Expr **args, BuiltinArg *arg_type, size_t arg_len)
+static bool sema_check_builtin_args(SemaContext *context, Expr **args, BuiltinArg *arg_type, size_t arg_len)
 {
 	for (size_t i = 0; i < arg_len; i++)
 	{
@@ -181,7 +180,7 @@ static inline bool sema_expr_analyse_swizzle(SemaContext *context, Expr *expr, b
 		optional = optional || type_is_optional(args[i]->type);
 	}
 	// Ensure matching types
-	if (swizzle_two && !sema_check_builtin_args_match(args, 2)) return false;
+	if (swizzle_two && !sema_check_builtin_args_match(context, args, 2)) return false;
 
 	unsigned components = type_flatten(args[0]->type)->array.len;
 	if (swizzle_two) components *= 2;
@@ -203,7 +202,7 @@ static inline bool sema_expr_analyse_swizzle(SemaContext *context, Expr *expr, b
 	return true;
 }
 
-static inline bool is_valid_atomicity(Expr* expr)
+static inline bool is_valid_atomicity(SemaContext *context, Expr *expr)
 {
 	if (!expr_is_const_int(expr) || !int_fits(expr->const_expr.ixx, TYPE_U8) || expr->const_expr.ixx.i.low > 6)
 	{
@@ -248,7 +247,7 @@ static bool sema_expr_analyse_compare_exchange(SemaContext *context, Expr *expr)
 	for (int i = 5; i < 7; i++)
 	{
 		if (!sema_analyse_expr_rhs(context, type_char, args[i], false, NULL)) return false;
-		if (!is_valid_atomicity(args[i])) return false;
+		if (!is_valid_atomicity(context, args[i])) return false;
 	}
 	unsigned success = args[5]->const_expr.ixx.i.low;
 	unsigned failure = args[6]->const_expr.ixx.i.low;
@@ -359,7 +358,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 	{
 		case BUILTIN_SET_ROUNDING_MODE:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTEGER }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTEGER}, 1)) return false;
 			rtype = type_void;
 			break;
 		case BUILTIN_SYSCALL:
@@ -372,27 +371,27 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_VECCOMPNE:
 		{
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_NUMVEC, BA_NUMVEC }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_NUMVEC, BA_NUMVEC}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			Type *vec_type = type_flatten(args[0]->type);
 			rtype = type_get_vector(type_bool, vec_type->array.len);
 			break;
 		}
 		case BUILTIN_SELECT:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_BOOLVEC, BA_VEC, BA_VEC }, 3)) return false;
-			if (!sema_check_builtin_args_match(&args[1], 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_BOOLVEC, BA_VEC, BA_VEC}, 3)) return false;
+			if (!sema_check_builtin_args_match(context, &args[1], 2)) return false;
 			rtype = args[1]->type;
-			if (!sema_expr_is_valid_mask_for_value(args[0], args[1])) return false;
+			if (!sema_expr_is_valid_mask_for_value(context, args[0], args[1])) return false;
 			break;
 		case BUILTIN_OVERFLOW_ADD:
 		case BUILTIN_OVERFLOW_MUL:
 		case BUILTIN_OVERFLOW_SUB:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args,
-										 (BuiltinArg[]) { BA_INTEGER, BA_INTEGER, BA_POINTER },
-										 3)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args,
+			                             (BuiltinArg[]) {BA_INTEGER, BA_INTEGER, BA_POINTER},
+			                             3)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			if (type_no_optional(args[0]->type->canonical) != type_no_optional(args[2]->type->canonical->pointer))
 			{
 				RETURN_SEMA_ERROR(args[2], "Expected %s, not %s.",
@@ -407,49 +406,49 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_EXACT_SUB:
 		case BUILTIN_EXACT_MOD:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTEGER, BA_INTEGER }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTEGER, BA_INTEGER}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type->canonical;
 			break;
 		case BUILTIN_ANY_MAKE:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_TYPEID }, 2)) return false;
-			rtype = type_anyptr;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_TYPEID}, 2)) return false;
+			rtype = type_any;
 			break;
 		case BUILTIN_EXACT_NEG:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTLIKE }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTLIKE}, 1)) return false;
 			rtype = args[0]->type->canonical;
 			break;
 		case BUILTIN_MEMCOPY_INLINE:
 			assert(arg_count == 6);
-			if (!sema_check_builtin_args(args,
-			                             (BuiltinArg[]) { BA_POINTER, BA_POINTER, BA_SIZE, BA_BOOL, BA_SIZE, BA_SIZE },
+			if (!sema_check_builtin_args(context, args,
+			                             (BuiltinArg[]) {BA_POINTER, BA_POINTER, BA_SIZE, BA_BOOL, BA_SIZE, BA_SIZE},
 			                             6)) return false;
-			if (!sema_check_builtin_args_const(&args[2], 4)) return false;
+			if (!sema_check_builtin_args_const(context, &args[2], 4)) return false;
 			rtype = type_void;
 			break;
 		case BUILTIN_MEMCOPY:
 		case BUILTIN_MEMMOVE:
 			assert(arg_count == 6);
-			if (!sema_check_builtin_args(args,
-										 (BuiltinArg[]) { BA_POINTER, BA_POINTER, BA_SIZE, BA_BOOL, BA_SIZE, BA_SIZE },
-										 6)) return false;
-			if (!sema_check_builtin_args_const(&args[3], 3)) return false;
+			if (!sema_check_builtin_args(context, args,
+			                             (BuiltinArg[]) {BA_POINTER, BA_POINTER, BA_SIZE, BA_BOOL, BA_SIZE, BA_SIZE},
+			                             6)) return false;
+			if (!sema_check_builtin_args_const(context, &args[3], 3)) return false;
 			rtype = type_void;
 			break;
 		case BUILTIN_MEMSET:
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_CHAR, BA_SIZE, BA_BOOL, BA_SIZE },
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_CHAR, BA_SIZE, BA_BOOL, BA_SIZE},
 			                             5)) return false;
-			if (!sema_check_builtin_args_const(&args[3], 2)) return false;
+			if (!sema_check_builtin_args_const(context, &args[3], 2)) return false;
 			rtype = type_void;
 			break;
 		case BUILTIN_MEMSET_INLINE:
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_CHAR, BA_SIZE, BA_BOOL, BA_SIZE },
-										 5)) return false;
-			if (!sema_check_builtin_args_const(&args[2], 3)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_CHAR, BA_SIZE, BA_BOOL, BA_SIZE},
+			                             5)) return false;
+			if (!sema_check_builtin_args_const(context, &args[2], 3)) return false;
 			rtype = type_void;
 			break;
 		case BUILTIN_BITREVERSE:
@@ -458,31 +457,31 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_POPCOUNT:
 		case BUILTIN_CTTZ:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTLIKE }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTLIKE}, 1)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_SAT_SHL:
 		case BUILTIN_SAT_SUB:
 		case BUILTIN_SAT_ADD:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTLIKE, BA_INTLIKE }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTLIKE, BA_INTLIKE}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_REVERSE:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_VEC }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_VEC}, 1)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_EXPECT:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_BOOLINT, BA_BOOLINT }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_BOOLINT, BA_BOOLINT}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_EXPECT_WITH_PROBABILITY:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_BOOLINT, BA_BOOLINT }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_BOOLINT, BA_BOOLINT}, 2)) return false;
 			if (!cast_implicit(context, args[2], type_double))
 			{
 				RETURN_SEMA_ERROR(args[2], "Expected a 'double', but was %s.", type_quoted_error_string(args[2]->type));
@@ -496,7 +495,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 				Real r = args[2]->const_expr.fxx.f;
 				if (r < 0 || r > 1) RETURN_SEMA_ERROR(args[2], "The probability must be between 0 and 1.");
 			}
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_CEIL:
@@ -520,14 +519,14 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_SQRT:
 		case BUILTIN_TRUNC:
 			assert(arg_count);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_FLOATLIKE, BA_FLOATLIKE, BA_FLOATLIKE },
-										 arg_count)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_FLOATLIKE, BA_FLOATLIKE, BA_FLOATLIKE},
+			                             arg_count)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_FRAMEADDRESS:
 		case BUILTIN_RETURNADDRESS:
 			assert(arg_count);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTEGER }, arg_count)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTEGER}, arg_count)) return false;
 			if (!cast_implicit(context, args[0], type_int)) return false;
 			if (!expr_is_const_int(args[0])) RETURN_SEMA_ERROR(args[0], "Expected a compile time constant integer.");
 			rtype = type_voidptr;
@@ -545,7 +544,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			break;
 		case BUILTIN_PREFETCH:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_INTEGER, BA_INTEGER }, 3)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_INTEGER, BA_INTEGER}, 3)) return false;
 			for (unsigned i = 1; i < 3; i++)
 			{
 				if (!expr_is_const(args[i])) RETURN_SEMA_ERROR(args[i], "A constant value is required.");
@@ -566,20 +565,20 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			break;
 		case BUILTIN_POW:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_FLOATLIKE, BA_FLOATLIKE }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_FLOATLIKE, BA_FLOATLIKE}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_POW_INT:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_FLOATLIKE, BA_INTLIKE }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_FLOATLIKE, BA_INTLIKE}, 2)) return false;
 			if (!cast_implicit(context, args[1], type_cint)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_REDUCE_FMUL:
 		case BUILTIN_REDUCE_FADD:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_FLOATVEC, BA_FLOAT }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_FLOATVEC, BA_FLOAT}, 2)) return false;
 			if (!cast_implicit(context, args[1], args[0]->type->canonical->array.base)) return false;
 			{
 				Expr *arg = args[0];
@@ -592,7 +591,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_REDUCE_MIN:
 		{
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_NUMVEC }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_NUMVEC}, 1)) return false;
 			rtype = type_get_indexed_type(args[0]->type);
 			break;
 		}
@@ -602,18 +601,18 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_REDUCE_XOR:
 		case BUILTIN_REDUCE_MUL:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_BOOLINTVEC }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_BOOLINTVEC}, 1)) return false;
 			rtype = type_get_indexed_type(args[0]->type);
 			break;
 		case BUILTIN_ABS:
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_NUMLIKE }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_NUMLIKE}, 1)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_GATHER:
 		{
 			assert(arg_count == 4);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_PTRVEC, BA_BOOLVEC, BA_VEC, BA_INTEGER }, 4)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_PTRVEC, BA_BOOLVEC, BA_VEC, BA_INTEGER}, 4)) return false;
 			Type *flat_pointer_vec = type_flatten(args[0]->type);
 			Type *flat_passthru_vec = type_flatten(args[2]->type);
 			Type *pointer_type = flat_pointer_vec->array.base;
@@ -630,14 +629,14 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 				                  type_quoted_error_string(args[2]->type));
 			}
 			if (!sema_check_alignment_expression(context, args[3])) return false;
-			if (!sema_expr_is_valid_mask_for_value(args[1], args[2])) return false;
+			if (!sema_expr_is_valid_mask_for_value(context, args[1], args[2])) return false;
 			rtype = type_get_vector(pointer_type->pointer, len);
 			break;
 		}
 		case BUILTIN_SCATTER:
 		{
 			assert(arg_count == 4);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_PTRVEC, BA_VEC, BA_BOOLVEC, BA_INTEGER }, 4)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_PTRVEC, BA_VEC, BA_BOOLVEC, BA_INTEGER}, 4)) return false;
 			Type *flat_pointer_vec = type_flatten(args[0]->type);
 			Type *flat_value_vec = type_flatten(args[1]->type);
 			Type *pointer_type = flat_pointer_vec->array.base;
@@ -653,14 +652,14 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 				                  type_quoted_error_string(args[2]->type));
 			}
 			if (!sema_check_alignment_expression(context, args[3])) return false;
-			if (!sema_expr_is_valid_mask_for_value(args[2], args[1])) return false;
+			if (!sema_expr_is_valid_mask_for_value(context, args[2], args[1])) return false;
 			rtype = type_void;
 			break;
 		}
 		case BUILTIN_MASKED_LOAD:
 		{
 			assert(arg_count == 4);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_BOOLVEC, BA_VEC, BA_INTEGER }, 4)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_BOOLVEC, BA_VEC, BA_INTEGER}, 4)) return false;
 			Type *pointer_type = args[0]->type;
 			if (!type_is_pointer(pointer_type)) RETURN_SEMA_ERROR(args[0], "Expected a direct pointer.");
 			if (pointer_type->pointer->canonical != args[2]->type->canonical)
@@ -668,14 +667,14 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 				RETURN_SEMA_ERROR(args[2], "Expected the value to be of type '%s'.", type_quoted_error_string(pointer_type->pointer));
 			}
 			if (!sema_check_alignment_expression(context, args[3])) return false;
-			if (!sema_expr_is_valid_mask_for_value(args[1], args[2])) return false;
+			if (!sema_expr_is_valid_mask_for_value(context, args[1], args[2])) return false;
  			rtype = pointer_type->pointer;
 			break;
 		}
 		case BUILTIN_MASKED_STORE:
 		{
 			assert(arg_count == 4);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_VEC, BA_BOOLVEC, BA_INTEGER }, 4)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_VEC, BA_BOOLVEC, BA_INTEGER}, 4)) return false;
 			Type *pointer_type = args[0]->type;
 			if (!type_is_pointer(pointer_type)) RETURN_SEMA_ERROR(args[0], "Expected a direct pointer.");
 			if (pointer_type->pointer->canonical != args[1]->type->canonical)
@@ -683,49 +682,49 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 				RETURN_SEMA_ERROR(args[2], "Expected the value to be of type %s.", type_quoted_error_string(pointer_type->pointer));
 			}
 			if (!sema_check_alignment_expression(context, args[3])) return false;
-			if (!sema_expr_is_valid_mask_for_value(args[2], args[1])) return false;
+			if (!sema_expr_is_valid_mask_for_value(context, args[2], args[1])) return false;
 			rtype = type_void;
 			break;
 		}
 		case BUILTIN_MAX:
 		case BUILTIN_MIN:
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_NUMLIKE, BA_NUMLIKE }, 2)) return false;
-			if (!sema_check_builtin_args_match(args, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_NUMLIKE, BA_NUMLIKE}, 2)) return false;
+			if (!sema_check_builtin_args_match(context, args, 2)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_FMA:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args,
-										 (BuiltinArg[]) { BA_FLOATLIKE, BA_FLOATLIKE, BA_FLOATLIKE },
-										 3)) return false;
-			if (!sema_check_builtin_args_match(args, 3)) return false;
+			if (!sema_check_builtin_args(context, args,
+			                             (BuiltinArg[]) {BA_FLOATLIKE, BA_FLOATLIKE, BA_FLOATLIKE},
+			                             3)) return false;
+			if (!sema_check_builtin_args_match(context, args, 3)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_FSHL:
 		case BUILTIN_FSHR:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_INTLIKE, BA_INTLIKE, BA_INTLIKE },
-										 3)) return false;
-			if (!sema_check_builtin_args_match(args, 3)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_INTLIKE, BA_INTLIKE, BA_INTLIKE},
+			                             3)) return false;
+			if (!sema_check_builtin_args_match(context, args, 3)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_FMULADD:
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_FLOAT, BA_FLOAT, BA_FLOAT },
-										 3)) return false;
-			if (!sema_check_builtin_args_match(args, 3)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_FLOAT, BA_FLOAT, BA_FLOAT},
+			                             3)) return false;
+			if (!sema_check_builtin_args_match(context, args, 3)) return false;
 			rtype = args[0]->type;
 			break;
 		case BUILTIN_ATOMIC_LOAD:
 		{
 			assert(arg_count == 3);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]){ BA_POINTER, BA_BOOL, BA_INTEGER }, 3)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_BOOL, BA_INTEGER}, 3)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original == type_voidptr) RETURN_SEMA_ERROR(args[0], "Expected a typed pointer.");
 			if (!expr_is_const(args[1])) RETURN_SEMA_ERROR(args[1], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[2])) return false;
+			if (!is_valid_atomicity(context, args[2])) return false;
 			switch (args[2]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_ACQUIRE_RELEASE:
@@ -738,7 +737,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_VOLATILE_LOAD:
 		{
 			assert(arg_count == 1);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER}, 1)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original == type_voidptr) RETURN_SEMA_ERROR(args[0], "Expected a typed pointer.");
 			rtype = original->pointer;
@@ -747,7 +746,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_VOLATILE_STORE:
 		{
 			assert(arg_count == 2);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER}, 1)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original != type_voidptr)
 			{
@@ -760,7 +759,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_ATOMIC_FETCH_DEC_WRAP:
 		{
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_INTEGER }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_INTEGER}, 2)) return false;
 			Type *original = type_flatten(args[0]->type);
 			Type *val = type_flatten(args[1]->type);
 			if (!type_is_unsigned(val) )
@@ -778,7 +777,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			}
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[3])) RETURN_SEMA_ERROR(args[3], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[3])) return false;
+			if (!is_valid_atomicity(context, args[3])) return false;
 			switch (args[3]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_UNORDERED:
@@ -794,7 +793,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_ATOMIC_FETCH_XOR:
 		{
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_INTEGER }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_INTEGER}, 2)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original != type_voidptr)
 			{
@@ -802,7 +801,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			}
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[3])) RETURN_SEMA_ERROR(args[3], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[3])) return false;
+			if (!is_valid_atomicity(context, args[3])) return false;
 			switch (args[3]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_UNORDERED:
@@ -815,7 +814,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_ATOMIC_FETCH_EXCHANGE:
 		{
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER }, 1)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER}, 1)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original != type_voidptr)
 			{
@@ -825,7 +824,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			if (!type_is_atomic(val)) RETURN_SEMA_ERROR(args[1], "%s exceeds pointer size.", val);
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[3])) RETURN_SEMA_ERROR(args[3], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[3])) return false;
+			if (!is_valid_atomicity(context, args[3])) return false;
 			switch (args[3]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_UNORDERED:
@@ -841,7 +840,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_ATOMIC_FETCH_MIN:
 		{
 			assert(arg_count == 5);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER, BA_NUM }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER, BA_NUM}, 2)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original != type_voidptr)
 			{
@@ -849,7 +848,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			}
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[3])) RETURN_SEMA_ERROR(args[3], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[3])) return false;
+			if (!is_valid_atomicity(context, args[3])) return false;
 			switch (args[3]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_UNORDERED:
@@ -862,8 +861,8 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 		case BUILTIN_ATOMIC_STORE:
 		{
 			assert(arg_count == 4);
-			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER }, 1)) return false;
-			if (!sema_check_builtin_args(&args[2], (BuiltinArg[]) { BA_BOOL, BA_INTEGER }, 2)) return false;
+			if (!sema_check_builtin_args(context, args, (BuiltinArg[]) {BA_POINTER}, 1)) return false;
+			if (!sema_check_builtin_args(context, &args[2], (BuiltinArg[]) {BA_BOOL, BA_INTEGER}, 2)) return false;
 			Type *original = type_flatten(args[0]->type);
 			if (original != type_voidptr)
 			{
@@ -871,7 +870,7 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr)
 			}
 			if (!expr_is_const(args[2])) RETURN_SEMA_ERROR(args[2], "'is_volatile' must be a compile time constant.");
 			if (!expr_is_const(args[3])) RETURN_SEMA_ERROR(args[3], "Ordering must be a compile time constant.");
-			if (!is_valid_atomicity(args[3])) return false;
+			if (!is_valid_atomicity(context, args[3])) return false;
 			switch (args[3]->const_expr.ixx.i.low)
 			{
 				case ATOMIC_ACQUIRE_RELEASE:
diff --git a/src/compiler/sema_casts.c b/src/compiler/sema_casts.c
index 06f79fce7..3eda01e76 100644
--- a/src/compiler/sema_casts.c
+++ b/src/compiler/sema_casts.c
@@ -19,7 +19,9 @@ typedef struct
 	ConvGroup to_group;
 } CastContext;
 
-static void sema_error_const_int_out_of_range(Expr *expr, Expr *problem, Type *to_type);
+#define RETURN_CAST_ERROR(_node, ...) do { print_error_at((_node)->span, __VA_ARGS__); sema_print_inline(cc->context); return false; } while (0)
+
+static bool sema_error_const_int_out_of_range(CastContext *cc, Expr *expr, Expr *problem, Type *to_type);
 static Expr *recursive_may_narrow(Expr *expr, Type *type);
 static void expr_recursively_rewrite_untyped_list(Expr *expr, Expr **list);
 static inline bool insert_runtime_cast(Expr *expr, CastKind kind, Type *type);
@@ -104,7 +106,7 @@ static bool cast_is_allowed(CastContext *cc, bool is_explicit, bool is_silent)
 	{
 		if (!is_silent)
 		{
-			SEMA_ERROR(cc->expr, "You cannot cast %s to %s.", type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
+			RETURN_CAST_ERROR(cc->expr, "You cannot cast %s to %s.", type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
 		}
 		return false;
 	}
@@ -171,7 +173,7 @@ void cast_to_int_to_max_bit_size(SemaContext *context, Expr *lhs, Expr *rhs, Typ
  * Perform vararg promotions typical for C style varargs:
  * 1. Widen int and bool to C int size
  * 2. Widen float and smaller to double
- * 3. Turn subarrays into pointers
+ * 3. Turn slices into pointers
  */
 void cast_promote_vararg(SemaContext *context, Expr *arg)
 {
@@ -192,8 +194,8 @@ void cast_promote_vararg(SemaContext *context, Expr *arg)
 		return;
 	}
 
-	// 3. Turn subarrays into pointers
-	if (arg_type->type_kind == TYPE_SUBARRAY)
+	// 3. Turn slices into pointers
+	if (arg_type->type_kind == TYPE_SLICE)
 	{
 		cast_no_check(context, arg, type_get_ptr(arg_type->array.base), IS_OPTIONAL(arg));
 		return;
@@ -204,10 +206,9 @@ void cast_promote_vararg(SemaContext *context, Expr *arg)
 /**
  * General error due to casts.
  */
-bool sema_error_failed_cast(Expr *expr, Type *from, Type *to)
+bool sema_error_failed_cast(SemaContext *context, Expr *expr, Type *from, Type *to)
 {
-	SEMA_ERROR(expr, "The cast %s to %s is not allowed.", type_quoted_error_string(from), type_quoted_error_string(to));
-	return false;
+	RETURN_SEMA_ERROR(expr, "The cast %s to %s is not allowed.", type_quoted_error_string(from), type_quoted_error_string(to));
 }
 
 /**
@@ -261,8 +262,8 @@ Type *type_infer_len_from_actual_type(Type *to_infer, Type *actual_type)
 		case TYPE_INFERRED_VECTOR:
 			assert(type_is_arraylike(type_flatten(actual_type)));
 			return type_add_optional(type_get_vector(indexed, type_flatten(actual_type)->array.len), is_optional);
-		case TYPE_SUBARRAY:
-			return type_add_optional(type_get_subarray(indexed), is_optional);
+		case TYPE_SLICE:
+			return type_add_optional(type_get_slice(indexed), is_optional);
 		case TYPE_VECTOR:
 			// The case of int[*]*[<2>] x = ...
 			return type_add_optional(type_get_vector(indexed, to_infer->array.len), is_optional);
@@ -338,16 +339,16 @@ CastKind cast_to_bool_kind(Type *type)
 		case TYPE_FAULTTYPE:
 		case TYPE_ANYFAULT:
 			return CAST_EUBOOL;
-		case TYPE_SUBARRAY:
-			return CAST_SABOOL;
+		case TYPE_SLICE:
+			return CAST_SLBOOL;
 		case ALL_INTS:
 			return CAST_INTBOOL;
 		case ALL_FLOATS:
 			return CAST_FPBOOL;
 		case TYPE_POINTER:
 			return CAST_PTRBOOL;
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 			return CAST_ANYBOOL;
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_INFERRED_VECTOR:
@@ -367,8 +368,6 @@ CastKind cast_to_bool_kind(Type *type)
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_ENUM:
 		case TYPE_MEMBER:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			// Everything else is an error
 			return CAST_ERROR;
 	}
@@ -549,23 +548,21 @@ Expr *recursive_may_narrow(Expr *expr, Type *type)
 
 
 
-static void sema_error_const_int_out_of_range(Expr *expr, Expr *problem, Type *to_type)
+static bool sema_error_const_int_out_of_range(CastContext *cc, Expr *expr, Expr *problem, Type *to_type)
 {
 	assert(expr_is_const(expr));
 	if (expr->const_expr.is_character && expr->type->type_kind != TYPE_U128)
 	{
-		SEMA_ERROR(problem, "The unicode character U+%04x cannot fit in a %s.", (uint32_t)expr->const_expr.ixx.i.low, type_quoted_error_string(to_type));
-		return;
+		RETURN_CAST_ERROR(problem, "The unicode character U+%04x cannot fit in a %s.", (uint32_t)expr->const_expr.ixx.i.low, type_quoted_error_string(to_type));
 	}
 	if (expr->const_expr.const_kind == CONST_ENUM)
 	{
-		SEMA_ERROR(problem, "The ordinal '%d' is out of range for %s, so you need an explicit cast to truncate the value.",
+		RETURN_CAST_ERROR(problem, "The ordinal '%d' is out of range for %s, so you need an explicit cast to truncate the value.",
 				   expr->const_expr.enum_err_val->var.index,
 				   type_quoted_error_string(to_type));
-		return;
 	}
 	const char *error_value = expr->const_expr.is_hex ? int_to_str(expr->const_expr.ixx, 16) : expr_const_to_error_string(&expr->const_expr);
-	SEMA_ERROR(problem, "The value '%s' is out of range for %s, so you need an explicit cast to truncate the value.", error_value,
+	RETURN_CAST_ERROR(problem, "The value '%s' is out of range for %s, so you need an explicit cast to truncate the value.", error_value,
 			   type_quoted_error_string(to_type));
 }
 
@@ -629,6 +626,7 @@ Type *cast_numeric_arithmetic_promotion(Type *type)
 		case ALL_UNSIGNED_INTS:
 			if (canonical->builtin.bitsize < platform_target.width_c_int) return type_cuint;
 			return type;
+		case TYPE_BF16:
 		case TYPE_F16:
 			// Promote F16 to a real type.
 			return type_float;
@@ -639,13 +637,13 @@ Type *cast_numeric_arithmetic_promotion(Type *type)
 	}
 }
 
-static void report_cast_error(CastContext *cc, bool may_cast_explicit)
+static bool report_cast_error(CastContext *cc, bool may_cast_explicit)
 {
 	Expr *expr = cc->expr;
 	Type *to = cc->to_type;
 	if (may_cast_explicit)
 	{
-		SEMA_ERROR(expr,
+		RETURN_CAST_ERROR(expr,
 		           "Implicitly casting %s to %s is not permitted, but you may do an explicit cast by placing '(%s)' before the expression.",
 		           type_quoted_error_string(type_no_optional(expr->type)),
 		           type_quoted_error_string(to),
@@ -653,7 +651,7 @@ static void report_cast_error(CastContext *cc, bool may_cast_explicit)
 	}
 	else
 	{
-		SEMA_ERROR(expr,
+		RETURN_CAST_ERROR(expr,
 		           "It is not possible to cast %s to %s.",
 		           type_quoted_error_string(type_no_optional(expr->type)), type_quoted_error_string(to));
 	}
@@ -707,7 +705,7 @@ static bool rule_int_to_ptr(CastContext *cc, bool is_explicit, bool is_silent)
 		if (!int_fits(expr->const_expr.ixx, type_uptr->canonical->type_kind))
 		{
 			if (is_silent) return false;
-			SEMA_ERROR(expr, "'0x%s' does not fit in a pointer.", int_to_str(expr->const_expr.ixx, 16));
+			RETURN_CAST_ERROR(expr, "'0x%s' does not fit in a pointer.", int_to_str(expr->const_expr.ixx, 16));
 			return false;
 		}
 		return true;
@@ -716,7 +714,7 @@ static bool rule_int_to_ptr(CastContext *cc, bool is_explicit, bool is_silent)
 	if (type_size(cc->from_type) < type_size(type_iptr))
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "You cannot convert an integer smaller than a pointer size to a pointer.");
+		RETURN_CAST_ERROR(expr, "You cannot convert an integer smaller than a pointer size to a pointer.");
 	}
 
 	if (!is_explicit) return sema_cast_error(cc, true, is_silent);
@@ -734,7 +732,7 @@ static bool rule_ptr_to_int(CastContext *cc, bool is_explicit, bool is_silent)
 	if (too_small)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "Casting %s to %s is not allowed because '%s' is smaller than a pointer. "
+		RETURN_CAST_ERROR(cc->expr, "Casting %s to %s is not allowed because '%s' is smaller than a pointer. "
 		                            "Use (%s)(iptr) if you want this lossy cast.",
 		                  type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type),
 		                  type_to_error_string(cc->to_type), type_to_error_string(cc->to_type));
@@ -742,26 +740,26 @@ static bool rule_ptr_to_int(CastContext *cc, bool is_explicit, bool is_silent)
 	return true;
 }
 
-static bool rule_arrptr_to_sa(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_arrptr_to_slice(CastContext *cc, bool is_explicit, bool is_silent)
 {
-	Type *subarray_base = cc->to->array.base;
+	Type *slice_base = cc->to->array.base;
 	Type *from_base = cc->from_type->pointer->array.base;
 
 	// int[<2>]*, int[2]*
 	if (is_explicit)
 	{
-		subarray_base = type_flatten(subarray_base);
+		slice_base = type_flatten(slice_base);
 		from_base = type_flatten(from_base);
 	}
 	// Same base type? E.g. int[2]* -> int[], then we're done.
-	if (from_base == subarray_base)
+	if (from_base == slice_base)
 	{
 		return true;
 	}
 
-	if (subarray_base->type_kind == TYPE_POINTER && from_base->type_kind == TYPE_POINTER)
+	if (slice_base->type_kind == TYPE_POINTER && from_base->type_kind == TYPE_POINTER)
 	{
-		switch (match_pointers(cc, subarray_base, from_base, is_explicit, is_silent))
+		switch (match_pointers(cc, slice_base, from_base, is_explicit, is_silent))
 		{
 			case TYPE_SAME:
 				return true;
@@ -776,7 +774,7 @@ static bool rule_arrptr_to_sa(CastContext *cc, bool is_explicit, bool is_silent)
 				UNREACHABLE
 		}
 	}
-	bool may_explicit = !is_silent && rule_arrptr_to_sa(cc, true, true);
+	bool may_explicit = !is_silent && rule_arrptr_to_slice(cc, true, true);
 	return sema_cast_error(cc, may_explicit, is_silent);
 }
 
@@ -790,7 +788,7 @@ static bool rule_ulist_to_struct(CastContext *cc, bool is_explicit, bool is_sile
 	if (size != vec_size(members))
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "%s may only be initialized with 0 elements or %d, not %d.",
+		RETURN_CAST_ERROR(cc->expr, "%s may only be initialized with 0 elements or %d, not %d.",
 		                  type_quoted_error_string(cc->to_type),
 		                  vec_size(members), size);
 	}
@@ -809,7 +807,7 @@ static bool rule_ulist_to_vecarr(CastContext *cc, bool is_explicit, bool is_sile
 	if (size != cc->to->array.len)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "%s may only be initialized with 0 elements or %d, not %d.",
+		RETURN_CAST_ERROR(cc->expr, "%s may only be initialized with 0 elements or %d, not %d.",
 		                  type_quoted_error_string(cc->to_type),
 						  cc->to->array.len, size);
 	}
@@ -820,7 +818,7 @@ static bool rule_ulist_to_vecarr(CastContext *cc, bool is_explicit, bool is_sile
 	return true;
 }
 
-static bool rule_ulist_to_subarray(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_ulist_to_slice(CastContext *cc, bool is_explicit, bool is_silent)
 {
 	Type *base = cc->to->array.base;
 	FOREACH_BEGIN(Expr *expr, cc->expr->const_expr.untyped_list)
@@ -836,7 +834,7 @@ static bool rule_ulist_to_inferred(CastContext *cc, bool is_explicit, bool is_si
 	if (!size)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "This untyped list would infer to a zero elements, which is not allowed.");
+		RETURN_CAST_ERROR(cc->expr, "This untyped list would infer to a zero elements, which is not allowed.");
 	}
 	Type *base = cc->to->array.base;
 	FOREACH_BEGIN(Expr *expr, expressions)
@@ -845,10 +843,10 @@ static bool rule_ulist_to_inferred(CastContext *cc, bool is_explicit, bool is_si
 	return true;
 }
 
-static bool rule_sa_to_ptr(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_slice_to_ptr(CastContext *cc, bool is_explicit, bool is_silent)
 {
-	Type *subarray_base = cc->from_type->array.base->canonical;
-	Type *natural_ptr = type_get_ptr(subarray_base);
+	Type *slice_base = cc->from_type->array.base->canonical;
+	Type *natural_ptr = type_get_ptr(slice_base);
 	switch (match_pointers(cc, natural_ptr, cc->to, is_explicit, is_silent))
 	{
 		case TYPE_SAME:
@@ -863,7 +861,7 @@ static bool rule_sa_to_ptr(CastContext *cc, bool is_explicit, bool is_silent)
 		default:
 			UNREACHABLE
 	}
-	bool may_explicit = !is_silent && rule_sa_to_ptr(cc, true, true);
+	bool may_explicit = !is_silent && rule_slice_to_ptr(cc, true, true);
 	return sema_cast_error(cc, may_explicit, is_silent);
 }
 
@@ -872,7 +870,7 @@ static bool rule_untyped_to_struct(CastContext *cc, bool is_explicit, bool is_si
 	TODO
 }
 
-static bool rule_sa_to_sa(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_slice_to_slice(CastContext *cc, bool is_explicit, bool is_silent)
 {
 	Type *from_type = cc->from_type;
 	Type *from_base = from_type->array.base;
@@ -896,14 +894,14 @@ static bool rule_sa_to_sa(CastContext *cc, bool is_explicit, bool is_silent)
 	{
 		if (!is_explicit) return sema_cast_error(cc, false, is_silent);
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "%s cannot be cast to %s as its elements have different size.",
+		RETURN_CAST_ERROR(cc->expr, "%s cannot be cast to %s as its elements have different size.",
 		                  type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
 	}
 	if (type_abi_alignment(from_base) < type_abi_alignment(array_base))
 	{
 		if (!is_explicit) return sema_cast_error(cc, false, is_silent);
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr,
+		RETURN_CAST_ERROR(cc->expr,
 		                  "%s cannot be cast to %s as its elements has a greater default alignment, but you can use a bitcast.",
 		                  type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
 	}
@@ -917,9 +915,9 @@ static bool rule_arr_to_arr(CastContext *cc, bool is_explicit, bool is_silent)
 	if (type_size(cc->from_type) != type_size(cc->to))
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(cc->expr, "Arrays of different size may not be converted.");
+		RETURN_CAST_ERROR(cc->expr, "Arrays of different size may not be converted.");
 	}
-	return rule_sa_to_sa(cc, is_explicit, is_silent);
+	return rule_slice_to_slice(cc, is_explicit, is_silent);
 }
 
 static bool rule_arr_to_vec(CastContext *cc, bool is_explicit, bool is_silent)
@@ -956,19 +954,19 @@ static bool rule_vec_to_arr(CastContext *cc, bool is_explicit, bool is_silent)
 	return cast_is_allowed(cc, is_explicit, is_silent);
 }
 
-static bool rule_sa_to_vecarr(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_slice_to_vecarr(CastContext *cc, bool is_explicit, bool is_silent)
 {
 	Expr *expr = cc->expr;
 	MemberIndex size = sema_len_from_const(expr);
 	if (size < 0)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "Conversions from subarrays to arrays or vectors are only permitted on constant subarrays.");
+		RETURN_CAST_ERROR(expr, "Conversions from slices to arrays or vectors are only permitted on constant slices.");
 	}
 	if (size == 0)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "Zero sized subarrays can't be converted to arrays or vectors.");
+		RETURN_CAST_ERROR(expr, "Zero sized slices can't be converted to arrays or vectors.");
 	}
 	if (cc->to_group == CONV_ARRAY)
 	{
@@ -985,11 +983,11 @@ static bool rule_sa_to_vecarr(CastContext *cc, bool is_explicit, bool is_silent)
 	return cast_is_allowed(cc, is_explicit, is_silent);
 }
 
-static bool rule_sa_to_infer(CastContext *cc, bool is_explicit, bool is_silent)
+static bool rule_slice_to_infer(CastContext *cc, bool is_explicit, bool is_silent)
 {
 	Expr *expr = cc->expr;
 	// 1. We might infer something above.
-	if (cc->to->type_kind == TYPE_SUBARRAY)
+	if (cc->to->type_kind == TYPE_SLICE)
 	{
 		cast_context_set_from(cc, cc->from_type->array.base);
 		cast_context_set_to(cc, cc->to->array.base);
@@ -1000,12 +998,12 @@ static bool rule_sa_to_infer(CastContext *cc, bool is_explicit, bool is_silent)
 	if (size < 0)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "Conversions from subarrays to arrays or vectors are only permitted on constant subarrays.");
+		RETURN_CAST_ERROR(expr, "Conversions from slices to arrays or vectors are only permitted on constant slices.");
 	}
 	if (size == 0)
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "Zero sized subarrays can't be converted to arrays or vectors.");
+		RETURN_CAST_ERROR(expr, "Zero sized slices can't be converted to arrays or vectors.");
 	}
 	cast_context_set_from(cc, type_get_array(cc->from_type->array.base, size));
 	return cast_is_allowed(cc, is_explicit, is_silent);
@@ -1025,15 +1023,15 @@ static bool rule_ptr_to_interface(CastContext *cc, bool is_explicit, bool is_sil
 	Type *pointee = cc->from_type->pointer;
 	if (type_may_implement_interface(pointee))
 	{
-		Type *interface = cc->to->pointer;
+		Type *interface = cc->to;
 		Decl *pointee_decl = pointee->decl;
 		FOREACH_BEGIN(TypeInfo *interface_type, pointee_decl->interfaces)
-			if (!sema_resolve_type_info(cc->context, interface_type, RESOLVE_TYPE_ALLOW_ANY)) return false;
+			if (!sema_resolve_type_info(cc->context, interface_type, RESOLVE_TYPE_DEFAULT)) return false;
 			if (interface_type->type == interface) return true;
 		FOREACH_END();
 	}
 	if (is_silent) return false;
-	RETURN_SEMA_ERROR(cc->expr, "%s cannot be implicitly cast to %s, but you can use an explicit "
+	RETURN_CAST_ERROR(cc->expr, "%s cannot be implicitly cast to %s, but you can use an explicit "
 					  "cast to (unsafely) assume the interface is implemented.",
 	                  type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
 }
@@ -1042,15 +1040,15 @@ static bool rule_interface_to_interface(CastContext *cc, bool is_explicit, bool
 {
 	if (is_explicit) return true;
 
-	Type *from_interface = cc->from_type->pointer;
-	Type *interface = cc->to->pointer->canonical;
+	Type *from_interface = cc->from_type;
+	Type *interface = cc->to->canonical;
 	if (!sema_resolve_type_decl(cc->context, from_interface)) return false;
 	FOREACH_BEGIN(TypeInfo *parent, from_interface->decl->interfaces)
 		if (parent->type->canonical == interface) return true;
 	FOREACH_END();
 	if (is_silent) return false;
-	RETURN_SEMA_ERROR(cc->expr, "%s is not a parent interface of %s, but you can insert an explicit cast '(%s)value' to enforce the (unsafe) conversion.",
-	                  type_quoted_error_string(cc->to->pointer), type_quoted_error_string(from_interface),
+	RETURN_CAST_ERROR(cc->expr, "%s is not a parent interface of %s, but you can insert an explicit cast '(%s)value' to enforce the (unsafe) conversion.",
+	                  type_quoted_error_string(cc->to), type_quoted_error_string(from_interface),
 	                  type_to_error_string(cc->to_type));
 }
 
@@ -1069,7 +1067,7 @@ static bool rule_explicit_ok(CastContext *cc, bool is_explicit, bool silent)
 	if (is_explicit) return true;
 	if (!silent)
 	{
-		SEMA_ERROR(cc->expr, "%s cannot implicitly be converted to %s, but you may use a cast.", type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
+		RETURN_CAST_ERROR(cc->expr, "%s cannot implicitly be converted to %s, but you may use a cast.", type_quoted_error_string(cc->expr->type), type_quoted_error_string(cc->to_type));
 	}
 	return false;
 }
@@ -1084,7 +1082,7 @@ static bool rule_int_to_float(CastContext *cc, bool is_explicit, bool is_silent)
 	if (!expr_is_simple(expr, true))
 	{
 		if (is_silent) return false;
-		RETURN_SEMA_ERROR(expr, "This conversion requires an explicit cast to %s, because the widening of the expression may be done in more than one way.",
+		RETURN_CAST_ERROR(expr, "This conversion requires an explicit cast to %s, because the widening of the expression may be done in more than one way.",
 		           type_quoted_error_string(cc->to_type));
 	}
 	return true;
@@ -1104,8 +1102,8 @@ static bool rule_widen_narrow(CastContext *cc, bool is_explicit, bool is_silent)
 		if (expr_is_simple(cc->expr, type_is_float(cc->to))) return true;
 		if (is_silent) return false;
 		{
-			SEMA_ERROR(expr, "This conversion requires an explicit cast to %s, because the widening of the expression may be done in more than one way.",
-			           type_quoted_error_string(cc->to_type));
+			RETURN_CAST_ERROR(expr, "This conversion requires an explicit cast to %s, because the widening of the expression may be done in more than one way.",
+							  type_quoted_error_string(cc->to_type));
 		}
 		return false;
 	}
@@ -1117,10 +1115,10 @@ static bool rule_widen_narrow(CastContext *cc, bool is_explicit, bool is_silent)
 		{
 			if (cc->to_group != CONV_INT)
 			{
-				RETURN_SEMA_ERROR(expr, "The value '%s' is out of range for %s, so you need an explicit cast to truncate the value.", expr_const_to_error_string(&expr->const_expr),
+				RETURN_CAST_ERROR(expr, "The value '%s' is out of range for %s, so you need an explicit cast to truncate the value.", expr_const_to_error_string(&expr->const_expr),
 				                  type_quoted_error_string(cc->to_type));
 			}
-			sema_error_const_int_out_of_range(expr, expr, cc->to_type);
+			sema_error_const_int_out_of_range(cc, expr, expr, cc->to_type);
 		}
 		return false;
 	}
@@ -1136,9 +1134,8 @@ static bool rule_widen_narrow(CastContext *cc, bool is_explicit, bool is_silent)
 		// If it's an integer that's the problem, zoom in on that one.
 		if (type_is_integer(type_flatten(problem->type))) expr = problem;
 		// Otherwise require a cast.
-		SEMA_ERROR(expr, "%s cannot implicitly be converted to %s, but you may use a cast.",
+		RETURN_CAST_ERROR(expr, "%s cannot implicitly be converted to %s, but you may use a cast.",
 		           type_quoted_error_string(expr->type), type_quoted_error_string(cc->to_type));
-		return false;
 	}
 	return true;
 }
@@ -1250,7 +1247,7 @@ static bool rule_int_to_enum(CastContext *cc, bool is_explicit, bool is_silent)
 	// Negative numbers are always wrong.
 	if (int_is_neg(to_convert))
 	{
-		if (!is_silent) SEMA_ERROR(cc->expr, "A negative number cannot be converted to an enum.");
+		if (!is_silent) RETURN_CAST_ERROR(cc->expr, "A negative number cannot be converted to an enum.");
 		return false;
 	}
 
@@ -1259,7 +1256,7 @@ static bool rule_int_to_enum(CastContext *cc, bool is_explicit, bool is_silent)
 	Int max = {.i.low = max_enums, .type = TYPE_U32};
 	if (int_comp(to_convert, max, BINARYOP_GE))
 	{
-		if (!is_silent) SEMA_ERROR(cc->expr, "This value exceeds the number of enums in %s.", enum_decl->name);
+		if (!is_silent) RETURN_CAST_ERROR(cc->expr, "This value exceeds the number of enums in %s.", enum_decl->name);
 		return false;
 	}
 	return true;
@@ -1309,7 +1306,7 @@ static inline bool insert_runtime_cast(Expr *expr, CastKind kind, Type *type)
 	return true;
 }
 
-static void cast_vaptr_to_sa(SemaContext *context, Expr *expr, Type *type) { insert_runtime_cast(expr, CAST_APTSA, type); }
+static void cast_vaptr_to_slice(SemaContext *context, Expr *expr, Type *type) { insert_runtime_cast(expr, CAST_APTSA, type); }
 static void cast_ptr_to_any(SemaContext *context, Expr *expr, Type *type) { insert_runtime_cast(expr, CAST_PTRANY, type); }
 static void cast_struct_to_inline(SemaContext *context, Expr *expr, Type *type) { insert_runtime_cast(expr, CAST_STINLINE, type); }
 static void cast_fault_to_anyfault(SemaContext *context, Expr *expr, Type *type) { expr->type = type; };
@@ -1718,7 +1715,7 @@ static void cast_anyfault_to_fault(SemaContext *context, Expr *expr, Type *type)
 	expr->type = type;
 }
 
-static void cast_sa_to_ptr(SemaContext *context, Expr *expr, Type *type)
+static void cast_slice_to_ptr(SemaContext *context, Expr *expr, Type *type)
 {
 	if (expr_is_const_string(expr) || expr_is_const_bytes(expr))
 	{
@@ -1825,7 +1822,7 @@ static void cast_ptr_to_bool(SemaContext *context, Expr *expr, Type *type)
 	expr_rewrite_const_bool(expr, type, true);
 }
 
-static void cast_sa_to_bool(SemaContext *context, Expr *expr, Type *type)
+static void cast_slice_to_bool(SemaContext *context, Expr *expr, Type *type)
 {
 	if (expr_is_const_initializer(expr))
 	{
@@ -1848,7 +1845,7 @@ static void cast_sa_to_bool(SemaContext *context, Expr *expr, Type *type)
 				break;
 		}
 	}
-	insert_runtime_cast(expr, CAST_SABOOL, type);
+	insert_runtime_cast(expr, CAST_SLBOOL, type);
 }
 
 /**
@@ -1856,7 +1853,7 @@ static void cast_sa_to_bool(SemaContext *context, Expr *expr, Type *type)
  * 1. int[] -> Foo[] where Foo is a distinct or typedef or pointer. Then we can just redefine
  * 2. The second case is something like int[] -> float[] for this case we need to make a bitcast using CAST_SASA.
  */
-static void cast_sa_to_sa(SemaContext *context, Expr *expr, Type *to_type)
+static void cast_slice_to_slice(SemaContext *context, Expr *expr, Type *to_type)
 {
 	Type *to_type_base = type_flatten(type_flatten(to_type)->array.base);
 	Type *from_type_base = type_flatten(type_flatten(expr->type)->array.base);
@@ -1865,10 +1862,10 @@ static void cast_sa_to_sa(SemaContext *context, Expr *expr, Type *to_type)
 		expr->type = to_type;
 		return;
 	}
-	insert_runtime_cast(expr, CAST_SASA, to_type);
+	insert_runtime_cast(expr, CAST_SLSL, to_type);
 }
 
-static void cast_sa_to_vecarr(SemaContext *context, Expr *expr, Type *to_type)
+static void cast_slice_to_vecarr(SemaContext *context, Expr *expr, Type *to_type)
 {
 	if (!expr_is_const(expr))
 	{
@@ -1883,7 +1880,7 @@ static void cast_sa_to_vecarr(SemaContext *context, Expr *expr, Type *to_type)
 			}
 			case EXPR_SLICE:
 			{
-				insert_runtime_cast(expr, CAST_SAARR, to_type);
+				insert_runtime_cast(expr, CAST_SLARR, to_type);
 				return;
 			}
 			default:
@@ -1897,7 +1894,7 @@ static void cast_sa_to_vecarr(SemaContext *context, Expr *expr, Type *to_type)
 	return;
 }
 
-static void cast_sa_to_infer(SemaContext *context, Expr *expr, Type *to_type)
+static void cast_slice_to_infer(SemaContext *context, Expr *expr, Type *to_type)
 {
 	ArraySize len = sema_len_from_const(expr);
 	assert(len > 0);
@@ -1987,10 +1984,10 @@ static void cast_typeid_to_bool(SemaContext *context, Expr *expr, Type *to_type)
 #define PT2IN &cast_ptr_to_int           
 #define PT2PT &cast_ptr_to_ptr           
 #define PT2AY &cast_ptr_to_any           
-#define AP2SA &cast_vaptr_to_sa          
-#define SA2BO &cast_sa_to_bool           
-#define SA2PT &cast_sa_to_ptr            
-#define SA2SA &cast_sa_to_sa             
+#define AP2SL &cast_vaptr_to_slice
+#define SL2BO &cast_slice_to_bool
+#define SL2PT &cast_slice_to_ptr
+#define SL2SL &cast_slice_to_slice
 #define VC2AR &cast_vec_to_arr           
 #define VC2VC &cast_vec_to_vec           
 #define AR2VC &cast_arr_to_vec           
@@ -2006,9 +2003,9 @@ static void cast_typeid_to_bool(SemaContext *context, Expr *expr, Type *to_type)
 #define TI2PT &cast_typeid_to_ptr        
 #define AF2BO &cast_anyfault_to_bool     
 #define AF2FA &cast_anyfault_to_fault    
-#define SA2VA &cast_sa_to_vecarr         
+#define SL2VA &cast_slice_to_vecarr
 #define XX2VO &cast_all_to_void          
-#define SA2FE &cast_sa_to_infer
+#define SL2FE &cast_slice_to_infer
 #define VA2FE &cast_vecarr_to_infer
 #define PT2FE &cast_ptr_to_infer
 #define UL2XX &cast_untyped_list_to_other
@@ -2026,20 +2023,20 @@ static void cast_typeid_to_bool(SemaContext *context, Expr *expr, Type *to_type)
 #define RARBS &rule_arr_to_bits           /* Char[*] -> bits (explicit + base match)                                                           */
 #define RINEN &rule_int_to_enum           /* Int -> enum (explicit, range check const)                                                         */
 #define RPTPT &rule_ptr_to_ptr            /* Ptr -> ptr (explicit or ptr match)                                                                */
-#define RAPSA &rule_arrptr_to_sa          /* Arrptr -> Subarray (explicit flattens distinct, pointer match)                                    */
-#define RSAPT &rule_sa_to_ptr             /* Subarray -> ptr (explicit flatens distinct, pointer match)                                        */
-#define RSASA &rule_sa_to_sa              /* Subarray -> subarray (explicit same size, align safe, match base otherwise) void* <-> int* match. */
-#define RSAVA &rule_sa_to_vecarr          /* Subarray -> vec/arr (if const, convert to vec/arr, check)                                         */
+#define RAPSL &rule_arrptr_to_slice       /* Arrptr -> Slice (explicit flattens distinct, pointer match)                                    */
+#define RSLPT &rule_slice_to_ptr          /* Slice -> ptr (explicit flatens distinct, pointer match)                                        */
+#define RSLSL &rule_slice_to_slice        /* Slice -> slice (explicit same size, align safe, match base otherwise) void* <-> int* match. */
+#define RSLVA &rule_slice_to_vecarr       /* Slice -> vec/arr (if const, convert to vec/arr, check)                                         */
 #define RVCVC &rule_vec_to_vec            /* Vec -> vec (as underlying type)                                                                   */
 #define RBSAR &rule_bits_to_arr           /* Bits -> arr (explicit + base match)                                                               */
 #define RBSIN &rule_bits_to_int           /* Bits -> int (explicit + size match)                                                               */
 #define RDIXX &rule_from_distinct         /* Distinct -> internal (explicit or inline)                                                         */
 #define RARVC &rule_arr_to_vec            /* Arr -> Vec (len matches, valid elements, flatten if explicit)                                     */
 #define RVCAR &rule_vec_to_arr            /* Vec -> Arr (len matches, if base can be converted, flatten if explicit)                           */
-#define RARAR &rule_arr_to_arr            /* Array to array conversion (like subarray, but len must match)                                     */
+#define RARAR &rule_arr_to_arr            /* Array to array conversion (like slice, but len must match)                                        */
 #define RSTST &rule_struct_to_struct      /* Struct -> struct (if inline)                                                                      */
 #define RSTDI &rule_to_struct_to_distinct /* Struct -> inline (struct inline = distinct, distinct inline = struct if explicit flatten)         */
-#define RSAFE &rule_sa_to_infer           /* Subarray -> infer (only if subarray is constant or can infer)                                     */
+#define RSLFE &rule_slice_to_infer        /* Slice -> infer (only if slice is constant or can infer)                                           */
 #define RVAFE &rule_vecarr_to_infer       /* Vec/arr -> infer (if base matches)                                                                */
 #define RPTFE &rule_ptr_to_infer          /* Ptr -> infer (if pointee may infer)                                                               */
 #define RPTIF &rule_ptr_to_interface      /* Ptr -> Interface if the pointee implements it                                                     */
@@ -2047,17 +2044,17 @@ static void cast_typeid_to_bool(SemaContext *context, Expr *expr, Type *to_type)
 #define RULST &rule_ulist_to_struct       /* Untyped list -> bitstruct or union                                                                */
 #define RULAR &rule_ulist_to_vecarr       /* Untyped list -> vector or array                                                                   */
 #define RULFE &rule_ulist_to_inferred     /* Untyped list -> inferred vector or array                                                          */
-#define RULSA &rule_ulist_to_subarray     /* Untyped list -> subarray                                                                          */
+#define RULSL &rule_ulist_to_slice        /* Untyped list -> slice                                                                          */
 
 CastRule cast_rules[CONV_LAST + 1][CONV_LAST + 1] = {
-// void, wildc,  bool,   int, float,   ptr,  sarr,   vec, bitst, distc, array, strct, union,   any,  infc, fault,  enum, typid, afaul, voidp, arrpt, infer, ulist (to)
+// void, wildc,  bool,   int, float,   ptr, slice,   vec, bitst, distc, array, strct, union,   any,  infc, fault,  enum, typid, afaul, voidp, arrpt, infer, ulist (to)
  {_NA__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__}, // VOID    (from)
  {ROKOK, _NA__, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, ROKOK, _NO__, _NO__}, // WILDCARD
  {REXPL, _NO__, _NA__, REXPL, REXPL, _NO__, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__}, // BOOL
  {REXPL, _NO__, REXPL, RWIDE, RINFL, RINPT, _NO__, ROKOK, RINBS, RXXDI, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RINEN, _NO__, _NO__, RINPT, RINPT, _NO__, _NO__}, // INT
  {REXPL, _NO__, REXPL, REXPL, RWIDE, _NO__, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__}, // FLOAT
  {REXPL, _NO__, REXPL, RPTIN, _NO__, RPTPT, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, ROKOK, RPTIF, _NO__, _NO__, _NO__, _NO__, ROKOK, RPTPT, RPTFE, _NO__}, // PTR
- {REXPL, _NO__, REXPL, _NO__, _NO__, RSAPT, RSASA, RSAVA, _NO__, RXXDI, RSAVA, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, ROKOK, RSAPT, RSAFE, _NO__}, // SARRAY
+ {REXPL, _NO__, REXPL, _NO__, _NO__, RSLPT, RSLSL, RSLVA, _NO__, RXXDI, RSLVA, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, ROKOK, RSLPT, RSLFE, _NO__}, // SLICE
  {REXPL, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RVCVC, _NO__, RXXDI, RVCAR, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RVAFE, _NO__}, // VECTOR
  {REXPL, _NO__, _NO__, RBSIN, _NO__, _NO__, _NO__, _NO__, _NO__, RXXDI, RBSAR, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__}, // BITSTRUCT
  {REXPL, _NO__, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, RDIXX, _NO__}, // DISTINCT
@@ -2071,36 +2068,36 @@ CastRule cast_rules[CONV_LAST + 1][CONV_LAST + 1] = {
  {REXPL, _NO__, REXPL, RPTIN, _NO__, REXPL, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NA__, _NO__, REXPL, REXPL, _NO__, _NO__}, // TYPEID
  {REXPL, _NO__, REXPL, RPTIN, _NO__, REXPL, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, _NO__, _NO__, REXPL, _NO__, _NO__, _NA__, REXPL, REXPL, _NO__, _NO__}, // ANYFAULT
  {REXPL, _NO__, REXPL, RPTIN, _NO__, ROKOK, _NO__, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, ROKOK, ROKOK, _NO__, _NO__, _NO__, _NO__, _NA__, ROKOK, _NO__, _NO__}, // VOIDPTR
- {REXPL, _NO__, REXPL, RPTIN, _NO__, RPTPT, RAPSA, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, ROKOK, ROKOK, _NO__, _NO__, _NO__, _NO__, ROKOK, RPTPT, RPTFE, _NO__}, // ARRPTR
+ {REXPL, _NO__, REXPL, RPTIN, _NO__, RPTPT, RAPSL, ROKOK, _NO__, RXXDI, _NO__, _NO__, _NO__, ROKOK, ROKOK, _NO__, _NO__, _NO__, _NO__, ROKOK, RPTPT, RPTFE, _NO__}, // ARRPTR
  {_NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__}, // INFERRED
- {_NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RULSA, RULAR, RULST, RXXDI, RULAR, RULST, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RULFE, _NO__}, // UNTYPED_LIST
+ {_NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RULSL, RULAR, RULST, RXXDI, RULAR, RULST, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, _NO__, RULFE, _NO__}, // UNTYPED_LIST
 };
 
 CastFunction cast_function[CONV_LAST + 1][CONV_LAST + 1] = {
-//void,  wildcd, bool, int,   float, ptr,   sarr,  vec,   bitst, dist,  array, struct,union, any,   infc,  fault, enum,  typeid,anyfa, vptr,  aptr,  infer, ulist (to)
- {0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // VOID (from)
- {XX2XX, 0,     XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, 0,     XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, 0,     0     }, // WILDCARD
- {XX2VO, 0,     0,     BO2IN, BO2FP, 0,     0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // BOOL
- {XX2VO, 0,     IN2BO, IN2IN, IN2FP, IN2PT, 0,     EX2VC, IA2BS, 0,     0,     0,     0,     0,     0,     0,     IN2EN, 0,     0,     IN2PT, IN2PT, 0,     0     }, // INT
- {XX2VO, 0,     FP2BO, FP2IN, FP2FP, 0,     0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // FLOAT
- {XX2VO, 0,     PT2BO, PT2IN, 0,     PT2PT, 0,     EX2VC, 0,     0,     0,     0,     0,     PT2AY, PT2AY, 0,     0,     0,     0,     PT2PT, PT2PT, PT2FE, 0     }, // PTR
- {XX2VO, 0,     SA2BO, 0,     0,     SA2PT, SA2SA, SA2VA, 0,     0,     SA2VA, 0,     0,     0,     0,     0,     0,     0,     0,     SA2PT, SA2PT, SA2FE, 0     }, // SARRAY
- {XX2VO, 0,     0,     0,     0,     0,     0,     VC2VC, 0,     0,     VC2AR, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     VA2FE, 0     }, // VECTOR
- {XX2VO, 0,     0,     BS2IA, 0,     0,     0,     0,     0,     0,     BS2IA, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // BITSTRUCT
- {0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // DISTINCT
- {XX2VO, 0,     0,     0,     0,     0,     0,     AR2VC, IA2BS, 0,     AR2AR, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     VA2FE, 0     }, // ARRAY
- {XX2VO, 0,     ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, 0,     ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, 0,     0     }, // STRUCT
- {XX2VO, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // UNION
- {XX2VO, 0,     AY2BO, 0,     0,     AY2PT, 0,     0,     0,     0,     0,     0,     0,     PT2PT, PT2PT, 0,     0,     0,     0,     AY2PT, AY2PT, 0,     0     }, // ANY
- {XX2VO, 0,     AY2BO, 0,     0,     AY2PT, 0,     0,     0,     0,     0,     0,     0,     PT2PT, PT2PT, 0,     0,     0,     0,     AY2PT, AY2PT, 0,     0     }, // INTERFACE
- {XX2VO, 0,     AF2BO, FA2IN, 0,     FA2PT, 0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     FA2AF, FA2PT, FA2PT, 0,     0     }, // FAULT
- {XX2VO, 0,     0,     EN2IN, 0,     0,     0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // ENUM
- {XX2VO, 0,     TI2BO, TI2IN, 0,     TI2PT, 0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     TI2PT, TI2PT, 0,     0     }, // TYPEID
- {XX2VO, 0,     AF2BO, FA2IN, 0,     FA2IN, 0,     EX2VC, 0,     0,     0,     0,     0,     0,     0,     AF2FA, 0,     0,     0,     FA2IN, FA2IN, 0,     0     }, // ANYFAULT
- {XX2VO, 0,     PT2BO, PT2IN, 0,     PT2PT, 0,     EX2VC, 0,     0,     0,     0,     0,     PT2AY, PT2AY, 0,     0,     0,     0,     0,     PT2PT, 0,     0     }, // VOIDPTR
- {XX2VO, 0,     PT2BO, PT2IN, 0,     PT2PT, AP2SA, EX2VC, 0,     0,     0,     0,     0,     PT2AY, PT2AY, 0,     0,     0,     0,     PT2PT, PT2PT, PT2FE, 0     }, // ARRAYPTR
- {    0, 0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // INFERRED
- {    0, 0,     0,     0,     0,     0,     UL2XX, UL2XX, UL2XX, 0, UL2XX, UL2XX,     0,     0,     0,     0,     0,     0,     0,     0,     0,     UL2XX, 0     }, // UNTYPED
+//void,  wildcd, bool,    int, float,   ptr, slice,  vec,  bitst, dist,  array, struct,union,   any,  infc, fault,  enum,typeid, anyfa,  vptr,  aptr, infer, ulist (to)
+ {0,          0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // VOID (from)
+ {XX2XX,      0, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX,     0, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX, XX2XX,     0,     0     }, // WILDCARD
+ {XX2VO,      0,     0, BO2IN, BO2FP,     0,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // BOOL
+ {XX2VO,      0, IN2BO, IN2IN, IN2FP, IN2PT,     0, EX2VC, IA2BS,     0,     0,     0,     0,     0,     0,     0, IN2EN,     0,     0, IN2PT, IN2PT,     0,     0     }, // INT
+ {XX2VO,      0, FP2BO, FP2IN, FP2FP,     0,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // FLOAT
+ {XX2VO,      0, PT2BO, PT2IN,     0, PT2PT,     0, EX2VC,     0,     0,     0,     0,     0, PT2AY, PT2AY,     0,     0,     0,     0, PT2PT, PT2PT, PT2FE,     0     }, // PTR
+ {XX2VO,      0, SL2BO,     0,     0, SL2PT, SL2SL, SL2VA,     0,     0, SL2VA,     0,     0,     0,     0,     0,     0,     0,     0, SL2PT, SL2PT, SL2FE,     0     }, // SLICE
+ {XX2VO,      0,     0,     0,     0,     0,     0, VC2VC,     0,     0, VC2AR,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0, VA2FE,     0     }, // VECTOR
+ {XX2VO,      0,     0, BS2IA,     0,     0,     0,     0,     0,     0, BS2IA,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // BITSTRUCT
+ {    0,      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // DISTINCT
+ {XX2VO,      0,     0,     0,     0,     0,     0, AR2VC, IA2BS,     0, AR2AR,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0, VA2FE,     0     }, // ARRAY
+ {XX2VO,      0, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN,     0, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN, ST2LN,     0,     0     }, // STRUCT
+ {XX2VO,      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // UNION
+ {XX2VO,      0, AY2BO,     0,     0, AY2PT,     0,     0,     0,     0,     0,     0,     0,     PT2PT, PT2PT, 0,     0,     0,     0, AY2PT, AY2PT,     0,     0     }, // ANY
+ {XX2VO,      0, AY2BO,     0,     0, AY2PT,     0,     0,     0,     0,     0,     0,     0,     PT2PT, PT2PT, 0,     0,     0,     0, AY2PT, AY2PT,     0,     0     }, // INTERFACE
+ {XX2VO,      0, AF2BO, FA2IN,     0, FA2PT,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0, FA2AF, FA2PT, FA2PT,     0,     0     }, // FAULT
+ {XX2VO,      0,     0, EN2IN,     0,     0,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // ENUM
+ {XX2VO,      0, TI2BO, TI2IN,     0, TI2PT,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0, TI2PT, TI2PT,     0,     0     }, // TYPEID
+ {XX2VO,      0, AF2BO, FA2IN,     0, FA2IN,     0, EX2VC,     0,     0,     0,     0,     0,     0,     0,     AF2FA, 0,     0,     0, FA2IN, FA2IN,     0,     0     }, // ANYFAULT
+ {XX2VO,      0, PT2BO, PT2IN,     0, PT2PT,     0, EX2VC,     0,     0,     0,     0,     0,     PT2AY, PT2AY, 0,     0,     0,     0,     0, PT2PT,     0,     0     }, // VOIDPTR
+ {XX2VO,      0, PT2BO, PT2IN,     0, PT2PT, AP2SL, EX2VC,     0,     0,     0,     0,     0,     PT2AY, PT2AY, 0,     0,     0,     0, PT2PT, PT2PT, PT2FE,     0     }, // ARRAYPTR
+ {    0,      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0     }, // INFERRED
+ {    0,      0,     0,     0,     0,     0, UL2XX, UL2XX, UL2XX,     0, UL2XX, UL2XX,     0,     0,     0,     0,     0,     0,     0,     0,     0, UL2XX,     0     }, // UNTYPED
 };
 
 static ConvGroup group_from_type[TYPE_LAST + 1] = {
@@ -2122,8 +2119,8 @@ static ConvGroup group_from_type[TYPE_LAST + 1] = {
 	[TYPE_F32]              = CONV_FLOAT,
 	[TYPE_F64]              = CONV_FLOAT,
 	[TYPE_F128]             = CONV_FLOAT,
-	[TYPE_ANY]              = CONV_NO,
-	[TYPE_INTERFACE]         = CONV_NO,
+	[TYPE_ANY]              = CONV_ANY,
+	[TYPE_INTERFACE]        = CONV_INTERFACE,
 	[TYPE_ANYFAULT]         = CONV_ANYFAULT,
 	[TYPE_TYPEID]           = CONV_TYPEID,
 	[TYPE_POINTER]          = CONV_POINTER,
@@ -2136,9 +2133,7 @@ static ConvGroup group_from_type[TYPE_LAST + 1] = {
 	[TYPE_TYPEDEF]          = CONV_NO,
 	[TYPE_DISTINCT]         = CONV_DISTINCT,
 	[TYPE_ARRAY]            = CONV_ARRAY,
-	[TYPE_INFPTR]           = CONV_INTERFACE,
-	[TYPE_ANYPTR]           = CONV_ANY,
-	[TYPE_SUBARRAY]         = CONV_SUBARRAY,
+	[TYPE_SLICE]            = CONV_SLICE,
 	[TYPE_FLEXIBLE_ARRAY]   = CONV_NO,
 	[TYPE_INFERRED_ARRAY]   = CONV_NO,
 	[TYPE_VECTOR]           = CONV_VECTOR,
diff --git a/src/compiler/sema_decls.c b/src/compiler/sema_decls.c
index 4aa1aa7a6..8b34adbc7 100644
--- a/src/compiler/sema_decls.c
+++ b/src/compiler/sema_decls.c
@@ -4,26 +4,33 @@
 
 #include "sema_internal.h"
 
+#define EXPORTED_USER_DEFINED_TYPES (ATTR_ENUM | ATTR_UNION | ATTR_STRUCT | ATTR_FAULT)
+#define CALLABLE_TYPE (ATTR_FUNC | ATTR_INTERFACE_METHOD | ATTR_MACRO)
+#define USER_DEFINED_TYPES EXPORTED_USER_DEFINED_TYPES | ATTR_BITSTRUCT | ATTR_DISTINCT
 
 static inline bool sema_analyse_func_macro(SemaContext *context, Decl *decl, AttributeDomain domain, bool *erase_decl);
 static inline bool sema_analyse_func(SemaContext *context, Decl *decl, bool *erase_decl);
 static inline bool sema_analyse_macro(SemaContext *context, Decl *decl, bool *erase_decl);
 static inline bool sema_analyse_signature(SemaContext *context, Signature *sig, TypeInfoId type_parent);
 static inline bool sema_analyse_main_function(SemaContext *context, Decl *decl);
-static inline bool sema_check_param_uniqueness_and_type(Decl **decls, Decl *current, unsigned current_index, unsigned count);
+static inline bool
+sema_check_param_uniqueness_and_type(SemaContext *context, Decl **decls, Decl *current, unsigned current_index,
+                                     unsigned count);
 
 static inline bool sema_analyse_method(SemaContext *context, Decl *decl);
 static inline bool sema_is_valid_method_param(SemaContext *context, Decl *param, Type *parent_type, bool is_dynamic);
 static inline bool sema_analyse_macro_method(SemaContext *context, Decl *decl);
-static inline bool unit_add_base_extension_method(CompilationUnit *unit, Type *parent_type, Decl *method_like);
-static inline bool unit_add_method_like(CompilationUnit *unit, Type *parent_type, Decl *method_like);
+static inline bool
+unit_add_base_extension_method(SemaContext *context, CompilationUnit *unit, Type *parent_type, Decl *method);
+static inline bool unit_add_method(SemaContext *context, Type *parent_type, Decl *method);
 
-static bool sema_analyse_operator_common(Decl *method, TypeInfo **rtype_ptr, Decl ***params_ptr, uint32_t parameters);
+static bool sema_analyse_operator_common(SemaContext *context, Decl *method, TypeInfo **rtype_ptr, Decl ***params_ptr,
+                                         uint32_t parameters);
 static inline Decl *operator_in_module(SemaContext *c, Module *module, OperatorOverload operator_overload);
-static inline bool sema_analyse_operator_element_at(Decl *method);
-static inline bool sema_analyse_operator_element_set(Decl *method);
-static inline bool sema_analyse_operator_len(Decl *method);
-static bool sema_check_operator_method_validity(Decl *method);
+static inline bool sema_analyse_operator_element_at(SemaContext *context, Decl *method);
+static inline bool sema_analyse_operator_element_set(SemaContext *context, Decl *method);
+static inline bool sema_analyse_operator_len(Decl *method, SemaContext *context);
+static bool sema_check_operator_method_validity(SemaContext *context, Decl *method);
 static inline const char *method_name_by_decl(Decl *method_like);
 
 static bool sema_analyse_struct_union(SemaContext *context, Decl *decl, bool *erase_decl);
@@ -33,7 +40,8 @@ static bool sema_analyse_struct_members(SemaContext *context, Decl *decl);
 static inline bool sema_analyse_struct_member(SemaContext *context, Decl *parent, Decl *decl, bool *erase_decl);
 static inline bool sema_analyse_bitstruct_member(SemaContext *context, Decl *parent, Decl *member, unsigned index, bool allow_overlap, bool *erase_decl);
 
-static inline bool sema_analyse_doc_header(AstId doc, Decl **params, Decl **extra_params, bool *pure_ref);
+static inline bool
+sema_analyse_doc_header(SemaContext *context, AstId doc, Decl **params, Decl **extra_params, bool *pure_ref);
 
 static const char *attribute_domain_to_string(AttributeDomain domain);
 static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr, AttributeDomain domain, bool *erase_decl);
@@ -43,7 +51,7 @@ static bool sema_analyse_attributes(SemaContext *context, Decl *decl, Attr **att
 									bool *erase_decl);
 static bool sema_analyse_attributes_for_var(SemaContext *context, Decl *decl, bool *erase_decl);
 static bool sema_check_section(SemaContext *context, Attr *attr);
-static inline bool sema_analyse_attribute_decl(SemaContext *c, Decl *decl, bool *erase_decl);
+static inline bool sema_analyse_attribute_decl(SemaContext *context, SemaContext *c, Decl *decl, bool *erase_decl);
 
 static inline bool sema_analyse_typedef(SemaContext *context, Decl *decl, bool *erase_decl);
 bool sema_analyse_decl_type(SemaContext *context, Type *type, SourceSpan span);
@@ -55,7 +63,7 @@ static bool sema_analyse_parameterized_define(SemaContext *c, Decl *decl);
 static Module *module_instantiate_generic(SemaContext *context, Module *module, Path *path, Expr **params,
 										  SourceSpan from);
 
-static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param, bool *has_default);
+static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param);
 static inline bool sema_analyse_enum(SemaContext *context, Decl *decl, bool *erase_decl);
 static inline bool sema_analyse_error(SemaContext *context, Decl *decl, bool *erase_decl);
 
@@ -95,7 +103,8 @@ static bool sema_check_section(SemaContext *context, Attr *attr)
 /**
  * Check parameter name uniqueness and that the type is not void.
  */
-static inline bool sema_check_param_uniqueness_and_type(Decl **decls, Decl *current, unsigned current_index, unsigned count)
+static inline bool sema_check_param_uniqueness_and_type(
+		SemaContext *context, Decl **decls, Decl *current, unsigned current_index, unsigned count)
 {
 	// We may have `void` arguments. They are not allowed in C3. Theoretically they could
 	// be permitted, but it would complicate semantics in general.
@@ -140,7 +149,7 @@ static inline bool sema_resolve_implemented_interfaces(SemaContext *context, Dec
 	{
 		TypeInfo *inf_info = interfaces[i];
 		// Resolve the name
-		if (!sema_resolve_type_info(context, inf_info, RESOLVE_TYPE_ALLOW_ANY)) return false;
+		if (!sema_resolve_type_info(context, inf_info, RESOLVE_TYPE_DEFAULT)) return false;
 		Type *inf_type = inf_info->type->canonical;
 		if (inf_type->type_kind != TYPE_INTERFACE)
 		{
@@ -233,9 +242,16 @@ static inline bool sema_analyse_struct_member(SemaContext *context, Decl *parent
 			TypeInfo *type_info = type_infoptr(decl->var.type_info);
 			if (!sema_resolve_type_info(context, type_info, RESOLVE_TYPE_ALLOW_FLEXIBLE)) return decl_poison(decl);
 			Type *type = type_info->type;
-			if (type_is_invalid_storage_type(type))
+			switch (type_storage_type(type))
 			{
-				RETURN_SEMA_ERROR(type_info, "Members cannot be of type %s.", type_quoted_error_string(type));
+				case STORAGE_NORMAL:
+					break;
+				case STORAGE_VOID:
+				case STORAGE_COMPILE_TIME:
+					RETURN_SEMA_ERROR(type_info, "Members cannot be of type %s.", type_quoted_error_string(type));
+				case STORAGE_WILDCARD:
+				case STORAGE_UNKNOWN:
+					RETURN_SEMA_ERROR(type_info, "%s has unknown size and cannot be used as a member.", type_quoted_error_string(type));
 			}
 			decl->type = type;
 			decl->resolve_status = RESOLVE_DONE;
@@ -879,6 +895,54 @@ static bool sema_analyse_bitstruct(SemaContext *context, Decl *decl, bool *erase
 	return decl_poison(decl);
 }
 
+INLINE Decl *sema_member_decl_for_name(Type *type, const char *name)
+{
+	RETRY:
+	switch (type->type_kind)
+	{
+		case TYPE_TYPEDEF:
+			type = type->canonical;
+			goto RETRY;
+		case TYPE_POISONED:
+		case TYPE_VOID:
+		case TYPE_BOOL:
+		case ALL_INTS:
+		case ALL_FLOATS:
+		case TYPE_ANYFAULT:
+		case TYPE_TYPEID:
+		case TYPE_POINTER:
+		case TYPE_FUNC:
+		case TYPE_FAULTTYPE:
+		case TYPE_ARRAY:
+		case TYPE_FLEXIBLE_ARRAY:
+		case TYPE_INFERRED_ARRAY:
+		case TYPE_VECTOR:
+		case TYPE_INFERRED_VECTOR:
+		case TYPE_UNTYPED_LIST:
+		case TYPE_OPTIONAL:
+		case TYPE_WILDCARD:
+		case TYPE_TYPEINFO:
+		case TYPE_MEMBER:
+		case TYPE_SLICE:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
+		case TYPE_ENUM:
+		{
+			FOREACH_BEGIN(Decl *param, type->decl->enums.parameters)
+				if (param->name == name) return param;
+			FOREACH_END();
+			return NULL;
+		}
+		case TYPE_STRUCT:
+		case TYPE_UNION:
+		case TYPE_DISTINCT:
+		case TYPE_BITSTRUCT:
+			return sema_decl_stack_find_decl_member(type->decl, name);
+		default:
+			UNREACHABLE
+	}
+}
+
 
 static inline bool sema_analyse_signature(SemaContext *context, Signature *sig, TypeInfoId type_parent)
 {
@@ -902,8 +966,7 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 		{
 			if (type_is_void(rtype))
 			{
-				SEMA_ERROR(rtype_info, "@nodiscard cannot be used on %s returning 'void'.", is_macro ? "macros" : "functions");
-				return false;
+				RETURN_SEMA_ERROR(rtype_info, "@nodiscard cannot be used on %s returning 'void'.", is_macro ? "macros" : "functions");
 			}
 		}
 		if (sig->attrs.maydiscard)
@@ -949,11 +1012,6 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 			default:
 				goto CHECK_PARAMS;
 		}
-		if (type_is_any_raw(inferred_type))
-		{
-			RETURN_SEMA_ERROR(param, "This would infer to %s, which cannot be passed by value. Use '&%s' instead.",
-			                  type_quoted_error_string(inferred_type), param->name);
-		}
 		param->var.type_info = type_info_id_new_base(inferred_type, param->span);
 	}
 
@@ -993,6 +1051,12 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 
 		assert(param->resolve_status == RESOLVE_NOT_DONE && "The param shouldn't have been resolved yet.");
 		param->resolve_status = RESOLVE_RUNNING;
+		bool erase = false;
+		if (!sema_analyse_attributes(context, param, param->attributes, ATTR_PARAM, &erase))
+		{
+			return decl_poison(param);
+		}
+		assert(!erase);
 		param->unit = context->unit;
 		assert(param->decl_kind == DECL_VAR);
 		VarDeclKind var_kind = param->var.kind;
@@ -1007,7 +1071,7 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 		switch (var_kind)
 		{
 			case VARDECL_PARAM_REF:
-				if (type_info && !type_is_pointer(param->type) && !type_is_any_interface_ptr(param->type))
+				if (type_info && !type_is_pointer(param->type))
 				{
 					RETURN_SEMA_ERROR(type_info, "A pointer type was expected for a ref argument, did you mean %s?",
 							   type_quoted_error_string(type_get_ptr(param->type)));
@@ -1087,7 +1151,7 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 					return decl_poison(param);
 				}
 			}
-			type_info->type = type_get_subarray(type_info->type);
+			type_info->type = type_get_slice(type_info->type);
 		}
 
 		if (type_info)
@@ -1097,6 +1161,7 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 			param->type = type_info->type;
 			if (!sema_set_abi_alignment(context, param->type, &param->alignment)) return false;
 		}
+
 		if (param->var.init_expr)
 		{
 			Expr *expr = param->var.init_expr;
@@ -1105,7 +1170,7 @@ static inline bool sema_analyse_signature(SemaContext *context, Signature *sig,
 				if (!sema_analyse_expr_rhs(context, param->type, expr, true, NULL)) return decl_poison(param);
 			}
 		}
-		if (!sema_check_param_uniqueness_and_type(params, param, i, param_count)) return decl_poison(param);
+		if (!sema_check_param_uniqueness_and_type(context, params, param, i, param_count)) return decl_poison(param);
 		param->resolve_status = RESOLVE_DONE;
 	}
 	return true;
@@ -1190,61 +1255,12 @@ static inline bool sema_analyse_distinct(SemaContext *context, Decl *decl, bool
 	}
 	// Distinct types drop the canonical
 	Type *base = info->type = info->type->canonical;
-	switch (base->type_kind)
-	{
-		case TYPE_FUNC:
-		case TYPE_TYPEDEF:
-		case CT_TYPES:
-		case TYPE_FLEXIBLE_ARRAY:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
-			UNREACHABLE
-			return false;
-		case TYPE_OPTIONAL:
-			UNREACHABLE
-		case TYPE_FAULTTYPE:
-			SEMA_ERROR(decl, "You cannot create a distinct type from a fault type.");
-			return false;
-		case TYPE_ANYFAULT:
-			SEMA_ERROR(decl, "You cannot create a distinct type from an error union.");
-			return false;
-		case TYPE_INFPTR:
-			SEMA_ERROR(decl, "You cannot create a distinct type from an interface pointer.");
-			return false;
-		case TYPE_ANYPTR:
-			SEMA_ERROR(decl, "You cannot create a distinct type from an 'any*'.");
-			return false;
-		case TYPE_VOID:
-		case TYPE_TYPEID:
-			SEMA_ERROR(decl, "Cannot create a distinct type from %s.", type_quoted_error_string(base));
-		case TYPE_BOOL:
-		case ALL_INTS:
-		case ALL_FLOATS:
-		case TYPE_POINTER:
-		case TYPE_ENUM:
-		case TYPE_BITSTRUCT:
-		case TYPE_STRUCT:
-		case TYPE_UNION:
-		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
-		case TYPE_VECTOR:
-		case TYPE_DISTINCT:
-			break;
-	}
-	// Do we need anything else?
 	return true;
 }
 
-static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param, bool *has_default)
+static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param)
 {
-	*has_default = false;
-	assert(param->decl_kind == DECL_VAR);
-	// We need to check that the parameters are not typeless nor are of any macro parameter kind.
-	if (param->var.kind != VARDECL_PARAM && !param->var.type_info)
-	{
-		SEMA_ERROR(param, "An associated value must be a normal typed parameter.");
-		return false;
-	}
+	assert(param->decl_kind == DECL_VAR && param->var.kind == VARDECL_PARAM && param->var.type_info);
 	if (vec_size(param->attributes))
 	{
 		SEMA_ERROR(param->attributes[0], "There are no valid attributes for associated values.");
@@ -1252,10 +1268,7 @@ static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param, bo
 	}
 	TypeInfo *type_info = type_infoptrzero(param->var.type_info);
 	if (!sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) return false;
-	if (param->var.vararg)
-	{
-		type_info->type = type_get_subarray(type_info->type);
-	}
+	assert(!param->var.vararg);
 	param->type = type_info->type;
 	assert(param->name);
 	if (param->name == kw_nameof)
@@ -1270,23 +1283,7 @@ static inline bool sema_analyse_enum_param(SemaContext *context, Decl *param, bo
 		return false;
 	}
 	sema_decl_stack_push(param);
-	if (param->var.init_expr)
-	{
-		Expr *expr = param->var.init_expr;
-
-		if (!sema_analyse_expr_rhs(context, param->type, expr, true, NULL)) return false;
-		if (IS_OPTIONAL(expr))
-		{
-			SEMA_ERROR(expr, "Default arguments may not be optionals.");
-			return false;
-		}
-		if (!expr_is_constant_eval(expr, CONSTANT_EVAL_GLOBAL_INIT))
-		{
-			SEMA_ERROR(expr, "Only constant expressions may be used as default values.");
-			return false;
-		}
-		*has_default = true;
-	}
+	assert(!param->var.init_expr);
 	return sema_set_abi_alignment(context, param->type, &param->alignment);
 }
 
@@ -1312,11 +1309,8 @@ static inline bool sema_analyse_enum(SemaContext *context, Decl *decl, bool *era
 
 	DEBUG_LOG("* Enum type resolved to %s.", type->name);
 
-
 	Decl **associated_values = decl->enums.parameters;
 	unsigned associated_value_count = vec_size(associated_values);
-	unsigned mandatory_count = 0;
-	bool default_values_used = false;
 	Decl** state = sema_decl_stack_store();
 	for (unsigned i = 0; i < associated_value_count; i++)
 	{
@@ -1332,18 +1326,7 @@ static inline bool sema_analyse_enum(SemaContext *context, Decl *decl, bool *era
 				value->resolve_status = RESOLVE_RUNNING;
 				break;
 		}
-		bool has_default = false;
-		if (!sema_analyse_enum_param(context, value, &has_default)) goto ERR;
-		if (!has_default)
-		{
-			mandatory_count++;
-			if (default_values_used && !value->var.vararg)
-			{
-				SEMA_ERROR(value, "Non-default parameters cannot appear after default parameters.");
-				goto ERR;
-			}
-		}
-		default_values_used |= has_default;
+		if (!sema_analyse_enum_param(context, value)) goto ERR;
 		value->resolve_status = RESOLVE_DONE;
 	}
 	sema_decl_stack_restore(state);
@@ -1407,15 +1390,13 @@ static inline bool sema_analyse_enum(SemaContext *context, Decl *decl, bool *era
 		{
 			if (!associated_value_count)
 			{
-				SEMA_ERROR(args[0], "No associated values are defined for this enum.");
-				return false;
+				RETURN_SEMA_ERROR(args[0], "No associated values are defined for this enum.");
 			}
-			SEMA_ERROR(args[associated_value_count], "Only %d associated value(s) may be defined for this enum.");
-			return false;
+			RETURN_SEMA_ERROR(args[associated_value_count], "Only %d associated value(s) may be defined for this enum.");
 		}
-		if (arg_count < mandatory_count)
+		if (arg_count < associated_value_count)
 		{
-			SEMA_ERROR(enum_value, "Expected associated value(s) defined for this enum.");
+			RETURN_SEMA_ERROR(enum_value, "Expected %d associated value(s) for this enum.", associated_value_count);
 			return false;
 		}
 		for (unsigned j = 0; j < arg_count; j++)
@@ -1429,7 +1410,6 @@ static inline bool sema_analyse_enum(SemaContext *context, Decl *decl, bool *era
 				return false;
 			}
 		}
-		REMINDER("named parameters and defaults do not work");
 		enum_value->resolve_status = RESOLVE_DONE;
 	}
 	return success;
@@ -1478,34 +1458,29 @@ static inline const char *method_name_by_decl(Decl *method_like)
 
 
 
-static bool sema_analyse_operator_common(Decl *method, TypeInfo **rtype_ptr, Decl ***params_ptr, uint32_t parameters)
+static bool sema_analyse_operator_common(SemaContext *context, Decl *method, TypeInfo **rtype_ptr, Decl ***params_ptr,
+                                         uint32_t parameters)
 {
 	Signature *signature = &method->func_decl.signature;
 	Decl **params = *params_ptr = signature->params;
 	uint32_t param_count = vec_size(params);
 	if (param_count > parameters)
 	{
-		SEMA_ERROR(params[parameters], "Too many parameters, '%s' expects only %u.", method->name, (unsigned)parameters);
-		return false;
+		RETURN_SEMA_ERROR(params[parameters], "Too many parameters, '%s' expects only %u.", method->name, (unsigned)parameters);
 	}
 	if (param_count < parameters)
 	{
-		SEMA_ERROR(method, "Not enough parameters, '%s' requires %u.", method->name, (unsigned)parameters);
-		return false;
+		RETURN_SEMA_ERROR(method, "Not enough parameters, '%s' requires %u.", method->name, (unsigned)parameters);
 	}
 
-	if (!signature->rtype)
-	{
-		SEMA_ERROR(method, "The return value must be explicitly typed for '%s'.", method->name);
-		return false;
-	}
+	if (!signature->rtype) RETURN_SEMA_ERROR(method, "The return value must be explicitly typed for '%s'.", method->name);
+
 	VECEACH(params, i)
 	{
 		Decl *param = params[i];
 		if (!params[i]->var.type_info)
 		{
-			SEMA_ERROR(param, "All parameters must be explicitly typed for '%s'.", method->name);
-			return false;
+			RETURN_SEMA_ERROR(param, "All parameters must be explicitly typed for '%s'.", method->name);
 		}
 	}
 	*rtype_ptr = type_infoptr(signature->rtype);
@@ -1560,50 +1535,63 @@ Decl *sema_find_operator(SemaContext *context, Type *type, OperatorOverload oper
 }
 
 
-static inline bool sema_analyse_operator_element_at(Decl *method)
+static inline bool sema_analyse_operator_element_at(SemaContext *context, Decl *method)
 {
 	TypeInfo *rtype;
 	Decl **params;
-	if (!sema_analyse_operator_common(method, &rtype, &params, 2)) return false;
-	if (type_is_void(rtype->type))
+	if (!sema_analyse_operator_common(context, method, &rtype, &params, 2)) return false;
+	switch (type_storage_type(rtype->type))
 	{
-		SEMA_ERROR(rtype, "The return type cannot be 'void'.");
-		return false;
+		case STORAGE_NORMAL:
+			break;
+		case STORAGE_VOID:
+		case STORAGE_WILDCARD:
+			RETURN_SEMA_ERROR(rtype, "The return type cannot be 'void'.");
+		case STORAGE_COMPILE_TIME:
+			RETURN_SEMA_ERROR(rtype, "The return type is %s which is a compile time type, which isn't allowed.",
+			                  type_quoted_error_string(rtype->type));
+		case STORAGE_UNKNOWN:
+			RETURN_SEMA_ERROR(rtype, "%s has unknown size and cannot be used as a return type.",
+			                  type_quoted_error_string(rtype->type));
+	}
+	if (method->operator == OVERLOAD_ELEMENT_REF && !type_is_pointer(rtype->type))
+	{
+		RETURN_SEMA_ERROR(rtype, "The return type must be a pointer, but it is returning %s, did you mean to overload [] instead?",
+		                  type_quoted_error_string(rtype->type));
 	}
 	return true;
 }
 
-static inline bool sema_analyse_operator_element_set(Decl *method)
+static inline bool sema_analyse_operator_element_set(SemaContext *context, Decl *method)
 {
 	TypeInfo *rtype;
 	Decl **params;
-	return sema_analyse_operator_common(method, &rtype, &params, 3);
+	return sema_analyse_operator_common(context, method, &rtype, &params, 3);
 }
 
-static inline bool sema_analyse_operator_len(Decl *method)
+static inline bool sema_analyse_operator_len(Decl *method, SemaContext *context)
 {
 	TypeInfo *rtype;
 	Decl **params;
-	if (!sema_analyse_operator_common(method, &rtype, &params, 1)) return false;
+	if (!sema_analyse_operator_common(context, method, &rtype, &params, 1)) return false;
 	if (!type_is_integer(rtype->type))
 	{
-		SEMA_ERROR(rtype, "The return type must be an integer type.");
-		return false;
+		RETURN_SEMA_ERROR(rtype, "The return type must be an integer type.");
 	}
 	return true;
 }
 
-static bool sema_check_operator_method_validity(Decl *method)
+static bool sema_check_operator_method_validity(SemaContext *context, Decl *method)
 {
 	switch (method->operator)
 	{
 		case OVERLOAD_ELEMENT_SET:
-			return sema_analyse_operator_element_set(method);
+			return sema_analyse_operator_element_set(context, method);
 		case OVERLOAD_ELEMENT_AT:
 		case OVERLOAD_ELEMENT_REF:
-			return sema_analyse_operator_element_at(method);
+			return sema_analyse_operator_element_at(context, method);
 		case OVERLOAD_LEN:
-			return sema_analyse_operator_len(method);
+			return sema_analyse_operator_len(method, context);
 	}
 	UNREACHABLE
 }
@@ -1643,101 +1631,282 @@ INLINE void sema_set_method_ext_name(CompilationUnit *unit, const char *parent_n
 
 bool sema_decl_if_cond(SemaContext *context, Decl *decl)
 {
-	FOREACH_BEGIN(Attr *attr, decl->attributes)
-		if (attr->attr_kind != ATTRIBUTE_IF) continue;
-		if (vec_size(attr->exprs) != 1)
-		{
-			RETURN_SEMA_ERROR(attr, "Expected an argument to '@if'.");
-		}
-		Expr *expr = attr->exprs[0];
-		if (!sema_analyse_ct_expr(context, expr)) return false;
-		if (expr->type->canonical != type_bool)
-		{
-			RETURN_SEMA_ERROR(expr, "Expected a boolean value not %s.", type_quoted_error_string(expr->type));
-		}
-		if (expr->const_expr.b) return true;
-		decl->decl_kind = DECL_ERASED;
-		return false;
+	Attr *attr = attr_find_kind(decl->attributes, ATTRIBUTE_IF);
+	assert(attr);
+	if (vec_size(attr->exprs) != 1)
+	{
+		RETURN_SEMA_ERROR(attr, "Expected an argument to '@if'.");
+	}
+	Expr *expr = attr->exprs[0];
+	if (!sema_analyse_ct_expr(context, expr)) return false;
+	if (expr->type->canonical != type_bool)
+	{
+		RETURN_SEMA_ERROR(expr, "Expected a boolean value not %s.", type_quoted_error_string(expr->type));
+	}
+	if (expr->const_expr.b) return true;
+	decl->decl_kind = DECL_ERASED;
+	return false;
+}
+
+INLINE Attr* method_find_overload_attribute(Decl *method)
+{
+	FOREACH_BEGIN(Attr *attr, method->attributes)
+		if (attr->attr_kind == ATTRIBUTE_OPERATOR) return attr;
 	FOREACH_END();
 	UNREACHABLE
 }
-static inline bool unit_add_base_extension_method(CompilationUnit *unit, Type *parent_type, Decl *method_like)
+
+static inline bool
+unit_add_base_extension_method(SemaContext *context, CompilationUnit *unit, Type *parent_type, Decl *method)
 {
-	sema_set_method_ext_name(unit, parent_type->name, method_like);
-	switch (method_like->visibility)
+	// We don't support operator overloading on base types, because
+	// there seems little use for it frankly.
+	if (method->operator)
+	{
+		RETURN_SEMA_ERROR(method_find_overload_attribute(method),
+						  "Only user-defined types support operator oveloading.");
+	}
+
+	// As with normal methods, update the name.
+	sema_set_method_ext_name(unit, parent_type->name, method);
+
+	// Add it to the right list of extensions.
+	switch (method->visibility)
 	{
 		case VISIBLE_PUBLIC:
-			vec_add(global_context.method_extensions, method_like);
+			vec_add(global_context.method_extensions, method);
 			break;
 		case VISIBLE_PRIVATE:
-			vec_add(unit->module->private_method_extensions, method_like);
+			vec_add(unit->module->private_method_extensions, method);
 			break;
 		case VISIBLE_LOCAL:
-			vec_add(unit->local_method_extensions, method_like);
+			vec_add(unit->local_method_extensions, method);
 			break;
 	}
-	DEBUG_LOG("Method-like '%s.%s' analysed.", parent_type->name, method_like->name);
+	DEBUG_LOG("Method-like '%s.%s' analysed.", parent_type->name, method->name);
 	return true;
 }
 
-static inline bool unit_add_method_like(CompilationUnit *unit, Type *parent_type, Decl *method_like)
+static inline void sema_get_overload_arguments(Decl *method, Type **value_ref, Type **index_ref)
+{
+	switch (method->operator)
+	{
+		case OVERLOAD_LEN:
+			UNREACHABLE
+		case OVERLOAD_ELEMENT_AT:
+			*value_ref = type_no_optional(typeget(method->func_decl.signature.rtype)->canonical);
+			*index_ref = method->func_decl.signature.params[1]->type->canonical;
+			return;
+		case OVERLOAD_ELEMENT_REF:
+			*value_ref = type_no_optional(typeget(method->func_decl.signature.rtype)->canonical->pointer);
+			*index_ref = method->func_decl.signature.params[1]->type->canonical;
+			return;
+		case OVERLOAD_ELEMENT_SET:
+			*value_ref = method->func_decl.signature.params[2]->type->canonical;
+			*index_ref = method->func_decl.signature.params[1]->type->canonical;
+			return;
+		default:
+			UNREACHABLE
+	}
+}
+
+/**
+ * Do checks on an operator method:
+ *
+ * 1. Are the arguments valid for the operator?
+ * 2. Check if the operator was already defined.
+ * 3. See if another operator was defined and if the results match up.
+ */
+INLINE bool sema_analyse_operator_method(SemaContext *context, Type *parent_type, Decl *method)
+{
+	// Check it's valid for the operator type.
+	if (!sema_check_operator_method_validity(context, method)) return false;
+
+	// See if the operator has already been defined.
+	OperatorOverload operator = method->operator;
+	Decl *other = sema_find_operator(context, parent_type, operator);
+	if (other)
+	{
+		Attr *attr = method_find_overload_attribute(method);
+		SEMA_ERROR(attr->exprs[0], "This operator is already defined for '%s'.", parent_type->name);
+		SEMA_NOTE(other, "The previous definition was here.");
+		return false;
+	}
+
+	// Check that actual types match up
+	Type *value;
+	Type *index_type;
+	switch (operator)
+	{
+		case OVERLOAD_LEN:
+			// No dependency
+			return true;
+		case OVERLOAD_ELEMENT_AT:
+			// [] compares &[]
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_REF);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			// And []=
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_SET);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			return true;
+		case OVERLOAD_ELEMENT_REF:
+			// &[] compares []
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_AT);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			// And []=
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_SET);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			return true;
+		case OVERLOAD_ELEMENT_SET:
+			// []= compares &[]
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_REF);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			// And []
+			other = sema_find_operator(context, parent_type, OVERLOAD_ELEMENT_AT);
+			if (other && decl_ok(other))
+			{
+				sema_get_overload_arguments(other, &value, &index_type);
+				break;
+			}
+			return true;
+		default:
+			UNREACHABLE
+	}
+
+	// We have an operator to compare with.
+	Type *this_value;
+	Type *this_index_type;
+	sema_get_overload_arguments(method, &this_value, &this_index_type);
+
+	// So compare the value
+	if (this_value != value)
+	{
+		SEMA_ERROR(method, "There is a mismatch of the 'value' type compared to that of another operator: expected %s but got %s.",
+		           type_quoted_error_string(value), type_quoted_error_string(this_value));
+		SEMA_NOTE(other, "The other definition is here.");
+		return false;
+	}
+
+	// And the index.
+	if (this_index_type != index_type)
+	{
+		SEMA_ERROR(method, "There is a mismatch of the 'index' type compared to that of another operator: expected %s but got %s.",
+		           type_quoted_error_string(index_type), type_quoted_error_string(this_index_type));
+		SEMA_NOTE(other, "The other definition is here.");
+		return false;
+	}
+
+	// Everything worked! Done.
+	return true;
+}
+
+/**
+ * Attempt to add a method to the type:
+ *
+ * 1. See if it is already defined as an extension method => if so show error
+ * 2. If it is a non-user defined => delegate to unit_add_base_extension_method
+ * 3. If it is check if it is defined on the type.
+ * 4. If it is an operator method call sema_analyse_operator_method to check it.
+ * 5. Register its external name.
+ * 6. Add the module according to visibility.
+ */
+static inline bool unit_add_method(SemaContext *context, Type *parent_type, Decl *method)
 {
+	CompilationUnit *unit = context->unit;
 	assert(parent_type->canonical == parent_type);
-	const char *name = method_like->name;
-	Decl *method = sema_find_extension_method_in_list(unit->local_method_extensions, parent_type, name);
-	if (!method) sema_find_extension_method_in_list(unit->module->private_method_extensions, parent_type, name);
-	if (!method) sema_find_extension_method_in_list(global_context.method_extensions, parent_type, name);
-	if (method)
-	{
-		SEMA_ERROR(method_like, "This %s is already defined.", method_name_by_decl(method_like));
-		SEMA_NOTE(method, "The previous definition was here.");
+	const char *name = method->name;
+
+	// Did we already define it externally?
+	Decl *other = sema_find_extension_method_in_list(unit->local_method_extensions, parent_type, name);
+	if (!other) sema_find_extension_method_in_list(unit->module->private_method_extensions, parent_type, name);
+	if (!other) sema_find_extension_method_in_list(global_context.method_extensions, parent_type, name);
+	if (other)
+	{
+		SEMA_ERROR(method, "This %s is already defined.", method_name_by_decl(method));
+		SEMA_NOTE(other, "The previous definition was here.");
 		return false;
 	}
 
-	if (!type_is_user_defined(parent_type)) return unit_add_base_extension_method(unit, parent_type, method_like);
+	// Is it a base extension?
+	if (!type_is_user_defined(parent_type)) return unit_add_base_extension_method(context, unit, parent_type, method);
+
+	// Resolve it as a user-defined type extension.
 	Decl *parent = parent_type->decl;
 	Decl *ambiguous = NULL;
 	Decl *private = NULL;
-	method = sema_resolve_method(unit, parent, name, &ambiguous, &private);
-	if (method && !method->func_decl.attr_interface_method)
+
+	// If we found it, issue an error.
+	other = sema_resolve_method(unit, parent, name, &ambiguous, &private);
+	if (other)
 	{
-		SEMA_ERROR(method_like, "This %s is already defined for '%s'.",
-				   method_name_by_decl(method_like), parent_type->name);
-		SEMA_NOTE(method, "The previous definition was here.");
+		SEMA_ERROR(method, "This %s is already defined for '%s'.",
+		           method_name_by_decl(method), parent_type->name);
+		SEMA_NOTE(other, "The previous definition was here.");
 		return false;
 	}
-	if (method_like->operator && !sema_check_operator_method_validity(method_like)) return false;
-	REMINDER("Check multiple operator");
-	sema_set_method_ext_name(unit, parent->extname, method_like);
-	DEBUG_LOG("Method-like '%s.%s' analysed.", parent->name, method_like->name);
-	switch (method_like->visibility)
+
+	// Is it an operator?
+	if (method->operator)
+	{
+		if (!sema_analyse_operator_method(context, parent_type, method)) return false;
+	}
+
+	// Set the external name
+	sema_set_method_ext_name(unit, parent->extname, method);
+	DEBUG_LOG("Method-like '%s.%s' analysed.", parent->name, method->name);
+
+	// Add it to the correct place: type methods, private extensions, local method extensions
+	switch (method->visibility)
 	{
 		case VISIBLE_PUBLIC:
-			vec_add(parent->methods, method_like);
+			vec_add(parent->methods, method);
 			break;
 		case VISIBLE_PRIVATE:
 			if (decl_module(parent) == unit->module && parent->visibility >= VISIBLE_PRIVATE)
 			{
-				vec_add(parent->methods, method_like);
+				vec_add(parent->methods, method);
 				break;
 			}
-			vec_add(unit->module->private_method_extensions, method_like);
+			vec_add(unit->module->private_method_extensions, method);
 			break;
 		case VISIBLE_LOCAL:
 			if (parent->unit == unit && parent->visibility >= VISIBLE_LOCAL)
 			{
-				vec_add(parent->methods, method_like);
+				vec_add(parent->methods, method);
 				break;
 			}
-			vec_add(unit->local_method_extensions, method_like);
+			vec_add(unit->local_method_extensions, method);
 			break;
 		default:
 			UNREACHABLE
 	}
 	return true;
-
 }
 
+/**
+ * Find an interface name by searching through its own interfaces as well as any
+ * parents to the interface.
+ */
 static Decl *sema_interface_method_by_name(Decl *interface, const char *name)
 {
 	FOREACH_BEGIN(Decl *method, interface->interface_methods)
@@ -1750,7 +1919,19 @@ static Decl *sema_interface_method_by_name(Decl *interface, const char *name)
 	return NULL;
 }
 
-static inline Decl *sema_find_interface_for_method(SemaContext *context, Type *parent_type, Decl *method)
+/**
+ * Given a method, find the interface it implements.
+ *
+ * 1. Check that it can implement an interface (structs, unions, distinct, faults and enums can)
+ * 2. Find the method in the interfaces implemented. If more than one interface has the method then they must match
+ * 3. If no match is found we return.
+ * 4. Otherwise we fully resolve the matching interface.
+ * 5. And return the interface method.
+ *
+ * If (2) or (4) fails, then this is an error returning a poisoned decl. Not finding a method is fine,
+ * this returns NULL.
+ */
+static inline Decl *sema_find_interface_for_method(SemaContext *context, CanonicalType *parent_type, Decl *method)
 {
 	// Can the parent even implement a interface?
 	switch (parent_type->type_kind)
@@ -1761,16 +1942,22 @@ static inline Decl *sema_find_interface_for_method(SemaContext *context, Type *p
 		case TYPE_FAULTTYPE:
 		case TYPE_ENUM:
 			break;
+		case TYPE_TYPEDEF:
+			UNREACHABLE
 		default:
 			return NULL;
 	}
 	const char *name = method->name;
 	Decl *first_match = NULL;
 	Decl *first_interface = NULL;
+
+	// Walk through all implemented interfaces.
 	FOREACH_BEGIN(TypeInfo *proto, parent_type->decl->interfaces)
 		Decl *interface = proto->type->decl;
 		Decl *match = sema_interface_method_by_name(interface, name);
 		if (!match) continue;
+
+		// Is there a already a match?
 		if (first_match)
 		{
 			if (first_match->type->function.prototype->raw_type == match->type->function.prototype->raw_type) continue;
@@ -1778,24 +1965,42 @@ static inline Decl *sema_find_interface_for_method(SemaContext *context, Type *p
 			           "Both '%s' and '%s' interfaces have a method matching '%s' but their signatures are different, "
 			           "which prevents it from being implemented.",
 			           first_interface->name, interface->name, name);
-			return NULL;
+			return poisoned_decl;
 		}
+
+		// Update the match.
 		first_match = match;
 		first_interface = interface;
 	FOREACH_END();
-	if (!first_match)
-	{
-		return NULL;
-	}
+
+	// No match => return NULL.
+	if (!first_match) return NULL;
+
+	// Analyse the interface.
 	if (!sema_analyse_decl(context, first_interface)) return poisoned_decl;
+
+	// Return the match.
 	return first_match;
 }
+
+
+/**
+ * Check that an interface matches the implementing method.
+ *
+ * 1. Check return types.
+ * 2. Check parameter count.
+ * 3. Check each parameter for matching types (TODO, should there be more checks?)
+ *
+ * @return true if it matches, false otherwise.
+ */
 static inline bool sema_compare_method_with_interface(SemaContext *context, Decl *decl, Decl *implemented_method)
 {
 	Signature interface_sig = implemented_method->func_decl.signature;
 	Signature this_sig = decl->func_decl.signature;
 	Type *any_rtype = typeget(interface_sig.rtype);
 	Type *this_rtype = typeget(this_sig.rtype);
+
+	// Do the return types match?
 	if (any_rtype->canonical != this_rtype->canonical)
 	{
 		SEMA_ERROR(type_infoptr(this_sig.rtype), "The prototype method has a return type %s, but this function returns %s, they need to match.",
@@ -1803,10 +2008,13 @@ static inline bool sema_compare_method_with_interface(SemaContext *context, Decl
 		SEMA_NOTE(type_infoptr(interface_sig.rtype), "The interface definition is here.");
 		return false;
 	}
+
 	Decl **any_params = interface_sig.params;
 	Decl **this_params = this_sig.params;
 	unsigned any_param_count = vec_size(any_params);
 	unsigned this_param_count = vec_size(this_params);
+
+	// Do the param counts match?
 	if (any_param_count != this_param_count)
 	{
 		if (any_param_count > this_param_count)
@@ -1823,6 +2031,8 @@ static inline bool sema_compare_method_with_interface(SemaContext *context, Decl
 		}
 		return false;
 	}
+
+	// Check each param.
 	FOREACH_BEGIN_IDX(i, Decl *param, this_params)
 		if (i == 0) continue;
 		if (param->type->canonical != any_params[i]->type->canonical)
@@ -1836,8 +2046,22 @@ static inline bool sema_compare_method_with_interface(SemaContext *context, Decl
 	return true;
 }
 
+/**
+ * Analyse a method.
+ *
+ * 1. Check that it has no init/finalizer attributes.
+ * 2. Check that it has no test/benchmark attributes.
+ * 3. Resolve the parent type.
+ * 4. Resolve the declaration of the parent (as needed).
+ * 5. Check that it has at least one parameter.
+ * 6. Check that this parameter is correct.
+ * 7. If it is dynamic, the type may not be an interface or any
+ * 8. If it is dynamic, make sure that it implements an interface correctly if available
+ * 9. Try adding the method
+ */
 static inline bool sema_analyse_method(SemaContext *context, Decl *decl)
 {
+	// Check for @init, @finalizer, @test and @benchmark
 	if (decl->func_decl.attr_init | decl->func_decl.attr_finalizer)
 	{
 		SEMA_ERROR(decl, "Methods may not have '@init' or '@finalizer' attributes.");
@@ -1849,45 +2073,40 @@ static inline bool sema_analyse_method(SemaContext *context, Decl *decl)
 		return decl_poison(decl);
 	}
 
+	// Resolve the parent type.
 	TypeInfo *parent_type = type_infoptr(decl->func_decl.type_parent);
 	if (!sema_resolve_type_info(context, parent_type, RESOLVE_TYPE_FUNC_METHOD)) return false;
 	Type *par_type = parent_type->type->canonical;
+
+	// Resolve declaration of parent as needed.
 	if (!sema_resolve_type_decl(context, par_type)) return false;
 	Decl **params = decl->func_decl.signature.params;
 	bool is_dynamic = decl->func_decl.attr_dynamic;
+
+	// Ensure it has at least one parameter.
 	if (!vec_size(params)) RETURN_SEMA_ERROR(decl, "A method must start with an argument of the type "
-												   "it is a method of, e.g. 'fn Foo.test(Foo* foo)'.");
+												   "it is a method of, e.g. 'fn void %s.%s(%s* self)'.",
+	                                         type_to_error_string(par_type), decl->name, type_to_error_string(par_type));
+
+	// Ensure that the first parameter is valid.
 	if (!sema_is_valid_method_param(context, params[0], par_type, is_dynamic)) return false;
 
-	if (decl->func_decl.attr_default)
-	{
-		if (par_type->type_kind != TYPE_INTERFACE)
-		{
-			RETURN_SEMA_ERROR(decl, "Only interfaces may have @default methods.");
-		}
-		Decl *implemented_method = sema_interface_method_by_name(par_type->decl, decl->name);
-		if (!implemented_method)
-		{
-			RETURN_SEMA_ERROR(decl, "No matching interface method could be found for the '%s' method.", decl->name);
-		}
-		if (!implemented_method->func_decl.attr_optional)
-		{
-			SEMA_ERROR(decl, "Only @optional interface methods may have @default implementations.", decl->name);
-			SEMA_NOTE(implemented_method, "The definition of the interface method is here.");
-			return false;
-		}
-		if (!sema_compare_method_with_interface(context, decl, implemented_method)) return false;
-		implemented_method->func_decl.default_method = declid(decl);
-		decl->func_decl.interface_method = declid(implemented_method);
-	}
+	// Make dynamic checks.
 	if (is_dynamic)
 	{
 		if (par_type->type_kind == TYPE_INTERFACE)
 		{
-			RETURN_SEMA_ERROR(decl, "Interfaces may not implement @dynamic methods.");
+			RETURN_SEMA_ERROR(decl, "Interfaces may not implement '@dynamic' methods, only regular methods.");
 		}
+		if (par_type == type_any)
+		{
+			RETURN_SEMA_ERROR(decl, "'any' may not implement '@dynamic' methods, only regular methods.");
+		}
+		// Retrieve the implemented method.
 		Decl *implemented_method = sema_find_interface_for_method(context, par_type, decl);
 		if (!decl_ok(implemented_method)) return false;
+
+		// If it's implementing a method, check it.
 		if (implemented_method)
 		{
 			if (!sema_compare_method_with_interface(context, decl, implemented_method)) return false;
@@ -1898,7 +2117,7 @@ static inline bool sema_analyse_method(SemaContext *context, Decl *decl)
 			decl->func_decl.interface_method = 0;
 		}
 	}
-	return unit_add_method_like(context->unit, par_type, decl);
+	return unit_add_method(context, par_type, decl);
 }
 
 static const char *attribute_domain_to_string(AttributeDomain domain)
@@ -1919,6 +2138,8 @@ static const char *attribute_domain_to_string(AttributeDomain domain)
 			return "bitstruct member";
 		case ATTR_FUNC:
 			return "function";
+		case ATTR_PARAM:
+			return "parameter";
 		case ATTR_ENUM_VALUE:
 			return "enum value";
 		case ATTR_GLOBAL:
@@ -1945,17 +2166,32 @@ static const char *attribute_domain_to_string(AttributeDomain domain)
 	UNREACHABLE
 }
 
+// Helper method
 INLINE bool update_abi(Decl *decl, CallABI abi)
 {
 	decl->func_decl.signature.abi = abi;
 	return true;
 }
-static bool update_call_abi_from_string(Decl *decl, Expr *expr)
+
+/**
+ * Given a @callconv string, update the call convention.
+ *
+ * Test for:
+ * 1. cdecl
+ * 2. veccall
+ * 3. stdcall
+ *
+ * If the platform is unsupported on the platform, it is ignored.
+ */
+static bool update_call_abi_from_string(SemaContext *context, Decl *decl, Expr *expr)
 {
 	const char *str = expr->const_expr.bytes.ptr;
 	CallABI abi;
-	if (strcmp(str, "cdecl") == 0) return update_abi(decl, CALL_C);
-	if (strcmp(str, "veccall") == 0)
+	// C decl is easy
+	if (str_eq(str, "cdecl")) return update_abi(decl, CALL_C);
+
+	// Check veccall
+	if (str_eq(str, "veccall"))
 	{
 		switch (platform_target.arch)
 		{
@@ -1974,6 +2210,7 @@ static bool update_call_abi_from_string(Decl *decl, Expr *expr)
 				return true;
 		}
 	}
+	// Finally check stdcall.
 	if (strcmp(str, "stdcall") == 0)
 	{
 		if (platform_target.arch == ARCH_TYPE_ARM || platform_target.arch == ARCH_TYPE_ARMB)
@@ -1982,14 +2219,16 @@ static bool update_call_abi_from_string(Decl *decl, Expr *expr)
 		}
 		return true;
 	}
-	SEMA_ERROR(expr, "Unknown call convention, only 'cdecl', 'stdcall' and 'veccall' are supported");
-	return false;
+	RETURN_SEMA_ERROR(expr, "Unknown call convention, only 'cdecl', 'stdcall' and 'veccall' are supported");
 }
 
 #define EXPORTED_USER_DEFINED_TYPES (ATTR_ENUM | ATTR_UNION | ATTR_STRUCT | ATTR_FAULT)
 #define CALLABLE_TYPE (ATTR_FUNC | ATTR_INTERFACE_METHOD | ATTR_MACRO)
 #define USER_DEFINED_TYPES EXPORTED_USER_DEFINED_TYPES | ATTR_BITSTRUCT | ATTR_DISTINCT
 
+/**
+ * Analyse almost all attributes.
+ */
 static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr, AttributeDomain domain, bool *erase_decl)
 {
 	AttributeType type = attr->attr_kind;
@@ -2000,13 +2239,12 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 			[ATTRIBUTE_BIGENDIAN] = ATTR_BITSTRUCT,
 			[ATTRIBUTE_BUILTIN] = ATTR_MACRO | ATTR_FUNC | ATTR_GLOBAL | ATTR_CONST,
 			[ATTRIBUTE_CALLCONV] = ATTR_FUNC | ATTR_INTERFACE_METHOD,
-			[ATTRIBUTE_DEFAULT] = ATTR_FUNC | ATTR_MACRO,
 			[ATTRIBUTE_DEPRECATED] = USER_DEFINED_TYPES | CALLABLE_TYPE | ATTR_CONST | ATTR_GLOBAL | ATTR_MEMBER | ATTR_BITSTRUCT_MEMBER | ATTR_INTERFACE,
 			[ATTRIBUTE_DYNAMIC] = ATTR_FUNC,
 			[ATTRIBUTE_EXPORT] = ATTR_FUNC | ATTR_GLOBAL | ATTR_CONST | EXPORTED_USER_DEFINED_TYPES,
 			[ATTRIBUTE_EXTERN] = ATTR_FUNC | ATTR_GLOBAL | ATTR_CONST | USER_DEFINED_TYPES,
 			[ATTRIBUTE_FINALIZER] = ATTR_FUNC,
-			[ATTRIBUTE_IF] = (AttributeDomain)~(ATTR_CALL | ATTR_LOCAL),
+			[ATTRIBUTE_IF] = (AttributeDomain)~(ATTR_CALL | ATTR_LOCAL | ATTR_PARAM),
 			[ATTRIBUTE_INIT] = ATTR_FUNC,
 			[ATTRIBUTE_INLINE] = ATTR_FUNC | ATTR_CALL,
 			[ATTRIBUTE_LINK] = ATTR_FUNC | ATTR_MACRO | ATTR_CONST | ATTR_GLOBAL,
@@ -2038,11 +2276,13 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 			[ATTRIBUTE_WINMAIN] = ATTR_FUNC,
 	};
 
+	// First check if it doesn't match the domain.
 	if ((attribute_domain[type] & domain) != domain)
 	{
-		sema_error_at(attr->span, "'%s' is not a valid %s attribute.", attr->name, attribute_domain_to_string(domain));
-		return false;
+		RETURN_SEMA_ERROR(attr, "'%s' is not a valid %s attribute.", attr->name, attribute_domain_to_string(domain));
 	}
+
+	// No attribute has more than one argument right now.
 	unsigned args = vec_size(attr->exprs);
 	if (args > 1 && type != ATTRIBUTE_LINK)
 	{
@@ -2050,22 +2290,23 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		return false;
 	}
 	Expr *expr = args ? attr->exprs[0] : NULL;
+
 	switch (type)
 	{
 		case ATTRIBUTE_PRIVATE:
 		case ATTRIBUTE_PUBLIC:
 		case ATTRIBUTE_LOCAL:
 		case ATTRIBUTE_BUILTIN:
-			// These are pseudo-attributes.
+			// These are pseudo-attributes and are processed separately.
 			UNREACHABLE;
 		case ATTRIBUTE_DEPRECATED:
+			// We expect an optional string.
 			if (expr)
 			{
 				if (!sema_analyse_expr(context, expr)) return false;
 				if (!expr_is_const_string(expr))
 				{
-					SEMA_ERROR(expr, "Expected a constant string value as argument.");
-					return false;
+					RETURN_SEMA_ERROR(expr, "Expected a constant string value as argument.");
 				}
 			}
 			decl->is_deprecated = true;
@@ -2085,8 +2326,8 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 			if (!expr) RETURN_SEMA_ERROR(decl, "Expected a string argument.");
 			if (expr && !sema_analyse_expr(context, expr)) return false;
 			if (!expr_is_const_string(expr)) RETURN_SEMA_ERROR(expr, "Expected a constant string value as argument.");
-			if (!update_call_abi_from_string(decl, expr)) return false;
-			break;
+			if (!update_call_abi_from_string(context, decl, expr)) return false;
+			return true;
 		case ATTRIBUTE_BENCHMARK:
 			decl->func_decl.attr_benchmark = true;
 			break;
@@ -2123,7 +2364,7 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_ALIGN:
 			if (!expr)
 			{
-				sema_error_at(attr->span, "'align' requires an power-of-2 argument, e.g. align(8).");
+				print_error_at(attr->span, "'align' requires an power-of-2 argument, e.g. align(8).");
 				return false;
 			}
 			if (!sema_analyse_expr(context, expr)) return false;
@@ -2155,7 +2396,7 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_EXPORT:
 			if (context->unit->module->is_generic)
 			{
-				sema_error_at(attr->span, "'@export' is not allowed in generic modules.");
+				print_error_at(attr->span, "'@export' is not allowed in generic modules.");
 				return false;
 			}
 			if (expr)
@@ -2235,12 +2476,12 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_EXTERN:
 			if (context->unit->module->is_generic)
 			{
-				sema_error_at(attr->span, "'%s' attributes are not allowed in generic modules.", attr->name);
+				print_error_at(attr->span, "'%s' attributes are not allowed in generic modules.", attr->name);
 				return false;
 			}
 			if (!expr)
 			{
-				sema_error_at(attr->span, "'%s' requires a string argument, e.g. %s(\"foo\").", attr->name, attr->name);
+				print_error_at(attr->span, "'%s' requires a string argument, e.g. %s(\"foo\").", attr->name, attr->name);
 				return false;
 			}
 			if (!sema_analyse_expr(context, expr)) return false;
@@ -2296,16 +2537,13 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_OVERLAP:
 			decl->bitstruct.overlap = true;
 			break;
-		case ATTRIBUTE_DEFAULT:
-			decl->func_decl.attr_default = true;
-			break;
 		case ATTRIBUTE_DYNAMIC:
 			decl->func_decl.attr_dynamic = true;
 			break;
 		case ATTRIBUTE_BIGENDIAN:
 			if (decl->bitstruct.little_endian)
 			{
-				sema_error_at(attr->span, "Attribute cannot be combined with @littleendian");
+				print_error_at(attr->span, "Attribute cannot be combined with @littleendian");
 				return decl_poison(decl);
 			}
 			decl->bitstruct.big_endian = true;
@@ -2313,7 +2551,7 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_LITTLEENDIAN:
 			if (decl->bitstruct.big_endian)
 			{
-				sema_error_at(attr->span, "Attribute cannot be combined with @bigendian");
+				print_error_at(attr->span, "Attribute cannot be combined with @bigendian");
 				return decl_poison(decl);
 			}
 			decl->bitstruct.little_endian = true;
@@ -2342,15 +2580,12 @@ static bool sema_analyse_attribute(SemaContext *context, Decl *decl, Attr *attr,
 		case ATTRIBUTE_NONE:
 			UNREACHABLE
 	}
-	if (expr)
-	{
-		SEMA_ERROR(expr, "'%s' should not have any arguments.", attr->name);
-		return false;
-	}
+	if (expr) RETURN_SEMA_ERROR(expr, "'%s' should not have any arguments.", attr->name);
 	return true;
 
 }
 
+
 // TODO consider doing this evaluation early, it should be possible.
 static bool sema_analyse_attributes_inner(SemaContext *context, Decl *decl, Attr **attrs, AttributeDomain domain,
 										  Decl *top, bool *erase_decl)
@@ -2451,7 +2686,8 @@ static bool sema_analyse_attributes(SemaContext *context, Decl *decl, Attr **att
 	return sema_analyse_attributes_inner(context, decl, attrs, domain, NULL, erase_decl);
 }
 
-static inline bool sema_analyse_doc_header(AstId doc, Decl **params, Decl **extra_params, bool *pure_ref)
+static inline bool sema_analyse_doc_header(SemaContext *context, AstId doc,
+										   Decl **params, Decl **extra_params, bool *pure_ref)
 {
 	while (doc)
 	{
@@ -2483,18 +2719,16 @@ static inline bool sema_analyse_doc_header(AstId doc, Decl **params, Decl **extr
 			param = extra_params[j];
 			if (param->name == param_name) goto NEXT;
 		}
-		SEMA_ERROR(&directive->contract_stmt.param, "There is no parameter '%s', did you misspell it?", param_name);
-		return false;
+		RETURN_SEMA_ERROR(&directive->contract_stmt.param, "There is no parameter '%s', did you misspell it?", param_name);
 	NEXT:;
 		Type *type = param->type;
 		if (type) type = type_flatten(type);
-		bool may_be_pointer = !type || type_is_pointer(type) || type_is_any_interface_ptr(type);
+		bool may_be_pointer = !type || type_is_pointer(type) || type_is_any_raw(type);
 		if (directive->contract_stmt.param.by_ref)
 		{
 			if (!may_be_pointer)
 			{
-				SEMA_ERROR(directive, "'&' can only be added to pointer type parameters.");
-				return false;
+				RETURN_SEMA_ERROR(directive, "'&' can only be added to pointer type parameters.");
 			}
 			param->var.not_null = true;
 		}
@@ -2511,10 +2745,9 @@ static inline bool sema_analyse_doc_header(AstId doc, Decl **params, Decl **extr
 			case PARAM_INOUT:
 				break;
 		}
-		if (!may_be_pointer && type->type_kind != TYPE_SUBARRAY)
+		if (!may_be_pointer && type->type_kind != TYPE_SLICE)
 		{
-			SEMA_ERROR(directive, "'in', 'out' and 'inout' may only be added to pointers and subarrays.");
-			return false;
+			RETURN_SEMA_ERROR(directive, "'in', 'out' and 'inout' may only be added to pointers and slices.");
 		}
 ADDED:;
 	}
@@ -2534,7 +2767,7 @@ static inline MainType sema_find_main_type(SemaContext *context, Signature *sig,
 			break;
 		case 1:
 			arg_type = type_flatten(params[0]->type);
-			if (arg_type == type_get_subarray(type_string)) return MAIN_TYPE_ARGS;
+			if (arg_type == type_get_slice(type_string)) return MAIN_TYPE_ARGS;
 			SEMA_ERROR(params[0], "Expected a parameter of type 'String[]'.");
 			return MAIN_TYPE_ERROR;
 		case 2:
@@ -2567,7 +2800,7 @@ static inline MainType sema_find_main_type(SemaContext *context, Signature *sig,
 				SEMA_ERROR(params[0], "Expected a parameter of type 'void*' (HINSTANCE)");
 				return MAIN_TYPE_ERROR;
 			}
-			if (arg_type2 != type_get_subarray(type_string))
+			if (arg_type2 != type_get_slice(type_string))
 			{
 				SEMA_ERROR(params[1], "Expected a parameter of type 'String[]'.");
 				return MAIN_TYPE_ERROR;
@@ -2922,9 +3155,9 @@ static inline bool sema_analyse_func(SemaContext *context, Decl *decl, bool *era
 		SEMA_ERROR(decl, "Expected a function body, if you want to declare an extern function use 'extern' or place it in an .c3i file.");
 		return false;
 	}
-
 	bool pure = false;
-	if (!sema_analyse_doc_header(decl->func_decl.docs, decl->func_decl.signature.params, NULL, &pure)) return decl_poison(decl);
+	if (!sema_analyse_doc_header(context, decl->func_decl.docs, decl->func_decl.signature.params, NULL,
+	                             &pure)) return decl_poison(decl);
 	decl->func_decl.signature.attrs.is_pure = pure;
 	if (!sema_set_alloca_alignment(context, decl->type, &decl->alignment)) return false;
 	DEBUG_LOG("<<< Function analysis of [%s] successful.", decl_safe_name(decl));
@@ -2943,7 +3176,10 @@ static inline bool sema_is_valid_method_param(SemaContext *context, Decl *param,
 	{
 		if (param_type->type_kind != TYPE_POINTER || param_type->pointer != parent_type)
 		{
-			RETURN_SEMA_ERROR(param, "The fist parameter must be of type %s", type_quoted_error_string(type_get_ptr(parent_type)));
+			RETURN_SEMA_ERROR(type_infoptr(param->var.type_info),
+							  "The first parameter must always be a pointer for '@dynamic' methods, "
+							  "so please change its type to %s if possible.",
+							  type_quoted_error_string(type_get_ptr(parent_type)));
 		}
 		return true;
 	}
@@ -2953,8 +3189,6 @@ static inline bool sema_is_valid_method_param(SemaContext *context, Decl *param,
 
 	switch (param_type->type_kind)
 	{
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
 		case TYPE_POINTER:
 			if (param_type->pointer == parent_type) return true;
 			break;
@@ -2962,31 +3196,32 @@ static inline bool sema_is_valid_method_param(SemaContext *context, Decl *param,
 			break;
 	}
 ERROR:
-	if (type_is_any_raw(parent_type))
-	{
-		RETURN_SEMA_ERROR(param, "The first parameter must have the type %s.",
-						  type_quoted_error_string(type_get_ptr(parent_type)));
-
-	}
-	RETURN_SEMA_ERROR(param, "The first parameter must be of type %s or %s.",
+	RETURN_SEMA_ERROR(type_infoptr(param->var.type_info),
+					  "The first parameter of a method must be of type %s or %s.",
 					  type_quoted_error_string(parent_type),
 	                  type_quoted_error_string(type_get_ptr(parent_type)));
 }
 
 static bool sema_analyse_macro_method(SemaContext *context, Decl *decl)
 {
+	// Resolve the type of the method.
 	TypeInfo *parent_type_info = type_infoptr(decl->func_decl.type_parent);
 	if (!sema_resolve_type_info(context, parent_type_info, RESOLVE_TYPE_MACRO_METHOD)) return false;
+
+	// Can the type have methods?
 	Type *parent_type = parent_type_info->type;
 	if (!type_may_have_method(parent_type))
 	{
 		RETURN_SEMA_ERROR(parent_type_info, "Methods can not be associated with '%s'", type_to_error_string(parent_type));
 	}
+
+	// We need at least one argument (the parent type)
 	if (!vec_size(decl->func_decl.signature.params))
 	{
-		SEMA_ERROR(decl, "Expected at least one parameter - of type '%s'.", type_to_error_string(parent_type));
-		return false;
+		RETURN_SEMA_ERROR(decl, "Expected at least one parameter - of type '%s'.", type_to_error_string(parent_type));
 	}
+
+	// Check the first argument.
 	Decl *first_param = decl->func_decl.signature.params[0];
 	if (!first_param)
 	{
@@ -2997,48 +3232,32 @@ static bool sema_analyse_macro_method(SemaContext *context, Decl *decl)
 
 	if (first_param->var.kind != VARDECL_PARAM_REF && first_param->var.kind != VARDECL_PARAM)
 	{
-		SEMA_ERROR(first_param, "The first parameter must be a regular or ref (&) type.");
-		return false;
+		RETURN_SEMA_ERROR(first_param, "The first parameter must be a regular or ref (&) type.");
 	}
-	return unit_add_method_like(context->unit, parent_type->canonical, decl);
+	return unit_add_method(context, parent_type->canonical, decl);
 }
 
-static inline bool sema_analyse_macro(SemaContext *context, Decl *decl, bool *erase_decl)
+INLINE bool sema_analyse_macro_body(SemaContext *context, Decl **body_parameters)
 {
-	decl->func_decl.unit = context->unit;
-
-	if (!sema_analyse_func_macro(context, decl, ATTR_MACRO, erase_decl)) return false;
-	if (*erase_decl) return true;
-	if (!sema_analyse_signature(context, &decl->func_decl.signature, decl->func_decl.type_parent)) return decl_poison(decl);
-
-	if (!decl->func_decl.signature.is_at_macro && decl->func_decl.body_param && !decl->func_decl.signature.is_safemacro)
-	{
-		SEMA_ERROR(decl, "Names of macros with a trailing body must start with '@'.");
-		return decl_poison(decl);
-	}
-
-	DeclId body_param = decl->func_decl.body_param;
-
-	Decl **body_parameters = body_param ? declptr(body_param)->body_params : NULL;
 	unsigned body_param_count = vec_size(body_parameters);
 	for (unsigned i = 0; i < body_param_count; i++)
 	{
 		assert(body_parameters);
 		Decl *param = body_parameters[i];
+		assert(param);
 		param->resolve_status = RESOLVE_RUNNING;
 		assert(param->decl_kind == DECL_VAR);
 		TypeInfo *type_info = type_infoptrzero(param->var.type_info);
 		switch (param->var.kind)
 		{
 			case VARDECL_PARAM:
-				if (type_info && !sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) return decl_poison(decl);
+				if (type_info && !sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) return false;
 				break;
 			case VARDECL_PARAM_EXPR:
 			case VARDECL_PARAM_CT:
 			case VARDECL_PARAM_REF:
 			case VARDECL_PARAM_CT_TYPE:
-				SEMA_ERROR(param, "Only plain variables are allowed as body parameters.");
-				return decl_poison(decl);
+				RETURN_SEMA_ERROR(param, "Only plain variables are allowed as body parameters.");
 			case VARDECL_CONST:
 			case VARDECL_GLOBAL:
 			case VARDECL_LOCAL:
@@ -3051,12 +3270,30 @@ static inline bool sema_analyse_macro(SemaContext *context, Decl *decl, bool *er
 			case VARDECL_ERASE:
 				UNREACHABLE
 		}
-		if (!sema_check_param_uniqueness_and_type(body_parameters, param, i, body_param_count)) return decl_poison(decl);
+		if (!sema_check_param_uniqueness_and_type(context, body_parameters, param, i, body_param_count)) return false;
 		param->resolve_status = RESOLVE_DONE;
 	}
-	bool pure = false;
-	if (!sema_analyse_doc_header(decl->func_decl.docs, decl->func_decl.signature.params, body_parameters, &pure)) return decl_poison(decl);
+	return true;
+}
+static inline bool sema_analyse_macro(SemaContext *context, Decl *decl, bool *erase_decl)
+{
+	decl->func_decl.unit = context->unit;
 
+	if (!sema_analyse_func_macro(context, decl, ATTR_MACRO, erase_decl)) return false;
+	if (*erase_decl) return true;
+	if (!sema_analyse_signature(context, &decl->func_decl.signature, decl->func_decl.type_parent)) return decl_poison(decl);
+
+	if (!decl->func_decl.signature.is_at_macro && decl->func_decl.body_param && !decl->func_decl.signature.is_safemacro)
+	{
+		SEMA_ERROR(decl, "Names of macros with a trailing body must start with '@'.");
+		return decl_poison(decl);
+	}
+	DeclId body_param = decl->func_decl.body_param;
+	Decl **body_parameters = body_param ? declptr(body_param)->body_params : NULL;
+	if (!sema_analyse_macro_body(context, body_parameters)) return decl_poison(decl);
+	bool pure = false;
+	if (!sema_analyse_doc_header(context, decl->func_decl.docs, decl->func_decl.signature.params, body_parameters,
+	                             &pure)) return decl_poison(decl);
 	if (decl->func_decl.type_parent)
 	{
 		if (!sema_analyse_macro_method(context, decl)) return decl_poison(decl);
@@ -3077,6 +3314,12 @@ static bool sema_analyse_attributes_for_var(SemaContext *context, Decl *decl, bo
 		case VARDECL_GLOBAL:
 			domain = ATTR_GLOBAL;
 			break;
+		case VARDECL_PARAM:
+		case VARDECL_PARAM_REF:
+		case VARDECL_PARAM_CT_TYPE:
+		case VARDECL_PARAM_CT:
+			domain = ATTR_PARAM;
+			break;
 		default:
 			domain = ATTR_LOCAL;
 			break;
@@ -3087,34 +3330,43 @@ static bool sema_analyse_attributes_for_var(SemaContext *context, Decl *decl, bo
 
 bool sema_analyse_decl_type(SemaContext *context, Type *type, SourceSpan span)
 {
-	switch (type->type_kind)
+	switch (type_storage_type(type))
 	{
-		case TYPE_VOID:
-			sema_error_at(span, "The use of 'void' as a variable type is not permitted.");
+		case STORAGE_NORMAL:
+			return true;
+		case STORAGE_VOID:
+		case STORAGE_WILDCARD:
+			if (type_is_optional(type))
+			{
+				print_error_at(span, "The use of 'void!' as a variable type is not permitted, use %s instead.",
+				              type_quoted_error_string(type_anyfault));
+			}
+			else
+			{
+				print_error_at(span, "The use of 'void' as a variable type is not permitted.");
+			}
 			return false;
-		case TYPE_UNTYPED_LIST:
-		case TYPE_MEMBER:
-		case TYPE_TYPEINFO:
-			sema_error_at(span, "The variable cannot have an compile time %s type.",
-						  type_quoted_error_string(type));
+		case STORAGE_COMPILE_TIME:
+			print_error_at(span, "The variable cannot have an compile time %s type.",
+			              type_quoted_error_string(type));
+			return false;
+		case STORAGE_UNKNOWN:
+			print_error_at(span, "%s has unknown size, and so it cannot be a variable type.",
+			              type_quoted_error_string(type));
 			return false;
-		default:
-			break;
-	}
-	if (!type_is_optional(type)) return true;
-	if (type == type_wildcard_optional || type_is_void(type->optional))
-	{
-		sema_error_at(span, "The use of 'void!' as a variable type is not permitted, use %s instead.",
-						 type_quoted_error_string(type_anyfault));
-		return false;
 	}
-	return true;
+	UNREACHABLE
 }
 
+/**
+ * Analyse $foo and $Foo variables.
+ */
 bool sema_analyse_var_decl_ct(SemaContext *context, Decl *decl)
 {
 	Expr *init;
-	assert(decl->decl_kind == DECL_VAR);
+	assert(decl->decl_kind == DECL_VAR && "Should only be called on variables.");
+
+	// Grab the optional type_info.
 	TypeInfo *type_info = vartype(decl);
 	switch (decl->var.kind)
 	{
@@ -3125,51 +3377,63 @@ bool sema_analyse_var_decl_ct(SemaContext *context, Decl *decl)
 				SEMA_ERROR(type_info, "Compile time type variables may not have a type.");
 				goto FAIL;
 			}
+			// Check initialization.
 			if ((init = decl->var.init_expr))
 			{
+				// Try to fold any constant into an lvalue.
 				if (!sema_analyse_expr_lvalue_fold_const(context, init)) goto FAIL;
+
+				// If this isn't a type, it's an error.
 				if (init->expr_kind != EXPR_TYPEINFO)
 				{
 					SEMA_ERROR(decl->var.init_expr, "Expected a type assigned to %s.", decl->name);
 					goto FAIL;
 				}
 			}
+			// Otherwise we're done.
 			break;
 		case VARDECL_LOCAL_CT:
-			if (type_info && !sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) goto FAIL;
+			// Resolve the type if it's present.
 			if (type_info)
 			{
+				if (!sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) goto FAIL;
+				// Set the type of the declaration.
 				decl->type = type_info->type->canonical;
 				init = decl->var.init_expr;
+				// If there is no init, set it to zero.
 				if (!init)
 				{
 					decl->var.init_expr = init = expr_new(EXPR_POISONED, decl->span);
 					expr_rewrite_to_const_zero(init, decl->type);
 				}
+
+				// Analyse the expression.
 				if (!sema_analyse_expr_rhs(context, decl->type, init, false, NULL)) goto FAIL;
+
+				// Check that it is constant.
 				if (!expr_is_constant_eval(init, CONSTANT_EVAL_CONSTANT_VALUE))
 				{
 					SEMA_ERROR(init, "Expected a constant expression assigned to %s.", decl->name);
 					goto FAIL;
 				}
+				break;
 			}
-			else
+			// If we don't have a type, resolve the expression.
+			if ((init = decl->var.init_expr))
 			{
-				if ((init = decl->var.init_expr))
-				{
-					if (!sema_analyse_expr(context, init)) goto FAIL;
-					if (!expr_is_constant_eval(init, CONSTANT_EVAL_CONSTANT_VALUE))
-					{
-						SEMA_ERROR(init, "Expected a constant expression assigned to %s.", decl->name);
-						goto FAIL;
-					}
-					decl->type = init->type;
-				}
-				else
+				if (!sema_analyse_expr(context, init)) goto FAIL;
+				// Check it is constant.
+				if (!expr_is_constant_eval(init, CONSTANT_EVAL_CONSTANT_VALUE))
 				{
-					decl->type = type_void;
+					SEMA_ERROR(init, "Expected a constant expression assigned to %s.", decl->name);
+					goto FAIL;
 				}
+				// Update the type.
+				decl->type = init->type;
+				break;
 			}
+			// Here we set a void type if both init and type is missing.
+			decl->type = type_void;
 			break;
 		default:
 			UNREACHABLE
@@ -3279,29 +3543,33 @@ bool sema_analyse_var_decl(SemaContext *context, Decl *decl, bool local)
 				return decl_poison(decl);
 			}
 			decl->type = init_expr->type;
-			if (type_is_invalid_storage_type(init_expr->type))
+			switch (type_storage_type(init_expr->type))
 			{
-				if (init_expr->type == type_wildcard_optional || init_expr->type == type_wildcard)
-				{
+				case STORAGE_NORMAL:
+					break;
+				case STORAGE_WILDCARD:
 					SEMA_ERROR(init_expr, "No type can be inferred from the optional result.");
-				}
-				else if (type_is_void(init_expr->type))
-				{
+					return decl_poison(decl);
+				case STORAGE_VOID:
 					SEMA_ERROR(init_expr, "You cannot initialize a value to 'void'.");
-				}
-				else if (init_expr->type == type_untypedlist)
-				{
-					SEMA_ERROR(init_expr, "The type of an untyped list cannot be inferred, you can try adding an explicit type to solve this.");
-				}
-				else if (decl->var.kind == VARDECL_CONST)
-				{
-					SEMA_ERROR(init_expr, "You cannot initialize a constant to %s, but you can assign the expression to a compile time variable.", type_invalid_storage_type_name(init_expr->type));
-				}
-				else
-				{
+					return decl_poison(decl);
+				case STORAGE_COMPILE_TIME:
+					if (init_expr->type == type_untypedlist)
+					{
+						SEMA_ERROR(init_expr, "The type of an untyped list cannot be inferred, you can try adding an explicit type to solve this.");
+						return decl_poison(decl);
+					}
+					if (decl->var.kind == VARDECL_CONST)
+					{
+						SEMA_ERROR(init_expr, "You cannot initialize a constant to %s, but you can assign the expression to a compile time variable.", type_invalid_storage_type_name(init_expr->type));
+						return decl_poison(decl);
+					}
 					SEMA_ERROR(init_expr, "You can't store a compile time type in a variable.");
-				}
-				return decl_poison(decl);
+					return decl_poison(decl);
+				case STORAGE_UNKNOWN:
+					SEMA_ERROR(init_expr, "You cannot initialize a value to %s as it has unknown size.",
+					           type_quoted_error_string(init_expr->type));
+					return decl_poison(decl);
 			}
 			if (!decl->alignment)
 			{
@@ -3374,14 +3642,6 @@ bool sema_analyse_var_decl(SemaContext *context, Decl *decl, bool local)
 			SEMA_ERROR(init_expr, "The expression must be a constant value.");
 			return decl_poison(decl);
 		}
-		else
-		{
-			if (decl->var.unwrap && IS_OPTIONAL(init))
-			{
-				SEMA_ERROR(decl->var.init_expr, "An optional expression was expected here.");
-				return decl_poison(decl);
-			}
-		}
 		if (expr_is_const(init_expr))
 		{
 			init_expr->const_expr.is_hex = false;
@@ -3471,26 +3731,39 @@ static Module *module_instantiate_generic(SemaContext *context, Module *module,
 	return new_module;
 }
 
-static bool sema_generate_parameterized_name_to_scratch(SemaContext *c, Module *module, Expr **params, bool mangled)
+static bool sema_generate_parameterized_name_to_scratch(SemaContext *context, Module *module, Expr **params, bool mangled)
 {
 	// First resolve
 	FOREACH_BEGIN_IDX(i, Expr *param, params)
 		if (param->expr_kind == EXPR_TYPEINFO)
 		{
 			TypeInfo *type_info = param->type_expr;
-			if (!sema_resolve_type_info(c, type_info, RESOLVE_TYPE_DEFAULT)) return false;
+			if (!sema_resolve_type_info(context, type_info, RESOLVE_TYPE_DEFAULT)) return false;
 			Type *type = type_info->type->canonical;
 			if (type->type_kind == TYPE_OPTIONAL) RETURN_SEMA_ERROR(type_info, "Expected a non-optional type.");
-			if (type_is_void(type)) RETURN_SEMA_ERROR(type_info, "A 'void' type cannot be used as a parameter type.");
-			if (type_is_invalid_storage_type(type)) RETURN_SEMA_ERROR(type_info, "Expected a runtime type.");
+			switch (type_storage_type(type))
+			{
+				case STORAGE_NORMAL:
+					break;
+				case STORAGE_VOID:
+					RETURN_SEMA_ERROR(type_info, "A 'void' type cannot be used as a parameter type.");
+				case STORAGE_WILDCARD:
+					RETURN_SEMA_ERROR(type_info, "The type is undefined and cannot be used as a parameter type.");
+				case STORAGE_COMPILE_TIME:
+					RETURN_SEMA_ERROR(type_info, "Expected a runtime type.");
+				case STORAGE_UNKNOWN:
+					RETURN_SEMA_ERROR(type_info,
+					                  "%s doesn't have a well defined size and cannot be used as a parameter type.",
+					                  type_quoted_error_string(type));
+			}
 			if (type_is_func_ptr(type))
 			{
-				if (!sema_resolve_type_decl(c, type->pointer)) return false;
+				if (!sema_resolve_type_decl(context, type->pointer)) return false;
 			}
 		}
 		else
 		{
-			if (!sema_analyse_ct_expr(c, param)) return false;
+			if (!sema_analyse_ct_expr(context, param)) return false;
 			Type *type = param->type->canonical;
 			bool is_enum_like = type_kind_is_enumlike(type->type_kind);
 			if (!type_is_integer_or_bool_kind(type) && !is_enum_like)
@@ -3595,17 +3868,17 @@ static bool sema_analyse_generic_module_contracts(SemaContext *c, Module *module
 		assert(ast->contract_stmt.kind == CONTRACT_REQUIRE);
 		SemaContext *new_context = context_transform_for_eval(c, &temp_context, module->units[0]);
 		FOREACH_BEGIN(Expr *expr, ast->contract_stmt.contract.decl_exprs->expression_list)
-			int res = sema_check_comp_time_bool(new_context, expr);
-			if (res == -1) goto FAIL;
-			if (res) continue;
+			CondResult res = sema_check_comp_time_bool(new_context, expr);
+			if (res == COND_MISSING) goto FAIL;
+			if (res == COND_TRUE) continue;
 			if (ast->contract_stmt.contract.comment)
 			{
-				sema_error_at(error_span,
+				print_error_at(error_span,
 				              "Parameter(s) would violate constraint: %s.",
 				              ast->contract_stmt.contract.comment);
 			} else
 			{
-				sema_error_at(error_span, "Parameter(s) failed validation: %s",
+				print_error_at(error_span, "Parameter(s) failed validation: %s",
 				              ast->contract_stmt.contract.expr_string);
 			}
 		FAIL:
@@ -3664,7 +3937,7 @@ Decl *sema_analyse_parameterized_identifier(SemaContext *c, Path *decl_path, con
 	if (parameter_count != vec_size(params))
 	{
 		assert(vec_size(params));
-		sema_error_at(extend_span_with_token(params[0]->span, vectail(params)->span),
+		print_error_at(extend_span_with_token(params[0]->span, vectail(params)->span),
 					  "The generic module expected %d arguments, but you supplied %d, did you make a mistake?",
 					  parameter_count,
 					  vec_size(params));
@@ -3700,7 +3973,7 @@ Decl *sema_analyse_parameterized_identifier(SemaContext *c, Path *decl_path, con
 	Decl *symbol = module_find_symbol(instantiated_module, name);
 	if (!symbol)
 	{
-		sema_error_at(span, "The generic module '%s' does not have '%s' for this parameterization.", module->name->module, name);
+		print_error_at(span, "The generic module '%s' does not have '%s' for this parameterization.", module->name->module, name);
 		return poisoned_decl;
 	}
 	if (was_initiated && instantiated_module->contracts)
@@ -3716,7 +3989,7 @@ Decl *sema_analyse_parameterized_identifier(SemaContext *c, Path *decl_path, con
 	return symbol;
 }
 
-static inline bool sema_analyse_attribute_decl(SemaContext *c, Decl *decl, bool *erase_decl)
+static inline bool sema_analyse_attribute_decl(SemaContext *context, SemaContext *c, Decl *decl, bool *erase_decl)
 {
 	if (!sema_analyse_attributes(c, decl, decl->attributes, ATTR_DEF, erase_decl)) return decl_poison(decl);
 	if (*erase_decl) return true;
@@ -3726,28 +3999,15 @@ static inline bool sema_analyse_attribute_decl(SemaContext *c, Decl *decl, bool
 	for (unsigned i = 0; i < param_count; i++)
 	{
 		Decl *param = params[i];
-		if (param->var.kind != VARDECL_PARAM)
-		{
-			SEMA_ERROR(param, "Expected a simple replacement parameter e.g. 'val' here.");
-			return false;
-		}
-		if (param->var.type_info)
-		{
-			SEMA_ERROR(param, "Type is not allowed on attribute parameters.");
-			return false;
-		}
-		if (param->var.init_expr)
-		{
-			SEMA_ERROR(param, "Attribute parameters may not have default values.");
-			return false;
-		}
+		if (param->var.kind != VARDECL_PARAM) RETURN_SEMA_ERROR(param, "Expected a simple replacement parameter e.g. 'val' here.");
+		if (param->var.type_info) RETURN_SEMA_ERROR(param, "Type is not allowed on attribute parameters.");
+		if (param->var.init_expr) RETURN_SEMA_ERROR(param, "Attribute parameters may not have default values.");
 		param->resolve_status = RESOLVE_DONE;
 		for (int j = 0; j < i; j++)
 		{
 			if (param[j].name == param->name)
 			{
-				SEMA_ERROR(param, "Duplicate parameter name '%s'.", param->name);
-				return false;
+				RETURN_SEMA_ERROR(param, "Duplicate parameter name '%s'.", param->name);
 			}
 		}
 	}
@@ -3791,7 +4051,6 @@ bool sema_resolve_type_structure(SemaContext *context, Type *type, SourceSpan sp
 		case TYPE_WILDCARD:
 		case TYPE_TYPEINFO:
 		case TYPE_MEMBER:
-		case TYPE_ANYPTR:
 			return true;
 		case TYPE_FUNC:
 			if (!type->decl) return true;
@@ -3802,7 +4061,6 @@ bool sema_resolve_type_structure(SemaContext *context, Type *type, SourceSpan sp
 		case TYPE_BITSTRUCT:
 		case TYPE_FAULTTYPE:
 			return sema_analyse_decl(context, type->decl);
-		case TYPE_INFPTR:
 		case TYPE_POINTER:
 			type = type->pointer;
 			goto RETRY;
@@ -3814,7 +4072,7 @@ bool sema_resolve_type_structure(SemaContext *context, Type *type, SourceSpan sp
 			type = type->decl->distinct->type;
 			goto RETRY;
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_VECTOR:
@@ -3827,6 +4085,7 @@ bool sema_resolve_type_structure(SemaContext *context, Type *type, SourceSpan sp
 	}
 	UNREACHABLE
 }
+
 bool sema_analyse_decl(SemaContext *context, Decl *decl)
 {
 	if (decl->resolve_status == RESOLVE_DONE) return decl_ok(decl);
@@ -3878,7 +4137,7 @@ bool sema_analyse_decl(SemaContext *context, Decl *decl)
 			set_external_name = true;
 			break;
 		case DECL_ATTRIBUTE:
-			if (!sema_analyse_attribute_decl(context, decl, &erase_decl)) goto FAILED;
+			if (!sema_analyse_attribute_decl(context, context, decl, &erase_decl)) goto FAILED;
 			break;
 		case DECL_DISTINCT:
 			if (!sema_analyse_distinct(context, decl, &erase_decl)) goto FAILED;
@@ -3930,22 +4189,3 @@ bool sema_analyse_decl(SemaContext *context, Decl *decl)
 	return decl_poison(decl);
 }
 
-void sema_display_deprecated_warning_on_use(SemaContext *context, Decl *decl, SourceSpan span)
-{
-	if (!decl->is_deprecated) return;
-	// Prevent multiple reports
-	decl->is_deprecated = false;
-	FOREACH_BEGIN(Attr *attr, decl->attributes)
-		if (attr->attr_kind == ATTRIBUTE_DEPRECATED)
-		{
-			if (attr->exprs)
-			{
-				const char *comment_string = attr->exprs[0]->const_expr.bytes.ptr;
-				sema_warning_at(span, "'%s' is deprecated: %s.", decl->name, comment_string);
-				return;
-			}
-			break;
-		}
-	FOREACH_END();
-	sema_warning_at(span, "'%s' is deprecated.", decl->name);
-}
diff --git a/src/compiler/sema_errors.c b/src/compiler/sema_errors.c
index 3f9136a0c..c571392f5 100644
--- a/src/compiler/sema_errors.c
+++ b/src/compiler/sema_errors.c
@@ -4,13 +4,13 @@
 
 #include "sema_internal.h"
 
-void sema_shadow_error(Decl *decl, Decl *old)
+void sema_shadow_error(SemaContext *context, Decl *decl, Decl *old)
 {
 	SEMA_ERROR(decl, "'%s' would shadow a previous declaration.", decl->name);
 	SEMA_NOTE(old, "The previous use of '%s' was here.", decl->name);
 }
 
-bool sema_type_error_on_binop(Expr *expr)
+bool sema_type_error_on_binop(SemaContext *context, Expr *expr)
 {
 	const char *c = token_type_to_string(binaryop_to_token(expr->binary_expr.operator));
 	SEMA_ERROR(expr, "%s is not defined in the expression %s %s %s.",
diff --git a/src/compiler/sema_expr.c b/src/compiler/sema_expr.c
index 0b8f11b43..d62c8eb15 100644
--- a/src/compiler/sema_expr.c
+++ b/src/compiler/sema_expr.c
@@ -59,7 +59,7 @@ static inline bool sema_expr_analyse_ct_stringify(SemaContext *context, Expr *ex
 static inline bool sema_expr_analyse_ct_offsetof(SemaContext *context, Expr *expr);
 static inline bool sema_expr_analyse_ct_call(SemaContext *context, Expr *expr);
 
-static inline bool sema_expr_analyse_retval(SemaContext *c, Expr *expr);
+static inline bool sema_expr_analyse_retval(SemaContext *context, Expr *expr);
 static inline bool sema_expr_analyse_expr_list(SemaContext *context, Expr *expr);
 
 // -- binary
@@ -121,8 +121,9 @@ static bool sema_binary_check_unclear_op_precedence(Expr *left_side, Expr * main
 static bool sema_binary_analyse_ct_common_assign(SemaContext *context, Expr *expr, Expr *left);
 static bool sema_binary_arithmetic_promotion(SemaContext *context, Expr *left, Expr *right, Type *left_type, Type *right_type,
                                  Expr *parent, const char *error_message, bool allow_bool_vec);
-static bool sema_binary_is_unsigned_always_false_comparison(SemaContext *context, Expr *expr, Expr *left, Expr *right);
-static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr);
+static bool sema_binary_is_unsigned_always_same_comparison(SemaContext *context, Expr *expr, Expr *left, Expr *right,
+                                                           Type *lhs_type, Type *rhs_type);
+static bool sema_binary_is_expr_lvalue(SemaContext *context, Expr *top_expr, Expr *expr);
 static void sema_binary_unify_voidptr(SemaContext *context, Expr *left, Expr *right, Type **left_type_ref, Type **right_type_ref);
 
 // -- function helper functions
@@ -149,10 +150,10 @@ static bool sema_flattened_expr_is_const_initializer(SemaContext *context, Expr
 static bool sema_slice_len_is_in_range(SemaContext *context, Type *type, Expr *len_expr, bool from_end, bool *remove_from_end);
 static bool sema_slice_index_is_in_range(SemaContext *context, Type *type, Expr *index_expr, bool end_index, bool from_end, bool *remove_from_end);
 
-static Expr **sema_vasplat_append(SemaContext *c, Expr **init_expressions, Expr *expr);
+static Expr **sema_vasplat_append(SemaContext *context, Expr **init_expressions, Expr *expr);
 INLINE Expr **sema_expand_vasplat(SemaContext *c, Expr **list, unsigned index);
 static inline IndexDiff range_const_len(Range *range);
-static inline bool sema_expr_begin_analyse(Expr *expr);
+static inline bool sema_expr_begin_analyse(SemaContext *context, Expr *expr);
 static inline bool sema_analyse_expr_dispatch(SemaContext *context, Expr *expr);
 
 static Decl *sema_expr_analyse_var_path(SemaContext *context, Expr *expr);
@@ -190,15 +191,13 @@ static inline bool sema_expr_analyse_enum_constant(SemaContext *context, Expr *e
 static inline bool sema_cast_ident_rvalue(SemaContext *context, Expr *expr);
 static inline bool sema_cast_rvalue(SemaContext *context, Expr *expr);
 
-static inline bool
-sema_expr_analyse_type_access(SemaContext *context, Expr *expr, Type *parent_type, bool was_group, Expr *identifier,
-                              bool *missing_ref);
-static inline bool
-sema_expr_analyse_member_access(SemaContext *context, Expr *expr, Expr *parent, bool was_group, Expr *identifier,
-                                bool *missing_ref);
+static inline bool sema_expr_analyse_type_access(SemaContext *context, Expr *expr, Type *parent_type, bool was_group, Expr *identifier, bool *missing_ref);
+static inline bool sema_expr_analyse_member_access(SemaContext *context, Expr *expr, Expr *parent, bool was_group, Expr *identifier, bool *missing_ref);
 static inline bool sema_expr_fold_to_member(Expr *expr, Expr *parent, Decl *member);
 static inline void sema_expr_flatten_const(SemaContext *context, Expr *expr);
 
+static inline bool sema_analyse_maybe_dead_expr(SemaContext *, Expr *expr, bool is_dead);
+
 // -- implementations
 
 static inline bool sema_constant_fold_ops(Expr *expr)
@@ -224,6 +223,45 @@ static inline bool sema_constant_fold_ops(Expr *expr)
 	UNREACHABLE
 }
 
+Expr *sema_enter_inline_member(Expr *parent, CanonicalType *type)
+{
+	switch (type->type_kind)
+	{
+		case TYPE_STRUCT:
+		{
+			Decl *decl = type->decl;
+			if (!decl->is_substruct) return NULL;
+			Expr *embedded_struct = expr_access_inline_member(parent, decl);
+			return embedded_struct;
+		}
+		case TYPE_DISTINCT:
+		{
+			Decl *decl = type->decl;
+			if (!decl->is_substruct) return NULL;
+			Expr *inner_expr = expr_copy(parent);
+			type = type->decl->distinct->type;
+			inner_expr->type = type;
+			return inner_expr;
+		}
+		case TYPE_ENUM:
+		{
+			Decl *decl = type->decl;
+			if (!decl->is_substruct) return NULL;
+			if (parent->expr_kind == EXPR_CONST)
+			{
+				return copy_expr_single(parent->const_expr.enum_err_val->enum_constant.args[0]);
+			}
+			Expr *property = expr_new(EXPR_ACCESS, parent->span);
+			property->resolve_status = RESOLVE_DONE;
+			property->access_expr.parent = parent;
+			property->access_expr.ref = decl->enums.parameters[0];
+			property->type = property->access_expr.ref->type;
+			return property;
+		}
+		default:
+			return NULL;
+	}
+}
 Expr *sema_expr_analyse_ct_arg_index(SemaContext *context, Expr *index_expr, unsigned *index_ref, bool report_error)
 {
 	unsigned args = vec_size(context->macro_varargs);
@@ -256,10 +294,10 @@ Expr *sema_expr_analyse_ct_arg_index(SemaContext *context, Expr *index_expr, uns
 	return context->macro_varargs[(size_t)index_val.i.low];
 }
 
-Expr *sema_ct_eval_expr(SemaContext *c, bool is_type_eval, Expr *inner, bool report_missing)
+Expr *sema_ct_eval_expr(SemaContext *context, bool is_type_eval, Expr *inner, bool report_missing)
 {
 	Path *path = NULL;
-	if (!sema_analyse_ct_expr(c, inner)) return false;
+	if (!sema_analyse_ct_expr(context, inner)) return false;
 	if (!expr_is_const_string(inner))
 	{
 		SEMA_ERROR(inner, "'%s' expects a constant string as the argument.", is_type_eval ? "$evaltype" : "$eval");
@@ -387,19 +425,19 @@ static inline Ast **context_push_returns(SemaContext *context)
 	return old_returns;
 }
 
-int sema_check_comp_time_bool(SemaContext *context, Expr *expr)
+CondResult sema_check_comp_time_bool(SemaContext *context, Expr *expr)
 {
-	if (!sema_analyse_cond_expr(context, expr)) return -1;
-	if (!expr_is_const(expr))
+	CondResult result = COND_MISSING;
+	if (!sema_analyse_cond_expr(context, expr, &result)) return COND_MISSING;
+	if (result == COND_MISSING)
 	{
 		SEMA_ERROR(expr, "Compile time evaluation requires a compile time constant value.");
-		return -1;
 	}
-	return expr->const_expr.b;
+	return result;
 }
 
 
-static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr)
+static bool sema_binary_is_expr_lvalue(SemaContext *context, Expr *top_expr, Expr *expr)
 {
 	switch (expr->expr_kind)
 	{
@@ -412,7 +450,7 @@ static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr)
 		case EXPR_CT_IDENT:
 			return true;
 		case EXPR_OTHER_CONTEXT:
-			return sema_binary_is_expr_lvalue(top_expr, expr->expr_other_context.inner);
+			return sema_binary_is_expr_lvalue(context, top_expr, expr->expr_other_context.inner);
 		case EXPR_IDENTIFIER:
 		{
 			Decl *decl = expr->identifier_expr.decl;
@@ -461,9 +499,9 @@ static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr)
 			return true;
 		case EXPR_BITACCESS:
 		case EXPR_ACCESS:
-			return sema_binary_is_expr_lvalue(top_expr, expr->access_expr.parent);
+			return sema_binary_is_expr_lvalue(context, top_expr, expr->access_expr.parent);
 		case EXPR_GROUP:
-			return sema_binary_is_expr_lvalue(top_expr, expr->inner_expr);
+			return sema_binary_is_expr_lvalue(context, top_expr, expr->inner_expr);
 		case EXPR_SUBSCRIPT:
 		case EXPR_SLICE:
 		case EXPR_SUBSCRIPT_ADDR:
@@ -476,7 +514,7 @@ static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr)
 			RETURN_SEMA_ERROR(top_expr, "You cannot assign to an unevaluated expression.");
 		case EXPR_EXPRESSION_LIST:
 			if (!vec_size(expr->expression_list)) return false;
-			return sema_binary_is_expr_lvalue(top_expr, VECLAST(expr->expression_list));
+			return sema_binary_is_expr_lvalue(context, top_expr, VECLAST(expr->expression_list));
 		case EXPR_CONST:
 			RETURN_SEMA_ERROR(top_expr, "You cannot assign to a constant expression.");
 		case EXPR_POISONED:
@@ -505,7 +543,6 @@ static bool sema_binary_is_expr_lvalue(Expr *top_expr, Expr *expr)
 		case EXPR_OPTIONAL:
 		case EXPR_FORCE_UNWRAP:
 		case EXPR_INITIALIZER_LIST:
-		case EXPR_MACRO_BLOCK:
 		case EXPR_MACRO_BODY_EXPANSION:
 		case EXPR_NOP:
 		case EXPR_OPERATOR_CHARS:
@@ -622,7 +659,6 @@ static bool expr_may_ref(Expr *expr)
 		case EXPR_OPTIONAL:
 		case EXPR_FORCE_UNWRAP:
 		case EXPR_INITIALIZER_LIST:
-		case EXPR_MACRO_BLOCK:
 		case EXPR_MACRO_BODY_EXPANSION:
 		case EXPR_NOP:
 		case EXPR_OPERATOR_CHARS:
@@ -651,10 +687,10 @@ static bool expr_may_ref(Expr *expr)
 	UNREACHABLE
 }
 
-bool sema_expr_check_assign(SemaContext *c, Expr *expr)
+bool sema_expr_check_assign(SemaContext *context, Expr *expr)
 {
 	Expr *inner;
-	if (!sema_binary_is_expr_lvalue(expr, expr)) return false;
+	if (!sema_binary_is_expr_lvalue(context, expr, expr)) return false;
 	if (expr->expr_kind == EXPR_SUBSCRIPT)
 	{
 		inner = exprptr(expr->subscript_expr.expr);
@@ -793,16 +829,12 @@ static inline bool sema_expr_analyse_ternary(SemaContext *context, Expr *expr)
 {
 	Expr *left = exprptrzero(expr->ternary_expr.then_expr);
 	Expr *cond = exprptr(expr->ternary_expr.cond);
-	int path = -1;
+	CondResult path = COND_MISSING;
 	// Normal
 	if (left)
 	{
-		if (!sema_analyse_cond_expr(context, cond)) return expr_poison(expr);
-		if (!sema_analyse_expr(context, left)) return expr_poison(expr);
-		if (expr_is_const(cond))
-		{
-			path = cond->const_expr.b ? 1 : 0;
-		}
+		if (!sema_analyse_cond_expr(context, cond, &path)) return expr_poison(expr);
+		if (!sema_analyse_maybe_dead_expr(context, left, path == COND_FALSE)) return expr_poison(expr);
 	}
 	else
 	{
@@ -814,18 +846,18 @@ static inline bool sema_expr_analyse_ternary(SemaContext *context, Expr *expr)
 			SEMA_ERROR(cond, "Cannot convert expression to boolean.");
 			return false;
 		}
-		if (expr_is_constant_eval(cond, true))
+		if (expr_is_constant_eval(cond, CONSTANT_EVAL_CONSTANT_VALUE))
 		{
 			Expr *copy = copy_expr_single(cond);
 			cast_no_check(context, copy, type_bool, false);
-			assert(expr_is_const(copy));
-			path = copy->const_expr.b ? 1 : 0;
+			assert(expr_is_const_bool(copy));
+			path = copy->const_expr.b ? COND_TRUE : COND_FALSE;
 		}
 		left = cond;
 	}
 
 	Expr *right = exprptr(expr->ternary_expr.else_expr);
-	if (!sema_analyse_expr(context, right)) return expr_poison(expr);
+	if (!sema_analyse_maybe_dead_expr(context, right, path == COND_TRUE)) return expr_poison(expr);
 
 	bool is_optional = false;
 	Type *left_canonical = left->type->canonical;
@@ -844,9 +876,9 @@ static inline bool sema_expr_analyse_ternary(SemaContext *context, Expr *expr)
 		if (!cast_implicit(context, left, no_fail_max) || !cast_implicit(context, right, no_fail_max)) return false;
 	}
 
-	if (path > -1)
+	if (path != COND_MISSING)
 	{
-		expr_replace(expr, path ? left : right);
+		expr_replace(expr, path == COND_TRUE ? left : right);
 	}
 
 	expr_binary_unify_failability(expr, left, right);
@@ -1288,7 +1320,7 @@ INLINE bool sema_call_expand_arguments(SemaContext *context, CalledDecl *callee,
 			{
 				if (!sema_analyse_expr(context, arg)) return false;
 				Type *type = arg->type;
-				if (type_is_invalid_storage_type(type))
+				if (type_storage_type(type) != STORAGE_NORMAL)
 				{
 					RETURN_SEMA_ERROR(arg, "A value of type %s cannot be passed as a variadic argument.",
 					                  type_quoted_error_string(type));
@@ -1352,10 +1384,10 @@ INLINE bool sema_call_expand_arguments(SemaContext *context, CalledDecl *callee,
 			{
 				if (!param)
 				{
-					sema_error_at_after(args[num_args - 1]->span, "Argument #%d is not set.", i);
+					print_error_after(args[num_args - 1]->span, "Argument #%d is not set.", i);
 					return false;
 				}
-				sema_error_at_after(args[num_args - 1]->span, "Expected '.%s = ...' after this argument.", param->name);
+				print_error_after(args[num_args - 1]->span, "Expected '.%s = ...' after this argument.", param->name);
 				return false;
 			}
 			if (num_args > (callee->struct_var ? 1 : 0))
@@ -1473,7 +1505,7 @@ static inline bool sema_call_analyse_invocation(SemaContext *context, Expr *call
 	{
 		// 7a. The parameter type is <type>[], so we get the <type>
 		Type *vararg_slot_type = decl_params[vararg_index]->type;
-		assert(vararg_slot_type->type_kind == TYPE_SUBARRAY);
+		assert(vararg_slot_type->type_kind == TYPE_SLICE);
 		variadic_type = vararg_slot_type->array.base;
 	}
 
@@ -1501,7 +1533,7 @@ static inline bool sema_call_analyse_invocation(SemaContext *context, Expr *call
 				else
 				{
 					if (!sema_analyse_expr(context, val)) return false;
-					if (type_is_invalid_storage_type(val->type))
+					if (type_storage_type(val->type) != STORAGE_NORMAL)
 					{
 						SEMA_ERROR(val, "A value of type %s cannot be passed as a variadic argument.",
 								   type_quoted_error_string(val->type));
@@ -1569,19 +1601,17 @@ static inline bool sema_call_analyse_invocation(SemaContext *context, Expr *call
 			case VARDECL_PARAM_REF:
 				// &foo
 				if (!sema_analyse_expr_lvalue(context, arg)) return false;
-				if (!type_is_any_interface_ptr(arg->type) && !sema_arg_is_pass_through_ref(arg) && !sema_expr_check_assign(context, arg)) return false;
-				if (!type_is_any_interface_ptr(arg->type)) expr_insert_addr(arg);
+				if (sema_arg_is_pass_through_ref(arg) && !sema_expr_check_assign(context, arg)) return false;
+				expr_insert_addr(arg);
 				*optional |= IS_OPTIONAL(arg);
 				if (!sema_call_check_contract_param_match(context, param, arg)) return false;
-				if (type_is_invalid_storage_type(type))
+				if (type_storage_type(type) != STORAGE_NORMAL)
 				{
-					SEMA_ERROR(arg, "A value of type %s cannot be passed by reference.", type_quoted_error_string(type));
-					return false;
+					RETURN_SEMA_ERROR(arg, "A value of type %s cannot be passed by reference.", type_quoted_error_string(type));
 				}
 				if (type && type->canonical != arg->type->canonical)
 				{
-					SEMA_ERROR(arg, "'%s' cannot be implicitly cast to '%s'.", type_to_error_string(arg->type), type_to_error_string(type));
-					return false;
+					RETURN_SEMA_ERROR(arg, "'%s' cannot be implicitly cast to '%s'.", type_to_error_string(arg->type), type_to_error_string(type));
 				}
 				if (!param->alignment)
 				{
@@ -1598,19 +1628,28 @@ static inline bool sema_call_analyse_invocation(SemaContext *context, Expr *call
 			case VARDECL_PARAM:
 				// foo
 				if (!sema_analyse_expr_rhs(context, type, arg, true, no_match_ref)) return false;
-				if (type_is_void(type_no_optional(arg->type))) RETURN_SEMA_ERROR(arg, "A 'void' value cannot be passed as a parameter.");
 				if (IS_OPTIONAL(arg)) *optional = true;
-				if (type_is_invalid_storage_type(arg->type))
+				switch (type_storage_type(arg->type))
 				{
-					assert(!type_is_wildcard(arg->type));
-					RETURN_SEMA_ERROR(arg, "A value of type %s can only be passed as a compile time parameter.", type_quoted_error_string(arg->type));
+					case STORAGE_NORMAL:
+						break;
+					case STORAGE_VOID:
+					case STORAGE_WILDCARD:
+						RETURN_SEMA_ERROR(arg, "A 'void' value cannot be passed as a parameter.");
+					case STORAGE_COMPILE_TIME:
+						RETURN_SEMA_ERROR(arg, "It is only possible to use %s as a compile time parameter.",
+						                  type_invalid_storage_type_name(arg->type));
+					case STORAGE_UNKNOWN:
+						RETURN_SEMA_ERROR(arg, "A value of type '%s' has no known size so cannot be "
+											   "passed as a parameter, you can pass a pointer to it though.",
+						                  type_quoted_error_string(arg->type));
 				}
+				if (!sema_call_check_contract_param_match(context, param, arg)) return false;
 				if (!param->alignment)
 				{
 					assert(callee.macro && "Only in the macro case should we need to insert the alignment.");
 					if (!sema_set_alloca_alignment(context, arg->type, &param->alignment)) return false;
 				}
-				if (!sema_call_check_contract_param_match(context, param, arg)) return false;
 				break;
 			case VARDECL_PARAM_EXPR:
 				// #foo
@@ -1954,7 +1993,8 @@ bool sema_expr_analyse_macro_call(SemaContext *context, Expr *call_expr, Expr *s
 	context_change_scope_with_flags(&macro_context, SCOPE_MACRO);
 
 	macro_context.block_return_defer = macro_context.active_scope.defer_last;
-	macro_context.inlining_span = context->current_macro ? context->inlining_span : call_expr->span;
+	InliningSpan span = { call_expr->span, context->inlined_at };
+	macro_context.inlined_at = &span;
 	macro_context.current_macro = decl;
 	macro_context.yield_body = macro_body ? macro_body->macro_body_expr.body : NULL;
 	macro_context.yield_params = body_params;
@@ -2122,16 +2162,40 @@ bool sema_expr_analyse_macro_call(SemaContext *context, Expr *call_expr, Expr *s
 			goto EXIT;
 		}
 	}
-NOT_CT:
-	call_expr->expr_kind = EXPR_MACRO_BLOCK;
-	call_expr->macro_block.had_optional_arg = has_optional_arg;
-	call_expr->macro_block.is_must_use = must_use;
-	call_expr->macro_block.is_optional_return = optional_return;
-	call_expr->macro_block.first_stmt = body->compound_stmt.first_stmt;
-	call_expr->macro_block.macro = decl;
-	call_expr->macro_block.params = params;
-	call_expr->macro_block.block_exit = block_exit_ref;
-	call_expr->macro_block.is_noreturn = is_no_return;
+NOT_CT:;
+	Expr **list = NULL;
+	FOREACH_BEGIN(Decl *param, params)
+		if (!param) continue;
+		VarDeclKind kind = param->var.kind;
+		if (kind != VARDECL_PARAM_REF && kind != VARDECL_PARAM) continue;
+		Expr *decl_expr = expr_new(EXPR_DECL, param->span);
+		decl_expr->decl_expr = param;
+		decl_expr->type = param->type;
+		decl_expr->resolve_status = RESOLVE_DONE;
+		vec_add(list, decl_expr);
+	FOREACH_END();
+	Expr *new_block;
+	if (list)
+	{
+		call_expr->expr_kind = EXPR_EXPRESSION_LIST;
+		new_block = expr_new(EXPR_EXPR_BLOCK, call_expr->span);
+		new_block->type = call_expr->type;
+		vec_add(list, new_block);
+		call_expr->expression_list = list;
+	}
+	else
+	{
+		new_block = call_expr;
+		call_expr->expr_kind = EXPR_EXPR_BLOCK;
+	}
+	new_block->resolve_status = RESOLVE_DONE;
+	new_block->expr_block.macro_id = declid(decl);
+	new_block->expr_block.had_optional_arg = has_optional_arg;
+	new_block->expr_block.is_must_use = must_use;
+	new_block->expr_block.is_optional_return = optional_return;
+	new_block->expr_block.first_stmt = body->compound_stmt.first_stmt;
+	new_block->expr_block.block_exit = block_exit_ref;
+	new_block->expr_block.is_noreturn = is_no_return;
 EXIT:
 	assert(context->active_scope.defer_last == context->active_scope.defer_start);
 	context->active_scope = old_scope;
@@ -2157,21 +2221,19 @@ static bool sema_call_analyse_body_expansion(SemaContext *macro_context, Expr *c
 	Expr *macro_body = exprptrzero(call_expr->macro_body);
 	if (macro_body && vec_size(macro_body->macro_body_expr.body_arguments))
 	{
-		SEMA_ERROR(call, "Nested expansion is not possible.");
+		PRINT_ERROR_AT(call, "Nested expansion is not possible.");
 		return false;
 	}
 	if (call_expr->splat_vararg)
 	{
-		SEMA_ERROR(call, "Expanding parameters is not allowed for macro invocations.");
-		return false;
+		PRINT_ERROR_AT(call, "Expanding parameters is not allowed for macro invocations.");
 	}
 	// Theoretically we could support named arguments, but that's unnecessary.
 	unsigned expressions = vec_size(call_expr->arguments);
 	Decl **body_parameters = declptr(body_param)->body_params;
 	if (expressions != vec_size(body_parameters))
 	{
-		SEMA_ERROR(call, "Expected %d parameter(s).", vec_size(body_parameters));
-		return false;
+		PRINT_ERROR_AT(call, "Expected %d parameter(s).", vec_size(body_parameters));
 	}
 	Expr **args = call_expr->arguments;
 
@@ -2369,7 +2431,7 @@ static bool sema_slice_len_is_in_range(SemaContext *context, Type *type, Expr *l
 		case TYPE_FLEXIBLE_ARRAY:
 			assert(!from_end);
 			FALLTHROUGH;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return true;
 		case TYPE_ARRAY:
 		case TYPE_VECTOR:
@@ -2458,7 +2520,7 @@ static bool sema_slice_index_is_in_range(SemaContext *context, Type *type, Expr
 			}
 			break;
 		}
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			// If not from end, just check the negative values.
 			if (!from_end) break;
 			// From end we can only do sanity checks ^0 is invalid for non-end index. ^-1 and less is invalid for all.
@@ -2928,7 +2990,7 @@ static inline bool sema_expr_analyse_slice(SemaContext *context, Expr *expr)
 	}
 
 	// Retain the original type when doing distinct slices.
-	Type *result_type = type_get_subarray(inner_type);
+	Type *result_type = type_get_slice(inner_type);
 	Type *original_type_canonical = original_type->canonical;
 	if (original_type_canonical->type_kind == TYPE_DISTINCT && type_base(original_type_canonical) == result_type)
 	{
@@ -3051,7 +3113,7 @@ static inline bool sema_expr_replace_with_enum_name_array(SemaContext *context,
 	initializer->initializer_list = element_values;
 	enum_array_expr->expr_kind = EXPR_COMPOUND_LITERAL;
 	enum_array_expr->expr_compound_literal.initializer = initializer;
-	enum_array_expr->expr_compound_literal.type_info = type_info_new_base(type_get_subarray(type_string), span);
+	enum_array_expr->expr_compound_literal.type_info = type_info_new_base(type_get_slice(type_string), span);
 	enum_array_expr->resolve_status = RESOLVE_NOT_DONE;
 	return sema_analyse_expr(context, enum_array_expr);
 }
@@ -3312,7 +3374,7 @@ static inline bool sema_create_const_len(SemaContext *context, Expr *expr, Type
 			break;
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		default:
 			UNREACHABLE
 	}
@@ -3343,7 +3405,7 @@ static inline bool sema_create_const_inner(SemaContext *context, Expr *expr, Typ
 			break;
 		case TYPE_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_VECTOR:
@@ -3376,6 +3438,9 @@ static inline bool sema_create_const_min(SemaContext *context, Expr *expr, Type
 		expr->const_expr.fxx.type = flat->type_kind;
 		switch (flat->type_kind)
 		{
+			case TYPE_BF16:
+				expr->const_expr.fxx.f = -338953138925153547590470800371487866880.0;
+				break;
 			case TYPE_F16:
 				expr->const_expr.fxx.f = -65504.0;
 				break;
@@ -3552,6 +3617,9 @@ static inline bool sema_create_const_max(SemaContext *context, Expr *expr, Type
 		expr->const_expr.fxx.type = flat->type_kind;
 		switch (flat->type_kind)
 		{
+			case TYPE_BF16:
+				expr->const_expr.fxx.f = 338953138925153547590470800371487866880.0;
+				break;
 			case TYPE_F16:
 				expr->const_expr.fxx.f = 65504.0;
 				break;
@@ -3607,7 +3675,7 @@ static bool sema_expr_rewrite_to_typeid_property(SemaContext *context, Expr *exp
 		case TYPE_PROPERTY_PARENTOF:
 			return sema_expr_rewrite_typeid_call(expr, typeid, TYPEID_INFO_PARENTOF, type_typeid);
 		case TYPE_PROPERTY_NAMES:
-			return sema_expr_rewrite_typeid_call(expr, typeid, TYPEID_INFO_NAMES, type_get_subarray(type_string));
+			return sema_expr_rewrite_typeid_call(expr, typeid, TYPEID_INFO_NAMES, type_get_slice(type_string));
 		case TYPE_PROPERTY_ALIGNOF:
 		case TYPE_PROPERTY_INF:
 		case TYPE_PROPERTY_MIN:
@@ -3709,7 +3777,7 @@ static bool sema_type_property_is_valid_for_type(Type *original_type, TypeProper
 				case TYPE_BITSTRUCT:
 				case TYPE_ARRAY:
 				case TYPE_FLEXIBLE_ARRAY:
-				case TYPE_SUBARRAY:
+				case TYPE_SLICE:
 				case TYPE_INFERRED_ARRAY:
 				case TYPE_INFERRED_VECTOR:
 				case TYPE_VECTOR:
@@ -3873,13 +3941,22 @@ static inline bool sema_expr_analyse_swizzle(SemaContext *context, Expr *expr, E
 	int index;
 	for (unsigned i = 0; i < len; i++)
 	{
-		index = (kw[0] + 3 - 'w') % 4;
-		if (index >= vec_len)
+		char val = swizzle[(int)kw[i]] - 1;
+		if ((val & 0xF) >= vec_len)
 		{
-			SEMA_ERROR(expr, "The '%c' component is not present in a vector of length %d.", kw[i], vec_len);
+			RETURN_SEMA_ERROR(expr, "The '%c' component is not present in a vector of length %d, did you assume a longer vector?", kw[i], vec_len);
 			return false;
 		}
+		if (i == 0)
+		{
+			index = val;
+		}
+		if ((index ^ val) & 0x10)
+		{
+			RETURN_SEMA_ERROR(expr, "Mixing [xyzw] and [rgba] is not permitted, you will need to select one of them.");
+		}
 	}
+	index &= 0xF;
 	if (len == 1)
 	{
 		expr->expr_kind = EXPR_SUBSCRIPT_ADDR;
@@ -3899,6 +3976,15 @@ static inline bool sema_expr_analyse_swizzle(SemaContext *context, Expr *expr, E
 	return true;
 }
 
+static inline bool sema_analyse_maybe_dead_expr(SemaContext *context, Expr *expr, bool is_dead)
+{
+	if (!is_dead || context->active_scope.is_dead) return sema_analyse_expr(context, expr);
+	context->active_scope.is_dead = true;
+	bool success = sema_analyse_expr(context, expr);
+	context->active_scope.is_dead = false;
+	return success;
+}
+
 static inline void sema_expr_flatten_const(SemaContext *context, Expr *expr)
 {
 	if (expr->expr_kind != EXPR_IDENTIFIER) return;
@@ -4041,7 +4127,7 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 	const char *kw = identifier->identifier_expr.ident;
 	if (kw_type == kw)
 	{
-		if (flat_type->type_kind == TYPE_ANYPTR)
+		if (flat_type->type_kind == TYPE_ANY)
 		{
 			expr_rewrite_to_builtin_access(expr, parent, ACCESS_TYPEOFANY, type_typeid);
 			return true;
@@ -4055,12 +4141,12 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 
 CHECK_DEEPER:
 
-	// 9. Fix hard coded function `len` on subarrays and arrays
+	// 9. Fix hard coded function `len` on slices and arrays
 	if (kw == kw_len)
 	{
-		if (flat_type->type_kind == TYPE_SUBARRAY)
+		if (flat_type->type_kind == TYPE_SLICE)
 		{
-			// Handle literal "foo".len which is now a subarray.
+			// Handle literal "foo".len which is now a slice.
 			sema_expr_flatten_const(context, parent);
 			if (expr_is_const_string(parent))
 			{
@@ -4093,23 +4179,22 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 		{
 			for (unsigned i = 0; i < len; i++)
 			{
-				char c = kw[i];
-				if (c < 'w' || c > 'z') goto NOT_SWIZZLE;
+				if (!swizzle[(int)kw[i]]) goto NOT_SWIZZLE;
 			}
 			// TODO should we do a missing for this as well?
 			return sema_expr_analyse_swizzle(context, expr, parent, flat_type, kw, len);
 			NOT_SWIZZLE:;
 		}
 	}
-	// Hard coded ptr on subarrays and any
+	// Hard coded ptr on slices and any
 	if (kw == kw_ptr)
 	{
-		if (flat_type->type_kind == TYPE_SUBARRAY)
+		if (flat_type->type_kind == TYPE_SLICE)
 		{
 			expr_rewrite_to_builtin_access(expr, current_parent, ACCESS_PTR, type_get_ptr(flat_type->array.base));
 			return true;
 		}
-		if (flat_type->type_kind == TYPE_ANYPTR)
+		if (flat_type->type_kind == TYPE_ANY)
 		{
 			expr_rewrite_to_builtin_access(expr, current_parent, ACCESS_PTR, type_voidptr);
 			return true;
@@ -4174,9 +4259,7 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 	{
 		Decl *ambiguous = NULL;
 		Decl *private = NULL;
-		// We look at any for any* and interface for interface*
-		Type *actual = type_is_any_interface_ptr(type) ? type->pointer : type;
-		Decl *method = sema_resolve_type_method(context->unit, actual, kw, &ambiguous, &private);
+		Decl *method = sema_resolve_type_method(context->unit, type, kw, &ambiguous, &private);
 		if (private)
 		{
 			if (missing_ref) goto MISSING_REF;
@@ -4191,7 +4274,7 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 		if (!method)
 		{
 			if (missing_ref) goto MISSING_REF;
-			RETURN_SEMA_ERROR(expr, "There is no member or method '%s' on '%s'", kw, type_to_error_string(actual));
+			RETURN_SEMA_ERROR(expr, "There is no member or method '%s' on '%s'", kw, type_to_error_string(type));
 		}
 		expr->access_expr.parent = current_parent;
 		expr->type = method->type ? type_add_optional(method->type, optional) : NULL;
@@ -4201,7 +4284,7 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 	}
 
 	// 10. Dump all members and methods into the scope.
-	Decl *decl = type->type_kind == TYPE_INFPTR ? type->pointer->decl : type->decl;
+	Decl *decl = type->decl;
 
 	Decl *member = sema_decl_stack_find_decl_member(decl, kw);
 
@@ -4244,32 +4327,25 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 	if (!member)
 	{
 		// 11a. We have a potential embedded struct check:
-		if (type_is_substruct(type))
+		Expr *substruct = sema_enter_inline_member(current_parent, type);
+		if (substruct)
 		{
-			Expr *embedded_struct = expr_access_inline_member(parent, type->decl);
-			current_parent = embedded_struct;
-			type = embedded_struct->type->canonical;
+			current_parent = substruct;
+			type = current_parent->type->canonical;
+			flat_type = type_flatten(type);
 			goto CHECK_DEEPER;
 		}
 
-		if (type->type_kind == TYPE_DISTINCT && decl->is_substruct)
-		{
-			Expr *inner_expr = expr_copy(current_parent);
-			type = type->decl->distinct->type;
-			inner_expr->type = type;
-			current_parent = inner_expr;
-			goto CHECK_DEEPER;
-		}
 		// 11b. Otherwise we give up.
 		if (private)
 		{
 			if (missing_ref) goto MISSING_REF;
 			RETURN_SEMA_ERROR(expr, "The method '%s' has private visibility.", kw);
 		}
-		if (parent->type->canonical->type_kind == TYPE_INFPTR)
+		if (parent->type->canonical->type_kind == TYPE_INTERFACE)
 		{
 			if (missing_ref) goto MISSING_REF;
-			RETURN_SEMA_ERROR(expr, "The '%s' interface has no method '%s', did you spell it correctly?", parent->type->canonical->pointer->canonical->name, kw);
+			RETURN_SEMA_ERROR(expr, "The '%s' interface has no method '%s', did you spell it correctly?", parent->type->canonical->name, kw);
 		}
 		if (missing_ref) goto MISSING_REF;
 		RETURN_SEMA_ERROR(expr, "There is no field or method '%s.%s'.", type_to_error_string(parent->type), kw);
@@ -4299,9 +4375,9 @@ static inline bool sema_expr_analyse_access(SemaContext *context, Expr *expr, bo
 	return false;
 }
 
-static Expr **sema_vasplat_append(SemaContext *c, Expr **init_expressions, Expr *expr)
+static Expr **sema_vasplat_append(SemaContext *context, Expr **init_expressions, Expr *expr)
 {
-	Expr **args = c->macro_varargs;
+	Expr **args = context->macro_varargs;
 	unsigned param_count = vec_size(args);
 	Range *range = &expr->vasplat_expr;
 	Expr *start = exprptrzero(range->start);
@@ -4313,7 +4389,7 @@ static Expr **sema_vasplat_append(SemaContext *c, Expr **init_expressions, Expr
 			SEMA_ERROR(expr, "$vasplat() expected a range.");
 			return NULL;
 		}
-		if (!sema_analyse_expr(c, start)) return NULL;
+		if (!sema_analyse_expr(context, start)) return NULL;
 		if (!expr_is_const_int(start))
 		{
 			SEMA_ERROR(expr, "Expected a constant integer.");
@@ -4345,7 +4421,7 @@ static Expr **sema_vasplat_append(SemaContext *c, Expr **init_expressions, Expr
 	unsigned end_idx = param_count;
 	if (end)
 	{
-		if (!sema_analyse_expr(c, end)) return NULL;
+		if (!sema_analyse_expr(context, end)) return NULL;
 		if (!expr_is_const_int(end))
 		{
 			SEMA_ERROR(expr, "Expected a constant integer.");
@@ -4480,7 +4556,7 @@ static inline bool sema_expr_analyse_expr_list(SemaContext *context, Expr *expr)
 	{
 		Expr *checked_expr = expr->expression_list[i];
 		if (!sema_analyse_expr(context, checked_expr)) return false;
-		if (i != last && !sema_expr_check_discard(checked_expr)) return false;
+		if (i != last && !sema_expr_check_discard(context, checked_expr)) return false;
 	}
 	expr->type = expr->expression_list[last]->type;
 	return success;
@@ -4539,7 +4615,7 @@ static bool sema_expr_analyse_slice_assign(SemaContext *context, Expr *expr, Typ
 	if (!sema_analyse_expr(context, right)) return false;
 	if (IS_OPTIONAL(right))
 	{
-		RETURN_SEMA_ERROR(right, "The right hand side may not be optional when using subarray assign.");
+		RETURN_SEMA_ERROR(right, "The right hand side may not be optional when using slice assign.");
 	}
 	Type *base = type_flatten(left_type)->array.base;
 	Type *rhs_type = type_flatten(right->type);
@@ -4550,7 +4626,7 @@ static bool sema_expr_analyse_slice_assign(SemaContext *context, Expr *expr, Typ
 			break;
 		case TYPE_VECTOR:
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			if (base == rhs_type->array.base) goto SLICE_COPY;
 			break;
 		default:
@@ -4578,7 +4654,7 @@ SLICE_COPY:;
 	switch (rhs_type->type_kind)
 	{
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_VECTOR:
 			if (rhs_type->array.base != base) goto EXPECTED;
 			break;
@@ -4596,7 +4672,7 @@ SLICE_COPY:;
 		default:
 			goto EXPECTED;
 	}
-	assert(right->expr_kind != EXPR_SLICE || rhs_type->type_kind == TYPE_SUBARRAY);
+	assert(right->expr_kind != EXPR_SLICE || rhs_type->type_kind == TYPE_SLICE);
 
 	// If we have a slice operation on the right hand side, check the ranges.
 	if (right->expr_kind == EXPR_SLICE)
@@ -4605,7 +4681,7 @@ SLICE_COPY:;
 		IndexDiff right_len = range_const_len(right_range);
 		if (left_len >= 0 && right_len >= 0 && left_len != right_len)
 		{
-			RETURN_SEMA_ERROR(expr, "Length mismatch between subarrays.");
+			RETURN_SEMA_ERROR(expr, "Length mismatch between slices.");
 		}
 	}
 	else
@@ -4631,7 +4707,7 @@ SLICE_COPY:;
 	expr->slice_assign_expr.right = exprid(right);
 	return true;
 EXPECTED:
-	RETURN_SEMA_ERROR(right, "Expected an array, vector or subarray with element type %s.",
+	RETURN_SEMA_ERROR(right, "Expected an array, vector or slice with element type %s.",
 	                  type_quoted_error_string(base));
 }
 
@@ -4653,7 +4729,7 @@ bool sema_expr_analyse_assign_right_side(SemaContext *context, Expr *expr, Type
 			return false;
 		}
 		if (!left_type) left_type = type_no_optional(right->type);
-		return sema_error_failed_cast(right, right->type, left_type);
+		return sema_error_failed_cast(context, right, right->type, left_type);
 	}
 
 	// 3. Set the result to the type on the right side.
@@ -4661,7 +4737,7 @@ bool sema_expr_analyse_assign_right_side(SemaContext *context, Expr *expr, Type
 
 	return true;
 }
-static inline bool sema_expr_begin_analyse(Expr *expr)
+static inline bool sema_expr_begin_analyse(SemaContext *context, Expr *expr)
 {
 	switch (expr->resolve_status)
 	{
@@ -4680,7 +4756,7 @@ static inline bool sema_expr_begin_analyse(Expr *expr)
 
 static inline bool sema_binary_analyse_ct_identifier_lvalue(SemaContext *context, Expr *expr)
 {
-	if (!sema_expr_begin_analyse(expr)) return expr_ok(expr);
+	if (!sema_expr_begin_analyse(context, expr)) return expr_ok(expr);
 
 	Decl *ambiguous_decl = NULL;
 	Decl *private_symbol = NULL;
@@ -4791,7 +4867,7 @@ static bool sema_expr_analyse_assign(SemaContext *context, Expr *expr, Expr *lef
 	}
 	if (left->expr_kind == EXPR_BITACCESS)
 	{
-		if (!sema_bit_assignment_check(right, left->access_expr.ref)) return false;
+		if (!sema_bit_assignment_check(context, right, left->access_expr.ref)) return false;
 		expr->expr_kind = EXPR_BITASSIGN;
 	}
 	return true;
@@ -5013,7 +5089,7 @@ static bool sema_binary_arithmetic_promotion(SemaContext *context, Expr *left, E
 	{
 		if (!error_message)
 		{
-			return sema_type_error_on_binop(parent);
+			return sema_type_error_on_binop(context, parent);
 		}
 		SEMA_ERROR(parent, error_message, type_quoted_error_string(left->type), type_quoted_error_string(right->type));
 		return false;
@@ -5283,24 +5359,27 @@ static bool sema_expr_analyse_sub(SemaContext *context, Expr *expr, Expr *left,
 
 }
 
-INLINE bool sema_is_valid_pointer_offset_type(Type *canonical_type, Expr *ptr_expr, Expr *add_expr, const char *error)
+INLINE bool sema_is_valid_pointer_offset_type(SemaContext *context, Type *canonical_type,
+											  Expr *ptr_expr, Expr *add_expr, const char *error)
 {
 	if (!type_is_integer(canonical_type))
 	{
 		RETURN_SEMA_ERROR(ptr_expr, "A value of type '%s' cannot %s '%s', an integer was expected here.",
-		           type_to_error_string(add_expr->type),
-				   error,
-		           type_to_error_string(add_expr->type));
+		                  type_to_error_string(add_expr->type),
+		                  error,
+		                  type_to_error_string(add_expr->type));
 	}
 	return true;
 }
 
-INLINE bool sema_is_valid_vector_pointer_offset_type(Type *canonical_type, Type *canonical_pointer_type, Expr *ptr_expr, Expr *add_expr, const char *error)
+INLINE bool sema_is_valid_vector_pointer_offset_type(SemaContext *context, Type *canonical_type,
+													 Type *canonical_pointer_type, Expr *ptr_expr,
+													 Expr *add_expr, const char *error)
 {
 	if (canonical_type->type_kind == TYPE_VECTOR)
 	{
 		// Reduce according to inline.
-		Type *element = type_flat_inline(canonical_type->array.base);
+		Type *element = type_flat_distinct_inline(canonical_type->array.base);
 		if (type_is_integer(element))
 		{
 			if (canonical_type->array.len != canonical_pointer_type->array.len)
@@ -5613,7 +5692,7 @@ static bool sema_expr_analyse_bit(SemaContext *context, Expr *expr, Expr *left,
 
 	if (!is_bool && !is_bitstruct && !expr_both_any_integer_or_integer_bool_vector(left, right))
 	{
-		return sema_type_error_on_binop(expr);
+		return sema_type_error_on_binop(context, expr);
 	}
 
 	// 3. Do constant folding if both sides are constant.
@@ -5680,7 +5759,7 @@ static bool sema_expr_analyse_shift(SemaContext *context, Expr *expr, Expr *left
 	// 2. Only integers or integer vectors may be shifted.
 	if (!expr_both_any_integer_or_integer_vector(left, right))
 	{
-		return sema_type_error_on_binop(expr);
+		return sema_type_error_on_binop(context, expr);
 	}
 
 	// 3. Promote lhs using the usual numeric promotion.
@@ -5747,7 +5826,7 @@ static bool sema_expr_analyse_shift_assign(SemaContext *context, Expr *expr, Exp
 	if (!sema_expr_check_assign(context, left)) return false;
 
 	// 3. Only integers may be shifted.
-	if (!expr_both_any_integer_or_integer_vector(left, right)) return sema_type_error_on_binop(expr);
+	if (!expr_both_any_integer_or_integer_vector(left, right)) return sema_type_error_on_binop(context, expr);
 
 	// 4. For a constant right hand side we will make a series of checks.
 	if (expr_is_const(right))
@@ -5805,12 +5884,13 @@ static bool sema_expr_analyse_and_or(SemaContext *context, Expr *expr, Expr *lef
 
 
 
-static bool sema_binary_is_unsigned_always_false_comparison(SemaContext *context, Expr *expr, Expr *left, Expr *right)
+static bool sema_binary_is_unsigned_always_same_comparison(SemaContext *context, Expr *expr, Expr *left, Expr *right,
+                                                           Type *lhs_type, Type *rhs_type)
 {
 	if (context->active_scope.flags & SCOPE_MACRO) return true;
 	if (!expr_is_const(left) && !expr_is_const(right)) return true;
 	if (!type_is_integer(left->type)) return true;
-	if (expr_is_const(left) && type_is_unsigned(type_flatten(right->type)))
+	if (expr_is_const(left) && type_is_unsigned(rhs_type))
 	{
 		if (int_is_neg(left->const_expr.ixx))
 		{
@@ -5821,18 +5901,22 @@ static bool sema_binary_is_unsigned_always_false_comparison(SemaContext *context
 		switch (expr->binary_expr.operator)
 		{
 			case BINARYOP_GT:
-				SEMA_ERROR(left, "Comparing '0 > unsigned expression' can never be true, and is only allowed inside of macro expansions.");
+				RETURN_SEMA_ERROR(right,
+				                  "Comparing '0 > unsigned expression' can never be true, and is only allowed inside of macro expansions.");
 				return false;
 			case BINARYOP_GE:
-				SEMA_ERROR(left,
-						   "Comparing '0 >= unsigned expression' is the same as 0 == expr and is a common bug, "
-						   "so is only allowed inside of macro expansions.");
-				return false;
+				RETURN_SEMA_ERROR(right,
+				                  "Comparing '0 >= unsigned expression' is the same as 0 == expr and is a common bug, "
+				                  "for this reason it is only allowed inside of macro expansions.");
+			case BINARYOP_LE:
+				RETURN_SEMA_ERROR(right,
+				                  "Comparing '0 <= unsigned expression' is always true and is a common bug, "
+				                  "for this reason it is only allowed inside of macro expansions.");
 			default:
 				return true;
 		}
 	}
-	if (!expr_is_const(right) || !type_is_unsigned(type_flatten(left->type))) return true;
+	if (!expr_is_const(right) || !type_is_unsigned(lhs_type)) return true;
 	if (int_is_neg(right->const_expr.ixx))
 	{
 		SEMA_ERROR(right, "Comparing an unsigned value with a negative constant is only allowed inside of macros.");
@@ -5842,14 +5926,17 @@ static bool sema_binary_is_unsigned_always_false_comparison(SemaContext *context
 	switch (expr->binary_expr.operator)
 	{
 		case BINARYOP_LT:
-			SEMA_ERROR(right,
-					   "Comparing 'unsigned expression < 0' can never be true, and is only allowed inside of macro expansions.");
+			RETURN_SEMA_ERROR(right,
+							  "Comparing 'unsigned expression < 0' can never be true, and is only allowed inside of macro expansions.");
 			return false;
 		case BINARYOP_LE:
-			SEMA_ERROR(right,
-					   "Comparing 'unsigned expression <= 0' is the same as expr == 0 and is a common bug, "
-					   "so is only allowed inside of macro expansions.");
-			return false;
+			RETURN_SEMA_ERROR(right,
+			                  "Comparing 'unsigned expression <= 0' is the same as expr == 0 and is a common bug, "
+			                  "for this reason it is only allowed inside of macro expansions.");
+		case BINARYOP_GE:
+			RETURN_SEMA_ERROR(right,
+			                  "Comparing 'unsigned expression >= 0' is always true and is a common bug, "
+			                  "for this reason it is only allowed inside of macro expansions.");
 		default:
 			return true;
 	}
@@ -5951,6 +6038,7 @@ static bool sema_expr_analyse_comp(SemaContext *context, Expr *expr, Expr *left,
 
 	// 6. Do the implicit cast.
 	bool success = true;
+
 	if (!cast_implicit(context, left, max)) success = cast_explicit(context, left, max);
 	if (!cast_implicit(context, right, max)) success = success && cast_explicit(context, right, max);
 
@@ -5966,7 +6054,7 @@ static bool sema_expr_analyse_comp(SemaContext *context, Expr *expr, Expr *left,
 	}
 	else
 	{
-		if (!sema_binary_is_unsigned_always_false_comparison(context, expr, left, right)) return false;
+		if (!sema_binary_is_unsigned_always_same_comparison(context, expr, left, right, left_type, right_type)) return false;
 	}
 
 	// 8. Set the type to bool
@@ -6428,7 +6516,7 @@ static inline bool sema_expr_analyse_taddr(SemaContext *context, Expr *expr, boo
 	if (!sema_analyse_expr(context, inner)) return false;
 
 	Type *type = inner->type;
-	if (type_is_invalid_storage_type(type))
+	if (type_storage_type(type) != STORAGE_NORMAL)
 	{
 		if (failed_ref)
 		{
@@ -6735,7 +6823,7 @@ static inline bool sema_expr_analyse_expr_block(SemaContext *context, Type *infe
 	BlockExit **ref = CALLOCS(BlockExit*);
 	BlockExit **stored_block_exit = context->block_exit_ref;
 	context->block_exit_ref = ref;
-	expr->expr_block.block_exit_ref = ref;
+	expr->expr_block.block_exit = ref;
 	SCOPE_START_WITH_FLAGS(SCOPE_EXPR_BLOCK)
 
 		context->block_return_defer = context->active_scope.defer_last;
@@ -6781,9 +6869,9 @@ static inline bool sema_expr_analyse_expr_block(SemaContext *context, Type *infe
 	EXIT:
 		POP_BREAKCONT();
 		POP_NEXT();
-
 		context_pop_defers(context, &stmt->next);
 	SCOPE_END;
+	expr->expr_block.macro_id = 0;
 	context->expected_block_type = stored_block_type;
 	context->block_exit_ref = stored_block_exit;
 	context_pop_returns(context, saved_returns);
@@ -6951,10 +7039,10 @@ static inline bool sema_expr_analyse_compiler_const(SemaContext *context, Expr *
 				expr->expr_kind = EXPR_CONST;
 				ConstInitializer *init = expr->const_expr.initializer = CALLOCS(ConstInitializer);
 				init->kind = CONST_INIT_ZERO;
-				init->type = expr->type = type_get_subarray(type_string);
+				init->type = expr->type = type_get_slice(type_string);
 				return true;
 			}
-			expr->type = type_get_subarray(type_string);
+			expr->type = type_get_slice(type_string);
 			expr->benchmark_hook_expr = BUILTIN_DEF_BENCHMARK_NAMES;
 			expr->expr_kind = EXPR_BENCHMARK_HOOK;
 			return true;
@@ -6965,10 +7053,10 @@ static inline bool sema_expr_analyse_compiler_const(SemaContext *context, Expr *
 				expr->expr_kind = EXPR_CONST;
 				ConstInitializer *init = expr->const_expr.initializer = CALLOCS(ConstInitializer);
 				init->kind = CONST_INIT_ZERO;
-				init->type = expr->type = type_get_subarray(type_voidptr);
+				init->type = expr->type = type_get_slice(type_voidptr);
 				return true;
 			}
-			expr->type = type_get_subarray(type_voidptr);
+			expr->type = type_get_slice(type_voidptr);
 			expr->benchmark_hook_expr = BUILTIN_DEF_BENCHMARK_FNS;
 			expr->expr_kind = EXPR_BENCHMARK_HOOK;
 			return true;
@@ -6979,10 +7067,10 @@ static inline bool sema_expr_analyse_compiler_const(SemaContext *context, Expr *
 				expr->expr_kind = EXPR_CONST;
 				ConstInitializer *init = expr->const_expr.initializer = CALLOCS(ConstInitializer);
 				init->kind = CONST_INIT_ZERO;
-				init->type = expr->type = type_get_subarray(type_string);
+				init->type = expr->type = type_get_slice(type_string);
 				return true;
 			}
-			expr->type = type_get_subarray(type_string);
+			expr->type = type_get_slice(type_string);
 			expr->test_hook_expr = BUILTIN_DEF_TEST_NAMES;
 			expr->expr_kind = EXPR_TEST_HOOK;
 			return true;
@@ -6993,10 +7081,10 @@ static inline bool sema_expr_analyse_compiler_const(SemaContext *context, Expr *
 				expr->expr_kind = EXPR_CONST;
 				ConstInitializer *init = expr->const_expr.initializer = CALLOCS(ConstInitializer);
 				init->kind = CONST_INIT_ZERO;
-				init->type = expr->type = type_get_subarray(type_voidptr);
+				init->type = expr->type = type_get_slice(type_voidptr);
 				return true;
 			}
-			expr->type = type_get_subarray(type_voidptr);
+			expr->type = type_get_slice(type_voidptr);
 			expr->test_hook_expr = BUILTIN_DEF_TEST_FNS;
 			expr->expr_kind = EXPR_TEST_HOOK;
 			return true;
@@ -7104,7 +7192,7 @@ static inline bool sema_expr_analyse_decl_element(SemaContext *context, Designat
 	{
 		switch (actual_type->type_kind)
 		{
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 				*member_ref = NULL;
 				*return_type = actual_type->array.base;
 				return true;
@@ -7118,7 +7206,7 @@ static inline bool sema_expr_analyse_decl_element(SemaContext *context, Designat
 	}
 	if (kw == kw_len)
 	{
-		if (type_is_arraylike(actual_type) || actual_type->type_kind == TYPE_SUBARRAY)
+		if (type_is_arraylike(actual_type) || actual_type->type_kind == TYPE_SLICE)
 		{
 			*member_ref = NULL;
 			*return_type = type_usz;
@@ -7138,11 +7226,11 @@ static inline bool sema_expr_analyse_decl_element(SemaContext *context, Designat
 		}
 		if (i == 0)
 		{
-			sema_error_at(loc, "%s has no members.", type_quoted_error_string(type));
+			print_error_at(loc, "%s has no members.", type_quoted_error_string(type));
 		}
 		else
 		{
-			sema_error_at(loc, "There is no such member in %s.", type_quoted_error_string(type));
+			print_error_at(loc, "There is no such member in %s.", type_quoted_error_string(type));
 		}
 		return false;
 	}
@@ -7154,7 +7242,7 @@ static inline bool sema_expr_analyse_decl_element(SemaContext *context, Designat
 		member = sema_resolve_method(context->unit, actual_type->decl, kw, &ambiguous, &private);
 		if (ambiguous)
 		{
-			sema_error_at(loc, "'%s' is an ambiguous name and so cannot be resolved, it may refer to method defined in '%s' or one in '%s'",
+			print_error_at(loc, "'%s' is an ambiguous name and so cannot be resolved, it may refer to method defined in '%s' or one in '%s'",
 					   kw, decl_module(member)->name->module, decl_module(ambiguous)->name->module);
 			return false;
 		}
@@ -7163,7 +7251,7 @@ static inline bool sema_expr_analyse_decl_element(SemaContext *context, Designat
 			*is_missing = true;
 			return false;
 		}
-		sema_error_at(loc, "There is no such member in %s.", type_quoted_error_string(type));
+		print_error_at(loc, "There is no such member in %s.", type_quoted_error_string(type));
 		return false;
 	}
 	*member_ref = member;
@@ -7178,7 +7266,7 @@ static inline bool sema_expr_analyse_ct_alignof(SemaContext *context, Expr *expr
 	Decl *decl = sema_expr_analyse_var_path(context, main_var);
 	if (!decl) return false;
 	Type *type = decl->type;
-	if (type_is_invalid_storage_type(type))
+	if (type_storage_type(type) != STORAGE_NORMAL)
 	{
 		SEMA_ERROR(main_var, "Cannot use '$alignof' on type %s.", type_quoted_error_string(type));
 		return false;
@@ -7363,13 +7451,13 @@ static Type *sema_expr_check_type_exists(SemaContext *context, TypeInfo *type_in
 			type_info = expr->type_expr;
 			goto RETRY;
 		}
-		case TYPE_INFO_SUBARRAY:
+		case TYPE_INFO_SLICE:
 		{
 			// If it's an array, make sure we can resolve the length
 			Type *type = sema_expr_check_type_exists(context, type_info->array.base);
 			if (!type) return NULL;
 			if (!type_ok(type)) return type;
-			return type_get_subarray(type);
+			return type_get_slice(type);
 		}
 		case TYPE_INFO_INFERRED_ARRAY:
 		{
@@ -7558,7 +7646,7 @@ static inline bool sema_expr_analyse_embed(SemaContext *context, Expr *expr, boo
 			.bytes.len = len,
 	};
 	expr->expr_kind = EXPR_CONST;
-	expr->type = type_get_subarray(type_char);
+	expr->type = type_get_slice(type_char);
 	return true;
 }
 
@@ -7622,8 +7710,7 @@ static inline bool sema_expr_analyse_lambda(SemaContext *context, Type *target_t
 	}
 	if (to_sig && vec_size(to_sig->params) != vec_size(sig->params))
 	{
-		SEMA_ERROR(expr, "The lambda doesn't match the required type %s.", type_quoted_error_string(target_type));
-		return false;
+		RETURN_SEMA_ERROR(expr, "The lambda doesn't match the required type %s.", type_quoted_error_string(target_type));
 	}
 	FOREACH_BEGIN_IDX(i, Decl *param, sig->params)
 		if (param->var.type_info) continue;
@@ -7661,6 +7748,12 @@ static inline bool sema_expr_analyse_lambda(SemaContext *context, Type *target_t
 	decl->extname = decl->name = scratch_buffer_copy();
 	decl->type = type_new_func(decl, sig);
 	if (!sema_analyse_function_signature(context, decl, sig->abi, sig)) return false;
+	if (target_type && flat->pointer->function.prototype->raw_type != decl->type->function.prototype->raw_type)
+	{
+		RETURN_SEMA_ERROR(expr, "The lambda has type %s, which doesn't match the required type %s.",
+		                  type_quoted_error_string(decl->type),
+						  type_quoted_error_string(target_type));
+	}
 	decl->func_decl.lambda_ct_parameters = ct_lambda_parameters;
 	decl->func_decl.is_lambda = true;
 	decl->alignment = type_alloca_alignment(decl->type);
@@ -7881,7 +7974,7 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
 			case EXPR_VASPLAT:
 			case EXPR_MACRO_BODY:
 				REMINDER("Check if these should be analysed");
-						FALLTHROUGH;
+				FALLTHROUGH;
 				// Above needs to be analysed
 			case EXPR_GROUP:
 			case EXPR_INITIALIZER_LIST:
@@ -7889,7 +7982,6 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
 			case EXPR_ASM:
 			case EXPR_CONST:
 			case EXPR_NOP:
-			case EXPR_MACRO_BLOCK:
 			case EXPR_LAMBDA:
 			case EXPR_EXPR_BLOCK:
 			case EXPR_CT_IS_CONST:
@@ -7949,7 +8041,7 @@ static inline bool sema_expr_analyse_ct_arg(SemaContext *context, Type *infer_ty
 			if (!decl)
 			{
 				if (!sema_analyse_inferred_expr(context, infer_type, arg_expr)) return false;
-				if (type_is_invalid_storage_type(arg_expr->type))
+				if (type_storage_type(arg_expr->type) != STORAGE_NORMAL)
 				{
 					RETURN_SEMA_ERROR(expr, "The vararg doesn't have a valid runtime type.");
 				}
@@ -8177,29 +8269,28 @@ static inline TypeProperty type_property_by_name(const char *name)
 	return TYPE_PROPERTY_NONE;
 }
 
-static inline bool sema_expr_analyse_retval(SemaContext *c, Expr *expr)
+static inline bool sema_expr_analyse_retval(SemaContext *context, Expr *expr)
 {
-	if ((c->active_scope.flags & (SCOPE_ENSURE | SCOPE_ENSURE_MACRO)) == 0)
+	if ((context->active_scope.flags & (SCOPE_ENSURE | SCOPE_ENSURE_MACRO)) == 0)
 	{
 		RETURN_SEMA_ERROR(expr, "'return' as a value can only be used inside of an '@ensure'.");
 	}
-	Expr *return_value = c->return_expr;
-	bool is_macro_ensure = (c->active_scope.flags & SCOPE_ENSURE_MACRO) != 0;
+	Expr *return_value = context->return_expr;
+	bool is_macro_ensure = (context->active_scope.flags & SCOPE_ENSURE_MACRO) != 0;
 	if (is_macro_ensure)
 	{
 		expr->type = type_no_optional(return_value->type);
 	}
 	else
 	{
-		expr->type = type_no_optional(c->rtype);
+		expr->type = type_no_optional(context->rtype);
 		if (type_is_void(expr->type))
 		{
-			SEMA_ERROR(expr, "'return' cannot be used on void functions.");
-			return false;
+			RETURN_SEMA_ERROR(expr, "'return' cannot be used on void functions.");
 		}
 	}
 	assert(return_value);
-	if (sema_flattened_expr_is_const(c, return_value))
+	if (sema_flattened_expr_is_const(context, return_value))
 	{
 		expr_replace(expr, copy_expr_single(return_value));
 	}
@@ -8317,8 +8408,6 @@ static inline bool sema_analyse_expr_dispatch(SemaContext *context, Expr *expr)
 		case EXPR_BITASSIGN:
 			// Created during semantic analysis
 			UNREACHABLE
-		case EXPR_MACRO_BLOCK:
-			UNREACHABLE
 		case EXPR_TYPEINFO:
 			expr->type = type_typeinfo;
 			return sema_resolve_type_info(context, expr->type_expr, RESOLVE_TYPE_DEFAULT);
@@ -8372,7 +8461,7 @@ static inline bool sema_analyse_expr_dispatch(SemaContext *context, Expr *expr)
 }
 
 
-bool sema_analyse_cond_expr(SemaContext *context, Expr *expr)
+bool sema_analyse_cond_expr(SemaContext *context, Expr *expr, CondResult *result)
 {
 	if (expr->expr_kind == EXPR_BINARY && expr->binary_expr.operator == BINARYOP_ASSIGN)
 	{
@@ -8387,7 +8476,12 @@ bool sema_analyse_cond_expr(SemaContext *context, Expr *expr)
 				   type_quoted_error_string(expr->type));
 		return false;
 	}
-	return cast_explicit(context, expr, type_bool);
+	if (!cast_explicit(context, expr, type_bool)) return false;
+	if (expr_is_const_bool(expr))
+	{
+		*result = expr->const_expr.b ? COND_TRUE : COND_FALSE;
+	}
+	return true;
 }
 
 
@@ -8415,13 +8509,13 @@ bool sema_analyse_expr_rhs(SemaContext *context, Type *to, Expr *expr, bool allo
 		if (flat != type_anyfault && flat->type_kind != TYPE_FAULTTYPE && expr_is_const(expr))
 		{
 			if (no_match_ref) goto NO_MATCH_REF;
-			sema_error_at_after(expr->span, "You need to add a trailing '?' here to make this an optional.");
+			print_error_after(expr->span, "You need to add a trailing '?' here to make this an optional.");
 			return false;
 		}
 	}
-	// Let's see if we have a fixed subarray.
+	// Let's see if we have a fixed slice.
 
-	if (to && type_is_arraylike(to_canonical) && expr->expr_kind == EXPR_SLICE && rhs_type_canonical->type_kind == TYPE_SUBARRAY)
+	if (to && type_is_arraylike(to_canonical) && expr->expr_kind == EXPR_SLICE && rhs_type_canonical->type_kind == TYPE_SLICE)
 	{
 		Type *element = type_get_indexed_type(rhs_type_canonical)->canonical;
 		if (element != type_get_indexed_type(to_canonical)->canonical) goto NO_SLICE;
@@ -8487,7 +8581,7 @@ MemberIndex sema_len_from_const(Expr *expr)
 	// We also handle the case where we have a cast from a const array.
 	if (!expr_is_const(expr))
 	{
-		if (type_flatten(expr->type)->type_kind != TYPE_SUBARRAY) return -1;
+		if (type_flatten(expr->type)->type_kind != TYPE_SLICE) return -1;
 		if (expr->expr_kind == EXPR_SLICE)
 		{
 			return range_const_len(&expr->subscript_expr.range);
@@ -8652,15 +8746,28 @@ bool sema_analyse_expr_lvalue(SemaContext *context, Expr *expr)
 	}
 }
 
-bool sema_expr_check_discard(Expr *expr)
+bool sema_expr_check_discard(SemaContext *context, Expr *expr)
 {
+	if (expr->expr_kind == EXPR_EXPRESSION_LIST)
+	{
+		FOREACH_BEGIN(Expr *expr_element, expr->expression_list)
+			if (!sema_expr_check_discard(context, expr_element)) return false;
+		FOREACH_END();
+		return true;
+	}
 	if (expr->expr_kind == EXPR_SUBSCRIPT_ASSIGN || expr->expr_kind == EXPR_SLICE_ASSIGN) return true;
 	if (expr->expr_kind == EXPR_BINARY && expr->binary_expr.operator >= BINARYOP_ASSIGN) return true;
-	if (expr->expr_kind == EXPR_MACRO_BLOCK)
+	if (expr->expr_kind == EXPR_EXPR_BLOCK)
 	{
-		if (expr->macro_block.is_must_use)
+		if (!expr->expr_block.macro_id)
 		{
-			if (expr->macro_block.is_optional_return)
+			if (type_is_void(expr->type)) return true;
+			RETURN_SEMA_ERROR(expr, "The block returns a value of type %s, which must be handled – did you forget to assign it to something?",
+									type_quoted_error_string(expr->type));
+		}
+		if (expr->expr_block.is_must_use)
+		{
+			if (expr->expr_block.is_optional_return)
 			{
 				RETURN_SEMA_ERROR(expr, "The macro returns %s, which is an optional and must be handled. "
 				                        "You can either assign it to a variable, rethrow it using '!', "
@@ -8669,7 +8776,7 @@ bool sema_expr_check_discard(Expr *expr)
 			}
 			RETURN_SEMA_ERROR(expr, "The called macro is marked `@nodiscard` meaning the result should be kept. You can still discard it using a void cast (e.g. '(void)the_call()') if you want.");
 		}
-		if (expr->macro_block.had_optional_arg) goto ERROR_ARGS;
+		if (expr->expr_block.had_optional_arg) goto ERROR_ARGS;
 		return true;
 	}
 	if (expr->expr_kind == EXPR_CALL)
@@ -8699,7 +8806,6 @@ bool sema_analyse_expr(SemaContext *context, Expr *expr)
 	return sema_analyse_expr_lvalue(context, expr) && sema_cast_rvalue(context, expr);
 }
 
-
 static inline int64_t expr_get_index_max(Expr *expr)
 {
 	if (expr_is_const_untyped_list(expr))
@@ -8892,7 +8998,7 @@ bool sema_insert_method_call(SemaContext *context, Expr *method_call, Decl *meth
 }
 
 // Check if the assignment fits
-bool sema_bit_assignment_check(Expr *right, Decl *member)
+bool sema_bit_assignment_check(SemaContext *context, Expr *right, Decl *member)
 {
 	// Don't check non-consts and non integers.
 	if (!expr_is_const(right) || !type_is_integer(right->type)) return true;
@@ -8904,8 +9010,8 @@ bool sema_bit_assignment_check(Expr *right, Decl *member)
 
 	if (int_bits_needed(right->const_expr.ixx) > bits)
 	{
-		SEMA_ERROR(right, "This constant would be truncated if stored in the bitstruct, do you need a wider bit range?");
-		return false;
+		RETURN_SEMA_ERROR(right, "This constant would be truncated if stored in the "
+								 "bitstruct, do you need a wider bit range?");
 	}
 	return true;
 }
diff --git a/src/compiler/sema_initializers.c b/src/compiler/sema_initializers.c
index dfb42d018..4e4cf0092 100644
--- a/src/compiler/sema_initializers.c
+++ b/src/compiler/sema_initializers.c
@@ -10,7 +10,7 @@ static inline bool sema_expr_analyse_array_plain_initializer(SemaContext *contex
 static inline bool sema_expr_analyse_untyped_initializer(SemaContext *context, Expr *initializer);
 static bool sema_expr_analyse_designated_initializer(SemaContext *context, Type *assigned, Type *flattened,
 													 Expr *initializer);
-static inline void sema_not_enough_elements_error(Expr *initializer, int element);
+static inline void sema_not_enough_elements_error(SemaContext *context, Expr *initializer, int element);
 static inline bool sema_expr_analyse_initializer(SemaContext *context, Type *assigned_type, Type *flattened, Expr *expr);
 static void sema_create_const_initializer_value(ConstInitializer *const_init, Expr *value);
 static void sema_create_const_initializer_from_designated_init(ConstInitializer *const_init, Expr *initializer);
@@ -50,7 +50,7 @@ static inline ConstantEvalKind env_eval_type(SemaContext *context)
 	return context->call_env.kind == CALL_ENV_GLOBAL_INIT ? CONSTANT_EVAL_GLOBAL_INIT : CONSTANT_EVAL_LOCAL_INIT;
 }
 
-static inline void sema_not_enough_elements_error(Expr *initializer, int element)
+static inline void sema_not_enough_elements_error(SemaContext *context, Expr *initializer, int element)
 {
 	if (element == 0)
 	{
@@ -133,7 +133,7 @@ static inline bool sema_expr_analyse_struct_plain_initializer(SemaContext *conte
 			}
 			if (i >= size)
 			{
-				sema_not_enough_elements_error(initializer, (int)i);
+				sema_not_enough_elements_error(context, initializer, (int)i);
 				return false;
 			}
 			Expr *new_initializer = expr_new(EXPR_INITIALIZER_LIST, elements[i]->span);
@@ -153,7 +153,7 @@ static inline bool sema_expr_analyse_struct_plain_initializer(SemaContext *conte
 		}
 		if (i >= size)
 		{
-			sema_not_enough_elements_error(initializer, i);
+			sema_not_enough_elements_error(context, initializer, i);
 			return false;
 		}
 		Expr *element = elements[i];
@@ -161,7 +161,7 @@ static inline bool sema_expr_analyse_struct_plain_initializer(SemaContext *conte
 		if (!sema_analyse_expr_rhs(context, members[i]->type, element, true, NULL)) return false;
 		if (member->decl_kind == DECL_VAR && member->var.kind == VARDECL_BITMEMBER)
 		{
-			if (!sema_bit_assignment_check(element, members[i])) return false;
+			if (!sema_bit_assignment_check(context, element, members[i])) return false;
 		}
 		optional = optional || IS_OPTIONAL(element);
 	}
@@ -416,7 +416,7 @@ static bool sema_expr_analyse_designated_initializer(SemaContext *context, Type
 		if (!sema_analyse_expr_rhs(context, result, value, true, NULL)) return false;
 		if (member && member->decl_kind == DECL_VAR && member->var.kind == VARDECL_BITMEMBER)
 		{
-			if (!sema_bit_assignment_check(value, member)) return false;
+			if (!sema_bit_assignment_check(context, value, member)) return false;
 		}
 		optional = optional || IS_OPTIONAL(value);
 		expr->resolve_status = RESOLVE_DONE;
@@ -496,7 +496,7 @@ static inline bool sema_expr_analyse_initializer(SemaContext *context, Type *ass
 		flattened->type_kind == TYPE_ARRAY ||
 		flattened->type_kind == TYPE_INFERRED_ARRAY ||
 		flattened->type_kind == TYPE_INFERRED_VECTOR ||
-		flattened->type_kind == TYPE_SUBARRAY ||
+		flattened->type_kind == TYPE_SLICE ||
 		flattened->type_kind == TYPE_VECTOR)
 	{
 		return sema_expr_analyse_array_plain_initializer(context, assigned_type, flattened, expr);
@@ -691,7 +691,7 @@ bool sema_expr_analyse_initializer_list(SemaContext *context, Type *to, Expr *ex
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_VECTOR:
 			return sema_expr_analyse_initializer(context, to, flattened, expr);
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		{
 			if (is_zero_init)
 			{
@@ -1126,7 +1126,7 @@ MemberIndex sema_get_initializer_const_array_size(SemaContext *context, Expr *in
 					*may_be_array = true;
 					return (MemberIndex)type->array.len;
 				}
-				if (type->type_kind == TYPE_SUBARRAY)
+				if (type->type_kind == TYPE_SLICE)
 				{
 					*may_be_array = true;
 					return 0;
diff --git a/src/compiler/sema_internal.h b/src/compiler/sema_internal.h
index 2ba5e3dc8..fa015c194 100644
--- a/src/compiler/sema_internal.h
+++ b/src/compiler/sema_internal.h
@@ -7,6 +7,9 @@
 
 #include "compiler_internal.h"
 
+#define SEMA_ERROR(_node, ...) print_error_at((_node)->span, __VA_ARGS__); sema_print_inline(context);
+#define RETURN_SEMA_ERROR(_node, ...) do { print_error_at((_node)->span, __VA_ARGS__); sema_print_inline(context); return false; } while (0)
+
 #define SCOPE_OUTER_START do { DynamicScope stored_scope = context->active_scope; context_change_scope_with_flags(context, SCOPE_NONE);
 #define SCOPE_OUTER_END assert(context->active_scope.defer_last == context->active_scope.defer_start); context->active_scope = stored_scope; } while(0)
 #define SCOPE_START SCOPE_START_WITH_FLAGS(SCOPE_NONE)
@@ -30,7 +33,6 @@ extern const char *ct_eval_error;
 
 Decl **global_context_acquire_locals_list(void);
 void generic_context_release_locals_list(Decl **);
-
 const char *context_filename(SemaContext *context);
 
 AstId context_get_defers(SemaContext *context, AstId defer_top, AstId defer_bottom, bool is_success);
@@ -41,6 +43,7 @@ void context_change_scope_with_flags(SemaContext *context, ScopeFlags flags);
 SemaContext *context_transform_for_eval(SemaContext *context, SemaContext *temp_context, CompilationUnit *eval_unit);
 
 TokenType sema_splitpathref(const char *string, ArraySize len, Path **path_ref, const char **ident_ref);
+void sema_print_inline(SemaContext *context);
 
 void sema_context_init(SemaContext *context, CompilationUnit *unit);
 void sema_context_destroy(SemaContext *context);
@@ -79,17 +82,16 @@ bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *expr);
 bool sema_expr_analyse_macro_call(SemaContext *context, Expr *call_expr, Expr *struct_var, Decl *decl, bool optional,
                                   bool *no_match_ref);
 Expr *sema_expr_analyse_ct_arg_index(SemaContext *context, Expr *index_expr, unsigned *index_ref, bool report_error);
-Expr *sema_ct_eval_expr(SemaContext *c, bool is_type, Expr *inner, bool report_missing);
+Expr *sema_ct_eval_expr(SemaContext *context, bool is_type, Expr *inner, bool report_missing);
 bool sema_analyse_asm(SemaContext *context, AsmInlineBlock *block, Ast *asm_stmt);
-bool sema_bit_assignment_check(Expr *right, Decl *member);
-int sema_check_comp_time_bool(SemaContext *context, Expr *expr);
-bool sema_expr_check_assign(SemaContext *c, Expr *expr);
+
+bool sema_bit_assignment_check(SemaContext *context, Expr *right, Decl *member);
+CondResult sema_check_comp_time_bool(SemaContext *context, Expr *expr);
+bool sema_expr_check_assign(SemaContext *context, Expr *expr);
 bool sema_analyse_function_signature(SemaContext *context, Decl *func_decl, CallABI abi, Signature *signature);
 ConstInitializer *sema_merge_bitstruct_const_initializers(ConstInitializer *lhs, ConstInitializer *rhs, BinaryOp op);
 void sema_invert_bitstruct_const_initializer(ConstInitializer *initializer);
-
 MemberIndex sema_len_from_const(Expr *expr);
-
 void cast_promote_vararg(SemaContext *context, Expr *arg);
 Type *cast_numeric_arithmetic_promotion(Type *type);
 void cast_to_int_to_max_bit_size(SemaContext *context, Expr *lhs, Expr *rhs, Type *left_type, Type *right_type);
@@ -99,7 +101,7 @@ Decl *sema_analyse_parameterized_identifier(SemaContext *c, Path *decl_path, con
 
 INLINE bool sema_set_abi_alignment(SemaContext *context, Type *type, AlignSize *result);
 INLINE bool sema_set_alloca_alignment(SemaContext *context, Type *type, AlignSize *result);
-void sema_display_deprecated_warning_on_use(SemaContext *context, Decl *decl, SourceSpan use);
+INLINE void sema_display_deprecated_warning_on_use(SemaContext *context, Decl *decl, SourceSpan use);
 
 INLINE bool sema_set_abi_alignment(SemaContext *context, Type *type, AlignSize *result)
 {
@@ -114,3 +116,28 @@ INLINE bool sema_set_alloca_alignment(SemaContext *context, Type *type, AlignSiz
 	*result = type_alloca_alignment(type);
 	return true;
 }
+
+INLINE Attr* attr_find_kind(Attr **attrs, AttributeType attr_type)
+{
+	FOREACH_BEGIN(Attr *attr, attrs)
+		if (attr->attr_kind == attr_type) return attr;
+	FOREACH_END();
+	return NULL;
+}
+
+INLINE void sema_display_deprecated_warning_on_use(SemaContext *context, Decl *decl, SourceSpan span)
+{
+	if (!decl->is_deprecated) return;
+	// Prevent multiple reports
+	decl->is_deprecated = false;
+	Attr *attr = attr_find_kind(decl->attributes, ATTRIBUTE_DEPRECATED);
+	assert(attr);
+	if (attr->exprs)
+	{
+		const char *comment_string = attr->exprs[0]->const_expr.bytes.ptr;
+		sema_warning_at(span, "'%s' is deprecated: %s.", decl->name, comment_string);
+		return;
+	}
+	sema_warning_at(span, "'%s' is deprecated.", decl->name);
+}
+
diff --git a/src/compiler/sema_liveness.c b/src/compiler/sema_liveness.c
index 84ef81101..490e3c084 100644
--- a/src/compiler/sema_liveness.c
+++ b/src/compiler/sema_liveness.c
@@ -17,11 +17,10 @@ INLINE void sema_trace_type_liveness(Type *type)
 		type = type->canonical;
 		switch (type->type_kind)
 		{
-			case TYPE_INFPTR:
 			case TYPE_POINTER:
 				type = type->pointer;
 				goto RETRY;
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 			case TYPE_ARRAY:
 			case TYPE_INFERRED_ARRAY:
 			case TYPE_FLEXIBLE_ARRAY:
@@ -389,17 +388,6 @@ static void sema_trace_expr_liveness(Expr *expr)
 		case EXPR_DESIGNATED_INITIALIZER_LIST:
 			sema_trace_expr_list_liveness(expr->designated_init_list);
 			return;
-		case EXPR_EXPR_BLOCK:
-		{
-			AstId current = expr->expr_block.first_stmt;
-			if (!current) return;
-			do
-			{
-				Ast *value = ast_next(&current);
-				sema_trace_stmt_liveness(value);
-			} while (current);
-			return;
-		}
 		case EXPR_IDENTIFIER:
 			sema_trace_decl_liveness(expr->identifier_expr.decl);
 			return;
@@ -413,14 +401,9 @@ static void sema_trace_expr_liveness(Expr *expr)
 		case EXPR_LAMBDA:
 			sema_trace_decl_liveness(expr->lambda_expr);
 			return;
-		case EXPR_MACRO_BLOCK:
-		{
-			FOREACH_BEGIN(Decl *val, expr->macro_block.params)
-				sema_trace_decl_liveness(val);
-			FOREACH_END();
-			sema_trace_stmt_chain_liveness(expr->macro_block.first_stmt);
+		case EXPR_EXPR_BLOCK:
+			sema_trace_stmt_chain_liveness(expr->expr_block.first_stmt);
 			return;
-		}
 		case EXPR_MACRO_BODY_EXPANSION:
 		{
 			FOREACH_BEGIN(Decl *arg, expr->body_expansion_expr.declarations)
@@ -460,8 +443,6 @@ static void sema_trace_expr_liveness(Expr *expr)
 			sema_trace_expr_liveness(exprptr(expr->swizzle_expr.parent));
 			return;
 		case EXPR_TERNARY:
-		{
-			REMINDER("Tracing ternary can be optimized");
 			sema_trace_expr_liveness(exprptr(expr->ternary_expr.cond));
 			if (expr->ternary_expr.then_expr)
 			{
@@ -469,7 +450,6 @@ static void sema_trace_expr_liveness(Expr *expr)
 			}
 			expr = exprptr(expr->ternary_expr.else_expr);
 			goto RETRY;
-		}
 		case EXPR_BENCHMARK_HOOK:
 		case EXPR_TEST_HOOK:
 			return;
@@ -539,7 +519,7 @@ INLINE void sema_trace_decl_dynamic_methods(Decl *decl)
 	{
 		Decl *method = methods[i];
 		if (method->decl_kind == DECL_MACRO) continue;
-		if (method->func_decl.attr_dynamic || method->func_decl.attr_default)
+		if (method->func_decl.attr_dynamic)
 		{
 			sema_trace_decl_liveness(method);
 		}
diff --git a/src/compiler/sema_name_resolution.c b/src/compiler/sema_name_resolution.c
index 85d5dbd06..d6dc254ba 100644
--- a/src/compiler/sema_name_resolution.c
+++ b/src/compiler/sema_name_resolution.c
@@ -437,13 +437,13 @@ static void sema_report_error_on_decl(Decl *found, NameResolve *name_resolve)
 		const char *private_name = decl_to_name(name_resolve->private_decl);
 		if (path_name)
 		{
-			sema_error_at(span, "The %s '%s::%s' is not visible from this module.",
+			print_error_at(span, "The %s '%s::%s' is not visible from this module.",
 						  private_name, path_name,
 						  symbol);
 		}
 		else
 		{
-			sema_error_at(span, "The %s '%s' is not visible from this module.",
+			print_error_at(span, "The %s '%s' is not visible from this module.",
 						  private_name, symbol);
 		}
 		return;
@@ -454,13 +454,13 @@ static void sema_report_error_on_decl(Decl *found, NameResolve *name_resolve)
 		const char *module_name = decl_module(name_resolve->maybe_decl)->name->module;
 		if (path_name)
 		{
-			sema_error_at(span, "Did you mean the %s '%s::%s' in module %s? If so please add 'import %s'.",
+			print_error_at(span, "Did you mean the %s '%s::%s' in module %s? If so please add 'import %s'.",
 						  maybe_name, module_name, symbol, module_name, module_name);
 
 		}
 		else
 		{
-			sema_error_at(span, "Did you mean the %s '%s' in module %s? If so please add 'import %s'.",
+			print_error_at(span, "Did you mean the %s '%s' in module %s? If so please add 'import %s'.",
 						  maybe_name, symbol, module_name, module_name);
 		}
 		return;
@@ -474,7 +474,7 @@ static void sema_report_error_on_decl(Decl *found, NameResolve *name_resolve)
 		const char *other_path = decl_module(name_resolve->ambiguous_other_decl)->name->module;
 		if (path_name)
 		{
-			sema_error_at(span,
+			print_error_at(span,
 						  "The %s '%s::%s' is defined in both '%s' and '%s', "
 						  "please use either %s::%s or %s::%s to resolve the ambiguity.",
 						  symbol_type, path_name, symbol, found_path, other_path,
@@ -484,10 +484,10 @@ static void sema_report_error_on_decl(Decl *found, NameResolve *name_resolve)
 		{
 			if (decl_needs_prefix(found))
 			{
-				sema_error_at(span, "The %s needs a path prefix (e.g. '%s::%s').", symbol_type, found_path, symbol);
+				print_error_at(span, "The %s needs a path prefix (e.g. '%s::%s').", symbol_type, found_path, symbol);
 				return;
 			}
-			sema_error_at(span,
+			print_error_at(span,
 						  "The %s '%s' is defined in both '%s' and '%s', please use either "
 						  "%s::%s or %s::%s to resolve the ambiguity.",
 						  symbol_type, symbol, found_path, other_path,
@@ -498,11 +498,11 @@ static void sema_report_error_on_decl(Decl *found, NameResolve *name_resolve)
 	assert(!found);
 	if (path_name)
 	{
-		sema_error_at(span, "'%s::%s' could not be found, did you spell it right?", path_name, symbol);
+		print_error_at(span, "'%s::%s' could not be found, did you spell it right?", path_name, symbol);
 	}
 	else
 	{
-		sema_error_at(span, "'%s' could not be found, did you spell it right?", symbol);
+		print_error_at(span, "'%s' could not be found, did you spell it right?", symbol);
 	}
 }
 
@@ -539,7 +539,7 @@ INLINE Decl *sema_resolve_symbol_common(SemaContext *context, NameResolve *name_
 			}
 			if (module_with_path)
 			{
-				sema_error_at(name_resolve->span, "'%s' could not be found in %s.", name_resolve->symbol, module_with_path->name->module);
+				print_error_at(name_resolve->span, "'%s' could not be found in %s.", name_resolve->symbol, module_with_path->name->module);
 			}
 			else
 			{
@@ -645,7 +645,7 @@ bool sema_check_type_variable_array(SemaContext *context, TypeInfo *type_info)
 			case TYPE_POINTER:
 				type = type->pointer;
 				continue;
-			case TYPE_SUBARRAY:
+			case TYPE_SLICE:
 			case TYPE_ARRAY:
 			case TYPE_FLEXIBLE_ARRAY:
 			case TYPE_INFERRED_ARRAY:
@@ -678,7 +678,6 @@ bool sema_resolve_type_decl(SemaContext *context, Type *type)
 		case TYPE_BOOL:
 		case ALL_INTS:
 		case ALL_FLOATS:
-		case TYPE_ANYPTR:
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 		case TYPE_POINTER:
@@ -686,8 +685,7 @@ bool sema_resolve_type_decl(SemaContext *context, Type *type)
 		case TYPE_MEMBER:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_VECTOR:
-		case TYPE_SUBARRAY:
-		case TYPE_INFPTR:
+		case TYPE_SLICE:
 		case TYPE_ANY:
 		case TYPE_INTERFACE:
 			return true;
@@ -720,10 +718,6 @@ bool sema_resolve_type_decl(SemaContext *context, Type *type)
 Decl *sema_resolve_type_method(CompilationUnit *unit, Type *type, const char *method_name, Decl **ambiguous_ref, Decl **private_ref)
 {
 	assert(type == type->canonical);
-	if (type->type_kind == TYPE_INFPTR)
-	{
-		type = type->pointer;
-	}
 	Decl *private = NULL;
 	Decl *ambiguous = NULL;
 	Decl *found = sema_find_extension_method_in_list(unit->local_method_extensions, type, method_name);
@@ -817,7 +811,7 @@ Decl *unit_resolve_parameterized_symbol(CompilationUnit *unit, NameResolve *name
 	if (!decl_is_user_defined_type(decl) && !name_resolve->path)
 	{
 		if (name_resolve->suppress_error) return poisoned_decl;
-		sema_error_at(name_resolve->span, "Function and variables must be prefixed with a path, e.g. 'foo::%s'.", name_resolve->symbol);
+		print_error_at(name_resolve->span, "Function and variables must be prefixed with a path, e.g. 'foo::%s'.", name_resolve->symbol);
 		return poisoned_decl;
 	}
 
@@ -928,7 +922,7 @@ INLINE bool sema_add_ct_local(SemaContext *context, Decl *decl)
 	Decl *other = sema_find_ct_local(context, decl->name);
 	if (other)
 	{
-		sema_shadow_error(decl, other);
+		sema_shadow_error(context, decl, other);
 		decl_poison(decl);
 		decl_poison(other);
 		return false;
@@ -952,7 +946,7 @@ bool sema_add_local(SemaContext *context, Decl *decl)
 	assert(!other || decl_module(other));
 	if (other && (decl_module(other) == current_unit->module || other->is_autoimport))
 	{
-		sema_shadow_error(decl, other);
+		sema_shadow_error(context, decl, other);
 		decl_poison(decl);
 		decl_poison(other);
 		return false;
diff --git a/src/compiler/sema_passes.c b/src/compiler/sema_passes.c
index e6ef5854b..5a8e23328 100644
--- a/src/compiler/sema_passes.c
+++ b/src/compiler/sema_passes.c
@@ -87,7 +87,7 @@ void sema_analysis_pass_process_imports(Module *module)
 			{
 				if (imports[j]->import.path->module == path->module)
 				{
-					SEMA_ERROR(import, "Module '%s' imported more than once, please remove one.", path->module);
+					PRINT_ERROR_AT(import, "Module '%s' imported more than once, please remove one.", path->module);
 					SEMA_NOTE(imports[j], "The previous one was here.");
 					decl_poison(import);
 					goto NEXT;
@@ -99,7 +99,7 @@ void sema_analysis_pass_process_imports(Module *module)
 			// 5. Do we find it?
 			if (!import_module)
 			{
-				SEMA_ERROR(import, "No module named '%s' could be found, did you type the name right?", path->module);
+				PRINT_ERROR_AT(import, "No module named '%s' could be found, did you type the name right?", path->module);
 				decl_poison(import);
 				continue;
 			}
@@ -107,7 +107,7 @@ void sema_analysis_pass_process_imports(Module *module)
 			// 6. Importing itself is not allowed.
 			if (import_module == module)
 			{
-				SEMA_ERROR(import, "Importing the current module is not allowed, you need to remove it.");
+				PRINT_ERROR_AT(import, "Importing the current module is not allowed, you need to remove it.");
 				decl_poison(import);
 				continue;
 			}
@@ -136,8 +136,7 @@ INLINE File *sema_load_file(CompilationUnit *unit, SourceSpan span, Expr *filena
 {
 	if (!expr_is_const_string(filename))
 	{
-		SEMA_ERROR(filename, "A compile time string was expected.");
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, filename, "A compile time string was expected.");
 	}
 	const char *string = filename->const_expr.bytes.ptr;
 	bool loaded;
@@ -152,7 +151,7 @@ INLINE File *sema_load_file(CompilationUnit *unit, SourceSpan span, Expr *filena
 	if (!file)
 	{
 		if (no_file) return no_file;
-		sema_error_at(span, "Failed to load file %s: %s", string, error);
+		print_error_at(span, "Failed to load file %s: %s", string, error);
 		return NULL;
 	}
 	if (global_context.errors_found) return NULL;
@@ -163,16 +162,14 @@ static Decl **sema_load_include(CompilationUnit *unit, Decl *decl)
 {
 	if (active_target.trust_level < TRUST_INCLUDE)
 	{
-		SEMA_ERROR(decl, "'$include' not permitted, trust level must be set to '--trust=include' or '--trust=full' to permit it.");
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, decl, "'$include' not permitted, trust level must be set to '--trust=include' or '--trust=full' to permit it.");
 	}
 	SemaContext context;
 	sema_context_init(&context, unit);
 	FOREACH_BEGIN(Attr *attr, decl->attributes)
 		if (attr->attr_kind != ATTRIBUTE_IF)
 		{
-			SEMA_ERROR(attr, "Invalid attribute for '$include'.");
-			return NULL;
+			RETURN_PRINT_ERROR_AT(NULL, attr, "Invalid attribute for '$include'.");
 		}
 	FOREACH_END();
 	bool success = sema_analyse_ct_expr(&context, decl->include.filename);
@@ -182,8 +179,7 @@ static Decl **sema_load_include(CompilationUnit *unit, Decl *decl)
 	if (!file) return NULL;
 	if (global_context.includes_used++ > MAX_INCLUDES)
 	{
-		SEMA_ERROR(decl, "This $include would cause the maximum number of includes (%d) to be exceeded.", MAX_INCLUDES);
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, decl, "This $include would cause the maximum number of includes (%d) to be exceeded.", MAX_INCLUDES);
 	}
 	return parse_include_file(file, unit);
 }
@@ -192,16 +188,14 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 {
 	if (active_target.trust_level < TRUST_FULL)
 	{
-		SEMA_ERROR(decl, "'$exec' not permitted, trust level must be set to '--trust=full' to permit it.");
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, decl, "'$exec' not permitted, trust level must be set to '--trust=full' to permit it.");
 	}
 	SemaContext context;
 	sema_context_init(&context, unit);
 	FOREACH_BEGIN(Attr *attr, decl->attributes)
 		if (attr->attr_kind != ATTRIBUTE_IF)
 		{
-			SEMA_ERROR(attr, "Invalid attribute for '$exec'.");
-			return NULL;
+			RETURN_PRINT_ERROR_AT(NULL, attr, "Invalid attribute for '$exec'.");
 		}
 	FOREACH_END();
 	Expr *filename = decl->exec_decl.filename;
@@ -213,8 +207,7 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 	if (!success) return NULL;
 	if (!expr_is_const_string(filename))
 	{
-		SEMA_ERROR(filename, "A filename was expected as the first argument to '$exec'.");
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, filename, "A filename was expected as the first argument to '$exec'.");
 	}
 	scratch_buffer_clear();
 	const char *file_str = filename->const_expr.bytes.ptr;
@@ -245,8 +238,7 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 			case CONST_TYPEID:
 				if (!arg->const_expr.typeid->name)
 				{
-					SEMA_ERROR(arg, "The type '%s' has no trivial name.", type_quoted_error_string(arg->const_expr.typeid));
-					return NULL;
+					RETURN_PRINT_ERROR_AT(NULL, arg, "The type '%s' has no trivial name.", type_quoted_error_string(arg->const_expr.typeid));
 				}
 				scratch_buffer_append(arg->const_expr.typeid->name);
 				continue;
@@ -260,8 +252,7 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 			case CONST_INITIALIZER:
 			case CONST_UNTYPED_LIST:
 			case CONST_MEMBER:
-				SEMA_ERROR(arg, "Bytes, initializers and member references may not be used as arguments.");
-				return NULL;
+				RETURN_PRINT_ERROR_AT(NULL, arg, "Bytes, initializers and member references may not be used as arguments.");
 		}
 		UNREACHABLE
 	FOREACH_END();
@@ -274,8 +265,7 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 		if (!dir_change(active_target.script_dir))
 		{
 			free(old_path);
-			SEMA_ERROR(decl, "Failed to open script dir '%s'", active_target.script_dir);
-			return NULL;
+			RETURN_PRINT_ERROR_AT(NULL, decl, "Failed to open script dir '%s'", active_target.script_dir);
 		}
 	}
 	if (c3_script)
@@ -293,14 +283,12 @@ static Decl **sema_run_exec(CompilationUnit *unit, Decl *decl)
 		free(old_path);
 		if (!success)
 		{
-			SEMA_ERROR(decl, "Failed to open run dir '%s'", active_target.script_dir);
-			return NULL;
+			RETURN_PRINT_ERROR_AT(NULL, decl, "Failed to open run dir '%s'", active_target.script_dir);
 		}
 	}
 	if (global_context.includes_used++ > MAX_INCLUDES)
 	{
-		SEMA_ERROR(decl, "This $include would cause the maximum number of includes (%d) to be exceeded.", MAX_INCLUDES);
-		return NULL;
+		RETURN_PRINT_ERROR_AT(NULL, decl, "This $include would cause the maximum number of includes (%d) to be exceeded.", MAX_INCLUDES);
 	}
 	return parse_include_file(file, unit);
 }
@@ -373,14 +361,14 @@ void sema_analysis_pass_register_conditional_units(Module *module)
 		if (!if_attr) goto CHECK_LINK;
 		if (vec_size(if_attr->exprs) != 1)
 		{
-			SEMA_ERROR(if_attr, "Expected one parameter.");
+			PRINT_ERROR_AT(if_attr, "Expected one parameter.");
 			goto FAIL_CONTEXT;
 		}
 		Expr *expr = if_attr->exprs[0];
 		if (!sema_analyse_ct_expr(&context, expr)) goto FAIL_CONTEXT;
 		if (!expr_is_const(expr) || expr->type->canonical != type_bool)
 		{
-			SEMA_ERROR(expr, "Expected a constant boolean expression.");
+			PRINT_ERROR_AT(expr, "Expected a constant boolean expression.");
 			goto FAIL_CONTEXT;
 		}
 		if (!expr->const_expr.b)
@@ -405,7 +393,7 @@ void sema_analysis_pass_register_conditional_units(Module *module)
 				if (!sema_analyse_expr(&context, string)) goto FAIL_CONTEXT;
 				if (!expr_is_const_string(string))
 				{
-					SEMA_ERROR(string, "Expected a constant string here, usage is: "
+					PRINT_ERROR_AT(string, "Expected a constant string here, usage is: "
 							   "'@link([cond1, ]link1, link2, ...)'.");
 					goto FAIL_CONTEXT;
 				}
@@ -635,7 +623,7 @@ void sema_analysis_pass_lambda(Module *module)
 	DEBUG_LOG("Pass finished with %d error(s).", global_context.errors_found);
 }
 
-static inline bool sema_check_interfaces(Decl *decl)
+static inline bool sema_check_interfaces(SemaContext *context, Decl *decl)
 {
 	Decl **store = sema_decl_stack_store();
 	FOREACH_BEGIN(Decl *method, decl->methods)
@@ -699,7 +687,7 @@ void sema_analysis_pass_interface(Module *module)
 			}
 			if (decl->interfaces)
 			{
-				sema_check_interfaces(decl);
+				sema_check_interfaces(&context, decl);
 			}
 		}
 		sema_context_destroy(&context);
diff --git a/src/compiler/sema_stmts.c b/src/compiler/sema_stmts.c
index 58a93767d..4ec2c5b01 100644
--- a/src/compiler/sema_stmts.c
+++ b/src/compiler/sema_stmts.c
@@ -32,11 +32,11 @@ static inline bool assert_create_from_contract(SemaContext *context, Ast *direct
 static bool sema_analyse_asm_string_stmt(SemaContext *context, Ast *stmt);
 static void sema_unwrappable_from_catch_in_else(SemaContext *c, Expr *cond);
 static inline bool sema_analyse_try_unwrap(SemaContext *context, Expr *expr);
-static inline bool sema_analyse_try_unwrap_chain(SemaContext *context, Expr *expr, CondType cond_type);
+static inline bool sema_analyse_try_unwrap_chain(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result);
 static void sema_remove_unwraps_from_try(SemaContext *c, Expr *cond);
-static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, CondType cond_type);
-static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, CondType cond_type);
-static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType cond_type);
+static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result);
+static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result);
+static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result);
 static inline Decl *sema_analyse_label(SemaContext *context, Ast *stmt);
 static bool context_labels_exist_in_scope(SemaContext *context);
 static inline bool sema_analyse_then_overwrite(SemaContext *context, Ast *statement, AstId replacement);
@@ -90,11 +90,18 @@ static inline bool sema_analyse_assert_stmt(SemaContext *context, Ast *statement
 		FOREACH_END();
 	}
 
+	CondResult result_no_resolve = COND_MISSING;
+	if (expr_is_const_bool(expr) && expr->resolve_status == RESOLVE_DONE)
+	{
+		result_no_resolve = expr->const_expr.b ? COND_TRUE : COND_FALSE;
+	}
+
 	// Check the conditional inside
-	if (!sema_analyse_cond_expr(context, expr)) return false;
+	CondResult result = COND_MISSING;
+	if (!sema_analyse_cond_expr(context, expr, &result)) return false;
 
 	// If it's constant, we process it differently.
-	if (expr_is_const(expr))
+	if (result != COND_MISSING)
 	{
 		// It's true, then replace the statement with a nop.
 		if (expr->const_expr.b)
@@ -102,21 +109,31 @@ static inline bool sema_analyse_assert_stmt(SemaContext *context, Ast *statement
 			statement->ast_kind = AST_NOP_STMT;
 			return true;
 		}
-		// If it's ensure (and an error) we print an error.
-		if (statement->assert_stmt.is_ensure)
+		// Was this 'assert(false)'?
+		if (result_no_resolve == COND_FALSE)
 		{
-			if (message_expr && expr_is_const(message_expr) && vec_size(statement->assert_stmt.args))
+			assert(result == COND_FALSE);
+			// If this is a test, then assert(false) is permitted.
+			if (context->call_env.current_function && context->call_env.current_function->func_decl.attr_test)
 			{
-				SEMA_ERROR(expr, "%.*s", EXPAND_EXPR_STRING(message_expr));
+				context->active_scope.jump_end = true;
+				return true;
 			}
-			else
+			// Otherwise, require unreachable.
+			RETURN_SEMA_ERROR(expr, "Use 'unreachable' instead of 'assert(false)'.");
+		}
+
+		// If it's ensure (and an error) we print an error.
+		if (!context->active_scope.jump_end && !context->active_scope.is_dead)
+		{
+			if (message_expr && expr_is_const(message_expr) && vec_size(statement->assert_stmt.args))
 			{
-				SEMA_ERROR(expr, "Contract violated.");
+				RETURN_SEMA_ERROR(expr, "%.*s", EXPAND_EXPR_STRING(message_expr));
 			}
-			return false;
+			if (statement->assert_stmt.is_ensure) RETURN_SEMA_ERROR(expr, "Contract violated.");
+			RETURN_SEMA_ERROR(expr, "This expression will always be 'false'.");
 		}
-		// assert(false) means this can't be reached.
-		context->active_scope.jump_end = true;
+		// Otherwise, continue, this is fine as it can't be reached.
 	}
 	return true;
 }
@@ -286,19 +303,15 @@ static inline bool assert_create_from_contract(SemaContext *context, Ast *direct
 			SEMA_ERROR(expr, "Only expressions are allowed.");
 			return false;
 		}
-		if (!sema_analyse_cond_expr(context, expr)) return false;
+		CondResult result = COND_MISSING;
+		if (!sema_analyse_cond_expr(context, expr, &result)) return false;
 
 		const char *comment = directive->contract_stmt.contract.comment;
 		if (!comment) comment = directive->contract_stmt.contract.expr_string;
-		if (expr_is_const(expr))
+		if (result == COND_TRUE) continue;
+		if (result == COND_FALSE)
 		{
-			assert(expr->const_expr.const_kind == CONST_BOOL);
-			if (expr->const_expr.b)
-			{
-				// Verified, so we can skip introducing it.
-				continue;
-			}
-			sema_error_at(evaluation_location.a ? evaluation_location : expr->span, "%s", comment);
+			print_error_at(evaluation_location.a ? evaluation_location : expr->span, "%s", comment);
 			return false;
 		}
 		Ast *assert = new_ast(AST_ASSERT_STMT, expr->span);
@@ -390,16 +403,15 @@ static bool sema_analyse_macro_constant_ensures(SemaContext *context, Expr *ret_
 					success = false;
 					goto END;
 				}
-				if (!sema_analyse_cond_expr(context, expr))
+				CondResult result = COND_MISSING;
+				if (!sema_analyse_cond_expr(context, expr, &result))
 				{
 					success = false;
 					goto END;
 				}
 				// Skipping non-const.
-				if (!expr_is_const(expr)) continue;
-				// It was ok.
-				assert(expr->const_expr.const_kind == CONST_BOOL);
-				if (expr->const_expr.b) continue;
+				if (result == COND_MISSING) continue;
+				if (result == COND_TRUE) continue;
 				const char *comment = directive->contract_stmt.contract.comment;
 				if (!comment) comment = directive->contract_stmt.contract.expr_string;
 				SEMA_ERROR(ret_expr, "%s", comment);
@@ -489,8 +501,8 @@ INLINE bool sema_check_not_stack_variable_escape(SemaContext *context, Expr *exp
 			switch (type_flatten(decl->type)->type_kind)
 			{
 				case TYPE_POINTER:
-				case TYPE_SUBARRAY:
-					// &foo[2] is fine if foo is a pointer or subarray.
+				case TYPE_SLICE:
+					// &foo[2] is fine if foo is a pointer or slice.
 					return true;
 				default:
 					break;
@@ -597,7 +609,82 @@ SKIP_ENSURE:;
 	return true;
 }
 
-
+static inline bool sema_expr_valid_try_expression(Expr *expr)
+{
+	switch (expr->expr_kind)
+	{
+		case EXPR_BITASSIGN:
+		case EXPR_CATCH_UNWRAP:
+		case EXPR_COND:
+		case EXPR_POISONED:
+		case EXPR_CT_AND_OR:
+		case EXPR_CT_ARG:
+		case EXPR_CT_CALL:
+		case EXPR_CT_CASTABLE:
+		case EXPR_CT_IS_CONST:
+		case EXPR_CT_DEFINED:
+		case EXPR_CT_EVAL:
+		case EXPR_CT_IDENT:
+			UNREACHABLE
+		case EXPR_BINARY:
+		case EXPR_POINTER_OFFSET:
+		case EXPR_CAST:
+		case EXPR_UNARY:
+		case EXPR_POST_UNARY:
+		case EXPR_TERNARY:
+		case EXPR_LAST_FAULT:
+			return false;
+		case EXPR_BITACCESS:
+		case EXPR_BUILTIN:
+		case EXPR_BUILTIN_ACCESS:
+		case EXPR_CALL:
+		case EXPR_COMPILER_CONST:
+		case EXPR_COMPOUND_LITERAL:
+		case EXPR_CONST:
+		case EXPR_DECL:
+		case EXPR_DESIGNATED_INITIALIZER_LIST:
+		case EXPR_DESIGNATOR:
+		case EXPR_EMBED:
+		case EXPR_EXPRESSION_LIST:
+		case EXPR_EXPR_BLOCK:
+		case EXPR_OPTIONAL:
+		case EXPR_FORCE_UNWRAP:
+		case EXPR_GENERIC_IDENT:
+		case EXPR_GROUP:
+		case EXPR_HASH_IDENT:
+		case EXPR_IDENTIFIER:
+		case EXPR_INITIALIZER_LIST:
+		case EXPR_LAMBDA:
+		case EXPR_MACRO_BODY_EXPANSION:
+		case EXPR_NOP:
+		case EXPR_OPERATOR_CHARS:
+		case EXPR_OTHER_CONTEXT:
+		case EXPR_RETHROW:
+		case EXPR_RETVAL:
+		case EXPR_SLICE:
+		case EXPR_SLICE_ASSIGN:
+		case EXPR_SLICE_COPY:
+		case EXPR_STRINGIFY:
+		case EXPR_SUBSCRIPT:
+		case EXPR_SWIZZLE:
+		case EXPR_SUBSCRIPT_ADDR:
+		case EXPR_SUBSCRIPT_ASSIGN:
+		case EXPR_BENCHMARK_HOOK:
+		case EXPR_TEST_HOOK:
+		case EXPR_TRY_UNWRAP:
+		case EXPR_TRY_UNWRAP_CHAIN:
+		case EXPR_TYPEID:
+		case EXPR_TYPEID_INFO:
+		case EXPR_TYPEINFO:
+		case EXPR_ANYSWITCH:
+		case EXPR_VASPLAT:
+		case EXPR_MACRO_BODY:
+		case EXPR_ACCESS:
+		case EXPR_ASM:
+			return true;
+	}
+	UNREACHABLE
+}
 static inline bool sema_analyse_try_unwrap(SemaContext *context, Expr *expr)
 {
 	assert(expr->expr_kind == EXPR_TRY_UNWRAP);
@@ -611,6 +698,10 @@ static inline bool sema_analyse_try_unwrap(SemaContext *context, Expr *expr)
 		// The `try foo()` case.
 		if (ident->expr_kind != EXPR_IDENTIFIER)
 		{
+			if (!sema_expr_valid_try_expression(ident))
+			{
+				RETURN_SEMA_ERROR(ident, "You need to assign this expression to something in order to use it with 'if (try ...)'.");
+			}
 			expr->try_unwrap_expr.optional = ident;
 			expr->try_unwrap_expr.lhs = NULL;
 			expr->try_unwrap_expr.assign_existing = true;
@@ -758,7 +849,7 @@ static inline bool sema_analyse_try_unwrap(SemaContext *context, Expr *expr)
 }
 
 
-static inline bool sema_analyse_try_unwrap_chain(SemaContext *context, Expr *expr, CondType cond_type)
+static inline bool sema_analyse_try_unwrap_chain(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result)
 {
 	assert(cond_type == COND_TYPE_UNWRAP_BOOL || cond_type == COND_TYPE_UNWRAP);
 
@@ -773,7 +864,9 @@ static inline bool sema_analyse_try_unwrap_chain(SemaContext *context, Expr *exp
 			if (!sema_analyse_try_unwrap(context, chain_element)) return false;
 			continue;
 		}
-		if (!sema_analyse_cond_expr(context, chain_element)) return false;
+		bool old_is_fail = *result == COND_FALSE;
+		if (!sema_analyse_cond_expr(context, chain_element, result)) return false;
+		if (old_is_fail) *result = COND_FALSE;
 	}
 	expr->type = type_bool;
 	expr->resolve_status = RESOLVE_DONE;
@@ -862,8 +955,7 @@ RESOLVE_EXPRS:;
 		if (!sema_analyse_expr(context, fail)) return false;
 		if (!type_is_optional(fail->type))
 		{
-			SEMA_ERROR(fail, "This expression is not optional, did you add it by mistake?");
-			return false;
+			RETURN_SEMA_ERROR(fail, "This expression is not optional, did you add it by mistake?");
 		}
 	}
 	expr->type = type_anyfault;
@@ -893,7 +985,7 @@ static void sema_remove_unwraps_from_try(SemaContext *c, Expr *cond)
 	}
 }
 
-static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, CondType cond_type)
+static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result)
 {
 	switch (expr->expr_kind)
 	{
@@ -903,7 +995,7 @@ static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, Cond
 				SEMA_ERROR(expr, "Try unwrapping is only allowed inside of a 'while' or 'if' conditional.");
 				return false;
 			}
-			return sema_analyse_try_unwrap_chain(context, expr, cond_type);
+			return sema_analyse_try_unwrap_chain(context, expr, cond_type, result);
 		case EXPR_CATCH_UNWRAP:
 			if (cond_type != COND_TYPE_UNWRAP_BOOL && cond_type != COND_TYPE_UNWRAP)
 			{
@@ -934,13 +1026,13 @@ static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, Cond
 		if (is_deref) right = right->unary_expr.expr;
 		if (!sema_analyse_expr_rhs(context, NULL, right, false, NULL)) return false;
 		Type *type = right->type->canonical;
-		if (type == type_get_ptr(type_anyptr) && is_deref)
+		if (type == type_get_ptr(type_any) && is_deref)
 		{
 			is_deref = false;
 			right = exprptr(expr->binary_expr.right);
 			if (!sema_analyse_expr_rhs(context, NULL, right, false, NULL)) return false;
 		}
-		if (type != type_anyptr) goto NORMAL_EXPR;
+		if (type != type_any) goto NORMAL_EXPR;
 		// Found an expansion here
 		expr->expr_kind = EXPR_ANYSWITCH;
 		expr->any_switch.new_ident = left->identifier_expr.ident;
@@ -954,7 +1046,7 @@ static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, Cond
 	}
 	if (!sema_analyse_expr(context, expr)) return false;
 	Type *type = expr->type->canonical;
-	if (type != type_anyptr) return true;
+	if (type != type_any) return true;
 	if (expr->expr_kind == EXPR_IDENTIFIER)
 	{
 		Decl *decl = expr->identifier_expr.decl;
@@ -968,7 +1060,7 @@ static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, Cond
 	}
 	return true;
 
-NORMAL_EXPR:
+NORMAL_EXPR:;
 	return sema_analyse_expr(context, expr);
 }
 /**
@@ -979,7 +1071,7 @@ static inline bool sema_analyse_last_cond(SemaContext *context, Expr *expr, Cond
  *
  * In this case the final value is 4.0 and the type is float.
  */
-static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, CondType cond_type)
+static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result)
 {
 	assert(expr->expr_kind == EXPR_COND);
 
@@ -999,7 +1091,7 @@ static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, Cond
 		if (!sema_analyse_expr(context, dexprs[i])) return false;
 	}
 
-	if (!sema_analyse_last_cond(context, dexprs[entries - 1], cond_type)) return false;
+	if (!sema_analyse_last_cond(context, dexprs[entries - 1], cond_type, result)) return false;
 
 	expr->type = dexprs[entries - 1]->type;
 	expr->resolve_status = RESOLVE_DONE;
@@ -1019,7 +1111,7 @@ static inline bool sema_analyse_cond_list(SemaContext *context, Expr *expr, Cond
  * @param cast_to_bool if the result is to be cast to bool after
  * @return true if it passes analysis.
  */
-static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType cond_type)
+static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType cond_type, CondResult *result)
 {
 	bool cast_to_bool = cond_type == COND_TYPE_UNWRAP_BOOL;
 	assert(expr->expr_kind == EXPR_COND && "Conditional expressions should always be of type EXPR_DECL_LIST");
@@ -1027,11 +1119,10 @@ static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType
 	// 1. Analyse the declaration list.
 	ScopeFlags current_flags = context->active_scope.flags;
 	context->active_scope.flags |= SCOPE_COND;
-	bool success = sema_analyse_cond_list(context, expr, cond_type);
+	bool success = sema_analyse_cond_list(context, expr, cond_type, result);
 	context->active_scope.flags = current_flags;
 	if (!success) return false;
 
-
 	// 2. If we get "void", either through a void call or an empty list,
 	//    signal that.
 	if (type_is_void(expr->type))
@@ -1056,17 +1147,20 @@ static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType
 			return false;
 		}
 		// 3e. Expect that it isn't an optional
-		if (IS_OPTIONAL(init) && !decl->var.unwrap)
+		if (IS_OPTIONAL(init))
 		{
-			return sema_error_failed_cast(last, last->type, cast_to_bool ? type_bool : init->type);
+			return sema_error_failed_cast(context, last, last->type, cast_to_bool ? type_bool : init->type);
 			return false;
 		}
-		// TODO document
-		if (!decl->var.unwrap && cast_to_bool && cast_to_bool_kind(typeget(decl->var.type_info)) == CAST_ERROR)
+		if (cast_to_bool && cast_to_bool_kind(typeget(decl->var.type_info)) == CAST_ERROR)
 		{
 			SEMA_ERROR(last->decl_expr->var.init_expr, "The expression needs to be convertible to a boolean.");
 			return false;
 		}
+		if (cast_to_bool && expr_is_const_bool(init))
+		{
+			*result = init->const_expr.b ? COND_TRUE : COND_FALSE;
+		}
 		return true;
 	}
 
@@ -1086,6 +1180,10 @@ static inline bool sema_analyse_cond(SemaContext *context, Expr *expr, CondType
 	{
 		if (!cast_explicit(context, last, type_bool)) return false;
 	}
+	if (expr_is_const_bool(last))
+	{
+		*result = last->const_expr.b ? COND_TRUE : COND_FALSE;
+	}
 	return true;
 }
 
@@ -1123,14 +1221,14 @@ static inline bool sema_analyse_expr_stmt(SemaContext *context, Ast *statement)
 {
 	Expr *expr = statement->expr_stmt;
 	if (!sema_analyse_expr(context, expr)) return false;
-	if (!sema_expr_check_discard(expr)) return false;
+	if (!sema_expr_check_discard(context, expr)) return false;
 	switch (expr->expr_kind)
 	{
 		case EXPR_CALL:
 			if (expr->call_expr.no_return) context->active_scope.jump_end = true;
 			break;
-		case EXPR_MACRO_BLOCK:
-			if (expr->macro_block.is_noreturn) context->active_scope.jump_end = true;
+		case EXPR_EXPR_BLOCK:
+			if (expr->expr_block.is_noreturn) context->active_scope.jump_end = true;
 			break;
 		case EXPR_CONST:
 			// Remove all const statements.
@@ -1194,19 +1292,18 @@ static inline bool sema_analyse_for_cond(SemaContext *context, ExprId *cond_ref,
 		return true;
 	}
 	Expr *cond = exprptr(cond_id);
+	CondResult result = COND_MISSING;
 	if (cond->expr_kind == EXPR_COND)
 	{
-		if (!sema_analyse_cond(context, cond, COND_TYPE_UNWRAP_BOOL)) return false;
+		if (!sema_analyse_cond(context, cond, COND_TYPE_UNWRAP_BOOL, &result)) return false;
 	}
 	else
 	{
-		if (!sema_analyse_cond_expr(context, cond)) return false;
+		if (!sema_analyse_cond_expr(context, cond, &result)) return false;
 	}
 
 	// If this is const true, then set this to infinite and remove the expression.
-	Expr *cond_last = cond->expr_kind == EXPR_COND ? VECLAST(cond->cond_expr) : cond;
-	assert(cond_last);
-	if (expr_is_const(cond_last) && cond_last->const_expr.b)
+	if (result == COND_TRUE)
 	{
 		if (cond->expr_kind != EXPR_COND || vec_size(cond->cond_expr) == 1)
 		{
@@ -1735,7 +1832,8 @@ static inline bool sema_analyse_if_stmt(SemaContext *context, Ast *statement)
 	SCOPE_OUTER_START
 		CondType cond_type = then->ast_kind == AST_IF_CATCH_SWITCH_STMT
 							 ? COND_TYPE_UNWRAP : COND_TYPE_UNWRAP_BOOL;
-		success = sema_analyse_cond(context, cond, cond_type);
+		CondResult result = COND_MISSING;
+		success = sema_analyse_cond(context, cond, cond_type, &result);
 
 		if (success && !ast_ok(then))
 		{
@@ -1781,6 +1879,7 @@ static inline bool sema_analyse_if_stmt(SemaContext *context, Ast *statement)
 		else
 		{
 			SCOPE_START_WITH_LABEL(statement->if_stmt.flow.label);
+				if (result == COND_FALSE) context->active_scope.is_dead = true;
 				success = success && sema_analyse_statement(context, then);
 				then_jump = context->active_scope.jump_end;
 			SCOPE_END;
@@ -1791,6 +1890,7 @@ static inline bool sema_analyse_if_stmt(SemaContext *context, Ast *statement)
 		if (statement->if_stmt.else_body)
 		{
 			SCOPE_START_WITH_LABEL(statement->if_stmt.flow.label);
+				if (result == COND_TRUE) context->active_scope.is_dead = true;
 				sema_remove_unwraps_from_try(context, cond);
 				sema_unwrappable_from_catch_in_else(context, cond);
 				success = success && sema_analyse_statement(context, else_body);
@@ -2083,9 +2183,9 @@ static inline bool sema_analyse_then_overwrite(SemaContext *context, Ast *statem
 static inline bool sema_analyse_ct_if_stmt(SemaContext *context, Ast *statement)
 {
 	unsigned ct_context = sema_context_push_ct_stack(context);
-	int res = sema_check_comp_time_bool(context, statement->ct_if_stmt.expr);
-	if (res == -1) goto FAILED;
-	if (res)
+	CondResult res = sema_check_comp_time_bool(context, statement->ct_if_stmt.expr);
+	if (res == COND_MISSING) goto FAILED;
+	if (res == COND_TRUE)
 	{
 		if (sema_analyse_then_overwrite(context, statement, statement->ct_if_stmt.then)) goto SUCCESS;
 		goto FAILED;
@@ -2108,8 +2208,8 @@ static inline bool sema_analyse_ct_if_stmt(SemaContext *context, Ast *statement)
 		assert(elif->ast_kind == AST_CT_IF_STMT);
 
 		res = sema_check_comp_time_bool(context, elif->ct_if_stmt.expr);
-		if (res == -1) goto FAILED;
-		if (res)
+		if (res == COND_MISSING) goto FAILED;
+		if (res == COND_TRUE)
 		{
 			if (sema_analyse_then_overwrite(context, statement, elif->ct_if_stmt.then)) goto SUCCESS;
 			goto FAILED;
@@ -2186,7 +2286,7 @@ static inline bool sema_check_value_case(SemaContext *context, Type *switch_type
 	}
 	if (is_range && (!expr_is_const_int(expr) || !expr_is_const(to_expr)))
 	{
-		sema_error_at(extend_span_with_token(expr->span, to_expr->span), "Ranges must be constant integers.");
+		print_error_at(extend_span_with_token(expr->span, to_expr->span), "Ranges must be constant integers.");
 		return false;
 	}
 	ExprConst *const_expr = &expr->const_expr;
@@ -2196,7 +2296,7 @@ static inline bool sema_check_value_case(SemaContext *context, Type *switch_type
 	{
 		if (int_comp(const_expr->ixx, to_const_expr->ixx, BINARYOP_GT))
 		{
-			sema_error_at(extend_span_with_token(expr->span, to_expr->span),
+			print_error_at(extend_span_with_token(expr->span, to_expr->span),
 						  "The range is not valid because the first value (%s) is greater than the second (%s). "
 						  "It would work if you swapped their order.",
 						  int_to_str(const_expr->ixx, 10),
@@ -2275,7 +2375,7 @@ static bool sema_analyse_switch_body(SemaContext *context, Ast *statement, Sourc
 	bool use_type_id = false;
 	if (!type_is_comparable(switch_type))
 	{
-		sema_error_at(expr_span, "You cannot test '%s' for equality, and only values that supports '==' for comparison can be used in a switch.", type_to_error_string(switch_type));
+		print_error_at(expr_span, "You cannot test '%s' for equality, and only values that supports '==' for comparison can be used in a switch.", type_to_error_string(switch_type));
 		return false;
 	}
 	// We need an if-chain if this isn't an enum/integer type.
@@ -2389,9 +2489,13 @@ static bool sema_analyse_switch_body(SemaContext *context, Ast *statement, Sourc
 	}
 	if (is_enum_switch && !exhaustive && success)
 	{
-		SEMA_ERROR(statement, create_missing_enums_in_switch_error(cases, case_count, flat->decl->enums.values));
-		success = false;
+		RETURN_SEMA_ERROR(statement, create_missing_enums_in_switch_error(cases, case_count, flat->decl->enums.values));
+	}
+	if ((if_chain || max_ranged) && statement->flow.jump)
+	{
+		RETURN_SEMA_ERROR(statement, "Switch cannot use a jump table, please remove '@jump'.");
 	}
+
 	statement->flow.no_exit = all_jump_end;
 	statement->switch_stmt.flow.if_chain = if_chain || max_ranged;
 	return success;
@@ -2418,7 +2522,7 @@ static inline bool sema_analyse_ct_switch_stmt(SemaContext *context, Ast *statem
 		case ALL_FLOATS:
 		case TYPE_BOOL:
 			break;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			if (expr_is_const_string(cond)) break;
 			FALLTHROUGH;
 		default:
@@ -2662,7 +2766,8 @@ static inline bool sema_analyse_switch_stmt(SemaContext *context, Ast *statement
 		Decl *any_decl = NULL;
 		if (statement->ast_kind == AST_SWITCH_STMT)
 		{
-			if (cond && !sema_analyse_cond(context, cond, COND_TYPE_EVALTYPE_VALUE)) return false;
+			CondResult res = COND_MISSING;
+			if (cond && !sema_analyse_cond(context, cond, COND_TYPE_EVALTYPE_VALUE, &res)) return false;
 			Expr *last = cond ? VECLAST(cond->cond_expr) : NULL;
 			switch_type = last ? last->type->canonical : type_bool;
 			if (last && last->expr_kind == EXPR_ANYSWITCH)
@@ -2672,7 +2777,7 @@ static inline bool sema_analyse_switch_stmt(SemaContext *context, Ast *statement
 				if (var_switch.is_assign)
 				{
 					inner = expr_new(EXPR_DECL, last->span);
-					any_decl = decl_new_generated_var(type_anyptr, VARDECL_LOCAL, last->span);
+					any_decl = decl_new_generated_var(type_any, VARDECL_LOCAL, last->span);
 					any_decl->var.init_expr = var_switch.any_expr;
 					inner->decl_expr = any_decl;
 					if (!sema_analyse_expr(context, inner)) return false;
@@ -2682,7 +2787,7 @@ static inline bool sema_analyse_switch_stmt(SemaContext *context, Ast *statement
 					inner = expr_new(EXPR_IDENTIFIER, last->span);
 					any_decl = var_switch.variable;
 					expr_resolve_ident(inner, any_decl);
-					inner->type = type_anyptr;
+					inner->type = type_any;
 				}
 				expr_rewrite_to_builtin_access(last, inner, ACCESS_TYPEOFANY, type_typeid);
 				switch_type = type_typeid;
@@ -2726,33 +2831,21 @@ bool sema_analyse_ct_assert_stmt(SemaContext *context, Ast *statement)
 			SEMA_ERROR(message_expr, "Expected a string as the error message.");
 		}
 	}
-	int res = expr ? sema_check_comp_time_bool(context, expr) : 0;
+	CondResult res = expr ? sema_check_comp_time_bool(context, expr) : COND_FALSE;
 
-	if (res == -1) return false;
+	if (res == COND_MISSING) return false;
 	SourceSpan span = expr ? expr->span : statement->span;
-	if (!res)
+	if (res == COND_FALSE)
 	{
-		if (context->current_macro)
-		{
-			if (message_expr)
-			{
-				sema_error_at(context->inlining_span, "%.*s", EXPAND_EXPR_STRING(message_expr));
-			}
-			else
-			{
-				sema_error_at(context->inlining_span, "Compile time assert failed.");
-			}
-			sema_error_prev_at(span, expr ? "$assert was defined here." : "$error was defined here");
-			return false;
-		}
 		if (message_expr)
 		{
-			sema_error_at(span, "%.*s", EXPAND_EXPR_STRING(message_expr));
+			print_error_at(span, "%.*s", EXPAND_EXPR_STRING(message_expr));
 		}
 		else
 		{
-			sema_error_at(span, "Compile time assert failed.");
+			print_error_at(span, "Compile time assert failed.");
 		}
+		sema_print_inline(context);
 		return false;
 	}
 	statement->ast_kind = AST_NOP_STMT;
@@ -2851,14 +2944,15 @@ static inline bool sema_analyse_ct_for_stmt(SemaContext *context, Ast *statement
 		// First evaluate the cond, which we note that we *must* have.
 		// we need to make a copy
 		Expr *copy = copy_expr_single(exprptr(condition));
-		if (!sema_analyse_cond_expr(context, copy)) goto FAILED;
-		if (!expr_is_const(copy))
+		CondResult result = COND_MISSING;
+		if (!sema_analyse_cond_expr(context, copy, &result)) goto FAILED;
+		if (result == COND_MISSING)
 		{
 			SEMA_ERROR(copy, "Expected a value that can be evaluated at compile time.");
 			goto FAILED;
 		}
-		// This is simple, since we know we have a boolean, just break if we reached "false"
-		if (!copy->const_expr.b) break;
+		// Break if we reached "false"
+		if (result == COND_FALSE) break;
 
 		// Otherwise we copy the body.
 		Ast *compound_stmt = copy_ast_single(body);
diff --git a/src/compiler/sema_types.c b/src/compiler/sema_types.c
index 114529836..d979cd559 100644
--- a/src/compiler/sema_types.c
+++ b/src/compiler/sema_types.c
@@ -100,7 +100,7 @@ static inline bool sema_resolve_array_type(SemaContext *context, TypeInfo *type,
 	TypeInfoKind kind = type->kind;
 	// We can resolve the base type in a shallow way if we don't use it to determine
 	// length and alignment
-	if (kind == TYPE_INFO_SUBARRAY || (resolve_type_kind & RESOLVE_TYPE_IS_POINTEE))
+	if (kind == TYPE_INFO_SLICE || (resolve_type_kind & RESOLVE_TYPE_IS_POINTEE))
 	{
 		if (!sema_resolve_type(context, type->array.base, resolve_type_kind))
 		{
@@ -134,15 +134,15 @@ static inline bool sema_resolve_array_type(SemaContext *context, TypeInfo *type,
 	Type *base = base_info->type;
 	switch (type->kind)
 	{
-		case TYPE_INFO_SUBARRAY:
+		case TYPE_INFO_SLICE:
 			if (!type_is_valid_for_array(base))
 			{
 				SEMA_ERROR(base_info,
-				           "You cannot form a subarray with elements of type %s.",
+				           "You cannot form a slice with elements of type %s.",
 				           type_quoted_error_string(base));
 				return type_info_poison(type);
 			}
-			type->type = type_get_subarray(type->array.base->type);
+			type->type = type_get_slice(type->array.base->type);
 			break;
 		case TYPE_INFO_INFERRED_ARRAY:
 			if (!type_is_valid_for_array(base))
@@ -299,13 +299,19 @@ INLINE bool sema_resolve_evaltype(SemaContext *context, TypeInfo *type_info, Res
 	}
 	TypeInfo *inner_type = inner->type_expr;
 	if (!sema_resolve_type(context, inner_type, resolve_kind)) return false;
-	if (inner_type->type != type_void && type_is_invalid_storage_type(inner_type->type))
+	switch (type_storage_type(inner_type->type))
 	{
-		SEMA_ERROR(expr, "Compile-time types may not be used with $evaltype.");
-		return false;
+		case STORAGE_VOID:
+		case STORAGE_UNKNOWN:
+		case STORAGE_NORMAL:
+			type_info->type = inner_type->type;
+			return true;
+		case STORAGE_WILDCARD:
+			RETURN_SEMA_ERROR(expr, "$evaltype failed to resolve this to a definite type.");
+		case STORAGE_COMPILE_TIME:
+			RETURN_SEMA_ERROR(expr, "$evaltype does not support compile-time types.");
 	}
-	type_info->type = inner_type->type;
-	return true;
+	UNREACHABLE
 }
 
 // $typeof(...)
@@ -314,20 +320,19 @@ INLINE bool sema_resolve_typeof(SemaContext *context, TypeInfo *type_info)
 	Expr *expr = type_info->unresolved_type_expr;
 	if (!sema_analyse_expr(context, expr)) return false;
 	Type *expr_type = expr->type;
-	if (expr_type != type_void && type_is_invalid_storage_type(expr->type))
+	switch (type_storage_type(expr->type))
 	{
-		if (expr_type == type_wildcard)
-		{
-			RETURN_SEMA_ERROR(expr, "This expression has no concrete type.");
-		}
-		if (expr_type == type_wildcard_optional)
-		{
-			RETURN_SEMA_ERROR(expr, "This optional expression is untyped.");
-		}
-		RETURN_SEMA_ERROR(expr, "Expected a regular runtime expression here.");
+		case STORAGE_NORMAL:
+		case STORAGE_VOID:
+		case STORAGE_UNKNOWN:
+			type_info->type = expr_type;
+			return true;
+		case STORAGE_WILDCARD:
+			RETURN_SEMA_ERROR(expr, "This %sexpression lacks a concrete type.", type_is_optional(expr_type) ? "optional " : "");
+		case STORAGE_COMPILE_TIME:
+			RETURN_SEMA_ERROR(expr, "This expression has a compile time type.");
 	}
-	type_info->type = expr_type;
-	return true;
+	UNREACHABLE
 }
 
 INLINE bool sema_resolve_typefrom(SemaContext *context, TypeInfo *type_info)
@@ -380,19 +385,6 @@ static inline bool sema_resolve_type(SemaContext *context, TypeInfo *type_info,
 	if (type_info->resolve_status == RESOLVE_DONE)
 	{
 		if (!type_info_ok(type_info)) return false;
-		if (!(resolve_type_kind & RESOLVE_TYPE_ALLOW_ANY))
-		{
-			switch (type_no_optional(type_info->type)->canonical->type_kind)
-			{
-				case TYPE_ANY:
-				case TYPE_INTERFACE:
-					RETURN_SEMA_ERROR(type_info, "%s has no valid runtime size, you should use '%s' instead.",
-					                  type_quoted_error_string(type_no_optional(type_info->type)),
-					                  type_quoted_error_string(type_get_ptr(type_no_optional(type_info->type))));
-				default:
-					break;
-			}
-		}
 		return true;
 	}
 
@@ -468,7 +460,7 @@ static inline bool sema_resolve_type(SemaContext *context, TypeInfo *type_info,
 				return type_info_poison(type_info);
 			}
 			FALLTHROUGH;
-		case TYPE_INFO_SUBARRAY:
+		case TYPE_INFO_SLICE:
 		case TYPE_INFO_ARRAY:
 		case TYPE_INFO_VECTOR:
 			if (!sema_resolve_array_type(context, type_info, resolve_type_kind))
@@ -481,27 +473,6 @@ static inline bool sema_resolve_type(SemaContext *context, TypeInfo *type_info,
 			break;
 	}
 APPEND_QUALIFIERS:
-	switch (type_info->type->type_kind)
-	{
-		case TYPE_ANY:
-			if (!(resolve_type_kind & RESOLVE_TYPE_ALLOW_ANY))
-			{
-				SEMA_ERROR(type_info, "An 'any' has undefined size, please use 'any*' instead.");
-				return type_info_poison(type_info);
-			}
-			break;
-		case TYPE_INTERFACE:
-			if (!(resolve_type_kind & RESOLVE_TYPE_ALLOW_ANY))
-			{
-				SEMA_ERROR(type_info, "%s is an interface and has undefined size, please use %s instead.",
-				           type_quoted_error_string(type_info->type),
-				           type_quoted_error_string(type_get_ptr(type_info->type)));
-				return type_info_poison(type_info);
-			}
-			break;
-		default:
-			break;
-	}
 	switch (kind)
 	{
 		case TYPE_COMPRESSED_NONE:
@@ -510,19 +481,19 @@ static inline bool sema_resolve_type(SemaContext *context, TypeInfo *type_info,
 			type_info->type = type_get_ptr(type_info->type);
 			break;
 		case TYPE_COMPRESSED_SUB:
-			type_info->type = type_get_subarray(type_info->type);
+			type_info->type = type_get_slice(type_info->type);
 			break;
 		case TYPE_COMPRESSED_SUBPTR:
-			type_info->type = type_get_ptr(type_get_subarray(type_info->type));
+			type_info->type = type_get_ptr(type_get_slice(type_info->type));
 			break;
 		case TYPE_COMPRESSED_PTRPTR:
 			type_info->type = type_get_ptr(type_get_ptr(type_info->type));
 			break;
 		case TYPE_COMPRESSED_PTRSUB:
-			type_info->type = type_get_subarray(type_get_ptr(type_info->type));
+			type_info->type = type_get_slice(type_get_ptr(type_info->type));
 			break;
 		case TYPE_COMPRESSED_SUBSUB:
-			type_info->type = type_get_subarray(type_get_subarray(type_info->type));
+			type_info->type = type_get_slice(type_get_slice(type_info->type));
 			break;
 	}
 	if (type_info->optional)
@@ -534,3 +505,4 @@ static inline bool sema_resolve_type(SemaContext *context, TypeInfo *type_info,
 	return true;
 }
 
+
diff --git a/src/compiler/semantic_analyser.c b/src/compiler/semantic_analyser.c
index 5ff91ff75..8ccdda6bb 100644
--- a/src/compiler/semantic_analyser.c
+++ b/src/compiler/semantic_analyser.c
@@ -5,6 +5,9 @@
 #include <compiler_tests/benchmark.h>
 #include "sema_internal.h"
 
+char swizzle[256] = { ['x'] = 0x01, ['y'] = 0x02, ['z'] = 0x03, ['w'] = 0x04,
+					  ['r'] = 0x11, ['g'] = 0x12, ['b'] = 0x13, ['a'] = 0x14 };
+
 void context_change_scope_with_flags(SemaContext *context, ScopeFlags flags)
 {
 	unsigned depth = context->active_scope.depth + 1;
@@ -13,6 +16,7 @@ void context_change_scope_with_flags(SemaContext *context, ScopeFlags flags)
 		FATAL_ERROR("Too deeply nested scopes.");
 	}
 
+	bool scope_is_dead = context->active_scope.is_dead;
 	Ast *previous_defer = context->active_scope.in_defer;
 	AstId parent_defer = context->active_scope.defer_last;
 	unsigned last_local = context->active_scope.current_local;
@@ -37,6 +41,7 @@ void context_change_scope_with_flags(SemaContext *context, ScopeFlags flags)
 			.scope_id = ++context->scope_id,
 			.allow_dead_code = false,
 			.jump_end = false,
+			.is_dead = scope_is_dead,
 			.depth = depth,
 			.current_local = last_local,
 			.label_start = label_start,
@@ -312,7 +317,7 @@ static void assign_panicfn(void)
 		error_exit("'%s' is not a function function.", panicf);
 	}
 	if (!type_func_match(type_get_ptr(panicf_fn_type), type_void, 5, type_string, type_string, type_string, type_uint,
-						 type_get_subarray(type_anyptr)))
+	                     type_get_slice(type_any)))
 	{
 		error_exit("Expected panic function to have the signature fn void(String, String, String, uint, ...).");
 	}
@@ -510,3 +515,14 @@ SemaContext *context_transform_for_eval(SemaContext *context, SemaContext *temp_
 	temp_context->current_macro = context->current_macro;
 	return temp_context;
 }
+
+void sema_print_inline(SemaContext *context)
+{
+	if (!context) return;
+	InliningSpan *inlined_at = context->inlined_at;
+	while (inlined_at)
+	{
+		sema_error_prev_at(inlined_at->span, "Inlined from here.");
+		inlined_at = inlined_at->prev;
+	}
+}
\ No newline at end of file
diff --git a/src/compiler/symtab.c b/src/compiler/symtab.c
index d322f3354..5f6d81417 100644
--- a/src/compiler/symtab.c
+++ b/src/compiler/symtab.c
@@ -49,6 +49,7 @@ const char *kw_at_param;
 const char *kw_at_pure;
 const char *kw_at_require;
 const char *kw_at_return;
+const char *kw_at_jump;
 const char *kw_check_assign;
 const char *kw_deprecated;
 const char *kw_finalize;
@@ -318,13 +319,12 @@ void symtab_init(uint32_t capacity)
 	kw_at_pure = KW_DEF("@pure");
 	kw_at_require = KW_DEF("@require");
 	kw_at_return = KW_DEF("@return");
-
+	kw_at_jump = KW_DEF("@jump");
 	attribute_list[ATTRIBUTE_ALIGN] = KW_DEF("@align");
 	attribute_list[ATTRIBUTE_BENCHMARK] = KW_DEF("@benchmark");
 	attribute_list[ATTRIBUTE_BIGENDIAN] = KW_DEF("@bigendian");
 	attribute_list[ATTRIBUTE_BUILTIN] = KW_DEF("@builtin");
 	attribute_list[ATTRIBUTE_CALLCONV] = KW_DEF("@callconv");
-	attribute_list[ATTRIBUTE_DEFAULT] = KW_DEF("@default");
 	attribute_list[ATTRIBUTE_DEPRECATED] = KW_DEF("@deprecated");
 	attribute_list[ATTRIBUTE_DYNAMIC] = KW_DEF("@dynamic");
 	attribute_list[ATTRIBUTE_EXPORT] = KW_DEF("@export");
diff --git a/src/compiler/target.c b/src/compiler/target.c
index b3cf0d2bc..4b790c28a 100644
--- a/src/compiler/target.c
+++ b/src/compiler/target.c
@@ -7,6 +7,7 @@ extern void LLVMSetTargetMachineUseInitArray(LLVMTargetMachineRef ref, bool use_
 static bool x64features_contains(X86Features *cpu_features, X86Feature feature);
 static ObjectFormatType object_format_from_os(OsType os, ArchType arch_type);
 static unsigned arch_pointer_bit_width(OsType os, ArchType arch);
+static unsigned arch_int_register_bit_width(OsType os, ArchType arch);
 static ArchType arch_from_llvm_string(StringSlice string);
 static EnvironmentType environment_type_from_llvm_string(StringSlice string);
 static bool arch_is_supported(ArchType arch);
@@ -928,6 +929,7 @@ static inline void target_setup_x64_abi(BuildTarget *target)
 	x86features_from_cpu(&cpu_features, cpu_set);
 	x64features_limit_from_capability(&cpu_features, target->feature.x86_vector_capability);
 	if (target->feature.soft_float == SOFT_FLOAT_YES) platform_target.x64.soft_float = true;
+	if (target->feature.pass_win64_simd_as_arrays == WIN64_SIMD_ARRAY) platform_target.x64.win64_simd_as_array = true;
 	scratch_buffer_clear();
 	x86features_as_diff_to_scratch(&cpu_features, cpu_set);
 	if (platform_target.x64.soft_float) scratch_buffer_append("+soft-float,");
@@ -1291,6 +1293,39 @@ static unsigned arch_pointer_bit_width(OsType os, ArchType arch)
 	}
 }
 
+static unsigned arch_int_register_bit_width(OsType os, ArchType arch)
+{
+	switch (arch)
+	{
+		case ARCH_TYPE_UNKNOWN:
+		case ARCH_UNSUPPORTED:
+			return 0;
+		case ARCH_TYPE_ARM:
+		case ARCH_TYPE_ARMB:
+		case ARCH_TYPE_PPC:
+		case ARCH_TYPE_RISCV32:
+		case ARCH_TYPE_THUMB:
+		case ARCH_TYPE_THUMBEB:
+		case ARCH_TYPE_X86:
+		case ARCH_TYPE_WASM32:
+			return 32;
+		case ARCH_TYPE_WASM64:
+		case ARCH_TYPE_AARCH64:
+		case ARCH_TYPE_AARCH64_BE:
+		case ARCH_TYPE_RISCV64:
+			return 64;
+		case ARCH_TYPE_PPC64:
+		case ARCH_TYPE_PPC64LE:
+			if (os == OS_TYPE_PS3) return 32;
+			return 64;
+		case ARCH_TYPE_X86_64:
+			if (os == OS_TYPE_NACL) return 32;
+			return 64;
+		default:
+			UNREACHABLE
+	}
+}
+
 static unsigned os_target_supports_float16(OsType os, ArchType arch)
 {
 	switch (arch)
@@ -1816,6 +1851,7 @@ void target_setup(BuildTarget *target)
 	platform_target.tls_supported = os_target_use_thread_local(platform_target.os);
 	platform_target.big_endian = arch_big_endian(platform_target.arch);
 	platform_target.width_pointer = arch_pointer_bit_width(platform_target.os, platform_target.arch);
+	platform_target.width_register = arch_int_register_bit_width(platform_target.os, platform_target.arch);
 	platform_target.alloca_address_space = 0;
 	platform_target.object_format = object_format_from_os(platform_target.os, platform_target.arch);
 	switch (platform_target.object_format)
diff --git a/src/compiler/target.h b/src/compiler/target.h
index 58cacfd6e..048c130fc 100644
--- a/src/compiler/target.h
+++ b/src/compiler/target.h
@@ -286,6 +286,7 @@ typedef struct
 		{
 			X86Features features;
 			unsigned align_simd_default : 16;
+			bool win64_simd_as_array : 1;
 			bool soft_float : 1;
 			bool is_win64 : 1;
 			bool is_mingw64 : 1;
@@ -347,6 +348,7 @@ typedef struct
 	unsigned align_max_tls;
 	unsigned align_large_array;
 	unsigned width_pointer;
+	unsigned width_register;
 	unsigned width_c_short;
 	unsigned width_c_int;
 	unsigned width_c_long;
diff --git a/src/compiler/tilde_codegen_expr.c b/src/compiler/tilde_codegen_expr.c
index f00d187f3..1a6174603 100644
--- a/src/compiler/tilde_codegen_expr.c
+++ b/src/compiler/tilde_codegen_expr.c
@@ -1174,7 +1174,7 @@ void tilde_emit_comp(TildeContext *c, TBEValue *result, TBEValue *lhs, TBEValue
 		TODO // tilde_emit_float_comp(c, result, lhs, rhs, binary_op, NULL);
 		return;
 	}
-	if (lhs->type->type_kind == TYPE_SUBARRAY)
+	if (lhs->type->type_kind == TYPE_INFO_SLICE)
 	{
 		TODO // tilde_emit_subarray_comp(c, result, lhs, rhs, binary_op);
 		return;
diff --git a/src/compiler/tokens.c b/src/compiler/tokens.c
index 550f15e95..d822e6407 100644
--- a/src/compiler/tokens.c
+++ b/src/compiler/tokens.c
@@ -285,6 +285,10 @@ const char *token_type_to_string(TokenType type)
 			return "double";
 		case TOKEN_FLOAT:
 			return "float";
+		case TOKEN_BFLOAT:
+			return "bfloat";
+		case TOKEN_FLOAT16:
+			return "float16";
 		case TOKEN_LONG:
 			return "long";
 		case TOKEN_ULONG:
@@ -313,8 +317,6 @@ const char *token_type_to_string(TokenType type)
 			return "iptr";
 		case TOKEN_UPTR:
 			return "uptr";
-		case TOKEN_FLOAT16:
-			return "float16";
 		case TOKEN_DOCS_START:
 			return "/**";
 		case TOKEN_DOCS_END:
diff --git a/src/compiler/types.c b/src/compiler/types.c
index d778275e8..375fee71d 100644
--- a/src/compiler/types.c
+++ b/src/compiler/types.c
@@ -10,23 +10,23 @@ static struct
 {
 	Type u0, u1, i8, i16, i32, i64, i128;
 	Type u8, u16, u32, u64, u128;
-	Type f16, f32, f64, f128;
+	Type bf16, f16, f32, f64, f128;
 	Type usz, isz, uptr, iptr;
 	Type string;
 	Type voidstar, typeid, anyfault, member, typeinfo, untyped_list;
-	Type any, anyptr, wildcard;
+	Type any, wildcard;
 } t;
 
 Type *type_bool = &t.u1;
 Type *type_void = &t.u0;
 Type *type_voidptr = &t.voidstar;
 Type *type_float16 = &t.f16;
+Type *type_bfloat = &t.bf16;
 Type *type_float = &t.f32;
 Type *type_double = &t.f64;
 Type *type_f128 = &t.f128;
 Type *type_typeid = &t.typeid;
 Type *type_any = &t.any;
-Type *type_anyptr = &t.anyptr;
 Type *type_typeinfo = &t.typeinfo;
 Type *type_ichar = &t.i8;
 Type *type_short = &t.i16;
@@ -50,14 +50,14 @@ Type *type_chars = NULL;
 Type *type_wildcard_optional = NULL;
 Type *type_string = &t.string;
 
-static unsigned size_subarray;
-static AlignSize alignment_subarray;
+static unsigned size_slice;
+static AlignSize alignment_slice;
 static AlignSize max_alignment_vector;
 
 #define PTR_OFFSET 0
 #define INFERRED_ARRAY_OFFSET 1
 #define FLEXIBLE_ARRAY_OFFSET 2
-#define SUB_ARRAY_OFFSET 3
+#define SLICE_OFFSET 3
 #define INFERRED_VECTOR_OFFSET 4
 #define OPTIONAL_OFFSET 5
 #define ARRAY_OFFSET 6
@@ -124,8 +124,6 @@ static void type_append_name_to_scratch(Type *type)
 		case TYPE_INTERFACE:
 			scratch_buffer_append(type->decl->name);
 			break;
-		case TYPE_INFPTR:
-		case TYPE_ANYPTR:
 		case TYPE_POINTER:
 			type_append_name_to_scratch(type->pointer);
 			scratch_buffer_append_char('*');
@@ -141,7 +139,7 @@ static void type_append_name_to_scratch(Type *type)
 			}
 			scratch_buffer_append_char('!');
 			break;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			type_append_name_to_scratch(type->array.base);
 			scratch_buffer_append("[]");
 			break;
@@ -214,7 +212,6 @@ const char *type_to_error_string(Type *type)
 		case TYPE_ANY:
 		case TYPE_MEMBER:
 		case TYPE_WILDCARD:
-		case TYPE_ANYPTR:
 			return type->name;
 		case TYPE_ENUM:
 		case TYPE_FAULTTYPE:
@@ -246,7 +243,6 @@ const char *type_to_error_string(Type *type)
 			return "typeinfo";
 		case TYPE_TYPEID:
 			return "typeid";
-		case TYPE_INFPTR:
 		case TYPE_POINTER:
 			if (type->pointer->type_kind == TYPE_FUNC)
 			{
@@ -261,7 +257,7 @@ const char *type_to_error_string(Type *type)
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
 			return str_printf("%s[*]", type_to_error_string(type->array.base));
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			return str_printf("%s[]", type_to_error_string(type->array.base));
 	}
 	UNREACHABLE
@@ -324,8 +320,6 @@ TypeSize type_size(Type *type)
 			assert(type->decl->resolve_status == RESOLVE_DONE);
 			return type->decl->strukt.size;
 		case TYPE_VOID:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			return 1;
 		case TYPE_BOOL:
 		case TYPE_TYPEID:
@@ -333,16 +327,16 @@ TypeSize type_size(Type *type)
 		case ALL_FLOATS:
 		case TYPE_ANYFAULT:
 			return type->builtin.bytesize;
-		case TYPE_INFPTR:
-		case TYPE_ANYPTR:
+		case TYPE_INTERFACE:
+		case TYPE_ANY:
 			return t.iptr.canonical->builtin.bytesize * 2;
 		case TYPE_FUNC:
 		case TYPE_POINTER:
 			return t.iptr.canonical->builtin.bytesize;
 		case TYPE_ARRAY:
 			return type_size(type->array.base) * type->array.len;
-		case TYPE_SUBARRAY:
-			return size_subarray;
+		case TYPE_SLICE:
+			return size_slice;
 	}
 	UNREACHABLE
 }
@@ -423,15 +417,13 @@ bool type_is_abi_aggregate(Type *type)
 		case TYPE_VECTOR:
 		case TYPE_ANYFAULT:
 		case TYPE_FAULTTYPE:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			return false;
 		case TYPE_STRUCT:
 		case TYPE_UNION:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_ARRAY:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 			return true;
 		case CT_TYPES:
 		case TYPE_FLEXIBLE_ARRAY:
@@ -497,8 +489,6 @@ bool type_is_comparable(Type *type)
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_OPTIONAL:
 		case TYPE_MEMBER:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			return false;
 		case TYPE_BITSTRUCT:
 			type = type->decl->bitstruct.base_type->type;
@@ -506,7 +496,7 @@ bool type_is_comparable(Type *type)
 		case TYPE_TYPEDEF:
 			type = type->canonical;
 			goto RETRY;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_ARRAY:
 			// Arrays are comparable if elements are
 			type = type->array.base;
@@ -517,8 +507,8 @@ bool type_is_comparable(Type *type)
 		case TYPE_BOOL:
 		case ALL_INTS:
 		case ALL_FLOATS:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 		case TYPE_POINTER:
@@ -539,9 +529,8 @@ void type_mangle_introspect_name_to_buffer(Type *type)
 	switch (type->type_kind)
 	{
 		case CT_TYPES:
-		case TYPE_ANY:
 			UNREACHABLE
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			scratch_buffer_append("any$");
 			return;
 		case TYPE_VOID:
@@ -552,12 +541,11 @@ void type_mangle_introspect_name_to_buffer(Type *type)
 		case TYPE_TYPEID:
 			scratch_buffer_append(type->name);
 			return;
-		case TYPE_INFPTR:
 		case TYPE_POINTER:
 			scratch_buffer_append("p$");
 			type_mangle_introspect_name_to_buffer(type->pointer);
 			return;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			scratch_buffer_append("sa$");
 			type_mangle_introspect_name_to_buffer(type->array.base);
 			return;
@@ -678,8 +666,6 @@ AlignSize type_abi_alignment(Type *type)
 			return alignment;
 		}
 		case TYPE_VOID:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			return 1;
 		case TYPE_OPTIONAL:
 			type = type->optional;
@@ -705,8 +691,8 @@ AlignSize type_abi_alignment(Type *type)
 		case TYPE_ANYFAULT:
 			return type->builtin.abi_alignment;
 		case TYPE_FUNC:
-		case TYPE_INFPTR:
-		case TYPE_ANYPTR:
+		case TYPE_INTERFACE:
+		case TYPE_ANY:
 		case TYPE_POINTER:
 		case TYPE_TYPEID:
 			return t.iptr.canonical->builtin.abi_alignment;
@@ -715,8 +701,8 @@ AlignSize type_abi_alignment(Type *type)
 		case TYPE_FLEXIBLE_ARRAY:
 			type = type->array.base;
 			goto RETRY;
-		case TYPE_SUBARRAY:
-			return alignment_subarray;
+		case TYPE_SLICE:
+			return alignment_slice;
 	}
 	UNREACHABLE
 }
@@ -740,7 +726,7 @@ static Type *type_generate_ptr(Type *ptr_type, bool canonical)
 	Type *ptr = ptr_type->type_cache[PTR_OFFSET];
 	if (ptr == NULL)
 	{
-		ptr = type_new(ptr_type->type_kind == TYPE_INTERFACE ? TYPE_INFPTR : TYPE_POINTER, str_printf("%s*", ptr_type->name));
+		ptr = type_new(TYPE_POINTER, str_printf("%s*", ptr_type->name));
 		ptr->pointer = ptr_type;
 		ptr_type->type_cache[PTR_OFFSET] = ptr;
 		if (ptr_type == ptr_type->canonical)
@@ -780,7 +766,7 @@ static Type *type_generate_optional(Type *optional_type, bool canonical)
 	return optional;
 }
 
-static Type *type_generate_subarray(Type *arr_type, bool canonical)
+static Type *type_generate_slice(Type *arr_type, bool canonical)
 {
 	if (canonical) arr_type = arr_type->canonical;
 	if (!arr_type->type_cache)
@@ -788,19 +774,19 @@ static Type *type_generate_subarray(Type *arr_type, bool canonical)
 		create_type_cache(arr_type);
 	}
 
-	Type *arr = arr_type->type_cache[SUB_ARRAY_OFFSET];
+	Type *arr = arr_type->type_cache[SLICE_OFFSET];
 	if (arr == NULL)
 	{
-		arr = type_new(TYPE_SUBARRAY, str_printf("%s[]", arr_type->name));
+		arr = type_new(TYPE_SLICE, str_printf("%s[]", arr_type->name));
 		arr->array.base = arr_type;
-		arr_type->type_cache[SUB_ARRAY_OFFSET] = arr;
+		arr_type->type_cache[SLICE_OFFSET] = arr;
 		if (arr_type == arr_type->canonical)
 		{
 			arr->canonical = arr;
 		}
 		else
 		{
-			arr->canonical = type_generate_subarray(arr_type->canonical, true);
+			arr->canonical = type_generate_slice(arr_type->canonical, true);
 		}
 	}
 	return arr;
@@ -909,10 +895,10 @@ Type *type_get_optional(Type *optional_type)
 	return type_generate_optional(optional_type, false);
 }
 
-Type *type_get_subarray(Type *arr_type)
+Type *type_get_slice(Type *arr_type)
 {
 	assert(type_is_valid_for_array(arr_type));
-	return type_generate_subarray(arr_type, false);
+	return type_generate_slice(arr_type, false);
 }
 
 Type *type_get_inferred_array(Type *arr_type)
@@ -933,6 +919,7 @@ Type *type_get_flexible_array(Type *arr_type)
 	return type_generate_flexible_array(arr_type, false);
 }
 
+
 static inline bool array_structurally_equivalent_to_struct(Type *array, Type *type)
 {
 	assert(array->type_kind == TYPE_ARRAY);
@@ -1050,7 +1037,7 @@ Type *type_get_indexed_type(Type *type)
 		case TYPE_POINTER:
 			return type->pointer->canonical;
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_FLEXIBLE_ARRAY:
@@ -1158,8 +1145,8 @@ bool type_is_valid_for_array(Type *type)
 			assert(!type->decl || type->decl->resolve_status == RESOLVE_DONE);
 			type = type->decl->distinct->type;
 			goto RETRY;
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_ANY:
+		case TYPE_INTERFACE:
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 		case TYPE_POINTER:
@@ -1173,7 +1160,7 @@ bool type_is_valid_for_array(Type *type)
 		case ALL_FLOATS:
 		case TYPE_BOOL:
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_VECTOR:
 			return true;
 		case TYPE_TYPEDEF:
@@ -1192,8 +1179,6 @@ bool type_is_valid_for_array(Type *type)
 		case TYPE_MEMBER:
 		case TYPE_POISONED:
 		case TYPE_VOID:
-		case TYPE_ANY:
-		case TYPE_INTERFACE:
 			return false;
 	}
 	UNREACHABLE
@@ -1312,7 +1297,7 @@ static bool compare_func_param(Type *one, Type *other)
 		case TYPE_ARRAY:
 			if (one->array.len != other->array.len) return false;
 			FALLTHROUGH;
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_FLEXIBLE_ARRAY:
 			return compare_func_param(one->array.base, other->array.base);
 		case TYPE_FUNC:
@@ -1373,10 +1358,10 @@ static Type *flatten_raw_function_type(Type *type)
 			current = type->array.base;
 			other = flatten_raw_function_type(current);
 			return other == current ? type : type_get_array(other, type->array.len);
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 			current = type->array.base;
 			other = flatten_raw_function_type(current);
-			return other == current ? type : type_get_subarray(other);
+			return other == current ? type : type_get_slice(other);
 		case TYPE_FLEXIBLE_ARRAY:
 			current = type->array.base;
 			other = flatten_raw_function_type(current);
@@ -1523,6 +1508,7 @@ void type_setup(PlatformTarget *target)
 	max_alignment_vector = (AlignSize)target->align_max_vector;
 
 	type_create_float("float16", &t.f16, TYPE_F16, BITS16);
+	type_create_float("bfloat", &t.bf16, TYPE_BF16, BITS16);
 	type_create_float("float", &t.f32, TYPE_F32, BITS32);
 	type_create_float("double", &t.f64, TYPE_F64, BITS64);
 	type_create_float("float128", &t.f128, TYPE_F128, BITS128);
@@ -1552,21 +1538,17 @@ void type_setup(PlatformTarget *target)
 	create_type_cache(type_void);
 	type_void->type_cache[0] = &t.voidstar;
 	t.voidstar.pointer = type_void;
-	type_create("any", &t.any, TYPE_ANY, 1, 1, 1);
-	type_init("any*", &t.anyptr, TYPE_ANYPTR, target->width_pointer * 2, target->align_pointer);
-	create_type_cache(type_any);
-	type_any->type_cache[0] = &t.anyptr;
-	t.anyptr.pointer = type_any;
+	type_create("any", &t.any, TYPE_ANY, target->width_pointer * 2, target->align_pointer.align, target->align_pointer.pref_align);
 
 	type_create_alias("usz", &t.usz, type_int_unsigned_by_bitsize(target->width_pointer));
 	type_create_alias("isz", &t.isz, type_int_signed_by_bitsize(target->width_pointer));
 	type_create_alias("uptr", &t.uptr, type_int_unsigned_by_bitsize(target->width_pointer));
 	type_create_alias("iptr", &t.iptr, type_int_signed_by_bitsize(target->width_pointer));
 
-	alignment_subarray = MAX(type_abi_alignment(&t.voidstar), type_abi_alignment(t.usz.canonical));
-	size_subarray = (unsigned)(alignment_subarray * 2);
+	alignment_slice = MAX(type_abi_alignment(&t.voidstar), type_abi_alignment(t.usz.canonical));
+	size_slice = (unsigned)(alignment_slice * 2);
 	type_init("anyfault", &t.anyfault, TYPE_ANYFAULT, target->width_pointer, target->align_pointer);
-	type_chars = type_get_subarray(type_char);
+	type_chars = type_get_slice(type_char);
 	type_wildcard_optional = type_get_optional(type_wildcard);
 	Decl *string_decl = decl_new_with_type(symtab_preset("String", TOKEN_TYPE_IDENT), INVALID_SPAN, DECL_DISTINCT);
 	string_decl->extname = string_decl->name;
@@ -1588,6 +1570,7 @@ int type_kind_bitsize(TypeKind kind)
 		case TYPE_I16:
 		case TYPE_U16:
 		case TYPE_F16:
+		case TYPE_BF16:
 			return 16;
 		case TYPE_I32:
 		case TYPE_U32:
@@ -1611,18 +1594,16 @@ bool type_is_scalar(Type *type)
 	switch (type->type_kind)
 	{
 		case CT_TYPES:
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
 			UNREACHABLE
 		case TYPE_VOID:
 		case TYPE_FUNC:
 		case TYPE_STRUCT:
 		case TYPE_UNION:
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_VECTOR:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
+		case TYPE_INTERFACE:
+		case TYPE_ANY:
 		case TYPE_FLEXIBLE_ARRAY:
 			return false;
 		case TYPE_BOOL:
@@ -1705,6 +1686,8 @@ Type *type_from_token(TokenType type)
 			return type_char;
 		case TOKEN_FLOAT16:
 			return type_float16;
+		case TOKEN_BFLOAT:
+			return type_bfloat;
 		case TOKEN_DOUBLE:
 			return type_double;
 		case TOKEN_FLOAT:
@@ -1887,7 +1870,7 @@ bool type_may_have_method(Type *type)
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_INFERRED_VECTOR:
 		case TYPE_FLEXIBLE_ARRAY:
@@ -1907,8 +1890,6 @@ bool type_may_have_method(Type *type)
 		case TYPE_TYPEINFO:
 		case TYPE_MEMBER:
 		case TYPE_WILDCARD:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
 			return false;
 	}
 	UNREACHABLE
@@ -1925,7 +1906,7 @@ bool type_may_have_sub_elements(Type *type)
 		case TYPE_ENUM:
 		case TYPE_FAULTTYPE:
 		case TYPE_BITSTRUCT:
-		case TYPE_INFPTR:
+		case TYPE_INTERFACE:
 			return true;
 		default:
 			return false;
@@ -1947,6 +1928,7 @@ Type *type_find_max_num_type(Type *num_type, Type *other_num)
 	{
 		switch (other_kind)
 		{
+			case TYPE_BF16:
 			case TYPE_F16:
 			case TYPE_F32:
 			case TYPE_F64:
@@ -1995,15 +1977,15 @@ Type *type_find_max_num_type(Type *num_type, Type *other_num)
  */
 static inline Type *type_find_max_ptr_type(Type *type, Type *other)
 {
-	// Subarray and vararray can implicitly convert to a pointer.
-	if (other->type_kind == TYPE_SUBARRAY)
+	// Slice and vararray can implicitly convert to a pointer.
+	if (other->type_kind == TYPE_SLICE)
 	{
 		Type *max_type = type_find_max_type(type->pointer, other->pointer);
 		if (!max_type) return NULL;
 		return type_get_ptr(max_type);
 	}
 
-	// Neither subarray, vararray nor pointer? Then no max
+	// Neither slice, vararray nor pointer? Then no max
 	if (other->type_kind != TYPE_POINTER) return NULL;
 
 	Type* other_pointer_type = other->pointer;
@@ -2087,9 +2069,6 @@ Type *type_find_max_type(Type *type, Type *other)
 		case TYPE_OPTIONAL:
 		case TYPE_WILDCARD:
 			UNREACHABLE
-		case TYPE_INTERFACE:
-		case TYPE_ANY:
-			return NULL;
 		case TYPE_VOID:
 		case TYPE_BOOL:
 		case TYPE_TYPEINFO:
@@ -2105,18 +2084,18 @@ Type *type_find_max_type(Type *type, Type *other)
 			if (other->type_kind == TYPE_DISTINCT && type_is_float(other->decl->distinct->type)) return other;
 			if (other->type_kind == TYPE_VECTOR) return other;
 			return type_find_max_num_type(type, other);
-		case TYPE_ANYPTR:
+		case TYPE_ANY:
 			// any + interface => any
 			if (other == type_voidptr) return other;
-			return other->type_kind == TYPE_INFPTR ? type : NULL;
-		case TYPE_INFPTR:
+			return other->type_kind == TYPE_INTERFACE ? type : NULL;
+		case TYPE_INTERFACE:
 			// interface + void* => void*
 			return other == type_voidptr ? type_voidptr : NULL;
 		case TYPE_POINTER:
 			if (type->pointer->type_kind == TYPE_ARRAY)
 			{
 				Type *array_base = type->pointer->array.base->canonical;
-				if (other->type_kind == TYPE_SUBARRAY &&
+				if (other->type_kind == TYPE_SLICE &&
 					array_base == other->array.base->canonical)
 				{
 					return other;
@@ -2126,14 +2105,14 @@ Type *type_find_max_type(Type *type, Type *other)
 					Type *other_pointer = other->pointer;
 					if (other_pointer->type_kind == TYPE_ARRAY && other_pointer->array.base->canonical == array_base)
 					{
-						return type_get_subarray(array_base);
+						return type_get_slice(array_base);
 					}
 				}
 			}
 			if (type->pointer->type_kind == TYPE_VECTOR)
 			{
 				Type *vector_base = type->pointer->array.base->canonical;
-				if (other->type_kind == TYPE_SUBARRAY && vector_base == other->array.base->canonical)
+				if (other->type_kind == TYPE_SLICE && vector_base == other->array.base->canonical)
 				{
 					return other;
 				}
@@ -2161,7 +2140,7 @@ Type *type_find_max_type(Type *type, Type *other)
 			if (other->type_kind == TYPE_ARRAY) return other;
 			if (other->type_kind == TYPE_VECTOR) return other;
 			if (other->type_kind == TYPE_STRUCT) return other;
-			if (other->type_kind == TYPE_SUBARRAY) return other;
+			if (other->type_kind == TYPE_SLICE) return other;
 			return NULL;
 		case TYPE_UNION:
 		case TYPE_STRUCT:
@@ -2178,10 +2157,10 @@ Type *type_find_max_type(Type *type, Type *other)
 			// distinct + any other type => no
 			return NULL;
 		case TYPE_ARRAY:
-			// array + [subarray, other array, vector] => no
+			// array + [slice, other array, vector] => no
 			return NULL;
-		case TYPE_SUBARRAY:
-			// subarray + [other subarray, vector] => no
+		case TYPE_SLICE:
+			// slice + [other slice, vector] => no
 			return NULL;
 		case TYPE_VECTOR:
 			// No implicit conversion between vectors
@@ -2271,8 +2250,6 @@ unsigned type_get_introspection_kind(TypeKind kind)
 		case TYPE_TYPEID:
 			return INTROSPECT_TYPE_TYPEID;
 		case TYPE_POINTER:
-		case TYPE_ANYPTR:
-		case TYPE_INFPTR:
 			return INTROSPECT_TYPE_POINTER;
 		case TYPE_ENUM:
 			return INTROSPECT_TYPE_ENUM;
@@ -2294,8 +2271,8 @@ unsigned type_get_introspection_kind(TypeKind kind)
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
 			return INTROSPECT_TYPE_ARRAY;
-		case TYPE_SUBARRAY:
-			return INTROSPECT_TYPE_SUBARRAY;
+		case TYPE_SLICE:
+			return INTROSPECT_TYPE_SLICE;
 		case TYPE_VECTOR:
 		case TYPE_INFERRED_VECTOR:
 			return INTROSPECT_TYPE_VECTOR;
@@ -2322,12 +2299,10 @@ Module *type_base_module(Type *type)
 		case ALL_FLOATS:
 		case TYPE_BOOL:
 		case TYPE_ANY:
-		case TYPE_ANYPTR:
 		case TYPE_ANYFAULT:
 		case TYPE_TYPEID:
 		case TYPE_WILDCARD:
 			return NULL;
-		case TYPE_INFPTR:
 		case TYPE_POINTER:
 			type = type->pointer;
 			goto RETRY;
@@ -2345,7 +2320,7 @@ Module *type_base_module(Type *type)
 			type = type->canonical;
 			goto RETRY;
 		case TYPE_ARRAY:
-		case TYPE_SUBARRAY:
+		case TYPE_SLICE:
 		case TYPE_INFERRED_ARRAY:
 		case TYPE_FLEXIBLE_ARRAY:
 		case TYPE_VECTOR:
diff --git a/src/utils/file_utils.c b/src/utils/file_utils.c
index 75869e48e..70797f96a 100644
--- a/src/utils/file_utils.c
+++ b/src/utils/file_utils.c
@@ -38,7 +38,7 @@
 
 uint16_t *win_utf8to16(const char *value UNUSED)
 {
-#if (_MSC_VER)
+#if PLATFORM_WINDOWS
 	size_t len = strlen(value);
 	int needed = MultiByteToWideChar(CP_UTF8, 0, value, len + 1, NULL, 0);
 	if (needed <= 0)
@@ -59,7 +59,7 @@ uint16_t *win_utf8to16(const char *value UNUSED)
 #include <wchar.h>
 char *win_utf16to8(const uint16_t *wname UNUSED)
 {
-#if (_MSC_VER)
+#if PLATFORM_WINDOWS
 	size_t len = wcslen(wname);
 	int needed = WideCharToMultiByte(CP_UTF8, 0, wname, len + 1, NULL, 0, NULL, NULL);
 	if (needed <= 0)
diff --git a/src/utils/find_msvc.c b/src/utils/find_msvc.c
index c8381cc38..24706a032 100644
--- a/src/utils/find_msvc.c
+++ b/src/utils/find_msvc.c
@@ -9,6 +9,13 @@
 #include <stdbool.h>
 #include <io.h>         // For _get_osfhandle
 
+void free_windows_link_paths(WindowsSDK* obj)
+{
+	free(obj->vs_library_path);
+	free(obj->windows_sdk_ucrt_library_path);
+	free(obj->windows_sdk_um_library_path);
+}
+
 typedef struct
 {
   int windows_sdk_version;   // Zero if no Windows SDK found.
@@ -22,64 +29,25 @@ typedef struct
   wchar_t* vs_library_path;
 } Find_Result;
 
+
 Find_Result find_visual_studio_and_windows_sdk();
 void free_resources(Find_Result* result);
 
-WindowsSDK get_windows_link_paths() {
-  Find_Result paths = find_visual_studio_and_windows_sdk();
-
-  WindowsSDK out = { 0 };
-
-  // note: WideCharToMultiByte doesn't seem to do null termination.
-  // I'm wary of manually adding a null terminator, so hopefully this is reliable.
-  // This wouldn't be a problem if windows used UTF-8 like the rest of the world >:(
-  out.windows_sdk_um_library_path = (char*)ccalloc(MAX_PATH, 1);
-  out.windows_sdk_ucrt_library_path = (char*)ccalloc(MAX_PATH, 1);
-  out.vs_library_path = (char*)ccalloc(MAX_PATH, 1);
-
-  int um_len = wcslen(paths.windows_sdk_um_library_path);
-  WideCharToMultiByte(
-	CP_UTF8,                          // UTF-8
-	0,                                // config flags- I don't think we need these
-	paths.windows_sdk_um_library_path,// in
-	um_len,                           // in len
-	out.windows_sdk_um_library_path,  // out
-	MAX_PATH,                         // out len
-	NULL,
-	NULL
-  );
-  int ucrt_len = wcslen(paths.windows_sdk_ucrt_library_path);
-  WideCharToMultiByte(
-	CP_UTF8,
-	0,
-	paths.windows_sdk_ucrt_library_path,
-	ucrt_len,
-	out.windows_sdk_ucrt_library_path,
-	MAX_PATH,
-	NULL,
-	NULL
-  );
-  int vsl_len = wcslen(paths.vs_library_path);
-  WideCharToMultiByte(
-	CP_UTF8,
-	0,
-	paths.vs_library_path,
-	vsl_len,
-	out.vs_library_path,
-	MAX_PATH,
-	NULL,
-	NULL
-  );
-
-  free_resources(&paths);
-  return out;
+WindowsSDK get_windows_link_paths()
+{
+	Find_Result paths = find_visual_studio_and_windows_sdk();
+	WindowsSDK out = { 0 };
+
+	// note: WideCharToMultiByte doesn't seem to do null termination.
+    // I'm wary of manually adding a null terminator, so hopefully this is reliable.
+	// This wouldn't be a problem if windows used UTF-8 like the rest of the world >:(
+	out.windows_sdk_um_library_path = win_utf16to8(paths.windows_sdk_um_library_path);
+	out.windows_sdk_ucrt_library_path = win_utf16to8(paths.windows_sdk_ucrt_library_path);
+	out.vs_library_path = win_utf16to8(paths.vs_library_path);
+	free_resources(&paths);
+	return out;
 }
 
-void free_windows_link_paths(WindowsSDK* obj) {
-  free(obj->vs_library_path);
-  free(obj->windows_sdk_ucrt_library_path);
-  free(obj->windows_sdk_um_library_path);
-}
 
 // Everything past here is taken from microsoft_craziness.h:
 // https://gist.github.com/ActuallyaDeviloper/cd25b190743234d58079d6b08a8631e3
@@ -115,63 +83,63 @@ void free_resources(Find_Result* result) {
 #define INTERFACE ISetupInstance
 DECLARE_INTERFACE_(ISetupInstance, IUnknown)
 {
-  BEGIN_INTERFACE
+	BEGIN_INTERFACE
 
 	// IUnknown methods
 	STDMETHOD(QueryInterface)   (THIS_  REFIID, void**) PURE;
-  STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
-  STDMETHOD_(ULONG, Release)   (THIS) PURE;
-
-  // ISetupInstance methods
-  STDMETHOD(GetInstanceId)(THIS_ _Out_ BSTR * pbstrInstanceId) PURE;
-  STDMETHOD(GetInstallDate)(THIS_ _Out_ LPFILETIME pInstallDate) PURE;
-  STDMETHOD(GetInstallationName)(THIS_ _Out_ BSTR * pbstrInstallationName) PURE;
-  STDMETHOD(GetInstallationPath)(THIS_ _Out_ BSTR * pbstrInstallationPath) PURE;
-  STDMETHOD(GetInstallationVersion)(THIS_ _Out_ BSTR * pbstrInstallationVersion) PURE;
-  STDMETHOD(GetDisplayName)(THIS_ _In_ LCID lcid, _Out_ BSTR * pbstrDisplayName) PURE;
-  STDMETHOD(GetDescription)(THIS_ _In_ LCID lcid, _Out_ BSTR * pbstrDescription) PURE;
-  STDMETHOD(ResolvePath)(THIS_ _In_opt_z_ LPCOLESTR pwszRelativePath, _Out_ BSTR * pbstrAbsolutePath) PURE;
-
-  END_INTERFACE
+    STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
+    STDMETHOD_(ULONG, Release)   (THIS) PURE;
+
+    // ISetupInstance methods
+    STDMETHOD(GetInstanceId)(THIS_ _Out_ BSTR * pbstrInstanceId) PURE;
+    STDMETHOD(GetInstallDate)(THIS_ _Out_ LPFILETIME pInstallDate) PURE;
+    STDMETHOD(GetInstallationName)(THIS_ _Out_ BSTR * pbstrInstallationName) PURE;
+    STDMETHOD(GetInstallationPath)(THIS_ _Out_ BSTR * pbstrInstallationPath) PURE;
+    STDMETHOD(GetInstallationVersion)(THIS_ _Out_ BSTR * pbstrInstallationVersion) PURE;
+    STDMETHOD(GetDisplayName)(THIS_ _In_ LCID lcid, _Out_ BSTR * pbstrDisplayName) PURE;
+    STDMETHOD(GetDescription)(THIS_ _In_ LCID lcid, _Out_ BSTR * pbstrDescription) PURE;
+    STDMETHOD(ResolvePath)(THIS_ _In_opt_z_ LPCOLESTR pwszRelativePath, _Out_ BSTR * pbstrAbsolutePath) PURE;
+
+	END_INTERFACE
 };
 
 #undef  INTERFACE
 #define INTERFACE IEnumSetupInstances
 DECLARE_INTERFACE_(IEnumSetupInstances, IUnknown)
 {
-  BEGIN_INTERFACE
+	BEGIN_INTERFACE
 
 	// IUnknown methods
 	STDMETHOD(QueryInterface)   (THIS_  REFIID, void**) PURE;
-  STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
-  STDMETHOD_(ULONG, Release)   (THIS) PURE;
+	STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
+	STDMETHOD_(ULONG, Release)   (THIS) PURE;
 
-  // IEnumSetupInstances methods
-  STDMETHOD(Next)(THIS_ _In_ ULONG celt, _Out_writes_to_(celt, *pceltFetched) ISetupInstance * *rgelt, _Out_opt_ _Deref_out_range_(0, celt) ULONG * pceltFetched) PURE;
-  STDMETHOD(Skip)(THIS_ _In_ ULONG celt) PURE;
-  STDMETHOD(Reset)(THIS) PURE;
-  STDMETHOD(Clone)(THIS_ _Deref_out_opt_ IEnumSetupInstances * *ppenum) PURE;
+	// IEnumSetupInstances methods
+	STDMETHOD(Next)(THIS_ _In_ ULONG celt, _Out_writes_to_(celt, *pceltFetched) ISetupInstance * *rgelt, _Out_opt_ _Deref_out_range_(0, celt) ULONG * pceltFetched) PURE;
+	STDMETHOD(Skip)(THIS_ _In_ ULONG celt) PURE;
+	STDMETHOD(Reset)(THIS) PURE;
+	STDMETHOD(Clone)(THIS_ _Deref_out_opt_ IEnumSetupInstances * *ppenum) PURE;
 
-  END_INTERFACE
+	END_INTERFACE
 };
 
 #undef  INTERFACE
 #define INTERFACE ISetupConfiguration
 DECLARE_INTERFACE_(ISetupConfiguration, IUnknown)
 {
-  BEGIN_INTERFACE
+	BEGIN_INTERFACE
 
 	// IUnknown methods
 	STDMETHOD(QueryInterface)   (THIS_  REFIID, void**) PURE;
-  STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
-  STDMETHOD_(ULONG, Release)   (THIS) PURE;
+	STDMETHOD_(ULONG, AddRef)    (THIS) PURE;
+	STDMETHOD_(ULONG, Release)   (THIS) PURE;
 
-  // ISetupConfiguration methods
-  STDMETHOD(EnumInstances)(THIS_ _Out_ IEnumSetupInstances * *ppEnumInstances) PURE;
-  STDMETHOD(GetInstanceForCurrentProcess)(THIS_ _Out_ ISetupInstance * *ppInstance) PURE;
-  STDMETHOD(GetInstanceForPath)(THIS_ _In_z_ LPCWSTR wzPath, _Out_ ISetupInstance * *ppInstance) PURE;
+	// ISetupConfiguration methods
+	STDMETHOD(EnumInstances)(THIS_ _Out_ IEnumSetupInstances * *ppEnumInstances) PURE;
+	STDMETHOD(GetInstanceForCurrentProcess)(THIS_ _Out_ ISetupInstance * *ppInstance) PURE;
+	STDMETHOD(GetInstanceForPath)(THIS_ _In_z_ LPCWSTR wzPath, _Out_ ISetupInstance * *ppInstance) PURE;
 
-  END_INTERFACE
+    END_INTERFACE
 };
 
 #define CALL_STDMETHOD(object, method, ...) object->lpVtbl->method(object, __VA_ARGS__)
@@ -182,14 +150,15 @@ typedef struct {
   wchar_t* best_name;
 } Version_Data;
 
-bool os_file_exists(wchar_t* name) {
-  // @Robustness: What flags do we really want to check here?
+bool os_file_exists(wchar_t* name)
+{
+	// @Robustness: What flags do we really want to check here?
 
-  DWORD attrib = GetFileAttributesW(name);
-  if (attrib == INVALID_FILE_ATTRIBUTES) return false;
-  if (attrib & FILE_ATTRIBUTE_DIRECTORY) return false;
+	DWORD attrib = GetFileAttributesW(name);
+	if (attrib == INVALID_FILE_ATTRIBUTES) return false;
+	if (attrib & FILE_ATTRIBUTE_DIRECTORY) return false;
 
-  return true;
+	return true;
 }
 
 #define concat2(a, b) concat(a, b, NULL, NULL)
@@ -222,221 +191,230 @@ wchar_t* concat(wchar_t* a, wchar_t* b, wchar_t* c, wchar_t* d) {
 }
 
 typedef void (*Visit_Proc_W)(wchar_t* short_name, wchar_t* full_name, Version_Data* data);
-bool visit_files_w(wchar_t* dir_name, Version_Data* data, Visit_Proc_W proc) {
+bool visit_files_w(wchar_t* dir_name, Version_Data* data, Visit_Proc_W proc)
+{
 
-  // Visit everything in one folder (non-recursively). If it's a directory
-  // that doesn't start with ".", call the visit proc on it. The visit proc
-  // will see if the filename conforms to the expected versioning pattern.
+	// Visit everything in one folder (non-recursively). If it's a directory
+	// that doesn't start with ".", call the visit proc on it. The visit proc
+	// will see if the filename conforms to the expected versioning pattern.
 
-  WIN32_FIND_DATAW find_data;
+	WIN32_FIND_DATAW find_data;
 
-  wchar_t* wildcard_name = concat2(dir_name, L"\\*");
-  HANDLE handle = FindFirstFileW(wildcard_name, &find_data);
-  free(wildcard_name);
+	wchar_t* wildcard_name = concat2(dir_name, L"\\*");
+	HANDLE handle = FindFirstFileW(wildcard_name, &find_data);
+	free(wildcard_name);
 
-  if (handle == INVALID_HANDLE_VALUE) return false;
+	if (handle == INVALID_HANDLE_VALUE) return false;
 
-  while (true) {
-	if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (find_data.cFileName[0] != '.')) {
-	  wchar_t* full_name = concat3(dir_name, L"\\", find_data.cFileName);
-	  proc(find_data.cFileName, full_name, data);
-	  free(full_name);
-	}
+	while (true)
+	{
+		if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (find_data.cFileName[0] != '.'))
+		{
+			wchar_t* full_name = concat3(dir_name, L"\\", find_data.cFileName);
+			proc(find_data.cFileName, full_name, data);
+			free(full_name);
+		}
 
-	BOOL success = FindNextFileW(handle, &find_data);
-	if (!success) break;
-  }
+		BOOL success = FindNextFileW(handle, &find_data);
+		if (!success) break;
+	}
 
-  FindClose(handle);
+	FindClose(handle);
 
-  return true;
+	return true;
 }
 
-wchar_t* find_windows_kit_root_with_key(HKEY key, wchar_t* version) {
-  // Given a key to an already opened registry entry,
-  // get the value stored under the 'version' subkey.
-  // If that's not the right terminology, hey, I never do registry stuff.
+wchar_t* find_windows_kit_root_with_key(HKEY key, wchar_t* version)
+{
+	// Given a key to an already opened registry entry,
+	// get the value stored under the 'version' subkey.
+	// If that's not the right terminology, hey, I never do registry stuff.
 
-  DWORD required_length;
-  LSTATUS rc = RegQueryValueExW(key, version, NULL, NULL, NULL, &required_length);
-  if (rc != 0)  return NULL;
+	DWORD required_length;
+	LSTATUS rc = RegQueryValueExW(key, version, NULL, NULL, NULL, &required_length);
+	if (rc != 0)  return NULL;
 
-  DWORD length = required_length + 2;  // The +2 is for the maybe optional zero later on. Probably we are over-allocating.
-  wchar_t* value = (wchar_t*)cmalloc(length);
-  if (!value) return NULL;
+	DWORD length = required_length + 2;  // The +2 is for the maybe optional zero later on. Probably we are over-allocating.
+	wchar_t* value = (wchar_t*)cmalloc(length);
+	if (!value) return NULL;
 
-  rc = RegQueryValueExW(key, version, NULL, NULL, (LPBYTE)value, &required_length);  // We know that version is zero-terminated...
-  if (rc != 0)  return NULL;
+	rc = RegQueryValueExW(key, version, NULL, NULL, (LPBYTE)value, &required_length);  // We know that version is zero-terminated...
+	if (rc != 0)  return NULL;
 
-  // The documentation says that if the string for some reason was not stored
-  // with zero-termination, we need to manually terminate it. Sigh!!
+	// The documentation says that if the string for some reason was not stored
+	// with zero-termination, we need to manually terminate it. Sigh!!
 
-  value[required_length / 2] = 0;
+	value[required_length / 2] = 0;
 
-  return value;
+	return value;
 }
 
-void win10_best(wchar_t* short_name, wchar_t* full_name, Version_Data* data) {
-  // Find the Windows 10 subdirectory with the highest version number.
-
-  int i0, i1, i2, i3;
-  int success = swscanf_s(short_name, L"%d.%d.%d.%d", &i0, &i1, &i2, &i3);
-  if (success < 4) return;
-
-  if (i0 < data->best_version[0]) return;
-  else if (i0 == data->best_version[0]) {
-	if (i1 < data->best_version[1]) return;
-	else if (i1 == data->best_version[1]) {
-	  if (i2 < data->best_version[2]) return;
-	  else if (i2 == data->best_version[2]) {
-		if (i3 < data->best_version[3]) return;
-	  }
+void win10_best(wchar_t* short_name, wchar_t* full_name, Version_Data* data)
+{
+	// Find the Windows 10 subdirectory with the highest version number.
+
+	int i0, i1, i2, i3;
+	int success = swscanf_s(short_name, L"%d.%d.%d.%d", &i0, &i1, &i2, &i3);
+	if (success < 4) return;
+
+	if (i0 < data->best_version[0]) return;
+	else if (i0 == data->best_version[0]) {
+		if (i1 < data->best_version[1]) return;
+		else if (i1 == data->best_version[1]) {
+		  if (i2 < data->best_version[2]) return;
+		  else if (i2 == data->best_version[2]) {
+			if (i3 < data->best_version[3]) return;
+		  }
+		}
 	}
-  }
-
-  // we have to copy_string and free here because visit_files free's the full_name string
-  // after we execute this function, so Win*_Data would contain an invalid pointer.
-  if (data->best_name) free(data->best_name);
-  data->best_name = _wcsdup(full_name);
-
-  if (data->best_name) {
-	data->best_version[0] = i0;
-	data->best_version[1] = i1;
-	data->best_version[2] = i2;
-	data->best_version[3] = i3;
-  }
-}
-
-void win8_best(wchar_t* short_name, wchar_t* full_name, Version_Data* data) {
-  // Find the Windows 8 subdirectory with the highest version number.
-
-  int i0, i1;
-  int success = swscanf_s(short_name, L"winv%d.%d", &i0, &i1);
-  if (success < 2) return;
-
-  if (i0 < data->best_version[0]) return;
-  else if (i0 == data->best_version[0]) {
-	if (i1 < data->best_version[1]) return;
-  }
-
-  // we have to copy_string and free here because visit_files free's the full_name string
-  // after we execute this function, so Win*_Data would contain an invalid pointer.
-  if (data->best_name) free(data->best_name);
-  data->best_name = _wcsdup(full_name);
 
-  if (data->best_name) {
-	data->best_version[0] = i0;
-	data->best_version[1] = i1;
-  }
+	// we have to copy_string and free here because visit_files free's the full_name string
+	// after we execute this function, so Win*_Data would contain an invalid pointer.
+	if (data->best_name) free(data->best_name);
+	data->best_name = _wcsdup(full_name);
+
+	if (data->best_name)
+	{
+		data->best_version[0] = i0;
+		data->best_version[1] = i1;
+		data->best_version[2] = i2;
+		data->best_version[3] = i3;
+	}
 }
 
-void find_windows_kit_root(Find_Result* result) {
-  // Information about the Windows 10 and Windows 8 development kits
-  // is stored in the same place in the registry. We open a key
-  // to that place, first checking preferntially for a Windows 10 kit,
-  // then, if that's not found, a Windows 8 kit.
-
-  HKEY main_key;
-
-  LSTATUS rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
-	0, KEY_QUERY_VALUE | KEY_WOW64_32KEY | KEY_ENUMERATE_SUB_KEYS, &main_key);
-  if (rc != S_OK) return;
-
-  // Look for a Windows 10 entry.
-  wchar_t* windows10_root = find_windows_kit_root_with_key(main_key, L"KitsRoot10");
+void win8_best(wchar_t* short_name, wchar_t* full_name, Version_Data* data)
+{
+	// Find the Windows 8 subdirectory with the highest version number.
 
-  if (windows10_root) {
-	wchar_t* windows10_lib = concat2(windows10_root, L"Lib");
-	free(windows10_root);
+	int i0, i1;
+	int success = swscanf_s(short_name, L"winv%d.%d", &i0, &i1);
+	if (success < 2) return;
 
-	Version_Data data = { 0 };
-	visit_files_w(windows10_lib, &data, win10_best);
-	free(windows10_lib);
+	if (i0 < data->best_version[0]) return;
 
-	if (data.best_name) {
-	  result->windows_sdk_version = 10;
-	  result->windows_sdk_root = data.best_name;
-	  RegCloseKey(main_key);
-	  return;
+	if (i0 == data->best_version[0])
+	{
+		if (i1 < data->best_version[1]) return;
 	}
-  }
 
-  // Look for a Windows 8 entry.
-  wchar_t* windows8_root = find_windows_kit_root_with_key(main_key, L"KitsRoot81");
+	// we have to copy_string and free here because visit_files free's the full_name string
+	// after we execute this function, so Win*_Data would contain an invalid pointer.
+	if (data->best_name) free(data->best_name);
+	data->best_name = _wcsdup(full_name);
 
-  if (windows8_root) {
-	wchar_t* windows8_lib = concat2(windows8_root, L"Lib");
-	free(windows8_root);
+	if (data->best_name)
+	{
+		data->best_version[0] = i0;
+		data->best_version[1] = i1;
+	}
+}
 
-	Version_Data data = { 0 };
-	visit_files_w(windows8_lib, &data, win8_best);
-	free(windows8_lib);
+void find_windows_kit_root(Find_Result* result)
+{
+	// Information about the Windows 10 and Windows 8 development kits
+	// is stored in the same place in the registry. We open a key
+	// to that place, first checking preferntially for a Windows 10 kit,
+	// then, if that's not found, a Windows 8 kit.
+
+	HKEY main_key;
+	LSTATUS rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
+		0, KEY_QUERY_VALUE | KEY_WOW64_32KEY | KEY_ENUMERATE_SUB_KEYS, &main_key);
+	if (rc != S_OK) return;
+
+	// Look for a Windows 10 entry.
+	wchar_t* windows10_root = find_windows_kit_root_with_key(main_key, L"KitsRoot10");
+
+	if (windows10_root) {
+		wchar_t* windows10_lib = concat2(windows10_root, L"Lib");
+		free(windows10_root);
+
+		Version_Data data = { 0 };
+		visit_files_w(windows10_lib, &data, win10_best);
+		free(windows10_lib);
+
+		if (data.best_name) {
+		  result->windows_sdk_version = 10;
+		  result->windows_sdk_root = data.best_name;
+		  RegCloseKey(main_key);
+		  return;
+		}
+	}
 
-	if (data.best_name) {
-	  result->windows_sdk_version = 8;
-	  result->windows_sdk_root = data.best_name;
-	  RegCloseKey(main_key);
-	  return;
+	// Look for a Windows 8 entry.
+	wchar_t* windows8_root = find_windows_kit_root_with_key(main_key, L"KitsRoot81");
+
+	if (windows8_root)
+	{
+		wchar_t* windows8_lib = concat2(windows8_root, L"Lib");
+		free(windows8_root);
+
+		Version_Data data = { 0 };
+		visit_files_w(windows8_lib, &data, win8_best);
+		free(windows8_lib);
+
+		if (data.best_name)
+		{
+			result->windows_sdk_version = 8;
+			result->windows_sdk_root = data.best_name;
+			RegCloseKey(main_key);
+			return;
+		}
 	}
-  }
 
-  // If we get here, we failed to find anything.
-  RegCloseKey(main_key);
+	// If we get here, we failed to find anything.
+	RegCloseKey(main_key);
 }
 
-bool find_visual_studio_2017_by_fighting_through_microsoft_craziness(Find_Result* result) {
-  HRESULT rc = CoInitialize(NULL);
-  // "Subsequent valid calls return false." So ignore false.
-  // if rc != S_OK  return false;
-
-  GUID my_uid = { 0x42843719, 0xDB4C, 0x46C2, {0x8E, 0x7C, 0x64, 0xF1, 0x81, 0x6E, 0xFD, 0x5B} };
-  GUID CLSID_SetupConfiguration = { 0x177F0C4A, 0x1CD3, 0x4DE7, {0xA3, 0x2C, 0x71, 0xDB, 0xBB, 0x9F, 0xA3, 0x6D} };
-
-  ISetupConfiguration* config = NULL;
-
-  // NOTE(Kalinovcic): This is so stupid... These functions take references, so the code is different for C and C++......
-//#ifdef __cplusplus
-//  HRESULT hr = CoCreateInstance(CLSID_SetupConfiguration, NULL, CLSCTX_INPROC_SERVER, my_uid, (void**)&config);
-//#else
-  HRESULT hr = CoCreateInstance(&CLSID_SetupConfiguration, NULL, CLSCTX_INPROC_SERVER, &my_uid, (void**)&config);
-//#endif
-
-  if (hr != 0)  return false;
-
-  IEnumSetupInstances* instances = NULL;
-  hr = CALL_STDMETHOD(config, EnumInstances, &instances);
-  CALL_STDMETHOD_(config, Release);
-  if (hr != 0)     return false;
-  if (!instances)  return false;
-
-  bool found_visual_studio_2017 = false;
-  while (1) {
-	ULONG found = 0;
-	ISetupInstance* instance = NULL;
-	HRESULT hr = CALL_STDMETHOD(instances, Next, 1, &instance, &found);
-	if (hr != S_OK) break;
-
-	BSTR bstr_inst_path;
-	hr = CALL_STDMETHOD(instance, GetInstallationPath, &bstr_inst_path);
-	CALL_STDMETHOD_(instance, Release);
-	if (hr != S_OK)  continue;
-
-	wchar_t* tools_filename = concat2(bstr_inst_path, L"\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt");
-	SysFreeString(bstr_inst_path);
-
-	FILE* f;
-	errno_t open_result = _wfopen_s(&f, tools_filename, L"rt");
-	free(tools_filename);
-	if (open_result != 0) continue;
-	if (!f) continue;
-
-	LARGE_INTEGER tools_file_size;
-	HANDLE file_handle = (HANDLE)_get_osfhandle(_fileno(f));
-	BOOL success = GetFileSizeEx(file_handle, &tools_file_size);
-	if (!success) {
-	  fclose(f);
-	  continue;
-	}
+bool find_visual_studio_2017_by_fighting_through_microsoft_craziness(Find_Result* result)
+{
+	HRESULT rc = CoInitialize(NULL);
+	// "Subsequent valid calls return false." So ignore false.
+	// if rc != S_OK  return false;
+
+	GUID my_uid = { 0x42843719, 0xDB4C, 0x46C2, {0x8E, 0x7C, 0x64, 0xF1, 0x81, 0x6E, 0xFD, 0x5B} };
+	GUID CLSID_SetupConfiguration = { 0x177F0C4A, 0x1CD3, 0x4DE7, {0xA3, 0x2C, 0x71, 0xDB, 0xBB, 0x9F, 0xA3, 0x6D} };
+
+	ISetupConfiguration* config = NULL;
+
+	HRESULT hr = CoCreateInstance(&CLSID_SetupConfiguration, NULL, CLSCTX_INPROC_SERVER, &my_uid, (void**)&config);
+
+    if (hr != 0)  return false;
+
+    IEnumSetupInstances* instances = NULL;
+    hr = CALL_STDMETHOD(config, EnumInstances, &instances);
+    CALL_STDMETHOD_(config, Release);
+    if (hr != 0)     return false;
+    if (!instances)  return false;
+
+    bool found_visual_studio_2017 = false;
+    while (1)
+	{
+		ULONG found = 0;
+		ISetupInstance* instance = NULL;
+		HRESULT hr = CALL_STDMETHOD(instances, Next, 1, &instance, &found);
+		if (hr != S_OK) break;
+
+		BSTR bstr_inst_path;
+		hr = CALL_STDMETHOD(instance, GetInstallationPath, &bstr_inst_path);
+		CALL_STDMETHOD_(instance, Release);
+		if (hr != S_OK)  continue;
+
+		wchar_t* tools_filename = concat2(bstr_inst_path, L"\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt");
+		SysFreeString(bstr_inst_path);
+
+		FILE* f;
+		errno_t open_result = _wfopen_s(&f, tools_filename, L"rt");
+		free(tools_filename);
+		if (open_result != 0) continue;
+		if (!f) continue;
+
+		LARGE_INTEGER tools_file_size;
+		HANDLE file_handle = (HANDLE)_get_osfhandle(_fileno(f));
+		if (!GetFileSizeEx(file_handle, &tools_file_size))
+		{
+			fclose(f);
+			continue;
+		}
 
 	size_t version_length = (size_t)(tools_file_size.QuadPart + 1);  // Warning: This multiplication by 2 presumes there is no variable-length encoding in the wchars (wacky characters in the file could betray this expectation).
 	wchar_t* version = (wchar_t*)cmalloc(version_length * 2);
@@ -551,19 +529,21 @@ void find_visual_studio_by_fighting_through_microsoft_craziness(Find_Result* res
   // If we get here, we failed to find anything.
 }
 
-Find_Result find_visual_studio_and_windows_sdk() {
-  Find_Result result = { 0 };
+Find_Result find_visual_studio_and_windows_sdk()
+{
+	Find_Result result = { 0 };
 
-  find_windows_kit_root(&result);
+	find_windows_kit_root(&result);
 
-  if (result.windows_sdk_root) {
-	result.windows_sdk_um_library_path = concat2(result.windows_sdk_root, L"\\um\\x64");
-	result.windows_sdk_ucrt_library_path = concat2(result.windows_sdk_root, L"\\ucrt\\x64");
-  }
+	if (result.windows_sdk_root)
+	{
+		result.windows_sdk_um_library_path = concat2(result.windows_sdk_root, L"\\um\\x64");
+		result.windows_sdk_ucrt_library_path = concat2(result.windows_sdk_root, L"\\ucrt\\x64");
+	}
 
-  find_visual_studio_by_fighting_through_microsoft_craziness(&result);
+	find_visual_studio_by_fighting_through_microsoft_craziness(&result);
 
-  return result;
+	return result;
 }
 
 #endif //defined(_MSC_VER)
\ No newline at end of file
diff --git a/src/utils/lib.h b/src/utils/lib.h
index 9e762777d..7b0929808 100644
--- a/src/utils/lib.h
+++ b/src/utils/lib.h
@@ -152,6 +152,8 @@ void slice_trim(StringSlice *slice);
 
 void scratch_buffer_clear(void);
 void scratch_buffer_append(const char *string);
+UNUSED char *scratch_buffer_get_quoted(const char *string);
+UNUSED void scratch_buffer_append_quoted(const char *string);
 void scratch_buffer_append_len(const char *string, size_t len);
 void scratch_buffer_append_char(char c);
 void scratch_buffer_append_signed_int(int64_t i);
@@ -322,7 +324,7 @@ static inline void* expand_(void *vec, size_t element_size)
 	for (unsigned foreach_index = 0; foreach_index < foreach_len__; val = foreach_vec__[++foreach_index])
 
 #define FOREACH_BEGIN_IDX(idx__, decl__, vec__) \
-void* CONCAT(foreach_vec_, __LINE__) = (vec__); unsigned CONCAT(foreach_len_, __LINE__) = vec_size(CONCAT(foreach_vec_, __LINE__)); \
+;void* CONCAT(foreach_vec_, __LINE__) = (vec__); unsigned CONCAT(foreach_len_, __LINE__) = vec_size(CONCAT(foreach_vec_, __LINE__)); \
 	for (unsigned idx__ = 0; idx__ < CONCAT(foreach_len_, __LINE__); idx__++) { decl__ = ((void**)CONCAT(foreach_vec_, __LINE__))[idx__];
 #define FOREACH_END() } do {} while (0)
 #define FOREACH_BEGIN(decl__, vec__) FOREACH_BEGIN_IDX(CONCAT(idx__, __LINE__), decl__, vec__)
diff --git a/src/utils/stringutils.c b/src/utils/stringutils.c
index 9cbdd67b7..f00c33d09 100644
--- a/src/utils/stringutils.c
+++ b/src/utils/stringutils.c
@@ -304,6 +304,39 @@ void scratch_buffer_append_len(const char *string, size_t len)
 	scratch_buffer.len += (uint32_t)len;
 }
 
+char *scratch_buffer_get_quoted(const char *string)
+{
+	scratch_buffer_clear();
+	scratch_buffer_append_quoted(string);
+	return scratch_buffer_to_string();
+}
+
+void scratch_buffer_append_quoted(const char *string)
+{
+	char c;
+	while ((c = string++[0]) != '\0')
+	{
+		switch (c)
+		{
+			case '"':
+				scratch_buffer_append("\\\"");
+				continue;
+			case '\\':
+				scratch_buffer_append("\\\\");
+				continue;
+			case '\n':
+				scratch_buffer_append("\\n");
+				continue;
+			case '\'':
+				scratch_buffer_append("\\'");
+				continue;
+			default:
+				scratch_buffer_append_char(c);
+				continue;
+
+		}
+	}
+}
 void scratch_buffer_append(const char *string)
 {
 	scratch_buffer_append_len(string, strlen(string));
diff --git a/src/version.h b/src/version.h
index 7f83ff564..68a0f4c26 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
-#define COMPILER_VERSION "0.5.6"
+#define COMPILER_VERSION "0.6.0"
 #define PRERELEASE 1
\ No newline at end of file
diff --git a/test/test_suite/any/any_in_any.c3t b/test/test_suite/any/any_in_any.c3t
index 5b00671b5..56e828ea1 100644
--- a/test/test_suite/any/any_in_any.c3t
+++ b/test/test_suite/any/any_in_any.c3t
@@ -2,36 +2,36 @@
 module foo;
 fn void main()
 {
-	any* x;
+	any x;
 	x = &x;
 	x = &&(&x);
 	x = &&(&&(&x));
 }
 /* #expect: foo.ll
 
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 @"$ct.any$" = linkonce global %.introspect { i8 7, i64 0, ptr null, i64 16, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
 @"$ct.p$any$" = linkonce global %.introspect { i8 19, i64 0, ptr null, i64 8, i64 ptrtoint (ptr @"$ct.any$" to i64), i64 0, [0 x i64] zeroinitializer }, align 8
 @"$ct.p$p$any$" = linkonce global %.introspect { i8 19, i64 0, ptr null, i64 8, i64 ptrtoint (ptr @"$ct.p$any$" to i64), i64 0, [0 x i64] zeroinitializer }, align 8
 
 define void @foo.main() #0 {
 entry:
-  %x = alloca %"any*", align 8
+  %x = alloca %any, align 8
   %taddr = alloca ptr, align 8
   %taddr1 = alloca ptr, align 8
   %taddr2 = alloca ptr, align 8
-  store %"any*" zeroinitializer, ptr %x, align 8
-  %0 = insertvalue %"any*" undef, ptr %x, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
-  store %"any*" %1, ptr %x, align 8
+  store %any zeroinitializer, ptr %x, align 8
+  %0 = insertvalue %any undef, ptr %x, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
+  store %any %1, ptr %x, align 8
   store ptr %x, ptr %taddr, align 8
-  %2 = insertvalue %"any*" undef, ptr %taddr, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.p$any$" to i64), 1
-  store %"any*" %3, ptr %x, align 8
+  %2 = insertvalue %any undef, ptr %taddr, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.p$any$" to i64), 1
+  store %any %3, ptr %x, align 8
   store ptr %x, ptr %taddr1, align 8
   store ptr %taddr1, ptr %taddr2, align 8
-  %4 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.p$p$any$" to i64), 1
-  store %"any*" %5, ptr %x, align 8
+  %4 = insertvalue %any undef, ptr %taddr2, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.p$p$any$" to i64), 1
+  store %any %5, ptr %x, align 8
   ret void
 }
diff --git a/test/test_suite/any/variant_assign.c3t b/test/test_suite/any/variant_assign.c3t
index 8e709a18b..e6e59e9c0 100644
--- a/test/test_suite/any/variant_assign.c3t
+++ b/test/test_suite/any/variant_assign.c3t
@@ -3,7 +3,7 @@ module foo;
 
 extern fn void printf(char*, ...);
 
-fn void test(any* z)
+fn void test(any z)
 {
     switch (z)
     {
@@ -15,7 +15,7 @@ fn void test(any* z)
             printf("Unknown type.\n");
     }
 }
-fn void test2(any* y)
+fn void test2(any y)
 {
     switch (z = y)
     {
@@ -29,7 +29,7 @@ fn void test2(any* y)
     }
 }
 
-fn void test3(any* y)
+fn void test3(any y)
 {
     switch (z = *y)
     {
@@ -64,7 +64,7 @@ fn int main()
 
 define void @foo.test(i64 %0, ptr %1) #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %switch = alloca i64, align 8
   %z3 = alloca ptr, align 8
   %z11 = alloca ptr, align 8
@@ -145,8 +145,8 @@ switch.exit:                                      ; preds = %switch.default, %sw
 ; Function Attrs:
 define void @foo.test2(i64 %0, ptr %1) #0 {
 entry:
-  %y = alloca %"any*", align 8
-  %.anon = alloca %"any*", align 8
+  %y = alloca %any, align 8
+  %.anon = alloca %any, align 8
   %switch = alloca i64, align 8
   %z = alloca ptr, align 8
   %taddr = alloca i32, align 4
@@ -184,9 +184,9 @@ switch.case:                                      ; preds = %result_block
   %8 = load ptr, ptr %.anon, align 8
   store ptr %8, ptr %z, align 8
   store i32 12, ptr %taddr, align 4
-  %9 = insertvalue %"any*" undef, ptr %taddr, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %10, ptr %y, align 8
+  %9 = insertvalue %any undef, ptr %taddr, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %10, ptr %y, align 8
   %11 = load ptr, ptr %z, align 8
   %12 = load i32, ptr %11, align 4
   call void (ptr, ...) @printf(ptr @.str.3, i32 %12)
@@ -233,8 +233,8 @@ switch.exit:                                      ; preds = %switch.default, %sw
 ; Function Attrs:
 define void @foo.test3(i64 %0, ptr %1) #0 {
 entry:
-  %y = alloca %"any*", align 8
-  %.anon = alloca %"any*", align 8
+  %y = alloca %any, align 8
+  %.anon = alloca %any, align 8
   %switch = alloca i64, align 8
   %z = alloca i32, align 4
   %z10 = alloca double, align 8
@@ -317,91 +317,91 @@ switch.exit:                                      ; preds = %switch.default, %sw
 define i32 @main() #0 {
 entry:
   %taddr = alloca double, align 8
-  %taddr1 = alloca %"any*", align 8
+  %taddr1 = alloca %any, align 8
   %taddr2 = alloca i32, align 4
-  %taddr3 = alloca %"any*", align 8
+  %taddr3 = alloca %any, align 8
   %taddr7 = alloca i8, align 1
-  %taddr8 = alloca %"any*", align 8
+  %taddr8 = alloca %any, align 8
   %taddr12 = alloca double, align 8
-  %taddr13 = alloca %"any*", align 8
+  %taddr13 = alloca %any, align 8
   %taddr17 = alloca i32, align 4
-  %taddr18 = alloca %"any*", align 8
+  %taddr18 = alloca %any, align 8
   %taddr22 = alloca i8, align 1
-  %taddr23 = alloca %"any*", align 8
+  %taddr23 = alloca %any, align 8
   %taddr27 = alloca double, align 8
-  %taddr28 = alloca %"any*", align 8
+  %taddr28 = alloca %any, align 8
   %taddr32 = alloca i32, align 4
-  %taddr33 = alloca %"any*", align 8
+  %taddr33 = alloca %any, align 8
   %taddr37 = alloca i8, align 1
-  %taddr38 = alloca %"any*", align 8
+  %taddr38 = alloca %any, align 8
   store double 1.230000e+02, ptr %taddr, align 8
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %1, ptr %taddr1, align 8
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %1, ptr %taddr1, align 8
   %lo = load i64, ptr %taddr1, align 8
   %ptradd = getelementptr inbounds i8, ptr %taddr1, i64 8
   %hi = load ptr, ptr %ptradd, align 8
   call void @foo.test(i64 %lo, ptr %hi)
   store i32 1, ptr %taddr2, align 4
-  %2 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %taddr3, align 8
+  %2 = insertvalue %any undef, ptr %taddr2, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %taddr3, align 8
   %lo4 = load i64, ptr %taddr3, align 8
   %ptradd5 = getelementptr inbounds i8, ptr %taddr3, i64 8
   %hi6 = load ptr, ptr %ptradd5, align 8
   call void @foo.test(i64 %lo4, ptr %hi6)
   store i8 1, ptr %taddr7, align 1
-  %4 = insertvalue %"any*" undef, ptr %taddr7, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %5, ptr %taddr8, align 8
+  %4 = insertvalue %any undef, ptr %taddr7, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %5, ptr %taddr8, align 8
   %lo9 = load i64, ptr %taddr8, align 8
   %ptradd10 = getelementptr inbounds i8, ptr %taddr8, i64 8
   %hi11 = load ptr, ptr %ptradd10, align 8
   call void @foo.test(i64 %lo9, ptr %hi11)
   store double 1.235000e+02, ptr %taddr12, align 8
-  %6 = insertvalue %"any*" undef, ptr %taddr12, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %7, ptr %taddr13, align 8
+  %6 = insertvalue %any undef, ptr %taddr12, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %7, ptr %taddr13, align 8
   %lo14 = load i64, ptr %taddr13, align 8
   %ptradd15 = getelementptr inbounds i8, ptr %taddr13, i64 8
   %hi16 = load ptr, ptr %ptradd15, align 8
   call void @foo.test2(i64 %lo14, ptr %hi16)
   store i32 1, ptr %taddr17, align 4
-  %8 = insertvalue %"any*" undef, ptr %taddr17, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %9, ptr %taddr18, align 8
+  %8 = insertvalue %any undef, ptr %taddr17, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %9, ptr %taddr18, align 8
   %lo19 = load i64, ptr %taddr18, align 8
   %ptradd20 = getelementptr inbounds i8, ptr %taddr18, i64 8
   %hi21 = load ptr, ptr %ptradd20, align 8
   call void @foo.test2(i64 %lo19, ptr %hi21)
   store i8 1, ptr %taddr22, align 1
-  %10 = insertvalue %"any*" undef, ptr %taddr22, 0
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %11, ptr %taddr23, align 8
+  %10 = insertvalue %any undef, ptr %taddr22, 0
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %11, ptr %taddr23, align 8
   %lo24 = load i64, ptr %taddr23, align 8
   %ptradd25 = getelementptr inbounds i8, ptr %taddr23, i64 8
   %hi26 = load ptr, ptr %ptradd25, align 8
   call void @foo.test2(i64 %lo24, ptr %hi26)
   store double 1.240000e+02, ptr %taddr27, align 8
-  %12 = insertvalue %"any*" undef, ptr %taddr27, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %13, ptr %taddr28, align 8
+  %12 = insertvalue %any undef, ptr %taddr27, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %13, ptr %taddr28, align 8
   %lo29 = load i64, ptr %taddr28, align 8
   %ptradd30 = getelementptr inbounds i8, ptr %taddr28, i64 8
   %hi31 = load ptr, ptr %ptradd30, align 8
   call void @foo.test3(i64 %lo29, ptr %hi31)
   store i32 2, ptr %taddr32, align 4
-  %14 = insertvalue %"any*" undef, ptr %taddr32, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %15, ptr %taddr33, align 8
+  %14 = insertvalue %any undef, ptr %taddr32, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %15, ptr %taddr33, align 8
   %lo34 = load i64, ptr %taddr33, align 8
   %ptradd35 = getelementptr inbounds i8, ptr %taddr33, i64 8
   %hi36 = load ptr, ptr %ptradd35, align 8
   call void @foo.test3(i64 %lo34, ptr %hi36)
   store i8 1, ptr %taddr37, align 1
-  %16 = insertvalue %"any*" undef, ptr %taddr37, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %17, ptr %taddr38, align 8
+  %16 = insertvalue %any undef, ptr %taddr37, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %17, ptr %taddr38, align 8
   %lo39 = load i64, ptr %taddr38, align 8
   %ptradd40 = getelementptr inbounds i8, ptr %taddr38, i64 8
   %hi41 = load ptr, ptr %ptradd40, align 8
diff --git a/test/test_suite/any/variant_switch.c3t b/test/test_suite/any/variant_switch.c3t
index b5d3d95e6..7496d4d2d 100644
--- a/test/test_suite/any/variant_switch.c3t
+++ b/test/test_suite/any/variant_switch.c3t
@@ -3,7 +3,7 @@ module foo;
 
 extern fn void printf(char*, ...);
 
-fn void test(any* z)
+fn void test(any z)
 {
     switch (z)
     {
@@ -36,7 +36,7 @@ fn int main()
 
 define void @foo.test(i64 %0, ptr %1) #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %switch = alloca i64, align 8
   %z3 = alloca ptr, align 8
   %z11 = alloca ptr, align 8
@@ -132,31 +132,31 @@ if.exit:                                          ; preds = %if.then, %switch.ex
 define i32 @main() #0 {
 entry:
   %taddr = alloca double, align 8
-  %taddr1 = alloca %"any*", align 8
+  %taddr1 = alloca %any, align 8
   %taddr2 = alloca i32, align 4
-  %taddr3 = alloca %"any*", align 8
+  %taddr3 = alloca %any, align 8
   %taddr7 = alloca i8, align 1
-  %taddr8 = alloca %"any*", align 8
+  %taddr8 = alloca %any, align 8
   store double 1.230000e+02, ptr %taddr, align 8
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %1, ptr %taddr1, align 8
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %1, ptr %taddr1, align 8
   %lo = load i64, ptr %taddr1, align 8
   %ptradd = getelementptr inbounds i8, ptr %taddr1, i64 8
   %hi = load ptr, ptr %ptradd, align 8
   call void @foo.test(i64 %lo, ptr %hi)
   store i32 1, ptr %taddr2, align 4
-  %2 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %taddr3, align 8
+  %2 = insertvalue %any undef, ptr %taddr2, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %taddr3, align 8
   %lo4 = load i64, ptr %taddr3, align 8
   %ptradd5 = getelementptr inbounds i8, ptr %taddr3, i64 8
   %hi6 = load ptr, ptr %ptradd5, align 8
   call void @foo.test(i64 %lo4, ptr %hi6)
   store i8 1, ptr %taddr7, align 1
-  %4 = insertvalue %"any*" undef, ptr %taddr7, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %5, ptr %taddr8, align 8
+  %4 = insertvalue %any undef, ptr %taddr7, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %5, ptr %taddr8, align 8
   %lo9 = load i64, ptr %taddr8, align 8
   %ptradd10 = getelementptr inbounds i8, ptr %taddr8, i64 8
   %hi11 = load ptr, ptr %ptradd10, align 8
diff --git a/test/test_suite/any/variant_test.c3t b/test/test_suite/any/variant_test.c3t
index 7f9f41db0..dacf55d4f 100644
--- a/test/test_suite/any/variant_test.c3t
+++ b/test/test_suite/any/variant_test.c3t
@@ -2,7 +2,7 @@
 module foo;
 extern fn void printf(char*, ...);
 
-fn void test(any* x)
+fn void test(any x)
 {
     switch (x.type)
     {
@@ -10,7 +10,7 @@ fn void test(any* x)
             printf("Was int\n");
         case double:
             printf("Was double\n");
-        case any*:
+        case any:
             printf("Was variant\n");
         case int*:
             printf("Was int*\n");
@@ -19,7 +19,7 @@ fn void test(any* x)
     }
 }
 
-fn void test_all(any*... y)
+fn void test_all(any... y)
 {
     foreach (element : y)
     {
@@ -29,9 +29,9 @@ fn void test_all(any*... y)
 
 fn void main()
 {
-    any* x = &&1;
+    any x = &&1;
     int z;
-    any* y = &z;
+    any y = &z;
     typeid g = y.type;
     typeid h = x.type;
     if (y.type == int.typeid)
@@ -63,8 +63,8 @@ fn void main()
 
 /* #expect: foo.ll
 
-%"any*" = type { ptr, i64 }
-%"any*[]" = type { ptr, i64 }
+%any = type { ptr, i64 }
+%"any[]" = type { ptr, i64 }
 @"$ct.int" = linkonce global %.introspect { i8 2, i64 0, ptr null, i64 4, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
 @"$ct.double" = linkonce global %.introspect { i8 4, i64 0, ptr null, i64 8, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
 @"$ct.any$" = linkonce global %.introspect { i8 7, i64 0, ptr null, i64 16, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
@@ -73,7 +73,7 @@ fn void main()
 
 define void @foo.test(i64 %0, ptr %1) #0 {
 entry:
-  %x = alloca %"any*", align 8
+  %x = alloca %any, align 8
   %switch = alloca i64, align 8
   store i64 %0, ptr %x, align 8
   %ptradd = getelementptr inbounds i8, ptr %x, i64 8
@@ -190,10 +190,10 @@ switch.exit:                                      ; preds = %switch.default, %sw
 ; Function Attrs:
 define void @foo.test_all(ptr %0, i64 %1) #0 {
 entry:
-  %y = alloca %"any*[]", align 8
+  %y = alloca %"any[]", align 8
   %.anon = alloca i64, align 8
   %.anon2 = alloca i64, align 8
-  %element = alloca %"any*", align 8
+  %element = alloca %any, align 8
   store ptr %0, ptr %y, align 8
   %ptradd = getelementptr inbounds i8, ptr %y, i64 8
   store i64 %1, ptr %ptradd, align 8
@@ -230,30 +230,30 @@ loop.exit:                                        ; preds = %loop.cond
 ; Function Attrs:
 define void @foo.main() #0 {
 entry:
-  %x = alloca %"any*", align 8
+  %x = alloca %any, align 8
   %taddr = alloca i32, align 4
   %z = alloca i32, align 4
-  %y = alloca %"any*", align 8
+  %y = alloca %any, align 8
   %g = alloca i64, align 8
   %h = alloca i64, align 8
   %taddr7 = alloca double, align 8
   %taddr17 = alloca double, align 8
-  %taddr18 = alloca %"any*", align 8
+  %taddr18 = alloca %any, align 8
   %taddr22 = alloca i32, align 4
-  %taddr23 = alloca %"any*", align 8
+  %taddr23 = alloca %any, align 8
   %taddr27 = alloca i8, align 1
-  %taddr28 = alloca %"any*", align 8
+  %taddr28 = alloca %any, align 8
   %df = alloca ptr, align 8
-  %varargslots = alloca [5 x %"any*"], align 16
+  %varargslots = alloca [5 x %any], align 16
   %taddr33 = alloca double, align 8
   store i32 1, ptr %taddr, align 4
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %1, ptr %x, align 8
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %1, ptr %x, align 8
   store i32 0, ptr %z, align 4
-  %2 = insertvalue %"any*" undef, ptr %z, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %y, align 8
+  %2 = insertvalue %any undef, ptr %z, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %y, align 8
   %ptradd = getelementptr inbounds i8, ptr %y, i64 8
   %4 = load i64, ptr %ptradd, align 8
   store i64 %4, ptr %g, align 8
@@ -281,12 +281,12 @@ if.then5:                                         ; preds = %if.exit
 
 if.exit6:                                         ; preds = %if.then5, %if.exit
   store double 1.000000e+00, ptr %taddr7, align 8
-  %8 = insertvalue %"any*" undef, ptr %taddr7, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %9, ptr %y, align 8
-  %10 = insertvalue %"any*" undef, ptr %x, 0
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
-  store %"any*" %11, ptr %x, align 8
+  %8 = insertvalue %any undef, ptr %taddr7, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %9, ptr %y, align 8
+  %10 = insertvalue %any undef, ptr %x, 0
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
+  store %any %11, ptr %x, align 8
   %ptradd8 = getelementptr inbounds i8, ptr %y, i64 8
   %12 = load i64, ptr %ptradd8, align 8
   %eq9 = icmp eq i64 %12, ptrtoint (ptr @"$ct.int" to i64)
@@ -312,25 +312,25 @@ if.exit15:                                        ; preds = %if.then14, %if.exit
   %hi = load ptr, ptr %ptradd16, align 8
   call void @foo.test(i64 %lo, ptr %hi)
   store double 1.000000e+00, ptr %taddr17, align 8
-  %14 = insertvalue %"any*" undef, ptr %taddr17, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.double" to i64), 1
-  store %"any*" %15, ptr %taddr18, align 8
+  %14 = insertvalue %any undef, ptr %taddr17, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  store %any %15, ptr %taddr18, align 8
   %lo19 = load i64, ptr %taddr18, align 8
   %ptradd20 = getelementptr inbounds i8, ptr %taddr18, i64 8
   %hi21 = load ptr, ptr %ptradd20, align 8
   call void @foo.test(i64 %lo19, ptr %hi21)
   store i32 1, ptr %taddr22, align 4
-  %16 = insertvalue %"any*" undef, ptr %taddr22, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %17, ptr %taddr23, align 8
+  %16 = insertvalue %any undef, ptr %taddr22, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %17, ptr %taddr23, align 8
   %lo24 = load i64, ptr %taddr23, align 8
   %ptradd25 = getelementptr inbounds i8, ptr %taddr23, i64 8
   %hi26 = load ptr, ptr %ptradd25, align 8
   call void @foo.test(i64 %lo24, ptr %hi26)
   store i8 1, ptr %taddr27, align 1
-  %18 = insertvalue %"any*" undef, ptr %taddr27, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %19, ptr %taddr28, align 8
+  %18 = insertvalue %any undef, ptr %taddr27, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %19, ptr %taddr28, align 8
   %lo29 = load i64, ptr %taddr28, align 8
   %ptradd30 = getelementptr inbounds i8, ptr %taddr28, i64 8
   %hi31 = load ptr, ptr %ptradd30, align 8
@@ -341,18 +341,18 @@ if.exit15:                                        ; preds = %if.then14, %if.exit
   %ptradd32 = getelementptr inbounds i8, ptr %varargslots, i64 16
   call void @llvm.memcpy.p0.p0.i32(ptr align 16 %ptradd32, ptr align 8 %x, i32 16, i1 false)
   store double 1.000000e+00, ptr %taddr33, align 8
-  %20 = insertvalue %"any*" undef, ptr %taddr33, 0
-  %21 = insertvalue %"any*" %20, i64 ptrtoint (ptr @"$ct.double" to i64), 1
+  %20 = insertvalue %any undef, ptr %taddr33, 0
+  %21 = insertvalue %any %20, i64 ptrtoint (ptr @"$ct.double" to i64), 1
   %ptradd34 = getelementptr inbounds i8, ptr %varargslots, i64 32
-  store %"any*" %21, ptr %ptradd34, align 16
-  %22 = insertvalue %"any*" undef, ptr %x, 0
-  %23 = insertvalue %"any*" %22, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
+  store %any %21, ptr %ptradd34, align 16
+  %22 = insertvalue %any undef, ptr %x, 0
+  %23 = insertvalue %any %22, i64 ptrtoint (ptr @"$ct.any$" to i64), 1
   %ptradd35 = getelementptr inbounds i8, ptr %varargslots, i64 48
-  store %"any*" %23, ptr %ptradd35, align 16
-  %24 = insertvalue %"any*" undef, ptr %df, 0
-  %25 = insertvalue %"any*" %24, i64 ptrtoint (ptr @"$ct.p$int" to i64), 1
+  store %any %23, ptr %ptradd35, align 16
+  %24 = insertvalue %any undef, ptr %df, 0
+  %25 = insertvalue %any %24, i64 ptrtoint (ptr @"$ct.p$int" to i64), 1
   %ptradd36 = getelementptr inbounds i8, ptr %varargslots, i64 64
-  store %"any*" %25, ptr %ptradd36, align 16
+  store %any %25, ptr %ptradd36, align 16
   call void @foo.test_all(ptr %varargslots, i64 5)
   ret void
 }
diff --git a/test/test_suite/arrays/array_struct.c3t b/test/test_suite/arrays/array_struct.c3t
index ea62aa384..d73e0e4d1 100644
--- a/test/test_suite/arrays/array_struct.c3t
+++ b/test/test_suite/arrays/array_struct.c3t
@@ -10,4 +10,4 @@ Foo[10] array @private;
 
 /* #expect: test.ll
 
-@test.array = protected unnamed_addr global [10 x %Foo] zeroinitializer, align 16
\ No newline at end of file
+@test.array = internal unnamed_addr global [10 x %Foo] zeroinitializer, align 16
\ No newline at end of file
diff --git a/test/test_suite/arrays/complex_array_const.c3t b/test/test_suite/arrays/complex_array_const.c3t
index 48eefbe58..fcd12f014 100644
--- a/test/test_suite/arrays/complex_array_const.c3t
+++ b/test/test_suite/arrays/complex_array_const.c3t
@@ -19,4 +19,4 @@ Connection[3] link @private
 @.str = private unnamed_addr constant [6 x i8] c"link1\00", align 1
 @.str.1 = private unnamed_addr constant [6 x i8] c"link2\00", align 1
 @.str.2 = private unnamed_addr constant [6 x i8] c"link3\00", align 1
-@test.link = protected unnamed_addr global [3 x %Connection] [%Connection { i64 1, ptr @.str, i64 10 }, %Connection { i64 2, ptr @.str.1, i64 20 }, %Connection { i64 3, ptr @.str.2, i64 30 }], align 16
+@test.link = internal unnamed_addr global [3 x %Connection] [%Connection { i64 1, ptr @.str, i64 10 }, %Connection { i64 2, ptr @.str.1, i64 20 }, %Connection { i64 3, ptr @.str.2, i64 30 }], align 16
diff --git a/test/test_suite/arrays/global_init.c3t b/test/test_suite/arrays/global_init.c3t
index b44e4ba15..b53eb7097 100644
--- a/test/test_suite/arrays/global_init.c3t
+++ b/test/test_suite/arrays/global_init.c3t
@@ -14,8 +14,8 @@ int *bf3 = &abc[2] + 2;
 
 fn void main() {
 	int *bf34 = (&abc[2] + 2) + 3;
-	static any*[3] x = { &&42, &&'c', &&"for" };
-	any*[3] y = { &&42, &&'c', &&"for" };
+	static any[3] x = { &&42, &&'c', &&"for" };
+	any[3] y = { &&42, &&'c', &&"for" };
 }
 
 /* #expect: test.ll
@@ -33,30 +33,30 @@ fn void main() {
 @.taddr.9 = private global i32 42, align 4
 @.taddr.10 = private global i8 99, align 1
 @.taddr.11 = private global %"char[]" { ptr @.str, i64 3 }, align 8
-@main.x = internal unnamed_addr global [3 x %"any*"] [%"any*" { ptr @.taddr.9, i64 ptrtoint (ptr @"$ct.int" to i64) }, %"any*" { ptr @.taddr.10, i64 ptrtoint (ptr @"$ct.char" to i64) }, %"any*" { ptr @.taddr.11, i64 ptrtoint (ptr @"$ct.String" to i64) }], align 16
+@main.x = internal unnamed_addr global [3 x %any] [%any { ptr @.taddr.9, i64 ptrtoint (ptr @"$ct.int" to i64) }, %any { ptr @.taddr.10, i64 ptrtoint (ptr @"$ct.char" to i64) }, %any { ptr @.taddr.11, i64 ptrtoint (ptr @"$ct.String" to i64) }], align 16
 
 ; Function Attrs:
 define void @test.main() #0 {
 entry:
   %bf34 = alloca ptr, align 8
-  %y = alloca [3 x %"any*"], align 16
+  %y = alloca [3 x %any], align 16
   %taddr = alloca i32, align 4
   %taddr1 = alloca i8, align 1
   %taddr3 = alloca %"char[]", align 8
   store ptr getelementptr (i8, ptr @test.abc, i64 28), ptr %bf34, align 8
   store i32 42, ptr %taddr, align 4
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %1, ptr %y, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %1, ptr %y, align 16
   %ptradd = getelementptr inbounds i8, ptr %y, i64 16
   store i8 99, ptr %taddr1, align 1
-  %2 = insertvalue %"any*" undef, ptr %taddr1, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %3, ptr %ptradd, align 16
+  %2 = insertvalue %any undef, ptr %taddr1, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %3, ptr %ptradd, align 16
   %ptradd2 = getelementptr inbounds i8, ptr %y, i64 32
   store %"char[]" { ptr @.str.12, i64 3 }, ptr %taddr3, align 8
-  %4 = insertvalue %"any*" undef, ptr %taddr3, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %5, ptr %ptradd2, align 16
+  %4 = insertvalue %any undef, ptr %taddr3, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %5, ptr %ptradd2, align 16
   ret void
 }
diff --git a/test/test_suite/assert/assert_with_void.c3 b/test/test_suite/assert/assert_with_void.c3
index b1be829a0..905ffe81d 100644
--- a/test/test_suite/assert/assert_with_void.c3
+++ b/test/test_suite/assert/assert_with_void.c3
@@ -13,7 +13,7 @@ macro deep_print(a)
     var $Type = $typeof(a);
     $switch ($Type.kindof)
         $case ARRAY:
-        $case SUBARRAY:
+        $case SLICE:
             io::print("[");
             foreach (i, x : a)
             {
diff --git a/test/test_suite/assert/assertf.c3t b/test/test_suite/assert/assertf.c3t
index 6038a2d25..fc2f6f43f 100644
--- a/test/test_suite/assert/assertf.c3t
+++ b/test/test_suite/assert/assertf.c3t
@@ -16,8 +16,8 @@ define i64 @main.main() #0 {
 entry:
   %i = alloca i64, align 8
   %taddr = alloca i64, align 8
-  %varargslots = alloca [2 x %"any*"], align 16
-  %indirectarg = alloca %"any*[]", align 8
+  %varargslots = alloca [2 x %any], align 16
+  %indirectarg = alloca %"any[]", align 8
   store i64 0, ptr %i, align 8
   br label %loop.cond
 
@@ -32,20 +32,20 @@ loop.body:                                        ; preds = %loop.cond
   br i1 %neq, label %assert_ok, label %assert_fail
 
 assert_fail:                                      ; preds = %loop.body
-  %2 = insertvalue %"any*" undef, ptr %i, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %2 = insertvalue %any undef, ptr %i, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %4 = load i64, ptr %i, align 8
   %mul = mul i64 %4, 2
   store i64 %mul, ptr %taddr, align 8
-  %5 = insertvalue %"any*" undef, ptr %taddr, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %3, ptr %varargslots, align 16
+  %5 = insertvalue %any undef, ptr %taddr, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %3, ptr %varargslots, align 16
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %6, ptr %ptradd, align 16
-  %7 = insertvalue %"any*[]" undef, ptr %varargslots, 0
-  %"$$temp" = insertvalue %"any*[]" %7, i64 2, 1
-  store %"any*[]" %"$$temp", ptr %indirectarg, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg, i64 10, ptr @.file, i64 10, ptr @.func, i64 4, i32 7, ptr byval(%"any*[]") align 8 %indirectarg)
+  store %any %6, ptr %ptradd, align 16
+  %7 = insertvalue %"any[]" undef, ptr %varargslots, 0
+  %"$$temp" = insertvalue %"any[]" %7, i64 2, 1
+  store %"any[]" %"$$temp", ptr %indirectarg, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg, i64 10, ptr @.file, i64 10, ptr @.func, i64 4, i32 7, ptr byval(%"any[]") align 8 %indirectarg)
   unreachable
 
 assert_ok:                                        ; preds = %loop.body
diff --git a/test/test_suite/assert/unreachable.c3t b/test/test_suite/assert/unreachable.c3t
index f4dc010df..7e2485304 100644
--- a/test/test_suite/assert/unreachable.c3t
+++ b/test/test_suite/assert/unreachable.c3t
@@ -17,7 +17,7 @@ fn void test()
 define void @unreachable.test() #0 {
 entry:
   %x = alloca i32, align 4
-  %indirectarg = alloca %"any*[]", align 8
+  %indirectarg = alloca %"any[]", align 8
   %0 = call i32 @unreachable.foo()
   store i32 %0, ptr %x, align 4
   %1 = load i32, ptr %x, align 4
@@ -28,7 +28,7 @@ if.then:                                          ; preds = %entry
   ret void
 
 if.exit:                                          ; preds = %entry
-  store %"any*[]" zeroinitializer, ptr %indirectarg, align 8
-  call void @std.core.builtin.panicf(ptr @.str, i64 30, ptr @.str.1, i64 14, ptr @.str.2, i64 4, i32 10, ptr byval(%"any*[]") align 8 %indirectarg)
+  store %"any[]" zeroinitializer, ptr %indirectarg, align 8
+  call void @std.core.builtin.panicf(ptr @.str, i64 30, ptr @.str.1, i64 14, ptr @.str.2, i64 4, i32 10, ptr byval(%"any[]") align 8 %indirectarg)
   unreachable
 }
\ No newline at end of file
diff --git a/test/test_suite/assignment/alignment_index.c3t b/test/test_suite/assignment/alignment_index.c3t
new file mode 100644
index 000000000..9685ced18
--- /dev/null
+++ b/test/test_suite/assignment/alignment_index.c3t
@@ -0,0 +1,22 @@
+// #target: windows-x64
+module test;
+int[<2>] foo @align(1);
+
+fn void main()
+{
+	foo[1] = 2;
+	foo.y = 4;
+}
+
+/* #expect: test.ll
+
+@test.foo = local_unnamed_addr global <2 x i32> zeroinitializer, align 1
+
+define void @test.main() #0 {
+entry:
+  %0 = load <2 x i32>, ptr @test.foo, align 1
+  %elemset = insertelement <2 x i32> %0, i32 2, i64 1
+  store <2 x i32> %elemset, ptr @test.foo, align 1
+  store i32 4, ptr getelementptr inbounds (i8, ptr @test.foo, i64 4), align 1
+  ret void
+}
\ No newline at end of file
diff --git a/test/test_suite/assignment/int_assign.c3t b/test/test_suite/assignment/int_assign.c3t
index ac2ec0f2a..a905dece6 100644
--- a/test/test_suite/assignment/int_assign.c3t
+++ b/test/test_suite/assignment/int_assign.c3t
@@ -1,3 +1,4 @@
+// #target: windows-x64
 module test;
 
 fn int foo()
diff --git a/test/test_suite/assignment/var_variable.c3t b/test/test_suite/assignment/var_variable.c3
similarity index 99%
rename from test/test_suite/assignment/var_variable.c3t
rename to test/test_suite/assignment/var_variable.c3
index 1eed2f9b0..89772ea69 100644
--- a/test/test_suite/assignment/var_variable.c3t
+++ b/test/test_suite/assignment/var_variable.c3
@@ -1,7 +1,6 @@
 module test;
 import std::io;
 
-
 macro @foo(;@body)
 {
 	var i = 1.0;
diff --git a/test/test_suite/bitstruct/bitstruct_anon_in_struct_ok.c3t b/test/test_suite/bitstruct/bitstruct_anon_in_struct_ok.c3t
index 5e0b6841c..cf79b500c 100644
--- a/test/test_suite/bitstruct/bitstruct_anon_in_struct_ok.c3t
+++ b/test/test_suite/bitstruct/bitstruct_anon_in_struct_ok.c3t
@@ -31,12 +31,12 @@ fn void main() {
 define void @foo.main() #0 {
 entry:
   %test = alloca %Test, align 2
-  %varargslots = alloca [3 x %"any*"], align 16
+  %varargslots = alloca [3 x %any], align 16
   %taddr = alloca i8, align 1
   %taddr5 = alloca i8, align 1
   %taddr8 = alloca i16, align 2
   %retparam = alloca i64, align 8
-  %varargslots10 = alloca [4 x %"any*"], align 16
+  %varargslots10 = alloca [4 x %any], align 16
   %taddr14 = alloca i8, align 1
   %taddr18 = alloca i8, align 1
   %taddr23 = alloca i8, align 1
@@ -54,25 +54,25 @@ entry:
   %2 = and i16 255, %lshrl
   %trunc = trunc i16 %2 to i8
   store i8 %trunc, ptr %taddr, align 1
-  %3 = insertvalue %"any*" undef, ptr %taddr, 0
-  %4 = insertvalue %"any*" %3, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %4, ptr %varargslots, align 16
+  %3 = insertvalue %any undef, ptr %taddr, 0
+  %4 = insertvalue %any %3, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %4, ptr %varargslots, align 16
   %ptradd3 = getelementptr inbounds i8, ptr %test, i64 2
   %5 = load i16, ptr %ptradd3, align 2
   %6 = and i16 255, %5
   %trunc4 = trunc i16 %6 to i8
   store i8 %trunc4, ptr %taddr5, align 1
-  %7 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %8 = insertvalue %"any*" %7, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  %7 = insertvalue %any undef, ptr %taddr5, 0
+  %8 = insertvalue %any %7, i64 ptrtoint (ptr @"$ct.char" to i64), 1
   %ptradd6 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %8, ptr %ptradd6, align 16
+  store %any %8, ptr %ptradd6, align 16
   %ptradd7 = getelementptr inbounds i8, ptr %test, i64 2
   %9 = load i16, ptr %ptradd7, align 2
   store i16 %9, ptr %taddr8, align 2
-  %10 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
+  %10 = insertvalue %any undef, ptr %taddr8, 0
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
   %ptradd9 = getelementptr inbounds i8, ptr %varargslots, i64 32
-  store %"any*" %11, ptr %ptradd9, align 16
+  store %any %11, ptr %ptradd9, align 16
   %12 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 18, ptr %varargslots, i64 3)
   %ptradd11 = getelementptr inbounds i8, ptr %test, i64 2
   %13 = load i16, ptr %ptradd11, align 2
@@ -80,39 +80,39 @@ entry:
   %14 = and i16 1, %lshrl12
   %trunc13 = trunc i16 %14 to i8
   store i8 %trunc13, ptr %taddr14, align 1
-  %15 = insertvalue %"any*" undef, ptr %taddr14, 0
-  %16 = insertvalue %"any*" %15, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %16, ptr %varargslots10, align 16
+  %15 = insertvalue %any undef, ptr %taddr14, 0
+  %16 = insertvalue %any %15, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %16, ptr %varargslots10, align 16
   %ptradd15 = getelementptr inbounds i8, ptr %test, i64 2
   %17 = load i16, ptr %ptradd15, align 2
   %lshrl16 = lshr i16 %17, 6
   %18 = and i16 1, %lshrl16
   %trunc17 = trunc i16 %18 to i8
   store i8 %trunc17, ptr %taddr18, align 1
-  %19 = insertvalue %"any*" undef, ptr %taddr18, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %19 = insertvalue %any undef, ptr %taddr18, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd19 = getelementptr inbounds i8, ptr %varargslots10, i64 16
-  store %"any*" %20, ptr %ptradd19, align 16
+  store %any %20, ptr %ptradd19, align 16
   %ptradd20 = getelementptr inbounds i8, ptr %test, i64 2
   %21 = load i16, ptr %ptradd20, align 2
   %lshrl21 = lshr i16 %21, 5
   %22 = and i16 1, %lshrl21
   %trunc22 = trunc i16 %22 to i8
   store i8 %trunc22, ptr %taddr23, align 1
-  %23 = insertvalue %"any*" undef, ptr %taddr23, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %23 = insertvalue %any undef, ptr %taddr23, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd24 = getelementptr inbounds i8, ptr %varargslots10, i64 32
-  store %"any*" %24, ptr %ptradd24, align 16
+  store %any %24, ptr %ptradd24, align 16
   %ptradd25 = getelementptr inbounds i8, ptr %test, i64 2
   %25 = load i16, ptr %ptradd25, align 2
   %lshrl26 = lshr i16 %25, 4
   %26 = and i16 1, %lshrl26
   %trunc27 = trunc i16 %26 to i8
   store i8 %trunc27, ptr %taddr28, align 1
-  %27 = insertvalue %"any*" undef, ptr %taddr28, 0
-  %28 = insertvalue %"any*" %27, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %27 = insertvalue %any undef, ptr %taddr28, 0
+  %28 = insertvalue %any %27, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd29 = getelementptr inbounds i8, ptr %varargslots10, i64 48
-  store %"any*" %28, ptr %ptradd29, align 16
+  store %any %28, ptr %ptradd29, align 16
   %29 = call i64 @std.io.printfn(ptr %retparam30, ptr @.str.1, i64 12, ptr %varargslots10, i64 4)
   ret void
 }
diff --git a/test/test_suite/bitstruct/bitstruct_arrays.c3t b/test/test_suite/bitstruct/bitstruct_arrays.c3t
index 5b4820cd7..5ca7383c1 100644
--- a/test/test_suite/bitstruct/bitstruct_arrays.c3t
+++ b/test/test_suite/bitstruct/bitstruct_arrays.c3t
@@ -133,202 +133,202 @@ entry:
   %3 = load i64, ptr %xx, align 8
   %shl = shl i64 %3, 61
   %ashr = ashr i64 %shl, 61
-  %4 = trunc i64 %ashr to i32
-  %5 = load i64, ptr %xx, align 8
-  %shl1 = shl i64 %5, 55
+  %trunc = trunc i64 %ashr to i32
+  %4 = load i64, ptr %xx, align 8
+  %shl1 = shl i64 %4, 55
   %ashr2 = ashr i64 %shl1, 58
-  %6 = trunc i64 %ashr2 to i32
-  call void (ptr, ...) @printf(ptr @.str, i32 %4, i32 %6)
-  %7 = load i64, ptr %xx, align 8
-  %shl3 = shl i64 %7, 61
-  %ashr4 = ashr i64 %shl3, 61
-  %8 = trunc i64 %ashr4 to i32
-  %sub = sub i32 %8, 1
-  %9 = load i64, ptr %xx, align 8
+  %trunc3 = trunc i64 %ashr2 to i32
+  call void (ptr, ...) @printf(ptr @.str, i32 %trunc, i32 %trunc3)
+  %5 = load i64, ptr %xx, align 8
+  %shl4 = shl i64 %5, 61
+  %ashr5 = ashr i64 %shl4, 61
+  %trunc6 = trunc i64 %ashr5 to i32
+  %sub = sub i32 %trunc6, 1
+  %6 = load i64, ptr %xx, align 8
   %zext = zext i32 %sub to i64
-  %10 = and i64 %zext, 7
-  %11 = and i64 %9, -8
-  %12 = or i64 %11, %10
-  store i64 %12, ptr %xx, align 8
+  %7 = and i64 %zext, 7
+  %8 = and i64 %6, -8
+  %9 = or i64 %8, %7
+  store i64 %9, ptr %xx, align 8
+  %10 = load i64, ptr %xx, align 8
+  %shl7 = shl i64 %10, 61
+  %ashr8 = ashr i64 %shl7, 61
+  %trunc9 = trunc i64 %ashr8 to i32
+  %11 = load i64, ptr %xx, align 8
+  %shl10 = shl i64 %11, 55
+  %ashr11 = ashr i64 %shl10, 58
+  %trunc12 = trunc i64 %ashr11 to i32
+  call void (ptr, ...) @printf(ptr @.str.1, i32 %trunc9, i32 %trunc12)
+  %12 = load i64, ptr %xx, align 8
+  %shl13 = shl i64 %12, 55
+  %ashr14 = ashr i64 %shl13, 58
+  %trunc15 = trunc i64 %ashr14 to i32
+  %mul = mul i32 %trunc15, 2
   %13 = load i64, ptr %xx, align 8
-  %shl5 = shl i64 %13, 61
-  %ashr6 = ashr i64 %shl5, 61
-  %14 = trunc i64 %ashr6 to i32
-  %15 = load i64, ptr %xx, align 8
-  %shl7 = shl i64 %15, 55
-  %ashr8 = ashr i64 %shl7, 58
-  %16 = trunc i64 %ashr8 to i32
-  call void (ptr, ...) @printf(ptr @.str.1, i32 %14, i32 %16)
+  %zext16 = zext i32 %mul to i64
+  %shl17 = shl i64 %zext16, 3
+  %14 = and i64 %shl17, 504
+  %15 = and i64 %13, -505
+  %16 = or i64 %15, %14
+  store i64 %16, ptr %xx, align 8
   %17 = load i64, ptr %xx, align 8
-  %shl9 = shl i64 %17, 55
-  %ashr10 = ashr i64 %shl9, 58
-  %18 = trunc i64 %ashr10 to i32
-  %mul = mul i32 %18, 2
+  %shl18 = shl i64 %17, 61
+  %ashr19 = ashr i64 %shl18, 61
+  %trunc20 = trunc i64 %ashr19 to i32
+  %18 = load i64, ptr %xx, align 8
+  %shl21 = shl i64 %18, 55
+  %ashr22 = ashr i64 %shl21, 58
+  %trunc23 = trunc i64 %ashr22 to i32
+  call void (ptr, ...) @printf(ptr @.str.2, i32 %trunc20, i32 %trunc23)
   %19 = load i64, ptr %xx, align 8
-  %zext11 = zext i32 %mul to i64
-  %shl12 = shl i64 %zext11, 3
-  %20 = and i64 %shl12, 504
-  %21 = and i64 %19, -505
-  %22 = or i64 %21, %20
-  store i64 %22, ptr %xx, align 8
-  %23 = load i64, ptr %xx, align 8
-  %shl13 = shl i64 %23, 61
-  %ashr14 = ashr i64 %shl13, 61
-  %24 = trunc i64 %ashr14 to i32
+  %shl24 = shl i64 %19, 55
+  %ashr25 = ashr i64 %shl24, 58
+  %trunc26 = trunc i64 %ashr25 to i32
+  %xor = xor i32 %trunc26, 4
+  %20 = load i64, ptr %xx, align 8
+  %zext27 = zext i32 %xor to i64
+  %shl28 = shl i64 %zext27, 3
+  %21 = and i64 %shl28, 504
+  %22 = and i64 %20, -505
+  %23 = or i64 %22, %21
+  store i64 %23, ptr %xx, align 8
+  %24 = load i64, ptr %xx, align 8
+  %shl29 = shl i64 %24, 61
+  %ashr30 = ashr i64 %shl29, 61
+  %trunc31 = trunc i64 %ashr30 to i32
   %25 = load i64, ptr %xx, align 8
-  %shl15 = shl i64 %25, 55
-  %ashr16 = ashr i64 %shl15, 58
-  %26 = trunc i64 %ashr16 to i32
-  call void (ptr, ...) @printf(ptr @.str.2, i32 %24, i32 %26)
+  %shl32 = shl i64 %25, 55
+  %ashr33 = ashr i64 %shl32, 58
+  %trunc34 = trunc i64 %ashr33 to i32
+  call void (ptr, ...) @printf(ptr @.str.3, i32 %trunc31, i32 %trunc34)
+  %26 = load i64, ptr %xx, align 8
+  %shl35 = shl i64 %26, 55
+  %ashr36 = ashr i64 %shl35, 58
+  %trunc37 = trunc i64 %ashr36 to i32
+  %or = or i32 %trunc37, 4
   %27 = load i64, ptr %xx, align 8
-  %shl17 = shl i64 %27, 55
-  %ashr18 = ashr i64 %shl17, 58
-  %28 = trunc i64 %ashr18 to i32
-  %xor = xor i32 %28, 4
-  %29 = load i64, ptr %xx, align 8
-  %zext19 = zext i32 %xor to i64
-  %shl20 = shl i64 %zext19, 3
-  %30 = and i64 %shl20, 504
-  %31 = and i64 %29, -505
-  %32 = or i64 %31, %30
-  store i64 %32, ptr %xx, align 8
+  %zext38 = zext i32 %or to i64
+  %shl39 = shl i64 %zext38, 3
+  %28 = and i64 %shl39, 504
+  %29 = and i64 %27, -505
+  %30 = or i64 %29, %28
+  store i64 %30, ptr %xx, align 8
+  %31 = load i64, ptr %xx, align 8
+  %shl40 = shl i64 %31, 61
+  %ashr41 = ashr i64 %shl40, 61
+  %trunc42 = trunc i64 %ashr41 to i32
+  %32 = load i64, ptr %xx, align 8
+  %shl43 = shl i64 %32, 55
+  %ashr44 = ashr i64 %shl43, 58
+  %trunc45 = trunc i64 %ashr44 to i32
+  call void (ptr, ...) @printf(ptr @.str.4, i32 %trunc42, i32 %trunc45)
   %33 = load i64, ptr %xx, align 8
-  %shl21 = shl i64 %33, 61
-  %ashr22 = ashr i64 %shl21, 61
-  %34 = trunc i64 %ashr22 to i32
+  %shl46 = shl i64 %33, 55
+  %ashr47 = ashr i64 %shl46, 58
+  %trunc48 = trunc i64 %ashr47 to i32
+  %shl49 = shl i32 %trunc48, 1
+  %34 = freeze i32 %shl49
   %35 = load i64, ptr %xx, align 8
-  %shl23 = shl i64 %35, 55
-  %ashr24 = ashr i64 %shl23, 58
-  %36 = trunc i64 %ashr24 to i32
-  call void (ptr, ...) @printf(ptr @.str.3, i32 %34, i32 %36)
-  %37 = load i64, ptr %xx, align 8
-  %shl25 = shl i64 %37, 55
-  %ashr26 = ashr i64 %shl25, 58
-  %38 = trunc i64 %ashr26 to i32
-  %or = or i32 %38, 4
+  %zext50 = zext i32 %34 to i64
+  %shl51 = shl i64 %zext50, 3
+  %36 = and i64 %shl51, 504
+  %37 = and i64 %35, -505
+  %38 = or i64 %37, %36
+  store i64 %38, ptr %xx, align 8
   %39 = load i64, ptr %xx, align 8
-  %zext27 = zext i32 %or to i64
-  %shl28 = shl i64 %zext27, 3
-  %40 = and i64 %shl28, 504
-  %41 = and i64 %39, -505
-  %42 = or i64 %41, %40
-  store i64 %42, ptr %xx, align 8
+  %shl52 = shl i64 %39, 61
+  %ashr53 = ashr i64 %shl52, 61
+  %trunc54 = trunc i64 %ashr53 to i32
+  %40 = load i64, ptr %xx, align 8
+  %shl55 = shl i64 %40, 55
+  %ashr56 = ashr i64 %shl55, 58
+  %trunc57 = trunc i64 %ashr56 to i32
+  call void (ptr, ...) @printf(ptr @.str.5, i32 %trunc54, i32 %trunc57)
+  %41 = load i64, ptr %xx, align 8
+  %shl58 = shl i64 %41, 55
+  %ashr59 = ashr i64 %shl58, 58
+  %trunc60 = trunc i64 %ashr59 to i32
+  %ashr61 = ashr i32 %trunc60, 1
+  %42 = freeze i32 %ashr61
   %43 = load i64, ptr %xx, align 8
-  %shl29 = shl i64 %43, 61
-  %ashr30 = ashr i64 %shl29, 61
-  %44 = trunc i64 %ashr30 to i32
-  %45 = load i64, ptr %xx, align 8
-  %shl31 = shl i64 %45, 55
-  %ashr32 = ashr i64 %shl31, 58
-  %46 = trunc i64 %ashr32 to i32
-  call void (ptr, ...) @printf(ptr @.str.4, i32 %44, i32 %46)
+  %zext62 = zext i32 %42 to i64
+  %shl63 = shl i64 %zext62, 3
+  %44 = and i64 %shl63, 504
+  %45 = and i64 %43, -505
+  %46 = or i64 %45, %44
+  store i64 %46, ptr %xx, align 8
   %47 = load i64, ptr %xx, align 8
-  %shl33 = shl i64 %47, 55
-  %ashr34 = ashr i64 %shl33, 58
-  %48 = trunc i64 %ashr34 to i32
-  %shl35 = shl i32 %48, 1
-  %49 = freeze i32 %shl35
+  %shl64 = shl i64 %47, 61
+  %ashr65 = ashr i64 %shl64, 61
+  %trunc66 = trunc i64 %ashr65 to i32
+  %48 = load i64, ptr %xx, align 8
+  %shl67 = shl i64 %48, 55
+  %ashr68 = ashr i64 %shl67, 58
+  %trunc69 = trunc i64 %ashr68 to i32
+  call void (ptr, ...) @printf(ptr @.str.6, i32 %trunc66, i32 %trunc69)
+  %49 = load i64, ptr %xx, align 8
+  %shl70 = shl i64 %49, 55
+  %ashr71 = ashr i64 %shl70, 58
+  %trunc72 = trunc i64 %ashr71 to i32
+  %sdiv = sdiv i32 %trunc72, 2
   %50 = load i64, ptr %xx, align 8
-  %zext36 = zext i32 %49 to i64
-  %shl37 = shl i64 %zext36, 3
-  %51 = and i64 %shl37, 504
+  %zext73 = zext i32 %sdiv to i64
+  %shl74 = shl i64 %zext73, 3
+  %51 = and i64 %shl74, 504
   %52 = and i64 %50, -505
   %53 = or i64 %52, %51
   store i64 %53, ptr %xx, align 8
   %54 = load i64, ptr %xx, align 8
-  %shl38 = shl i64 %54, 61
-  %ashr39 = ashr i64 %shl38, 61
-  %55 = trunc i64 %ashr39 to i32
+  %shl75 = shl i64 %54, 61
+  %ashr76 = ashr i64 %shl75, 61
+  %trunc77 = trunc i64 %ashr76 to i32
+  %55 = load i64, ptr %xx, align 8
+  %shl78 = shl i64 %55, 55
+  %ashr79 = ashr i64 %shl78, 58
+  %trunc80 = trunc i64 %ashr79 to i32
+  call void (ptr, ...) @printf(ptr @.str.7, i32 %trunc77, i32 %trunc80)
   %56 = load i64, ptr %xx, align 8
-  %shl40 = shl i64 %56, 55
-  %ashr41 = ashr i64 %shl40, 58
-  %57 = trunc i64 %ashr41 to i32
-  call void (ptr, ...) @printf(ptr @.str.5, i32 %55, i32 %57)
-  %58 = load i64, ptr %xx, align 8
-  %shl42 = shl i64 %58, 55
-  %ashr43 = ashr i64 %shl42, 58
-  %59 = trunc i64 %ashr43 to i32
-  %ashr44 = ashr i32 %59, 1
-  %60 = freeze i32 %ashr44
+  %shl81 = shl i64 %56, 55
+  %ashr82 = ashr i64 %shl81, 58
+  %trunc83 = trunc i64 %ashr82 to i32
+  %smod = srem i32 %trunc83, 2
+  %57 = load i64, ptr %xx, align 8
+  %zext84 = zext i32 %smod to i64
+  %shl85 = shl i64 %zext84, 3
+  %58 = and i64 %shl85, 504
+  %59 = and i64 %57, -505
+  %60 = or i64 %59, %58
+  store i64 %60, ptr %xx, align 8
   %61 = load i64, ptr %xx, align 8
-  %zext45 = zext i32 %60 to i64
-  %shl46 = shl i64 %zext45, 3
-  %62 = and i64 %shl46, 504
-  %63 = and i64 %61, -505
-  %64 = or i64 %63, %62
-  store i64 %64, ptr %xx, align 8
-  %65 = load i64, ptr %xx, align 8
-  %shl47 = shl i64 %65, 61
-  %ashr48 = ashr i64 %shl47, 61
-  %66 = trunc i64 %ashr48 to i32
-  %67 = load i64, ptr %xx, align 8
-  %shl49 = shl i64 %67, 55
-  %ashr50 = ashr i64 %shl49, 58
-  %68 = trunc i64 %ashr50 to i32
-  call void (ptr, ...) @printf(ptr @.str.6, i32 %66, i32 %68)
+  %shl86 = shl i64 %61, 61
+  %ashr87 = ashr i64 %shl86, 61
+  %trunc88 = trunc i64 %ashr87 to i32
+  %62 = load i64, ptr %xx, align 8
+  %shl89 = shl i64 %62, 55
+  %ashr90 = ashr i64 %shl89, 58
+  %trunc91 = trunc i64 %ashr90 to i32
+  call void (ptr, ...) @printf(ptr @.str.8, i32 %trunc88, i32 %trunc91)
+  %63 = load i64, ptr %xx, align 8
+  %64 = and i64 %63, -1048577
+  %65 = or i64 %64, 1048576
+  store i64 %65, ptr %xx, align 8
+  %66 = load i64, ptr %xx, align 8
+  %lshrl = lshr i64 %66, 20
+  %67 = and i64 1, %lshrl
+  %trunc92 = trunc i64 %67 to i8
+  %68 = trunc i8 %trunc92 to i1
+  %boolsi = zext i1 %68 to i32
+  call void (ptr, ...) @printf(ptr @.str.9, i32 %boolsi)
   %69 = load i64, ptr %xx, align 8
-  %shl51 = shl i64 %69, 55
-  %ashr52 = ashr i64 %shl51, 58
-  %70 = trunc i64 %ashr52 to i32
-  %sdiv = sdiv i32 %70, 2
+  %70 = and i64 %69, -1048577
+  store i64 %70, ptr %xx, align 8
   %71 = load i64, ptr %xx, align 8
-  %zext53 = zext i32 %sdiv to i64
-  %shl54 = shl i64 %zext53, 3
-  %72 = and i64 %shl54, 504
-  %73 = and i64 %71, -505
-  %74 = or i64 %73, %72
-  store i64 %74, ptr %xx, align 8
-  %75 = load i64, ptr %xx, align 8
-  %shl55 = shl i64 %75, 61
-  %ashr56 = ashr i64 %shl55, 61
-  %76 = trunc i64 %ashr56 to i32
-  %77 = load i64, ptr %xx, align 8
-  %shl57 = shl i64 %77, 55
-  %ashr58 = ashr i64 %shl57, 58
-  %78 = trunc i64 %ashr58 to i32
-  call void (ptr, ...) @printf(ptr @.str.7, i32 %76, i32 %78)
-  %79 = load i64, ptr %xx, align 8
-  %shl59 = shl i64 %79, 55
-  %ashr60 = ashr i64 %shl59, 58
-  %80 = trunc i64 %ashr60 to i32
-  %smod = srem i32 %80, 2
-  %81 = load i64, ptr %xx, align 8
-  %zext61 = zext i32 %smod to i64
-  %shl62 = shl i64 %zext61, 3
-  %82 = and i64 %shl62, 504
-  %83 = and i64 %81, -505
-  %84 = or i64 %83, %82
-  store i64 %84, ptr %xx, align 8
-  %85 = load i64, ptr %xx, align 8
-  %shl63 = shl i64 %85, 61
-  %ashr64 = ashr i64 %shl63, 61
-  %86 = trunc i64 %ashr64 to i32
-  %87 = load i64, ptr %xx, align 8
-  %shl65 = shl i64 %87, 55
-  %ashr66 = ashr i64 %shl65, 58
-  %88 = trunc i64 %ashr66 to i32
-  call void (ptr, ...) @printf(ptr @.str.8, i32 %86, i32 %88)
-  %89 = load i64, ptr %xx, align 8
-  %90 = and i64 %89, -1048577
-  %91 = or i64 %90, 1048576
-  store i64 %91, ptr %xx, align 8
-  %92 = load i64, ptr %xx, align 8
-  %lshrl = lshr i64 %92, 20
-  %93 = and i64 1, %lshrl
-  %trunc = trunc i64 %93 to i8
-  %94 = trunc i8 %trunc to i1
-  %boolsi = zext i1 %94 to i32
-  call void (ptr, ...) @printf(ptr @.str.9, i32 %boolsi)
-  %95 = load i64, ptr %xx, align 8
-  %96 = and i64 %95, -1048577
-  store i64 %96, ptr %xx, align 8
-  %97 = load i64, ptr %xx, align 8
-  %lshrl67 = lshr i64 %97, 20
-  %98 = and i64 1, %lshrl67
-  %trunc68 = trunc i64 %98 to i8
-  %99 = trunc i8 %trunc68 to i1
-  %boolsi69 = zext i1 %99 to i32
-  call void (ptr, ...) @printf(ptr @.str.10, i32 %boolsi69)
+  %lshrl93 = lshr i64 %71, 20
+  %72 = and i64 1, %lshrl93
+  %trunc94 = trunc i64 %72 to i8
+  %73 = trunc i8 %trunc94 to i1
+  %boolsi95 = zext i1 %73 to i32
+  call void (ptr, ...) @printf(ptr @.str.10, i32 %boolsi95)
   ret void
 }
 
diff --git a/test/test_suite/bitstruct/bitstruct_be.c3t b/test/test_suite/bitstruct/bitstruct_be.c3t
index ac91e1ba8..2fdeef613 100644
--- a/test/test_suite/bitstruct/bitstruct_be.c3t
+++ b/test/test_suite/bitstruct/bitstruct_be.c3t
@@ -46,16 +46,16 @@ fn void main()
   %0 = load i32, ptr %x, align 4
   %1 = call i32 @llvm.bswap.i32(i32 %0)
   store i32 2063597568, ptr %x, align 4
-  %2 = insertvalue %"any*" undef, ptr %x, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %varargslots, align 16
+  %2 = insertvalue %any undef, ptr %x, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %varargslots, align 16
   %4 = load i32, ptr %x, align 4
   %5 = call i32 @llvm.bswap.i32(i32 %4)
   store i32 %5, ptr %taddr, align 4
-  %6 = insertvalue %"any*" undef, ptr %taddr, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %6 = insertvalue %any undef, ptr %taddr, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %7, ptr %ptradd, align 16
+  store %any %7, ptr %ptradd, align 16
   %8 = call i64 @std.io.printf(ptr %retparam, ptr @.str, i64 18, ptr %varargslots, i64 2)
   store i32 873625686, ptr %abc, align 4
   store [4 x i8] c"\124Vx", ptr %abc2, align 1
@@ -77,9 +77,9 @@ loop.body:                                        ; preds = %loop.cond
   %ptradd2 = getelementptr inbounds i8, ptr %11, i64 %12
   %13 = load i8, ptr %ptradd2, align 1
   store i8 %13, ptr %d, align 1
-  %14 = insertvalue %"any*" undef, ptr %d, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %15, ptr %varargslots3, align 16
+  %14 = insertvalue %any undef, ptr %d, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %15, ptr %varargslots3, align 16
   %16 = call i64 @std.io.printf(ptr %retparam4, ptr @.str.1, i64 3, ptr %varargslots3, i64 1)
   %17 = load i64, ptr %.anon1, align 8
   %addnuw = add nuw i64 %17, 1
@@ -159,9 +159,9 @@ loop.body23:                                      ; preds = %loop.cond21
   %ptradd25 = getelementptr inbounds i8, ptr %29, i64 %30
   %31 = load i8, ptr %ptradd25, align 1
   store i8 %31, ptr %d24, align 1
-  %32 = insertvalue %"any*" undef, ptr %d24, 0
-  %33 = insertvalue %"any*" %32, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %33, ptr %varargslots26, align 16
+  %32 = insertvalue %any undef, ptr %d24, 0
+  %33 = insertvalue %any %32, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %33, ptr %varargslots26, align 16
   %34 = call i64 @std.io.printf(ptr %retparam27, ptr @.str.2, i64 3, ptr %varargslots26, i64 1)
   %35 = load i64, ptr %.anon20, align 8
   %addnuw30 = add nuw i64 %35, 1
@@ -230,9 +230,9 @@ voiderr54:                                        ; preds = %noerr_block52, %gua
   %47 = and i32 65535, %46
   %trunc = trunc i32 %47 to i16
   store i16 %trunc, ptr %taddr56, align 2
-  %48 = insertvalue %"any*" undef, ptr %taddr56, 0
-  %49 = insertvalue %"any*" %48, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
-  store %"any*" %49, ptr %varargslots55, align 16
+  %48 = insertvalue %any undef, ptr %taddr56, 0
+  %49 = insertvalue %any %48, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
+  store %any %49, ptr %varargslots55, align 16
   %50 = call i64 @std.io.printfn(ptr %retparam57, ptr @.str.3, i64 10, ptr %varargslots55, i64 1)
   %51 = load i32, ptr %abc, align 4
   %52 = call i32 @llvm.bswap.i32(i32 %51)
@@ -251,9 +251,9 @@ voiderr54:                                        ; preds = %noerr_block52, %gua
   %63 = and i32 65535, %62
   %trunc61 = trunc i32 %63 to i16
   store i16 %trunc61, ptr %taddr62, align 2
-  %64 = insertvalue %"any*" undef, ptr %taddr62, 0
-  %65 = insertvalue %"any*" %64, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
-  store %"any*" %65, ptr %varargslots60, align 16
+  %64 = insertvalue %any undef, ptr %taddr62, 0
+  %65 = insertvalue %any %64, i64 ptrtoint (ptr @"$ct.ushort" to i64), 1
+  store %any %65, ptr %varargslots60, align 16
   %66 = call i64 @std.io.printfn(ptr %retparam63, ptr @.str.4, i64 12, ptr %varargslots60, i64 1)
   %67 = load ptr, ptr %z, align 8
   store ptr %67, ptr %.anon66, align 8
@@ -271,9 +271,9 @@ loop.body70:                                      ; preds = %loop.cond68
   %ptradd72 = getelementptr inbounds i8, ptr %69, i64 %70
   %71 = load i8, ptr %ptradd72, align 1
   store i8 %71, ptr %d71, align 1
-  %72 = insertvalue %"any*" undef, ptr %d71, 0
-  %73 = insertvalue %"any*" %72, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %73, ptr %varargslots73, align 16
+  %72 = insertvalue %any undef, ptr %d71, 0
+  %73 = insertvalue %any %72, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %73, ptr %varargslots73, align 16
   %74 = call i64 @std.io.printf(ptr %retparam74, ptr @.str.5, i64 3, ptr %varargslots73, i64 1)
   %75 = load i64, ptr %.anon67, align 8
   %addnuw77 = add nuw i64 %75, 1
@@ -340,15 +340,15 @@ voiderr101:                                       ; preds = %noerr_block99, %gua
   store i32 0, ptr %y, align 4
   %85 = load i32, ptr %y, align 4
   store i32 123, ptr %y, align 4
-  %86 = insertvalue %"any*" undef, ptr %y, 0
-  %87 = insertvalue %"any*" %86, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %87, ptr %varargslots102, align 16
+  %86 = insertvalue %any undef, ptr %y, 0
+  %87 = insertvalue %any %86, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %87, ptr %varargslots102, align 16
   %88 = load i32, ptr %y, align 4
   store i32 %88, ptr %taddr103, align 4
-  %89 = insertvalue %"any*" undef, ptr %taddr103, 0
-  %90 = insertvalue %"any*" %89, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %89 = insertvalue %any undef, ptr %taddr103, 0
+  %90 = insertvalue %any %89, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd104 = getelementptr inbounds i8, ptr %varargslots102, i64 16
-  store %"any*" %90, ptr %ptradd104, align 16
+  store %any %90, ptr %ptradd104, align 16
   %91 = call i64 @std.io.printf(ptr %retparam105, ptr @.str.6, i64 18, ptr %varargslots102, i64 2)
   ret void
 }
\ No newline at end of file
diff --git a/test/test_suite/bitstruct/bitstruct_direct_in_struct.c3t b/test/test_suite/bitstruct/bitstruct_direct_in_struct.c3t
index 4d23a5105..644ca323b 100644
--- a/test/test_suite/bitstruct/bitstruct_direct_in_struct.c3t
+++ b/test/test_suite/bitstruct/bitstruct_direct_in_struct.c3t
@@ -15,9 +15,15 @@ fn int main(String[] args) {
     .x = x,
     .flags.flag1 = true,
   };
+  Flags flags;
+  Foo bar = {
+    .x = x,
+    .flags = flags,
+  };
   return 0;
 }
 
+
 /* #expect: test.ll
 
   store ptr %0, ptr %args, align 8
@@ -34,5 +40,13 @@ fn int main(String[] args) {
   %4 = and i32 %3, -2
   %5 = or i32 %4, 1
   store i32 %5, ptr %ptradd2, align 8
+  store i32 0, ptr %flags, align 4
+  store i64 0, ptr %bar, align 8
+  %ptradd3 = getelementptr inbounds i8, ptr %bar, i64 8
+  store i32 0, ptr %ptradd3, align 8
+  %6 = load i64, ptr %x, align 8
+  store i64 %6, ptr %bar, align 8
+  %ptradd4 = getelementptr inbounds i8, ptr %bar, i64 8
+  %7 = load i32, ptr %flags, align 4
+  store i32 %7, ptr %ptradd4, align 8
   ret i32 0
-
diff --git a/test/test_suite/bitstruct/bitstruct_initializer.c3t b/test/test_suite/bitstruct/bitstruct_initializer.c3t
index 21b1d6b35..666004788 100644
--- a/test/test_suite/bitstruct/bitstruct_initializer.c3t
+++ b/test/test_suite/bitstruct/bitstruct_initializer.c3t
@@ -54,32 +54,32 @@ entry:
   %y = alloca %Abc, align 8
   %d = alloca %Abc, align 8
   %b = alloca [8 x i8], align 1
-  %varargslots = alloca [3 x %"any*"], align 16
+  %varargslots = alloca [3 x %any], align 16
   %taddr = alloca i32, align 4
   %taddr30 = alloca i32, align 4
   %taddr34 = alloca i8, align 1
   %retparam = alloca i64, align 8
-  %varargslots36 = alloca [3 x %"any*"], align 16
+  %varargslots36 = alloca [3 x %any], align 16
   %taddr39 = alloca i32, align 4
   %taddr43 = alloca i32, align 4
   %taddr48 = alloca i8, align 1
   %retparam50 = alloca i64, align 8
-  %varargslots51 = alloca [3 x %"any*"], align 16
+  %varargslots51 = alloca [3 x %any], align 16
   %taddr62 = alloca i32, align 4
   %taddr74 = alloca i32, align 4
   %taddr78 = alloca i8, align 1
   %retparam80 = alloca i64, align 8
-  %varargslots111 = alloca [3 x %"any*"], align 16
+  %varargslots111 = alloca [3 x %any], align 16
   %taddr113 = alloca i32, align 4
   %taddr116 = alloca i32, align 4
   %taddr120 = alloca i8, align 1
   %retparam122 = alloca i64, align 8
-  %varargslots123 = alloca [3 x %"any*"], align 16
+  %varargslots123 = alloca [3 x %any], align 16
   %taddr126 = alloca i32, align 4
   %taddr130 = alloca i32, align 4
   %taddr135 = alloca i8, align 1
   %retparam137 = alloca i64, align 8
-  %varargslots138 = alloca [3 x %"any*"], align 16
+  %varargslots138 = alloca [3 x %any], align 16
   %taddr149 = alloca i32, align 4
   %taddr161 = alloca i32, align 4
   %taddr165 = alloca i8, align 1
@@ -154,56 +154,56 @@ entry:
   %11 = and i64 4294967295, %10
   %trunc27 = trunc i64 %11 to i32
   store i32 %trunc27, ptr %taddr, align 4
-  %12 = insertvalue %"any*" undef, ptr %taddr, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %13, ptr %varargslots, align 16
+  %12 = insertvalue %any undef, ptr %taddr, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %13, ptr %varargslots, align 16
   %14 = load i64, ptr %x, align 8
   %lshrl28 = lshr i64 %14, 32
   %15 = and i64 2147483647, %lshrl28
   %trunc29 = trunc i64 %15 to i32
   store i32 %trunc29, ptr %taddr30, align 4
-  %16 = insertvalue %"any*" undef, ptr %taddr30, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %16 = insertvalue %any undef, ptr %taddr30, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd31 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %17, ptr %ptradd31, align 16
+  store %any %17, ptr %ptradd31, align 16
   %18 = load i64, ptr %x, align 8
   %lshrl32 = lshr i64 %18, 63
   %19 = and i64 1, %lshrl32
   %trunc33 = trunc i64 %19 to i8
   store i8 %trunc33, ptr %taddr34, align 1
-  %20 = insertvalue %"any*" undef, ptr %taddr34, 0
-  %21 = insertvalue %"any*" %20, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %20 = insertvalue %any undef, ptr %taddr34, 0
+  %21 = insertvalue %any %20, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd35 = getelementptr inbounds i8, ptr %varargslots, i64 32
-  store %"any*" %21, ptr %ptradd35, align 16
+  store %any %21, ptr %ptradd35, align 16
   %22 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 8, ptr %varargslots, i64 3)
   %ptradd37 = getelementptr inbounds i8, ptr %y, i64 8
   %23 = load i64, ptr %ptradd37, align 8
   %24 = and i64 4294967295, %23
   %trunc38 = trunc i64 %24 to i32
   store i32 %trunc38, ptr %taddr39, align 4
-  %25 = insertvalue %"any*" undef, ptr %taddr39, 0
-  %26 = insertvalue %"any*" %25, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %26, ptr %varargslots36, align 16
+  %25 = insertvalue %any undef, ptr %taddr39, 0
+  %26 = insertvalue %any %25, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %26, ptr %varargslots36, align 16
   %ptradd40 = getelementptr inbounds i8, ptr %y, i64 8
   %27 = load i64, ptr %ptradd40, align 8
   %lshrl41 = lshr i64 %27, 32
   %28 = and i64 2147483647, %lshrl41
   %trunc42 = trunc i64 %28 to i32
   store i32 %trunc42, ptr %taddr43, align 4
-  %29 = insertvalue %"any*" undef, ptr %taddr43, 0
-  %30 = insertvalue %"any*" %29, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %29 = insertvalue %any undef, ptr %taddr43, 0
+  %30 = insertvalue %any %29, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd44 = getelementptr inbounds i8, ptr %varargslots36, i64 16
-  store %"any*" %30, ptr %ptradd44, align 16
+  store %any %30, ptr %ptradd44, align 16
   %ptradd45 = getelementptr inbounds i8, ptr %y, i64 8
   %31 = load i64, ptr %ptradd45, align 8
   %lshrl46 = lshr i64 %31, 63
   %32 = and i64 1, %lshrl46
   %trunc47 = trunc i64 %32 to i8
   store i8 %trunc47, ptr %taddr48, align 1
-  %33 = insertvalue %"any*" undef, ptr %taddr48, 0
-  %34 = insertvalue %"any*" %33, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %33 = insertvalue %any undef, ptr %taddr48, 0
+  %34 = insertvalue %any %33, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd49 = getelementptr inbounds i8, ptr %varargslots36, i64 32
-  store %"any*" %34, ptr %ptradd49, align 16
+  store %any %34, ptr %ptradd49, align 16
   %35 = call i64 @std.io.printfn(ptr %retparam50, ptr @.str.2, i64 8, ptr %varargslots36, i64 3)
   %36 = load i8, ptr %b, align 1
   %zext52 = zext i8 %36 to i32
@@ -223,9 +223,9 @@ entry:
   %shl61 = shl i32 %zext60, 24
   %42 = or i32 %shl61, %40
   store i32 %42, ptr %taddr62, align 4
-  %43 = insertvalue %"any*" undef, ptr %taddr62, 0
-  %44 = insertvalue %"any*" %43, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %44, ptr %varargslots51, align 16
+  %43 = insertvalue %any undef, ptr %taddr62, 0
+  %44 = insertvalue %any %43, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %44, ptr %varargslots51, align 16
   %ptradd63 = getelementptr inbounds i8, ptr %b, i64 4
   %45 = load i8, ptr %ptradd63, align 1
   %zext64 = zext i8 %45 to i32
@@ -246,20 +246,20 @@ entry:
   %51 = or i32 %shl73, %49
   %52 = and i32 2147483647, %51
   store i32 %52, ptr %taddr74, align 4
-  %53 = insertvalue %"any*" undef, ptr %taddr74, 0
-  %54 = insertvalue %"any*" %53, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %53 = insertvalue %any undef, ptr %taddr74, 0
+  %54 = insertvalue %any %53, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd75 = getelementptr inbounds i8, ptr %varargslots51, i64 16
-  store %"any*" %54, ptr %ptradd75, align 16
+  store %any %54, ptr %ptradd75, align 16
   %ptradd76 = getelementptr inbounds i8, ptr %b, i64 7
   %55 = load i8, ptr %ptradd76, align 1
   %lshrl77 = lshr i8 %55, 7
   %56 = trunc i8 %lshrl77 to i1
   %57 = zext i1 %56 to i8
   store i8 %57, ptr %taddr78, align 1
-  %58 = insertvalue %"any*" undef, ptr %taddr78, 0
-  %59 = insertvalue %"any*" %58, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %58 = insertvalue %any undef, ptr %taddr78, 0
+  %59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd79 = getelementptr inbounds i8, ptr %varargslots51, i64 32
-  store %"any*" %59, ptr %ptradd79, align 16
+  store %any %59, ptr %ptradd79, align 16
   %60 = call i64 @std.io.printfn(ptr %retparam80, ptr @.str.3, i64 8, ptr %varargslots51, i64 3)
   %add = add i32 %0, 1
   %zext81 = zext i32 %add to i64
@@ -329,56 +329,56 @@ entry:
   %75 = and i64 4294967295, %74
   %trunc112 = trunc i64 %75 to i32
   store i32 %trunc112, ptr %taddr113, align 4
-  %76 = insertvalue %"any*" undef, ptr %taddr113, 0
-  %77 = insertvalue %"any*" %76, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %77, ptr %varargslots111, align 16
+  %76 = insertvalue %any undef, ptr %taddr113, 0
+  %77 = insertvalue %any %76, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %77, ptr %varargslots111, align 16
   %78 = load i64, ptr %x, align 8
   %lshrl114 = lshr i64 %78, 32
   %79 = and i64 2147483647, %lshrl114
   %trunc115 = trunc i64 %79 to i32
   store i32 %trunc115, ptr %taddr116, align 4
-  %80 = insertvalue %"any*" undef, ptr %taddr116, 0
-  %81 = insertvalue %"any*" %80, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %80 = insertvalue %any undef, ptr %taddr116, 0
+  %81 = insertvalue %any %80, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd117 = getelementptr inbounds i8, ptr %varargslots111, i64 16
-  store %"any*" %81, ptr %ptradd117, align 16
+  store %any %81, ptr %ptradd117, align 16
   %82 = load i64, ptr %x, align 8
   %lshrl118 = lshr i64 %82, 63
   %83 = and i64 1, %lshrl118
   %trunc119 = trunc i64 %83 to i8
   store i8 %trunc119, ptr %taddr120, align 1
-  %84 = insertvalue %"any*" undef, ptr %taddr120, 0
-  %85 = insertvalue %"any*" %84, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %84 = insertvalue %any undef, ptr %taddr120, 0
+  %85 = insertvalue %any %84, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd121 = getelementptr inbounds i8, ptr %varargslots111, i64 32
-  store %"any*" %85, ptr %ptradd121, align 16
+  store %any %85, ptr %ptradd121, align 16
   %86 = call i64 @std.io.printfn(ptr %retparam122, ptr @.str.4, i64 8, ptr %varargslots111, i64 3)
   %ptradd124 = getelementptr inbounds i8, ptr %y, i64 8
   %87 = load i64, ptr %ptradd124, align 8
   %88 = and i64 4294967295, %87
   %trunc125 = trunc i64 %88 to i32
   store i32 %trunc125, ptr %taddr126, align 4
-  %89 = insertvalue %"any*" undef, ptr %taddr126, 0
-  %90 = insertvalue %"any*" %89, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %90, ptr %varargslots123, align 16
+  %89 = insertvalue %any undef, ptr %taddr126, 0
+  %90 = insertvalue %any %89, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %90, ptr %varargslots123, align 16
   %ptradd127 = getelementptr inbounds i8, ptr %y, i64 8
   %91 = load i64, ptr %ptradd127, align 8
   %lshrl128 = lshr i64 %91, 32
   %92 = and i64 2147483647, %lshrl128
   %trunc129 = trunc i64 %92 to i32
   store i32 %trunc129, ptr %taddr130, align 4
-  %93 = insertvalue %"any*" undef, ptr %taddr130, 0
-  %94 = insertvalue %"any*" %93, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %93 = insertvalue %any undef, ptr %taddr130, 0
+  %94 = insertvalue %any %93, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd131 = getelementptr inbounds i8, ptr %varargslots123, i64 16
-  store %"any*" %94, ptr %ptradd131, align 16
+  store %any %94, ptr %ptradd131, align 16
   %ptradd132 = getelementptr inbounds i8, ptr %y, i64 8
   %95 = load i64, ptr %ptradd132, align 8
   %lshrl133 = lshr i64 %95, 63
   %96 = and i64 1, %lshrl133
   %trunc134 = trunc i64 %96 to i8
   store i8 %trunc134, ptr %taddr135, align 1
-  %97 = insertvalue %"any*" undef, ptr %taddr135, 0
-  %98 = insertvalue %"any*" %97, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %97 = insertvalue %any undef, ptr %taddr135, 0
+  %98 = insertvalue %any %97, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd136 = getelementptr inbounds i8, ptr %varargslots123, i64 32
-  store %"any*" %98, ptr %ptradd136, align 16
+  store %any %98, ptr %ptradd136, align 16
   %99 = call i64 @std.io.printfn(ptr %retparam137, ptr @.str.5, i64 8, ptr %varargslots123, i64 3)
   %100 = load i8, ptr %b, align 1
   %zext139 = zext i8 %100 to i32
@@ -398,9 +398,9 @@ entry:
   %shl148 = shl i32 %zext147, 24
   %106 = or i32 %shl148, %104
   store i32 %106, ptr %taddr149, align 4
-  %107 = insertvalue %"any*" undef, ptr %taddr149, 0
-  %108 = insertvalue %"any*" %107, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %108, ptr %varargslots138, align 16
+  %107 = insertvalue %any undef, ptr %taddr149, 0
+  %108 = insertvalue %any %107, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %108, ptr %varargslots138, align 16
   %ptradd150 = getelementptr inbounds i8, ptr %b, i64 4
   %109 = load i8, ptr %ptradd150, align 1
   %zext151 = zext i8 %109 to i32
@@ -421,20 +421,20 @@ entry:
   %115 = or i32 %shl160, %113
   %116 = and i32 2147483647, %115
   store i32 %116, ptr %taddr161, align 4
-  %117 = insertvalue %"any*" undef, ptr %taddr161, 0
-  %118 = insertvalue %"any*" %117, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  %117 = insertvalue %any undef, ptr %taddr161, 0
+  %118 = insertvalue %any %117, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
   %ptradd162 = getelementptr inbounds i8, ptr %varargslots138, i64 16
-  store %"any*" %118, ptr %ptradd162, align 16
+  store %any %118, ptr %ptradd162, align 16
   %ptradd163 = getelementptr inbounds i8, ptr %b, i64 7
   %119 = load i8, ptr %ptradd163, align 1
   %lshrl164 = lshr i8 %119, 7
   %120 = trunc i8 %lshrl164 to i1
   %121 = zext i1 %120 to i8
   store i8 %121, ptr %taddr165, align 1
-  %122 = insertvalue %"any*" undef, ptr %taddr165, 0
-  %123 = insertvalue %"any*" %122, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %122 = insertvalue %any undef, ptr %taddr165, 0
+  %123 = insertvalue %any %122, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd166 = getelementptr inbounds i8, ptr %varargslots138, i64 32
-  store %"any*" %123, ptr %ptradd166, align 16
+  store %any %123, ptr %ptradd166, align 16
   %124 = call i64 @std.io.printfn(ptr %retparam167, ptr @.str.6, i64 8, ptr %varargslots138, i64 3)
   ret void
 }
diff --git a/test/test_suite/bitstruct/bitstruct_ops.c3t b/test/test_suite/bitstruct/bitstruct_ops.c3t
index 7e3d96d80..f504043d6 100644
--- a/test/test_suite/bitstruct/bitstruct_ops.c3t
+++ b/test/test_suite/bitstruct/bitstruct_ops.c3t
@@ -47,21 +47,21 @@ entry:
   %f1 = alloca i32, align 4
   %f2 = alloca i32, align 4
   %f3 = alloca i32, align 4
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %taddr = alloca i8, align 1
   %taddr2 = alloca i8, align 1
   %retparam = alloca i64, align 8
   %f4 = alloca i32, align 4
-  %varargslots3 = alloca [2 x %"any*"], align 16
+  %varargslots3 = alloca [2 x %any], align 16
   %taddr5 = alloca i8, align 1
   %taddr8 = alloca i8, align 1
   %retparam10 = alloca i64, align 8
   %f5 = alloca i32, align 4
-  %varargslots11 = alloca [2 x %"any*"], align 16
+  %varargslots11 = alloca [2 x %any], align 16
   %taddr13 = alloca i8, align 1
   %taddr16 = alloca i8, align 1
   %retparam18 = alloca i64, align 8
-  %varargslots20 = alloca [2 x %"any*"], align 16
+  %varargslots20 = alloca [2 x %any], align 16
   %taddr22 = alloca i8, align 1
   %taddr25 = alloca i8, align 1
   %retparam27 = alloca i64, align 8
@@ -69,20 +69,20 @@ entry:
   %b2 = alloca [13 x i8], align 1
   %b3 = alloca [13 x i8], align 1
   %0 = alloca i104, align 1
-  %varargslots29 = alloca [3 x %"any*"], align 16
+  %varargslots29 = alloca [3 x %any], align 16
   %taddr30 = alloca i8, align 1
   %taddr32 = alloca i8, align 1
   %taddr36 = alloca i8, align 1
   %retparam38 = alloca i64, align 8
   %1 = alloca i104, align 1
-  %varargslots40 = alloca [3 x %"any*"], align 16
+  %varargslots40 = alloca [3 x %any], align 16
   %taddr41 = alloca i8, align 1
   %taddr43 = alloca i8, align 1
   %taddr47 = alloca i8, align 1
   %retparam49 = alloca i64, align 8
   %taddr50 = alloca [13 x i8], align 1
   %2 = alloca i104, align 1
-  %varargslots52 = alloca [3 x %"any*"], align 16
+  %varargslots52 = alloca [3 x %any], align 16
   %taddr53 = alloca i8, align 1
   %taddr55 = alloca i8, align 1
   %taddr59 = alloca i8, align 1
@@ -97,18 +97,18 @@ entry:
   %6 = and i32 1, %5
   %trunc = trunc i32 %6 to i8
   store i8 %trunc, ptr %taddr, align 1
-  %7 = insertvalue %"any*" undef, ptr %taddr, 0
-  %8 = insertvalue %"any*" %7, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %8, ptr %varargslots, align 16
+  %7 = insertvalue %any undef, ptr %taddr, 0
+  %8 = insertvalue %any %7, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %8, ptr %varargslots, align 16
   %9 = load i32, ptr %f3, align 4
   %lshrl = lshr i32 %9, 1
   %10 = and i32 1, %lshrl
   %trunc1 = trunc i32 %10 to i8
   store i8 %trunc1, ptr %taddr2, align 1
-  %11 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %11 = insertvalue %any undef, ptr %taddr2, 0
+  %12 = insertvalue %any %11, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %12, ptr %ptradd, align 16
+  store %any %12, ptr %ptradd, align 16
   %13 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 5, ptr %varargslots, i64 2)
   %14 = load i32, ptr %f1, align 4
   %15 = load i32, ptr %f2, align 4
@@ -121,36 +121,36 @@ entry:
   %18 = and i32 1, %17
   %trunc4 = trunc i32 %18 to i8
   store i8 %trunc4, ptr %taddr5, align 1
-  %19 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %20, ptr %varargslots3, align 16
+  %19 = insertvalue %any undef, ptr %taddr5, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %20, ptr %varargslots3, align 16
   %21 = load i32, ptr %f4, align 4
   %lshrl6 = lshr i32 %21, 1
   %22 = and i32 1, %lshrl6
   %trunc7 = trunc i32 %22 to i8
   store i8 %trunc7, ptr %taddr8, align 1
-  %23 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %23 = insertvalue %any undef, ptr %taddr8, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd9 = getelementptr inbounds i8, ptr %varargslots3, i64 16
-  store %"any*" %24, ptr %ptradd9, align 16
+  store %any %24, ptr %ptradd9, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam10, ptr @.str.1, i64 5, ptr %varargslots3, i64 2)
   store i32 3, ptr %f5, align 4
   %26 = load i32, ptr %f5, align 4
   %27 = and i32 1, %26
   %trunc12 = trunc i32 %27 to i8
   store i8 %trunc12, ptr %taddr13, align 1
-  %28 = insertvalue %"any*" undef, ptr %taddr13, 0
-  %29 = insertvalue %"any*" %28, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %29, ptr %varargslots11, align 16
+  %28 = insertvalue %any undef, ptr %taddr13, 0
+  %29 = insertvalue %any %28, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %29, ptr %varargslots11, align 16
   %30 = load i32, ptr %f5, align 4
   %lshrl14 = lshr i32 %30, 1
   %31 = and i32 1, %lshrl14
   %trunc15 = trunc i32 %31 to i8
   store i8 %trunc15, ptr %taddr16, align 1
-  %32 = insertvalue %"any*" undef, ptr %taddr16, 0
-  %33 = insertvalue %"any*" %32, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %32 = insertvalue %any undef, ptr %taddr16, 0
+  %33 = insertvalue %any %32, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd17 = getelementptr inbounds i8, ptr %varargslots11, i64 16
-  store %"any*" %33, ptr %ptradd17, align 16
+  store %any %33, ptr %ptradd17, align 16
   %34 = call i64 @std.io.printfn(ptr %retparam18, ptr @.str.2, i64 5, ptr %varargslots11, i64 2)
   %35 = load i32, ptr %f5, align 4
   %36 = load i32, ptr %f2, align 4
@@ -160,18 +160,18 @@ entry:
   %38 = and i32 1, %37
   %trunc21 = trunc i32 %38 to i8
   store i8 %trunc21, ptr %taddr22, align 1
-  %39 = insertvalue %"any*" undef, ptr %taddr22, 0
-  %40 = insertvalue %"any*" %39, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %40, ptr %varargslots20, align 16
+  %39 = insertvalue %any undef, ptr %taddr22, 0
+  %40 = insertvalue %any %39, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %40, ptr %varargslots20, align 16
   %41 = load i32, ptr %f5, align 4
   %lshrl23 = lshr i32 %41, 1
   %42 = and i32 1, %lshrl23
   %trunc24 = trunc i32 %42 to i8
   store i8 %trunc24, ptr %taddr25, align 1
-  %43 = insertvalue %"any*" undef, ptr %taddr25, 0
-  %44 = insertvalue %"any*" %43, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %43 = insertvalue %any undef, ptr %taddr25, 0
+  %44 = insertvalue %any %43, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd26 = getelementptr inbounds i8, ptr %varargslots20, i64 16
-  store %"any*" %44, ptr %ptradd26, align 16
+  store %any %44, ptr %ptradd26, align 16
   %45 = call i64 @std.io.printfn(ptr %retparam27, ptr @.str.3, i64 5, ptr %varargslots20, i64 2)
   store [13 x i8] c"\03\00\00\02\00\00\00\00\00\00\00\00\00", ptr %b1, align 1
   store [13 x i8] c"\01\00\00\00\00\00\00\00\00\00\00\00\00", ptr %b2, align 1
@@ -184,28 +184,28 @@ entry:
   %49 = trunc i8 %48 to i1
   %50 = zext i1 %49 to i8
   store i8 %50, ptr %taddr30, align 1
-  %51 = insertvalue %"any*" undef, ptr %taddr30, 0
-  %52 = insertvalue %"any*" %51, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %52, ptr %varargslots29, align 16
+  %51 = insertvalue %any undef, ptr %taddr30, 0
+  %52 = insertvalue %any %51, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %52, ptr %varargslots29, align 16
   %53 = load i8, ptr %b3, align 1
   %lshrl31 = lshr i8 %53, 1
   %54 = trunc i8 %lshrl31 to i1
   %55 = zext i1 %54 to i8
   store i8 %55, ptr %taddr32, align 1
-  %56 = insertvalue %"any*" undef, ptr %taddr32, 0
-  %57 = insertvalue %"any*" %56, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %56 = insertvalue %any undef, ptr %taddr32, 0
+  %57 = insertvalue %any %56, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd33 = getelementptr inbounds i8, ptr %varargslots29, i64 16
-  store %"any*" %57, ptr %ptradd33, align 16
+  store %any %57, ptr %ptradd33, align 16
   %ptradd34 = getelementptr inbounds i8, ptr %b3, i64 3
   %58 = load i8, ptr %ptradd34, align 1
   %lshrl35 = lshr i8 %58, 1
   %59 = trunc i8 %lshrl35 to i1
   %60 = zext i1 %59 to i8
   store i8 %60, ptr %taddr36, align 1
-  %61 = insertvalue %"any*" undef, ptr %taddr36, 0
-  %62 = insertvalue %"any*" %61, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %61 = insertvalue %any undef, ptr %taddr36, 0
+  %62 = insertvalue %any %61, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd37 = getelementptr inbounds i8, ptr %varargslots29, i64 32
-  store %"any*" %62, ptr %ptradd37, align 16
+  store %any %62, ptr %ptradd37, align 16
   %63 = call i64 @std.io.printfn(ptr %retparam38, ptr @.str.4, i64 8, ptr %varargslots29, i64 3)
   %64 = load i104, ptr %b3, align 1
   %bnot39 = xor i104 %64, -1
@@ -215,28 +215,28 @@ entry:
   %66 = trunc i8 %65 to i1
   %67 = zext i1 %66 to i8
   store i8 %67, ptr %taddr41, align 1
-  %68 = insertvalue %"any*" undef, ptr %taddr41, 0
-  %69 = insertvalue %"any*" %68, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %69, ptr %varargslots40, align 16
+  %68 = insertvalue %any undef, ptr %taddr41, 0
+  %69 = insertvalue %any %68, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %69, ptr %varargslots40, align 16
   %70 = load i8, ptr %b3, align 1
   %lshrl42 = lshr i8 %70, 1
   %71 = trunc i8 %lshrl42 to i1
   %72 = zext i1 %71 to i8
   store i8 %72, ptr %taddr43, align 1
-  %73 = insertvalue %"any*" undef, ptr %taddr43, 0
-  %74 = insertvalue %"any*" %73, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %73 = insertvalue %any undef, ptr %taddr43, 0
+  %74 = insertvalue %any %73, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd44 = getelementptr inbounds i8, ptr %varargslots40, i64 16
-  store %"any*" %74, ptr %ptradd44, align 16
+  store %any %74, ptr %ptradd44, align 16
   %ptradd45 = getelementptr inbounds i8, ptr %b3, i64 3
   %75 = load i8, ptr %ptradd45, align 1
   %lshrl46 = lshr i8 %75, 1
   %76 = trunc i8 %lshrl46 to i1
   %77 = zext i1 %76 to i8
   store i8 %77, ptr %taddr47, align 1
-  %78 = insertvalue %"any*" undef, ptr %taddr47, 0
-  %79 = insertvalue %"any*" %78, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %78 = insertvalue %any undef, ptr %taddr47, 0
+  %79 = insertvalue %any %78, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd48 = getelementptr inbounds i8, ptr %varargslots40, i64 32
-  store %"any*" %79, ptr %ptradd48, align 16
+  store %any %79, ptr %ptradd48, align 16
   %80 = call i64 @std.io.printfn(ptr %retparam49, ptr @.str.5, i64 8, ptr %varargslots40, i64 3)
   store [13 x i8] c"\03\00\00\00\00\00\00\00\00\00\00\00\00", ptr %taddr50, align 1
   %81 = load i104, ptr %b3, align 1
@@ -248,28 +248,28 @@ entry:
   %84 = trunc i8 %83 to i1
   %85 = zext i1 %84 to i8
   store i8 %85, ptr %taddr53, align 1
-  %86 = insertvalue %"any*" undef, ptr %taddr53, 0
-  %87 = insertvalue %"any*" %86, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %87, ptr %varargslots52, align 16
+  %86 = insertvalue %any undef, ptr %taddr53, 0
+  %87 = insertvalue %any %86, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %87, ptr %varargslots52, align 16
   %88 = load i8, ptr %b3, align 1
   %lshrl54 = lshr i8 %88, 1
   %89 = trunc i8 %lshrl54 to i1
   %90 = zext i1 %89 to i8
   store i8 %90, ptr %taddr55, align 1
-  %91 = insertvalue %"any*" undef, ptr %taddr55, 0
-  %92 = insertvalue %"any*" %91, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %91 = insertvalue %any undef, ptr %taddr55, 0
+  %92 = insertvalue %any %91, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd56 = getelementptr inbounds i8, ptr %varargslots52, i64 16
-  store %"any*" %92, ptr %ptradd56, align 16
+  store %any %92, ptr %ptradd56, align 16
   %ptradd57 = getelementptr inbounds i8, ptr %b3, i64 3
   %93 = load i8, ptr %ptradd57, align 1
   %lshrl58 = lshr i8 %93, 1
   %94 = trunc i8 %lshrl58 to i1
   %95 = zext i1 %94 to i8
   store i8 %95, ptr %taddr59, align 1
-  %96 = insertvalue %"any*" undef, ptr %taddr59, 0
-  %97 = insertvalue %"any*" %96, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  %96 = insertvalue %any undef, ptr %taddr59, 0
+  %97 = insertvalue %any %96, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
   %ptradd60 = getelementptr inbounds i8, ptr %varargslots52, i64 32
-  store %"any*" %97, ptr %ptradd60, align 16
+  store %any %97, ptr %ptradd60, align 16
   %98 = call i64 @std.io.printfn(ptr %retparam61, ptr @.str.6, i64 8, ptr %varargslots52, i64 3)
   ret void
 }
diff --git a/test/test_suite/cast/cast_to_failable.c3 b/test/test_suite/cast/cast_to_failable.c3
index ae83f6c33..56d55b472 100644
--- a/test/test_suite/cast/cast_to_failable.c3
+++ b/test/test_suite/cast/cast_to_failable.c3
@@ -7,8 +7,8 @@ fn void test()
 {
     int! x;
     double! y;
-    int! d = ($typeof(MyErr.FOO?))(x); // #error: This optional expression is untyped
+    int! d = ($typeof(MyErr.FOO?))(x); // #error: optional expression lacks a concrete
     int! df = ($typeof(y))(x); // #error: Casting to an optional type is not allowed
+    double! df2 = ($typeof(y!!))(x);
 }
 
-
diff --git a/test/test_suite/clang/2002-07.c3t b/test/test_suite/clang/2002-07.c3t
index 86a4cb1c4..ab845d653 100644
--- a/test/test_suite/clang/2002-07.c3t
+++ b/test/test_suite/clang/2002-07.c3t
@@ -312,8 +312,8 @@ fn int strcmp(char *s1, char *s2) {
 @foo.listNode0 = local_unnamed_addr global %List { i32 1, ptr @foo.listNode1 }, align 8
 @foo.listNode1 = global %List { i32 2, ptr @foo.listNode2 }, align 8
 @foo.listArray = local_unnamed_addr global [10 x %List] zeroinitializer, align 16
-@foo.temp = protected unnamed_addr global ptr null, align 8
-@foo.remaining = protected unnamed_addr global i32 0, align 4
+@foo.temp = internal unnamed_addr global ptr null, align 8
+@foo.remaining = internal unnamed_addr global i32 0, align 4
 @foo.ext = local_unnamed_addr global ptr null, align 8
 @foo.globalQuad = local_unnamed_addr global %Quad { i32 4, %SubStruct { i16 1, i16 2 }, ptr null, i8 3, i32 156 }, align 8
 @foo.foo.10 = internal unnamed_addr global i32 0, align 4
diff --git a/test/test_suite/compile_time/compile_time_access_subscript.c3t b/test/test_suite/compile_time/compile_time_access_subscript.c3t
index 992c68391..4bfb53a3a 100644
--- a/test/test_suite/compile_time/compile_time_access_subscript.c3t
+++ b/test/test_suite/compile_time/compile_time_access_subscript.c3t
@@ -27,7 +27,7 @@ fn void main()
 {
 	var $i = int[4] { 1, 2, 3, 4 };
 	var $b = Abc[2] { Abc {}, Abc { 11, 22, 33, 44 }};
-	var $c = any*[4] {};
+	var $c = any[4] {};
 	check_type(int);
 	check_type(Abc);
 	check_type(anyfault);
@@ -55,7 +55,7 @@ fn void main()
   %z10 = alloca %Abc, align 4
   %z14 = alloca [2 x i32], align 4
   %z16 = alloca %"int[]", align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %literal = alloca %Abc, align 4
   %retparam = alloca i64, align 8
   store i32 0, ptr %z, align 4
@@ -90,9 +90,9 @@ fn void main()
   store float 0.000000e+00, ptr %ptradd18, align 4
   %ptradd19 = getelementptr inbounds i8, ptr %literal, i64 12
   store float 0.000000e+00, ptr %ptradd19, align 4
-  %0 = insertvalue %"any*" undef, ptr %literal, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.test.Abc" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
+  %0 = insertvalue %any undef, ptr %literal, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.test.Abc" to i64), 1
+  store %any %1, ptr %varargslots, align 16
   %2 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   ret void
 }
diff --git a/test/test_suite/compile_time/ct_assert_bug.c3 b/test/test_suite/compile_time/ct_assert_bug.c3
index 40ce323a0..a5a6370c0 100644
--- a/test/test_suite/compile_time/ct_assert_bug.c3
+++ b/test/test_suite/compile_time/ct_assert_bug.c3
@@ -6,13 +6,13 @@ fn void! main()
 {
     String[] s1;
     String[] s2;
-    deep_equal(s1, s2); // #error: Compile time assert failed
+    deep_equal(s1, s2);
 }
 
 macro bool deep_equal(a, b)
 {
     $switch ($typeof(a).kindof)
-        $case SUBARRAY:
+        $case SLICE:
             if (a.len != b.len) return false;
             foreach (i, x : a)
             {
@@ -20,6 +20,6 @@ macro bool deep_equal(a, b)
             }
             return true;
         $default:
-            $assert(false);
+            $assert(false); // #error: Compile time assert failed
     $endswitch
 }
\ No newline at end of file
diff --git a/test/test_suite/compile_time/ct_builtin_time_date.c3t b/test/test_suite/compile_time/ct_builtin_time_date.c3t
index eae523640..c00b36607 100644
--- a/test/test_suite/compile_time/ct_builtin_time_date.c3t
+++ b/test/test_suite/compile_time/ct_builtin_time_date.c3t
@@ -28,7 +28,7 @@ fn void main()
 
 define void @test.test(i32 %0) #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   %len = alloca i64, align 8
@@ -41,10 +41,10 @@ entry:
   %retparam18 = alloca i64, align 8
   %error_var24 = alloca i64, align 8
   %error_var30 = alloca i64, align 8
-  %varargslots38 = alloca [1 x %"any*"], align 16
+  %varargslots38 = alloca [1 x %any], align 16
   %taddr39 = alloca i64, align 8
   %retparam40 = alloca i64, align 8
-  %varargslots43 = alloca [1 x %"any*"], align 16
+  %varargslots43 = alloca [1 x %any], align 16
   %taddr44 = alloca i64, align 8
   %retparam45 = alloca i64, align 8
   %len48 = alloca i64, align 8
@@ -58,9 +58,9 @@ entry:
   %error_var80 = alloca i64, align 8
   %error_var86 = alloca i64, align 8
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   %gt = icmp sgt i32 %0, 0
   br i1 %gt, label %if.then, label %if.exit
@@ -184,14 +184,14 @@ noerr_block35:                                    ; preds = %after_check33
 
 voiderr37:                                        ; preds = %noerr_block35, %guard_block34, %guard_block28, %guard_block22
   store i64 14, ptr %taddr39, align 8
-  %22 = insertvalue %"any*" undef, ptr %taddr39, 0
-  %23 = insertvalue %"any*" %22, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %23, ptr %varargslots38, align 16
+  %22 = insertvalue %any undef, ptr %taddr39, 0
+  %23 = insertvalue %any %22, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %23, ptr %varargslots38, align 16
   %24 = call i64 @std.io.printfn(ptr %retparam40, ptr @.str.3, i64 2, ptr %varargslots38, i64 1)
   store i64 6, ptr %taddr44, align 8
-  %25 = insertvalue %"any*" undef, ptr %taddr44, 0
-  %26 = insertvalue %"any*" %25, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %26, ptr %varargslots43, align 16
+  %25 = insertvalue %any undef, ptr %taddr44, 0
+  %26 = insertvalue %any %25, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %26, ptr %varargslots43, align 16
   %27 = call i64 @std.io.printfn(ptr %retparam45, ptr @.str.4, i64 2, ptr %varargslots43, i64 1)
   %28 = call ptr @std.io.stdout()
   %29 = call i64 @std.io.File.write(ptr %retparam51, ptr %28, ptr @.str.5, i64 23)
diff --git a/test/test_suite/compile_time/ct_funcptr.c3t b/test/test_suite/compile_time/ct_funcptr.c3t
index a3a98dc62..f7203a80b 100644
--- a/test/test_suite/compile_time/ct_funcptr.c3t
+++ b/test/test_suite/compile_time/ct_funcptr.c3t
@@ -19,14 +19,14 @@ fn void main()
 define void @test.test(i32 %0) #0 {
 entry:
   %ptr = alloca ptr, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   store ptr @test.test, ptr %ptr, align 8
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   %gt = icmp sgt i32 %0, 0
   br i1 %gt, label %if.then, label %if.exit
diff --git a/test/test_suite/compile_time/ct_memberof.c3t b/test/test_suite/compile_time/ct_memberof.c3t
index a28797d09..a46498311 100644
--- a/test/test_suite/compile_time/ct_memberof.c3t
+++ b/test/test_suite/compile_time/ct_memberof.c3t
@@ -104,7 +104,7 @@ fn void main()
 define void @test.hello(i32 %0, double %1, i64 %2, i64 %3, ptr %4, i64 %5) #0 {
 entry:
   %d = alloca [4 x i32], align 8
-  %args = alloca %"any*[]", align 8
+  %args = alloca %"any[]", align 8
   store i64 %2, ptr %d, align 8
   %ptradd = getelementptr inbounds i8, ptr %d, i64 8
   store i64 %3, ptr %ptradd, align 8
@@ -152,52 +152,52 @@ entry:
   %retparam132 = alloca i64, align 8
   %error_var138 = alloca i64, align 8
   %error_var144 = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca %"char[]", align 8
   %retparam152 = alloca i64, align 8
-  %varargslots155 = alloca [2 x %"any*"], align 16
+  %varargslots155 = alloca [2 x %any], align 16
   %taddr156 = alloca %"char[]", align 8
   %taddr157 = alloca %"char[]", align 8
   %retparam158 = alloca i64, align 8
-  %varargslots161 = alloca [2 x %"any*"], align 16
+  %varargslots161 = alloca [2 x %any], align 16
   %taddr162 = alloca %"char[]", align 8
   %taddr163 = alloca %"char[]", align 8
   %retparam165 = alloca i64, align 8
-  %varargslots168 = alloca [2 x %"any*"], align 16
+  %varargslots168 = alloca [2 x %any], align 16
   %taddr169 = alloca %"char[]", align 8
   %taddr170 = alloca %"char[]", align 8
   %retparam172 = alloca i64, align 8
-  %varargslots175 = alloca [2 x %"any*"], align 16
+  %varargslots175 = alloca [2 x %any], align 16
   %taddr176 = alloca %"char[]", align 8
   %taddr177 = alloca %"char[]", align 8
   %retparam179 = alloca i64, align 8
-  %varargslots182 = alloca [1 x %"any*"], align 16
+  %varargslots182 = alloca [1 x %any], align 16
   %taddr183 = alloca %"char[]", align 8
   %retparam184 = alloca i64, align 8
-  %varargslots187 = alloca [2 x %"any*"], align 16
+  %varargslots187 = alloca [2 x %any], align 16
   %taddr188 = alloca %"char[]", align 8
   %taddr189 = alloca %"char[]", align 8
   %retparam191 = alloca i64, align 8
-  %varargslots194 = alloca [2 x %"any*"], align 16
+  %varargslots194 = alloca [2 x %any], align 16
   %taddr195 = alloca %"char[]", align 8
   %taddr196 = alloca %"char[]", align 8
   %retparam198 = alloca i64, align 8
-  %varargslots201 = alloca [2 x %"any*"], align 16
+  %varargslots201 = alloca [2 x %any], align 16
   %taddr202 = alloca %"char[]", align 8
   %taddr203 = alloca %"char[]", align 8
   %retparam205 = alloca i64, align 8
-  %varargslots208 = alloca [2 x %"any*"], align 16
+  %varargslots208 = alloca [2 x %any], align 16
   %taddr209 = alloca %"char[]", align 8
   %taddr210 = alloca %"char[]", align 8
   %retparam212 = alloca i64, align 8
-  %varargslots215 = alloca [1 x %"any*"], align 16
+  %varargslots215 = alloca [1 x %any], align 16
   %taddr216 = alloca %"char[]", align 8
   %retparam217 = alloca i64, align 8
-  %varargslots220 = alloca [2 x %"any*"], align 16
+  %varargslots220 = alloca [2 x %any], align 16
   %taddr221 = alloca %"char[]", align 8
   %taddr222 = alloca %"char[]", align 8
   %retparam224 = alloca i64, align 8
-  %varargslots227 = alloca [2 x %"any*"], align 16
+  %varargslots227 = alloca [2 x %any], align 16
   %taddr228 = alloca %"char[]", align 8
   %taddr229 = alloca %"char[]", align 8
   %retparam231 = alloca i64, align 8
@@ -206,17 +206,13 @@ entry:
   %not_err = icmp eq i64 %2, 0
   %3 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
   br i1 %3, label %after_check, label %assign_optional
-
 assign_optional:                                  ; preds = %entry
   store i64 %2, ptr %error_var, align 8
   br label %guard_block
-
 after_check:                                      ; preds = %entry
   br label %noerr_block
-
 guard_block:                                      ; preds = %assign_optional
   br label %voiderr
-
 noerr_block:                                      ; preds = %after_check
   %4 = load i64, ptr %retparam, align 8
   store i64 %4, ptr %len, align 8
@@ -224,55 +220,42 @@ noerr_block:                                      ; preds = %after_check
   %not_err3 = icmp eq i64 %5, 0
   %6 = call i1 @llvm.expect.i1(i1 %not_err3, i1 true)
   br i1 %6, label %after_check5, label %assign_optional4
-
 assign_optional4:                                 ; preds = %noerr_block
   store i64 %5, ptr %error_var2, align 8
   br label %guard_block6
-
 after_check5:                                     ; preds = %noerr_block
   br label %noerr_block7
-
 guard_block6:                                     ; preds = %assign_optional4
   br label %voiderr
-
 noerr_block7:                                     ; preds = %after_check5
   %7 = call i64 @std.io.File.flush(ptr %1)
   %not_err9 = icmp eq i64 %7, 0
   %8 = call i1 @llvm.expect.i1(i1 %not_err9, i1 true)
   br i1 %8, label %after_check11, label %assign_optional10
-
 assign_optional10:                                ; preds = %noerr_block7
   store i64 %7, ptr %error_var8, align 8
   br label %guard_block12
-
 after_check11:                                    ; preds = %noerr_block7
   br label %noerr_block13
-
 guard_block12:                                    ; preds = %assign_optional10
   br label %voiderr
-
 noerr_block13:                                    ; preds = %after_check11
   %9 = load i64, ptr %len, align 8
   %add = add i64 %9, 1
   br label %voiderr
-
 voiderr:                                          ; preds = %noerr_block13, %guard_block12, %guard_block6, %guard_block
   %10 = call ptr @std.io.stdout()
   %11 = call i64 @std.io.File.write(ptr %retparam17, ptr %10, ptr @.str.10, i64 3)
   %not_err18 = icmp eq i64 %11, 0
   %12 = call i1 @llvm.expect.i1(i1 %not_err18, i1 true)
   br i1 %12, label %after_check20, label %assign_optional19
-
 assign_optional19:                                ; preds = %voiderr
   store i64 %11, ptr %error_var15, align 8
   br label %guard_block21
-
 after_check20:                                    ; preds = %voiderr
   br label %noerr_block22
-
 guard_block21:                                    ; preds = %assign_optional19
   br label %voiderr36
-
 noerr_block22:                                    ; preds = %after_check20
   %13 = load i64, ptr %retparam17, align 8
   store i64 %13, ptr %len14, align 8
@@ -280,55 +263,42 @@ noerr_block22:                                    ; preds = %after_check20
   %not_err24 = icmp eq i64 %14, 0
   %15 = call i1 @llvm.expect.i1(i1 %not_err24, i1 true)
   br i1 %15, label %after_check26, label %assign_optional25
-
 assign_optional25:                                ; preds = %noerr_block22
   store i64 %14, ptr %error_var23, align 8
   br label %guard_block27
-
 after_check26:                                    ; preds = %noerr_block22
   br label %noerr_block28
-
 guard_block27:                                    ; preds = %assign_optional25
   br label %voiderr36
-
 noerr_block28:                                    ; preds = %after_check26
   %16 = call i64 @std.io.File.flush(ptr %10)
   %not_err30 = icmp eq i64 %16, 0
   %17 = call i1 @llvm.expect.i1(i1 %not_err30, i1 true)
   br i1 %17, label %after_check32, label %assign_optional31
-
 assign_optional31:                                ; preds = %noerr_block28
   store i64 %16, ptr %error_var29, align 8
   br label %guard_block33
-
 after_check32:                                    ; preds = %noerr_block28
   br label %noerr_block34
-
 guard_block33:                                    ; preds = %assign_optional31
   br label %voiderr36
-
 noerr_block34:                                    ; preds = %after_check32
   %18 = load i64, ptr %len14, align 8
   %add35 = add i64 %18, 1
   br label %voiderr36
-
 voiderr36:                                        ; preds = %noerr_block34, %guard_block33, %guard_block27, %guard_block21
   %19 = call ptr @std.io.stdout()
   %20 = call i64 @std.io.File.write(ptr %retparam40, ptr %19, ptr @.str.11, i64 6)
   %not_err41 = icmp eq i64 %20, 0
   %21 = call i1 @llvm.expect.i1(i1 %not_err41, i1 true)
   br i1 %21, label %after_check43, label %assign_optional42
-
 assign_optional42:                                ; preds = %voiderr36
   store i64 %20, ptr %error_var38, align 8
   br label %guard_block44
-
 after_check43:                                    ; preds = %voiderr36
   br label %noerr_block45
-
 guard_block44:                                    ; preds = %assign_optional42
   br label %voiderr59
-
 noerr_block45:                                    ; preds = %after_check43
   %22 = load i64, ptr %retparam40, align 8
   store i64 %22, ptr %len37, align 8
@@ -336,55 +306,42 @@ noerr_block45:                                    ; preds = %after_check43
   %not_err47 = icmp eq i64 %23, 0
   %24 = call i1 @llvm.expect.i1(i1 %not_err47, i1 true)
   br i1 %24, label %after_check49, label %assign_optional48
-
 assign_optional48:                                ; preds = %noerr_block45
   store i64 %23, ptr %error_var46, align 8
   br label %guard_block50
-
 after_check49:                                    ; preds = %noerr_block45
   br label %noerr_block51
-
 guard_block50:                                    ; preds = %assign_optional48
   br label %voiderr59
-
 noerr_block51:                                    ; preds = %after_check49
   %25 = call i64 @std.io.File.flush(ptr %19)
   %not_err53 = icmp eq i64 %25, 0
   %26 = call i1 @llvm.expect.i1(i1 %not_err53, i1 true)
   br i1 %26, label %after_check55, label %assign_optional54
-
 assign_optional54:                                ; preds = %noerr_block51
   store i64 %25, ptr %error_var52, align 8
   br label %guard_block56
-
 after_check55:                                    ; preds = %noerr_block51
   br label %noerr_block57
-
 guard_block56:                                    ; preds = %assign_optional54
   br label %voiderr59
-
 noerr_block57:                                    ; preds = %after_check55
   %27 = load i64, ptr %len37, align 8
   %add58 = add i64 %27, 1
   br label %voiderr59
-
 voiderr59:                                        ; preds = %noerr_block57, %guard_block56, %guard_block50, %guard_block44
   %28 = call ptr @std.io.stdout()
   %29 = call i64 @std.io.File.write(ptr %retparam63, ptr %28, ptr @.str.12, i64 6)
   %not_err64 = icmp eq i64 %29, 0
   %30 = call i1 @llvm.expect.i1(i1 %not_err64, i1 true)
   br i1 %30, label %after_check66, label %assign_optional65
-
 assign_optional65:                                ; preds = %voiderr59
   store i64 %29, ptr %error_var61, align 8
   br label %guard_block67
-
 after_check66:                                    ; preds = %voiderr59
   br label %noerr_block68
-
 guard_block67:                                    ; preds = %assign_optional65
   br label %voiderr82
-
 noerr_block68:                                    ; preds = %after_check66
   %31 = load i64, ptr %retparam63, align 8
   store i64 %31, ptr %len60, align 8
@@ -392,55 +349,42 @@ noerr_block68:                                    ; preds = %after_check66
   %not_err70 = icmp eq i64 %32, 0
   %33 = call i1 @llvm.expect.i1(i1 %not_err70, i1 true)
   br i1 %33, label %after_check72, label %assign_optional71
-
 assign_optional71:                                ; preds = %noerr_block68
   store i64 %32, ptr %error_var69, align 8
   br label %guard_block73
-
 after_check72:                                    ; preds = %noerr_block68
   br label %noerr_block74
-
 guard_block73:                                    ; preds = %assign_optional71
   br label %voiderr82
-
 noerr_block74:                                    ; preds = %after_check72
   %34 = call i64 @std.io.File.flush(ptr %28)
   %not_err76 = icmp eq i64 %34, 0
   %35 = call i1 @llvm.expect.i1(i1 %not_err76, i1 true)
   br i1 %35, label %after_check78, label %assign_optional77
-
 assign_optional77:                                ; preds = %noerr_block74
   store i64 %34, ptr %error_var75, align 8
   br label %guard_block79
-
 after_check78:                                    ; preds = %noerr_block74
   br label %noerr_block80
-
 guard_block79:                                    ; preds = %assign_optional77
   br label %voiderr82
-
 noerr_block80:                                    ; preds = %after_check78
   %36 = load i64, ptr %len60, align 8
   %add81 = add i64 %36, 1
   br label %voiderr82
-
 voiderr82:                                        ; preds = %noerr_block80, %guard_block79, %guard_block73, %guard_block67
   %37 = call ptr @std.io.stdout()
-  %38 = call i64 @std.io.File.write(ptr %retparam86, ptr %37, ptr @.str.13, i64 6)
+  %38 = call i64 @std.io.File.write(ptr %retparam86, ptr %37, ptr @.str.13, i64 5)
   %not_err87 = icmp eq i64 %38, 0
   %39 = call i1 @llvm.expect.i1(i1 %not_err87, i1 true)
   br i1 %39, label %after_check89, label %assign_optional88
-
 assign_optional88:                                ; preds = %voiderr82
   store i64 %38, ptr %error_var84, align 8
   br label %guard_block90
-
 after_check89:                                    ; preds = %voiderr82
   br label %noerr_block91
-
 guard_block90:                                    ; preds = %assign_optional88
   br label %voiderr105
-
 noerr_block91:                                    ; preds = %after_check89
   %40 = load i64, ptr %retparam86, align 8
   store i64 %40, ptr %len83, align 8
@@ -448,55 +392,42 @@ noerr_block91:                                    ; preds = %after_check89
   %not_err93 = icmp eq i64 %41, 0
   %42 = call i1 @llvm.expect.i1(i1 %not_err93, i1 true)
   br i1 %42, label %after_check95, label %assign_optional94
-
 assign_optional94:                                ; preds = %noerr_block91
   store i64 %41, ptr %error_var92, align 8
   br label %guard_block96
-
 after_check95:                                    ; preds = %noerr_block91
   br label %noerr_block97
-
 guard_block96:                                    ; preds = %assign_optional94
   br label %voiderr105
-
 noerr_block97:                                    ; preds = %after_check95
   %43 = call i64 @std.io.File.flush(ptr %37)
   %not_err99 = icmp eq i64 %43, 0
   %44 = call i1 @llvm.expect.i1(i1 %not_err99, i1 true)
   br i1 %44, label %after_check101, label %assign_optional100
-
 assign_optional100:                               ; preds = %noerr_block97
   store i64 %43, ptr %error_var98, align 8
   br label %guard_block102
-
 after_check101:                                   ; preds = %noerr_block97
   br label %noerr_block103
-
 guard_block102:                                   ; preds = %assign_optional100
   br label %voiderr105
-
 noerr_block103:                                   ; preds = %after_check101
   %45 = load i64, ptr %len83, align 8
   %add104 = add i64 %45, 1
   br label %voiderr105
-
 voiderr105:                                       ; preds = %noerr_block103, %guard_block102, %guard_block96, %guard_block90
   %46 = call ptr @std.io.stdout()
   %47 = call i64 @std.io.File.write(ptr %retparam109, ptr %46, ptr @.str.14, i64 4)
   %not_err110 = icmp eq i64 %47, 0
   %48 = call i1 @llvm.expect.i1(i1 %not_err110, i1 true)
   br i1 %48, label %after_check112, label %assign_optional111
-
 assign_optional111:                               ; preds = %voiderr105
   store i64 %47, ptr %error_var107, align 8
   br label %guard_block113
-
 after_check112:                                   ; preds = %voiderr105
   br label %noerr_block114
-
 guard_block113:                                   ; preds = %assign_optional111
   br label %voiderr128
-
 noerr_block114:                                   ; preds = %after_check112
   %49 = load i64, ptr %retparam109, align 8
   store i64 %49, ptr %len106, align 8
@@ -504,55 +435,42 @@ noerr_block114:                                   ; preds = %after_check112
   %not_err116 = icmp eq i64 %50, 0
   %51 = call i1 @llvm.expect.i1(i1 %not_err116, i1 true)
   br i1 %51, label %after_check118, label %assign_optional117
-
 assign_optional117:                               ; preds = %noerr_block114
   store i64 %50, ptr %error_var115, align 8
   br label %guard_block119
-
 after_check118:                                   ; preds = %noerr_block114
   br label %noerr_block120
-
 guard_block119:                                   ; preds = %assign_optional117
   br label %voiderr128
-
 noerr_block120:                                   ; preds = %after_check118
   %52 = call i64 @std.io.File.flush(ptr %46)
   %not_err122 = icmp eq i64 %52, 0
   %53 = call i1 @llvm.expect.i1(i1 %not_err122, i1 true)
   br i1 %53, label %after_check124, label %assign_optional123
-
 assign_optional123:                               ; preds = %noerr_block120
   store i64 %52, ptr %error_var121, align 8
   br label %guard_block125
-
 after_check124:                                   ; preds = %noerr_block120
   br label %noerr_block126
-
 guard_block125:                                   ; preds = %assign_optional123
   br label %voiderr128
-
 noerr_block126:                                   ; preds = %after_check124
   %54 = load i64, ptr %len106, align 8
   %add127 = add i64 %54, 1
   br label %voiderr128
-
 voiderr128:                                       ; preds = %noerr_block126, %guard_block125, %guard_block119, %guard_block113
   %55 = call ptr @std.io.stdout()
   %56 = call i64 @std.io.File.write(ptr %retparam132, ptr %55, ptr @.str.15, i64 3)
   %not_err133 = icmp eq i64 %56, 0
   %57 = call i1 @llvm.expect.i1(i1 %not_err133, i1 true)
   br i1 %57, label %after_check135, label %assign_optional134
-
 assign_optional134:                               ; preds = %voiderr128
   store i64 %56, ptr %error_var130, align 8
   br label %guard_block136
-
 after_check135:                                   ; preds = %voiderr128
   br label %noerr_block137
-
 guard_block136:                                   ; preds = %assign_optional134
   br label %voiderr151
-
 noerr_block137:                                   ; preds = %after_check135
   %58 = load i64, ptr %retparam132, align 8
   store i64 %58, ptr %len129, align 8
@@ -560,301 +478,290 @@ noerr_block137:                                   ; preds = %after_check135
   %not_err139 = icmp eq i64 %59, 0
   %60 = call i1 @llvm.expect.i1(i1 %not_err139, i1 true)
   br i1 %60, label %after_check141, label %assign_optional140
-
 assign_optional140:                               ; preds = %noerr_block137
   store i64 %59, ptr %error_var138, align 8
   br label %guard_block142
-
 after_check141:                                   ; preds = %noerr_block137
   br label %noerr_block143
-
 guard_block142:                                   ; preds = %assign_optional140
   br label %voiderr151
-
 noerr_block143:                                   ; preds = %after_check141
   %61 = call i64 @std.io.File.flush(ptr %55)
   %not_err145 = icmp eq i64 %61, 0
   %62 = call i1 @llvm.expect.i1(i1 %not_err145, i1 true)
   br i1 %62, label %after_check147, label %assign_optional146
-
 assign_optional146:                               ; preds = %noerr_block143
   store i64 %61, ptr %error_var144, align 8
   br label %guard_block148
-
 after_check147:                                   ; preds = %noerr_block143
   br label %noerr_block149
-
 guard_block148:                                   ; preds = %assign_optional146
   br label %voiderr151
-
 noerr_block149:                                   ; preds = %after_check147
   %63 = load i64, ptr %len129, align 8
   %add150 = add i64 %63, 1
   br label %voiderr151
-
 voiderr151:                                       ; preds = %noerr_block149, %guard_block148, %guard_block142, %guard_block136
   store %"char[]" { ptr @.str.17, i64 3 }, ptr %taddr, align 8
-  %64 = insertvalue %"any*" undef, ptr %taddr, 0
-  %65 = insertvalue %"any*" %64, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %65, ptr %varargslots, align 16
+  %64 = insertvalue %any undef, ptr %taddr, 0
+  %65 = insertvalue %any %64, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %65, ptr %varargslots, align 16
   %66 = call i64 @std.io.printfn(ptr %retparam152, ptr @.str.16, i64 8, ptr %varargslots, i64 1)
   store %"char[]" { ptr @.str.19, i64 1 }, ptr %taddr156, align 8
-  %67 = insertvalue %"any*" undef, ptr %taddr156, 0
-  %68 = insertvalue %"any*" %67, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %68, ptr %varargslots155, align 16
+  %67 = insertvalue %any undef, ptr %taddr156, 0
+  %68 = insertvalue %any %67, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %68, ptr %varargslots155, align 16
   store %"char[]" { ptr @.str.20, i64 3 }, ptr %taddr157, align 8
-  %69 = insertvalue %"any*" undef, ptr %taddr157, 0
-  %70 = insertvalue %"any*" %69, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %69 = insertvalue %any undef, ptr %taddr157, 0
+  %70 = insertvalue %any %69, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots155, i64 16
-  store %"any*" %70, ptr %ptradd, align 16
+  store %any %70, ptr %ptradd, align 16
   %71 = call i64 @std.io.printfn(ptr %retparam158, ptr @.str.18, i64 6, ptr %varargslots155, i64 2)
   store %"char[]" { ptr @.str.22, i64 4 }, ptr %taddr162, align 8
-  %72 = insertvalue %"any*" undef, ptr %taddr162, 0
-  %73 = insertvalue %"any*" %72, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %73, ptr %varargslots161, align 16
+  %72 = insertvalue %any undef, ptr %taddr162, 0
+  %73 = insertvalue %any %72, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %73, ptr %varargslots161, align 16
   store %"char[]" { ptr @.str.23, i64 4 }, ptr %taddr163, align 8
-  %74 = insertvalue %"any*" undef, ptr %taddr163, 0
-  %75 = insertvalue %"any*" %74, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %74 = insertvalue %any undef, ptr %taddr163, 0
+  %75 = insertvalue %any %74, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd164 = getelementptr inbounds i8, ptr %varargslots161, i64 16
-  store %"any*" %75, ptr %ptradd164, align 16
+  store %any %75, ptr %ptradd164, align 16
   %76 = call i64 @std.io.printfn(ptr %retparam165, ptr @.str.21, i64 6, ptr %varargslots161, i64 2)
   store %"char[]" zeroinitializer, ptr %taddr169, align 8
-  %77 = insertvalue %"any*" undef, ptr %taddr169, 0
-  %78 = insertvalue %"any*" %77, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %78, ptr %varargslots168, align 16
+  %77 = insertvalue %any undef, ptr %taddr169, 0
+  %78 = insertvalue %any %77, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %78, ptr %varargslots168, align 16
   store %"char[]" { ptr @.str.25, i64 5 }, ptr %taddr170, align 8
-  %79 = insertvalue %"any*" undef, ptr %taddr170, 0
-  %80 = insertvalue %"any*" %79, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %79 = insertvalue %any undef, ptr %taddr170, 0
+  %80 = insertvalue %any %79, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd171 = getelementptr inbounds i8, ptr %varargslots168, i64 16
-  store %"any*" %80, ptr %ptradd171, align 16
+  store %any %80, ptr %ptradd171, align 16
   %81 = call i64 @std.io.printfn(ptr %retparam172, ptr @.str.24, i64 6, ptr %varargslots168, i64 2)
   store %"char[]" { ptr @.str.27, i64 1 }, ptr %taddr176, align 8
-  %82 = insertvalue %"any*" undef, ptr %taddr176, 0
-  %83 = insertvalue %"any*" %82, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %83, ptr %varargslots175, align 16
+  %82 = insertvalue %any undef, ptr %taddr176, 0
+  %83 = insertvalue %any %82, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %83, ptr %varargslots175, align 16
   store %"char[]" { ptr @.str.28, i64 6 }, ptr %taddr177, align 8
-  %84 = insertvalue %"any*" undef, ptr %taddr177, 0
-  %85 = insertvalue %"any*" %84, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %84 = insertvalue %any undef, ptr %taddr177, 0
+  %85 = insertvalue %any %84, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd178 = getelementptr inbounds i8, ptr %varargslots175, i64 16
-  store %"any*" %85, ptr %ptradd178, align 16
+  store %any %85, ptr %ptradd178, align 16
   %86 = call i64 @std.io.printfn(ptr %retparam179, ptr @.str.26, i64 6, ptr %varargslots175, i64 2)
   store %"char[]" { ptr @.str.30, i64 3 }, ptr %taddr183, align 8
-  %87 = insertvalue %"any*" undef, ptr %taddr183, 0
-  %88 = insertvalue %"any*" %87, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %88, ptr %varargslots182, align 16
+  %87 = insertvalue %any undef, ptr %taddr183, 0
+  %88 = insertvalue %any %87, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %88, ptr %varargslots182, align 16
   %89 = call i64 @std.io.printfn(ptr %retparam184, ptr @.str.29, i64 8, ptr %varargslots182, i64 1)
   store %"char[]" { ptr @.str.32, i64 1 }, ptr %taddr188, align 8
-  %90 = insertvalue %"any*" undef, ptr %taddr188, 0
-  %91 = insertvalue %"any*" %90, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %91, ptr %varargslots187, align 16
+  %90 = insertvalue %any undef, ptr %taddr188, 0
+  %91 = insertvalue %any %90, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %91, ptr %varargslots187, align 16
   store %"char[]" { ptr @.str.33, i64 4 }, ptr %taddr189, align 8
-  %92 = insertvalue %"any*" undef, ptr %taddr189, 0
-  %93 = insertvalue %"any*" %92, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %92 = insertvalue %any undef, ptr %taddr189, 0
+  %93 = insertvalue %any %92, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd190 = getelementptr inbounds i8, ptr %varargslots187, i64 16
-  store %"any*" %93, ptr %ptradd190, align 16
+  store %any %93, ptr %ptradd190, align 16
   %94 = call i64 @std.io.printfn(ptr %retparam191, ptr @.str.31, i64 6, ptr %varargslots187, i64 2)
   store %"char[]" { ptr @.str.35, i64 1 }, ptr %taddr195, align 8
-  %95 = insertvalue %"any*" undef, ptr %taddr195, 0
-  %96 = insertvalue %"any*" %95, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %96, ptr %varargslots194, align 16
+  %95 = insertvalue %any undef, ptr %taddr195, 0
+  %96 = insertvalue %any %95, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %96, ptr %varargslots194, align 16
   store %"char[]" { ptr @.str.36, i64 5 }, ptr %taddr196, align 8
-  %97 = insertvalue %"any*" undef, ptr %taddr196, 0
-  %98 = insertvalue %"any*" %97, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %97 = insertvalue %any undef, ptr %taddr196, 0
+  %98 = insertvalue %any %97, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd197 = getelementptr inbounds i8, ptr %varargslots194, i64 16
-  store %"any*" %98, ptr %ptradd197, align 16
+  store %any %98, ptr %ptradd197, align 16
   %99 = call i64 @std.io.printfn(ptr %retparam198, ptr @.str.34, i64 6, ptr %varargslots194, i64 2)
   store %"char[]" zeroinitializer, ptr %taddr202, align 8
-  %100 = insertvalue %"any*" undef, ptr %taddr202, 0
-  %101 = insertvalue %"any*" %100, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %101, ptr %varargslots201, align 16
+  %100 = insertvalue %any undef, ptr %taddr202, 0
+  %101 = insertvalue %any %100, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %101, ptr %varargslots201, align 16
   store %"char[]" { ptr @.str.38, i64 5 }, ptr %taddr203, align 8
-  %102 = insertvalue %"any*" undef, ptr %taddr203, 0
-  %103 = insertvalue %"any*" %102, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %102 = insertvalue %any undef, ptr %taddr203, 0
+  %103 = insertvalue %any %102, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd204 = getelementptr inbounds i8, ptr %varargslots201, i64 16
-  store %"any*" %103, ptr %ptradd204, align 16
+  store %any %103, ptr %ptradd204, align 16
   %104 = call i64 @std.io.printfn(ptr %retparam205, ptr @.str.37, i64 6, ptr %varargslots201, i64 2)
   store %"char[]" { ptr @.str.40, i64 3 }, ptr %taddr209, align 8
-  %105 = insertvalue %"any*" undef, ptr %taddr209, 0
-  %106 = insertvalue %"any*" %105, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %106, ptr %varargslots208, align 16
+  %105 = insertvalue %any undef, ptr %taddr209, 0
+  %106 = insertvalue %any %105, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %106, ptr %varargslots208, align 16
   store %"char[]" { ptr @.str.41, i64 3 }, ptr %taddr210, align 8
-  %107 = insertvalue %"any*" undef, ptr %taddr210, 0
-  %108 = insertvalue %"any*" %107, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %107 = insertvalue %any undef, ptr %taddr210, 0
+  %108 = insertvalue %any %107, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd211 = getelementptr inbounds i8, ptr %varargslots208, i64 16
-  store %"any*" %108, ptr %ptradd211, align 16
+  store %any %108, ptr %ptradd211, align 16
   %109 = call i64 @std.io.printfn(ptr %retparam212, ptr @.str.39, i64 6, ptr %varargslots208, i64 2)
   store %"char[]" { ptr @.str.43, i64 4 }, ptr %taddr216, align 8
-  %110 = insertvalue %"any*" undef, ptr %taddr216, 0
-  %111 = insertvalue %"any*" %110, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %111, ptr %varargslots215, align 16
+  %110 = insertvalue %any undef, ptr %taddr216, 0
+  %111 = insertvalue %any %110, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %111, ptr %varargslots215, align 16
   %112 = call i64 @std.io.printfn(ptr %retparam217, ptr @.str.42, i64 8, ptr %varargslots215, i64 1)
   store %"char[]" { ptr @.str.45, i64 1 }, ptr %taddr221, align 8
-  %113 = insertvalue %"any*" undef, ptr %taddr221, 0
-  %114 = insertvalue %"any*" %113, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %114, ptr %varargslots220, align 16
+  %113 = insertvalue %any undef, ptr %taddr221, 0
+  %114 = insertvalue %any %113, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %114, ptr %varargslots220, align 16
   store %"char[]" { ptr @.str.46, i64 3 }, ptr %taddr222, align 8
-  %115 = insertvalue %"any*" undef, ptr %taddr222, 0
-  %116 = insertvalue %"any*" %115, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %115 = insertvalue %any undef, ptr %taddr222, 0
+  %116 = insertvalue %any %115, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd223 = getelementptr inbounds i8, ptr %varargslots220, i64 16
-  store %"any*" %116, ptr %ptradd223, align 16
+  store %any %116, ptr %ptradd223, align 16
   %117 = call i64 @std.io.printfn(ptr %retparam224, ptr @.str.44, i64 6, ptr %varargslots220, i64 2)
   store %"char[]" { ptr @.str.48, i64 1 }, ptr %taddr228, align 8
-  %118 = insertvalue %"any*" undef, ptr %taddr228, 0
-  %119 = insertvalue %"any*" %118, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %119, ptr %varargslots227, align 16
+  %118 = insertvalue %any undef, ptr %taddr228, 0
+  %119 = insertvalue %any %118, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %119, ptr %varargslots227, align 16
   store %"char[]" { ptr @.str.49, i64 5 }, ptr %taddr229, align 8
-  %120 = insertvalue %"any*" undef, ptr %taddr229, 0
-  %121 = insertvalue %"any*" %120, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %120 = insertvalue %any undef, ptr %taddr229, 0
+  %121 = insertvalue %any %120, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd230 = getelementptr inbounds i8, ptr %varargslots227, i64 16
-  store %"any*" %121, ptr %ptradd230, align 16
+  store %any %121, ptr %ptradd230, align 16
   %122 = call i64 @std.io.printfn(ptr %retparam231, ptr @.str.47, i64 6, ptr %varargslots227, i64 2)
   ret void
 }
-
-; Function Attrs:
+; Function Attrs: nounwind uwtable
 define void @test.main() #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i64, align 8
   %retparam = alloca i64, align 8
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %taddr2 = alloca i64, align 8
   %retparam3 = alloca i64, align 8
-  %varargslots4 = alloca [2 x %"any*"], align 16
+  %varargslots4 = alloca [2 x %any], align 16
   %taddr5 = alloca i64, align 8
   %taddr6 = alloca i64, align 8
   %retparam7 = alloca i64, align 8
-  %varargslots8 = alloca [2 x %"any*"], align 16
+  %varargslots8 = alloca [2 x %any], align 16
   %taddr9 = alloca i64, align 8
   %taddr10 = alloca i64, align 8
   %retparam12 = alloca i64, align 8
-  %varargslots13 = alloca [2 x %"any*"], align 16
+  %varargslots13 = alloca [2 x %any], align 16
   %taddr14 = alloca i64, align 8
   %taddr15 = alloca i64, align 8
   %retparam17 = alloca i64, align 8
-  %varargslots18 = alloca [2 x %"any*"], align 16
+  %varargslots18 = alloca [2 x %any], align 16
   %taddr19 = alloca i64, align 8
   %taddr20 = alloca i64, align 8
   %retparam22 = alloca i64, align 8
-  %varargslots23 = alloca [2 x %"any*"], align 16
+  %varargslots23 = alloca [2 x %any], align 16
   %taddr24 = alloca i64, align 8
   %taddr25 = alloca i64, align 8
   %retparam27 = alloca i64, align 8
-  %varargslots28 = alloca [2 x %"any*"], align 16
+  %varargslots28 = alloca [2 x %any], align 16
   %taddr29 = alloca i64, align 8
   %taddr30 = alloca i64, align 8
   %retparam32 = alloca i64, align 8
-  %varargslots33 = alloca [2 x %"any*"], align 16
+  %varargslots33 = alloca [2 x %any], align 16
   %taddr34 = alloca i64, align 8
   %taddr35 = alloca i64, align 8
   %retparam37 = alloca i64, align 8
-  %varargslots38 = alloca [1 x %"any*"], align 16
+  %varargslots38 = alloca [1 x %any], align 16
   %taddr39 = alloca i64, align 8
   %retparam40 = alloca i64, align 8
-  %varargslots41 = alloca [2 x %"any*"], align 16
+  %varargslots41 = alloca [2 x %any], align 16
   %taddr42 = alloca i64, align 8
   %taddr43 = alloca i64, align 8
   %retparam45 = alloca i64, align 8
   store i64 4, ptr %taddr, align 8
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %1, ptr %varargslots, align 16
   %2 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.50, i64 7, ptr %varargslots, i64 1)
   store i64 1, ptr %taddr2, align 8
-  %3 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %4 = insertvalue %"any*" %3, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %4, ptr %varargslots1, align 16
+  %3 = insertvalue %any undef, ptr %taddr2, 0
+  %4 = insertvalue %any %3, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %4, ptr %varargslots1, align 16
   %5 = call i64 @std.io.printfn(ptr %retparam3, ptr @.str.51, i64 7, ptr %varargslots1, i64 1)
   store i64 0, ptr %taddr5, align 8
-  %6 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %7, ptr %varargslots4, align 16
+  %6 = insertvalue %any undef, ptr %taddr5, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %7, ptr %varargslots4, align 16
   store i64 4, ptr %taddr6, align 8
-  %8 = insertvalue %"any*" undef, ptr %taddr6, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %8 = insertvalue %any undef, ptr %taddr6, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots4, i64 16
-  store %"any*" %9, ptr %ptradd, align 16
+  store %any %9, ptr %ptradd, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam7, ptr @.str.52, i64 8, ptr %varargslots4, i64 2)
   store i64 2, ptr %taddr9, align 8
-  %11 = insertvalue %"any*" undef, ptr %taddr9, 0
-  %12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %12, ptr %varargslots8, align 16
+  %11 = insertvalue %any undef, ptr %taddr9, 0
+  %12 = insertvalue %any %11, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %12, ptr %varargslots8, align 16
   store i64 2, ptr %taddr10, align 8
-  %13 = insertvalue %"any*" undef, ptr %taddr10, 0
-  %14 = insertvalue %"any*" %13, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %13 = insertvalue %any undef, ptr %taddr10, 0
+  %14 = insertvalue %any %13, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd11 = getelementptr inbounds i8, ptr %varargslots8, i64 16
-  store %"any*" %14, ptr %ptradd11, align 16
+  store %any %14, ptr %ptradd11, align 16
   %15 = call i64 @std.io.printfn(ptr %retparam12, ptr @.str.53, i64 8, ptr %varargslots8, i64 2)
   store i64 4, ptr %taddr14, align 8
-  %16 = insertvalue %"any*" undef, ptr %taddr14, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %17, ptr %varargslots13, align 16
+  %16 = insertvalue %any undef, ptr %taddr14, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %17, ptr %varargslots13, align 16
   store i64 4, ptr %taddr15, align 8
-  %18 = insertvalue %"any*" undef, ptr %taddr15, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %18 = insertvalue %any undef, ptr %taddr15, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd16 = getelementptr inbounds i8, ptr %varargslots13, i64 16
-  store %"any*" %19, ptr %ptradd16, align 16
+  store %any %19, ptr %ptradd16, align 16
   %20 = call i64 @std.io.printfn(ptr %retparam17, ptr @.str.54, i64 8, ptr %varargslots13, i64 2)
   store i64 4, ptr %taddr19, align 8
-  %21 = insertvalue %"any*" undef, ptr %taddr19, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %22, ptr %varargslots18, align 16
+  %21 = insertvalue %any undef, ptr %taddr19, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %22, ptr %varargslots18, align 16
   store i64 4, ptr %taddr20, align 8
-  %23 = insertvalue %"any*" undef, ptr %taddr20, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %23 = insertvalue %any undef, ptr %taddr20, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd21 = getelementptr inbounds i8, ptr %varargslots18, i64 16
-  store %"any*" %24, ptr %ptradd21, align 16
+  store %any %24, ptr %ptradd21, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam22, ptr @.str.55, i64 8, ptr %varargslots18, i64 2)
   store i64 4, ptr %taddr24, align 8
-  %26 = insertvalue %"any*" undef, ptr %taddr24, 0
-  %27 = insertvalue %"any*" %26, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %27, ptr %varargslots23, align 16
+  %26 = insertvalue %any undef, ptr %taddr24, 0
+  %27 = insertvalue %any %26, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %27, ptr %varargslots23, align 16
   store i64 4, ptr %taddr25, align 8
-  %28 = insertvalue %"any*" undef, ptr %taddr25, 0
-  %29 = insertvalue %"any*" %28, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %28 = insertvalue %any undef, ptr %taddr25, 0
+  %29 = insertvalue %any %28, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd26 = getelementptr inbounds i8, ptr %varargslots23, i64 16
-  store %"any*" %29, ptr %ptradd26, align 16
+  store %any %29, ptr %ptradd26, align 16
   %30 = call i64 @std.io.printfn(ptr %retparam27, ptr @.str.56, i64 9, ptr %varargslots23, i64 2)
   store i64 5, ptr %taddr29, align 8
-  %31 = insertvalue %"any*" undef, ptr %taddr29, 0
-  %32 = insertvalue %"any*" %31, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %32, ptr %varargslots28, align 16
+  %31 = insertvalue %any undef, ptr %taddr29, 0
+  %32 = insertvalue %any %31, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %32, ptr %varargslots28, align 16
   store i64 1, ptr %taddr30, align 8
-  %33 = insertvalue %"any*" undef, ptr %taddr30, 0
-  %34 = insertvalue %"any*" %33, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %33 = insertvalue %any undef, ptr %taddr30, 0
+  %34 = insertvalue %any %33, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd31 = getelementptr inbounds i8, ptr %varargslots28, i64 16
-  store %"any*" %34, ptr %ptradd31, align 16
+  store %any %34, ptr %ptradd31, align 16
   %35 = call i64 @std.io.printfn(ptr %retparam32, ptr @.str.57, i64 9, ptr %varargslots28, i64 2)
   store i64 8, ptr %taddr34, align 8
-  %36 = insertvalue %"any*" undef, ptr %taddr34, 0
-  %37 = insertvalue %"any*" %36, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %37, ptr %varargslots33, align 16
+  %36 = insertvalue %any undef, ptr %taddr34, 0
+  %37 = insertvalue %any %36, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %37, ptr %varargslots33, align 16
   store i64 4, ptr %taddr35, align 8
-  %38 = insertvalue %"any*" undef, ptr %taddr35, 0
-  %39 = insertvalue %"any*" %38, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %38 = insertvalue %any undef, ptr %taddr35, 0
+  %39 = insertvalue %any %38, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd36 = getelementptr inbounds i8, ptr %varargslots33, i64 16
-  store %"any*" %39, ptr %ptradd36, align 16
+  store %any %39, ptr %ptradd36, align 16
   %40 = call i64 @std.io.printfn(ptr %retparam37, ptr @.str.58, i64 10, ptr %varargslots33, i64 2)
   store i64 4, ptr %taddr39, align 8
-  %41 = insertvalue %"any*" undef, ptr %taddr39, 0
-  %42 = insertvalue %"any*" %41, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %42, ptr %varargslots38, align 16
+  %41 = insertvalue %any undef, ptr %taddr39, 0
+  %42 = insertvalue %any %41, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %42, ptr %varargslots38, align 16
   %43 = call i64 @std.io.printfn(ptr %retparam40, ptr @.str.59, i64 7, ptr %varargslots38, i64 1)
   store i64 8, ptr %taddr42, align 8
-  %44 = insertvalue %"any*" undef, ptr %taddr42, 0
-  %45 = insertvalue %"any*" %44, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %45, ptr %varargslots41, align 16
+  %44 = insertvalue %any undef, ptr %taddr42, 0
+  %45 = insertvalue %any %44, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %45, ptr %varargslots41, align 16
   store i64 4, ptr %taddr43, align 8
-  %46 = insertvalue %"any*" undef, ptr %taddr43, 0
-  %47 = insertvalue %"any*" %46, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  %46 = insertvalue %any undef, ptr %taddr43, 0
+  %47 = insertvalue %any %46, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
   %ptradd44 = getelementptr inbounds i8, ptr %varargslots41, i64 16
-  store %"any*" %47, ptr %ptradd44, align 16
+  store %any %47, ptr %ptradd44, align 16
   %48 = call i64 @std.io.printfn(ptr %retparam45, ptr @.str.60, i64 10, ptr %varargslots41, i64 2)
   call void @test.test(i32 10)
   ret void
 }
-
-; Function Attrs:
+; Function Attrs: nounwind uwtable
 define i32 @main(i32 %0, ptr %1) #0 {
 entry:
   call void @test.main()
diff --git a/test/test_suite/compile_time/untyped_conversions.c3t b/test/test_suite/compile_time/untyped_conversions.c3t
index 4744b54cf..050787316 100644
--- a/test/test_suite/compile_time/untyped_conversions.c3t
+++ b/test/test_suite/compile_time/untyped_conversions.c3t
@@ -27,7 +27,7 @@ fn void main()
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
 %Foo = type { i32, i32 }
 %"int[]" = type { ptr, i64 }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 
 @"$ct.test.Foo" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 8, i64 0, i64 2, [0 x i64] zeroinitializer }, align 8
 @.str = private unnamed_addr constant [9 x i8] c"%s %s %s\00", align 1
@@ -55,24 +55,24 @@ entry:
   %a = alloca [2 x i32], align 4
   %b = alloca %"int[]", align 8
   %c = alloca <2 x i32>, align 8
-  %varargslots = alloca [3 x %"any*"], align 16
+  %varargslots = alloca [3 x %any], align 16
   %retparam = alloca i64, align 8
   store i64 %0, ptr %a, align 4
   store ptr %1, ptr %b, align 8
   %ptradd = getelementptr inbounds i8, ptr %b, i64 8
   store i64 %2, ptr %ptradd, align 8
   store double %3, ptr %c, align 8
-  %4 = insertvalue %"any*" undef, ptr %a, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.a2$int" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
-  %6 = insertvalue %"any*" undef, ptr %b, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
+  %4 = insertvalue %any undef, ptr %a, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.a2$int" to i64), 1
+  store %any %5, ptr %varargslots, align 16
+  %6 = insertvalue %any undef, ptr %b, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
   %ptradd1 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %7, ptr %ptradd1, align 16
-  %8 = insertvalue %"any*" undef, ptr %c, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.v2$int" to i64), 1
+  store %any %7, ptr %ptradd1, align 16
+  %8 = insertvalue %any undef, ptr %c, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.v2$int" to i64), 1
   %ptradd2 = getelementptr inbounds i8, ptr %varargslots, i64 32
-  store %"any*" %9, ptr %ptradd2, align 16
+  store %any %9, ptr %ptradd2, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 8, ptr %varargslots, i64 3)
   ret void
 }
@@ -84,7 +84,7 @@ entry:
   %defg = alloca %Foo, align 4
   %y = alloca [1 x [2 x i32]], align 4
   %y2 = alloca [1 x [2 x double]], align 16
-  %varargslots = alloca [4 x %"any*"], align 16
+  %varargslots = alloca [4 x %any], align 16
   %retparam = alloca i64, align 8
   %literal = alloca [2 x i32], align 4
   %literal4 = alloca [2 x i32], align 4
@@ -96,22 +96,22 @@ entry:
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %defg, ptr align 4 @.__const.1, i32 8, i1 false)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %y, ptr align 4 @.__const.2, i32 8, i1 false)
   call void @llvm.memcpy.p0.p0.i32(ptr align 16 %y2, ptr align 16 @.__const.3, i32 16, i1 false)
-  %0 = insertvalue %"any*" undef, ptr %y, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.a1$a2$int" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
-  %2 = insertvalue %"any*" undef, ptr %y2, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.a1$a2$double" to i64), 1
+  %0 = insertvalue %any undef, ptr %y, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.a1$a2$int" to i64), 1
+  store %any %1, ptr %varargslots, align 16
+  %2 = insertvalue %any undef, ptr %y2, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.a1$a2$double" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %3, ptr %ptradd, align 16
-  %4 = insertvalue %"any*" undef, ptr %defg, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %ptradd, align 16
+  %4 = insertvalue %any undef, ptr %defg, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd1 = getelementptr inbounds i8, ptr %varargslots, i64 32
-  store %"any*" %5, ptr %ptradd1, align 16
+  store %any %5, ptr %ptradd1, align 16
   %ptradd2 = getelementptr inbounds i8, ptr %defg, i64 4
-  %6 = insertvalue %"any*" undef, ptr %ptradd2, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %6 = insertvalue %any undef, ptr %ptradd2, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots, i64 48
-  store %"any*" %7, ptr %ptradd3, align 16
+  store %any %7, ptr %ptradd3, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.4, i64 14, ptr %varargslots, i64 4)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %literal, ptr align 4 @.__const.5, i32 8, i1 false)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %literal4, ptr align 4 @.__const.6, i32 8, i1 false)
diff --git a/test/test_suite/concurrency/atomic_load_store.c3t b/test/test_suite/concurrency/atomic_load_store.c3t
index 61d5d6e03..9ddfc40a2 100644
--- a/test/test_suite/concurrency/atomic_load_store.c3t
+++ b/test/test_suite/concurrency/atomic_load_store.c3t
@@ -25,7 +25,7 @@ entry:
   %a = alloca i32, align 4
   %x = alloca i32, align 4
   %y = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   store i32 111, ptr %a, align 4
   %0 = load atomic i32, ptr %a seq_cst, align 4
@@ -38,9 +38,9 @@ entry:
   %3 = load i32, ptr %y, align 4
   %add1 = add i32 33, %3
   store atomic volatile i32 %add1, ptr %a monotonic, align 4
-  %4 = insertvalue %"any*" undef, ptr %a, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %a, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %6 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   ret void
 }
diff --git a/test/test_suite/concurrency/atomic_load_store_debug.c3t b/test/test_suite/concurrency/atomic_load_store_debug.c3t
index ca6f34e93..4d8a2674e 100644
--- a/test/test_suite/concurrency/atomic_load_store_debug.c3t
+++ b/test/test_suite/concurrency/atomic_load_store_debug.c3t
@@ -21,7 +21,7 @@ fn void main()
 
 /* #expect: test.ll
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 @"$ct.test.Ghh" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 12, i64 0, i64 3, [0 x i64] zeroinitializer }, align 8
 @.str = private unnamed_addr constant [3 x i8] c"%d\00", align 1
 @"$ct.int" = linkonce global %.introspect { i8 2, i64 0, ptr null, i64 4, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
@@ -38,7 +38,7 @@ entry:
   %value = alloca i32, align 4
   %x4 = alloca ptr, align 8
   %value6 = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   call void @llvm.dbg.declare(metadata ptr %a, metadata !10, metadata !DIExpression()), !dbg !12
   store i32 111, ptr %a, align 4, !dbg !13
@@ -47,49 +47,48 @@ entry:
   %0 = load ptr, ptr %x1, align 8, !dbg !16
   %1 = load atomic i32, ptr %0 seq_cst, align 4, !dbg !16
   store i32 %1, ptr %x, align 4, !dbg !16
-  call void @llvm.dbg.declare(metadata ptr %y, metadata !19, metadata !DIExpression()), !dbg !20
+  call void @llvm.dbg.declare(metadata ptr %y, metadata !21, metadata !DIExpression()), !dbg !22
   store ptr %a, ptr %x2, align 8
-  %2 = load ptr, ptr %x2, align 8, !dbg !21
-  %3 = load atomic volatile i32, ptr %2 monotonic, align 4, !dbg !21
-  store i32 %3, ptr %y, align 4, !dbg !21
+  %2 = load ptr, ptr %x2, align 8, !dbg !23
+  %3 = load atomic volatile i32, ptr %2 monotonic, align 4, !dbg !23
+  store i32 %3, ptr %y, align 4, !dbg !23
   store ptr %a, ptr %x3, align 8
-  %4 = load i32, ptr %x, align 4, !dbg !23
-  %add = add i32 123, %4, !dbg !24
+  %4 = load i32, ptr %x, align 4, !dbg !27
+  %add = add i32 123, %4, !dbg !28
   store i32 %add, ptr %value, align 4
-  %5 = load ptr, ptr %x3, align 8, !dbg !25
-  %6 = load i32, ptr %value, align 4, !dbg !25
-  store atomic i32 %6, ptr %5 seq_cst, align 4, !dbg !25
+  %5 = load ptr, ptr %x3, align 8, !dbg !29
+  %6 = load i32, ptr %value, align 4, !dbg !29
+  store atomic i32 %6, ptr %5 seq_cst, align 4, !dbg !29
   store ptr %a, ptr %x4, align 8
-  %7 = load i32, ptr %y, align 4, !dbg !27
-  %add5 = add i32 33, %7, !dbg !28
+  %7 = load i32, ptr %y, align 4, !dbg !33
+  %add5 = add i32 33, %7, !dbg !34
   store i32 %add5, ptr %value6, align 4
-  %8 = load ptr, ptr %x4, align 8, !dbg !29
-  %9 = load i32, ptr %value6, align 4, !dbg !29
-  store atomic volatile i32 %9, ptr %8 monotonic, align 4, !dbg !29
-  %10 = insertvalue %"any*" undef, ptr %a, 0, !dbg !31
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.int" to i64), 1, !dbg !31
-  store %"any*" %11, ptr %varargslots, align 16, !dbg !31
-  %12 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1), !dbg !32
-  ret void, !dbg !32
+  %8 = load ptr, ptr %x4, align 8, !dbg !35
+  %9 = load i32, ptr %value6, align 4, !dbg !35
+  store atomic volatile i32 %9, ptr %8 monotonic, align 4, !dbg !35
+  %10 = insertvalue %any undef, ptr %a, 0, !dbg !39
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.int" to i64), 1, !dbg !39
+  store %any %11, ptr %varargslots, align 16, !dbg !39
+  %12 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1), !dbg !40
+  ret void, !dbg !40
 }
-
-; Function Attrs:
-define i32 @main(i32 %0, ptr %1) #0 !dbg !33 {
+; Function Attrs: nounwind uwtable
+define i32 @main(i32 %0, ptr %1) #0 !dbg !41 {
 entry:
   %.anon = alloca i32, align 4
   %.anon1 = alloca ptr, align 8
   %.anon2 = alloca i32, align 4
   %.anon3 = alloca ptr, align 8
   store i32 %0, ptr %.anon, align 4
-  call void @llvm.dbg.declare(metadata ptr %.anon, metadata !39, metadata !DIExpression()), !dbg !40
+  call void @llvm.dbg.declare(metadata ptr %.anon, metadata !47, metadata !DIExpression()), !dbg !48
   store ptr %1, ptr %.anon1, align 8
-  call void @llvm.dbg.declare(metadata ptr %.anon1, metadata !41, metadata !DIExpression()), !dbg !40
+  call void @llvm.dbg.declare(metadata ptr %.anon1, metadata !49, metadata !DIExpression()), !dbg !48
   %2 = load i32, ptr %.anon, align 4
   store i32 %2, ptr %.anon2, align 4
   %3 = load ptr, ptr %.anon1, align 8
   store ptr %3, ptr %.anon3, align 8
-  call void @test.main(), !dbg !42
-  ret i32 0, !dbg !45
+  call void @test.main(), !dbg !50
+  ret i32 0, !dbg !54
 }
 
 declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
@@ -118,32 +117,41 @@ declare i1 @llvm.expect.i1(i1, i1) #2
 !14 = !DILocalVariable(name: "x", scope: !6, file: !5, line: 13, type: !11, align: 4)
 !15 = !DILocation(line: 13, column: 6, scope: !6)
 !16 = !DILocation(line:
-!17 = distinct !DILexicalBlock(scope: !6, file: !18,
-!18 = !DIFile(filename: "mem.c3"
-!19 = !DILocalVariable(name: "y", scope: !6, file: !5, line: 14, type: !11, align: 4)
-!20 = !DILocation(line: 14, column: 6, scope: !6)
-!21 = !DILocation(line:
-!22 = distinct !DILexicalBlock(scope: !6, file: !18
-!23 = !DILocation(line: 15, column: 25, scope: !6)
-!24 = !DILocation(line: 15, column: 19, scope: !6)
-!25 = !DILocation(line:
-!26 = distinct !DILexicalBlock(scope: !6, file: !18, line:
-!27 = !DILocation(line: 16, column: 24, scope: !6)
-!28 = !DILocation(line: 16, column: 19, scope: !6)
-!29 = !DILocation(line:
-!30 = distinct !DILexicalBlock(scope: !6, file: !18, line:
-!31 = !DILocation(line: 17, column: 20, scope: !6)
-!32 = !DILocation(line: 17, column: 6, scope: !6)
-!33 = distinct !DISubprogram(name: "_$main", linkageName: "main"
-!34 = !DISubroutineType(types: !35)
-!35 = !{!11, !11, !36}
-!36 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "char**", baseType: !37, size: 64, align: 64, dwarfAddressSpace: 0)
-!37 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "char*", baseType: !38, size: 64, align: 64, dwarfAddressSpace: 0)
-!38 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_unsigned_char)
-!39 = !DILocalVariable(name: ".anon", arg: 1, scope: !33
-!40 = !DILocation(line: 10, column: 9, scope: !33)
-!41 = !DILocalVariable(name: ".anon", arg: 2, scope: !33
-!42 = !DILocation(line: 18, column: 2, scope: !43)
-!43 = distinct !DILexicalBlock(scope: !33, file: !44, line: 18, column: 2)
-!44 = !DIFile(filename: "main_stub.c3"
-!45 = !DILocation(line: 19, column: 9, scope: !43)
+!17 = distinct !DILexicalBlock(scope: !19, file: !18,
+!18 = !DIFile(filename: "mem.c3",
+!19 = distinct !DISubprogram(name: "@atomic_load", linkageName: "@atomic_load", scope: !18
+!20 = !DILocation(line: 13, column: 10, scope: !6)
+!21 = !DILocalVariable(name: "y", scope: !6, file: !5, line: 14, type: !11, align: 4)
+!22 = !DILocation(line: 14, column: 6, scope: !6)
+!23 = !DILocation(line:
+!24 = distinct !DILexicalBlock(scope: !25, file: !18
+!25 = distinct !DISubprogram(name: "@atomic_load", linkageName: "@atomic_load", scope: !18
+!26 = !DILocation(line: 14, column: 10, scope: !6)
+!27 = !DILocation(line: 15, column: 25, scope: !6)
+!28 = !DILocation(line: 15, column: 19, scope: !6)
+!29 = !DILocation(line: 212, column: 20, scope: !30, inlinedAt: !32)
+!30 = distinct !DILexicalBlock(scope: !31, file: !18, line:
+!31 = distinct !DISubprogram(name: "@atomic_store", linkageName: "@atomic_store", scope: !18
+!32 = !DILocation(line: 15, column: 2, scope: !6)
+!33 = !DILocation(line: 16, column: 24, scope: !6)
+!34 = !DILocation(line: 16, column: 19, scope: !6)
+!35 = !DILocation(line: 212, column: 20, scope: !36, inlinedAt: !38)
+!36 = distinct !DILexicalBlock(scope: !37, file: !18, line: 212, column: 2)
+!37 = distinct !DISubprogram(name: "@atomic_store", linkageName: "@atomic_store", scope: !18, file: !18, line: 210, scopeLine: 210, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition, unit: !4, retainedNodes: !9)
+!38 = !DILocation(line: 16, column: 2, scope: !6)
+!39 = !DILocation(line: 17, column: 20, scope: !6)
+!40 = !DILocation(line: 17, column: 6, scope: !6)
+!41 = distinct !DISubprogram(name: "_$main", linkageName: "main", scope: !5, file: !5, line: 10, type: !42, scopeLine: 10, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !4, retainedNodes: !9)
+!42 = !DISubroutineType(types: !43)
+!43 = !{!11, !11, !44}
+!44 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "char**", baseType: !45, size: 64, align: 64, dwarfAddressSpace: 0)
+!45 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "char*", baseType: !46, size: 64, align: 64, dwarfAddressSpace: 0)
+!46 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_unsigned_char)
+!47 = !DILocalVariable(name: ".anon", arg: 1, scope: !41, file: !5, line: 10, type: !11)
+!48 = !DILocation(line: 10, column: 9, scope: !41)
+!49 = !DILocalVariable(name: ".anon", arg: 2, scope: !41, file: !5, line: 10, type: !44)
+!50 = !DILocation(line: 18, column: 2, scope: !51, inlinedAt: !48)
+!51 = distinct !DILexicalBlock(scope: !53, file: !52, line: 18, column: 2)
+!52 = !DIFile(filename: "main_stub.c3"
+!53 = distinct !DISubprogram(name: "@main_to_void_main", linkageName: "@main_to_void_main", scope: !52, file: !52, line: 16, scopeLine: 16, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition, unit: !4, retainedNodes: !9)
+!54 = !DILocation(line: 19, column: 9, scope: !51, inlinedAt: !48)
\ No newline at end of file
diff --git a/test/test_suite/constants/constants.c3t b/test/test_suite/constants/constants.c3t
index dcefe60b3..2c91ac5e3 100644
--- a/test/test_suite/constants/constants.c3t
+++ b/test/test_suite/constants/constants.c3t
@@ -19,16 +19,16 @@ fn void test()
 
 /* #expect: constants.ll
 
-@constants.AA = protected unnamed_addr constant i8 -1, align 1
+@constants.AA = internal unnamed_addr constant i8 -1, align 1
 @constants.BB = local_unnamed_addr constant i8 -56, align 1
-@constants.CC = protected unnamed_addr constant i32 -1, align 4
-@constants.DD = protected unnamed_addr constant i32 -1, align 4
-@constants.FOO = protected unnamed_addr constant i32 -1, align 4
-@constants.x = protected unnamed_addr global i32 255, align 4
-@constants.z = protected unnamed_addr global i32 -1, align 4
-@constants.w = protected unnamed_addr global i8 -1, align 1
-@constants.v = protected unnamed_addr global i16 -1, align 2
-@constants.z2 = protected unnamed_addr global i32 -1, align 4
+@constants.CC = internal unnamed_addr constant i32 -1, align 4
+@constants.DD = internal unnamed_addr constant i32 -1, align 4
+@constants.FOO = internal unnamed_addr constant i32 -1, align 4
+@constants.x = internal unnamed_addr global i32 255, align 4
+@constants.z = internal unnamed_addr global i32 -1, align 4
+@constants.w = internal unnamed_addr global i8 -1, align 1
+@constants.v = internal unnamed_addr global i16 -1, align 2
+@constants.z2 = internal unnamed_addr global i32 -1, align 4
 
 entry:
   %xx = alloca i32, align 4
diff --git a/test/test_suite/debug_symbols/constants.c3t b/test/test_suite/debug_symbols/constants.c3t
index b1e7498cb..66fa72984 100644
--- a/test/test_suite/debug_symbols/constants.c3t
+++ b/test/test_suite/debug_symbols/constants.c3t
@@ -7,10 +7,10 @@ const FOO @private = ~(uint)(0);
 
 /* #expect: constants.ll
 
-@constants.AA = protected unnamed_addr constant i8 1, align 1, !dbg !0
+@constants.AA = internal unnamed_addr constant i8 1, align 1, !dbg !0
 @constants.BB = local_unnamed_addr constant i8 -56, align 1, !dbg !4
-@constants.CC = protected unnamed_addr constant i32 -1, align 4, !dbg !6
-@constants.FOO = protected unnamed_addr constant i32 -1, align 4, !dbg !9
+@constants.CC = internal unnamed_addr constant i32 -1, align 4, !dbg !6
+@constants.FOO = internal unnamed_addr constant i32 -1, align 4, !dbg !9
 
 !llvm.module.flags = !{!11, !12, !13, !14}
 !llvm.dbg.cu = !{!15}
diff --git a/test/test_suite/debug_symbols/constants_mingw.c3t b/test/test_suite/debug_symbols/constants_mingw.c3t
index 045b7dd5b..b067b1b93 100644
--- a/test/test_suite/debug_symbols/constants_mingw.c3t
+++ b/test/test_suite/debug_symbols/constants_mingw.c3t
@@ -9,10 +9,10 @@ const FOO @private = ~(uint)(0);
 
 ; ModuleID = 'constants_mingw'
 
-@constants_mingw.AA = protected unnamed_addr constant i8 1, align 1, !dbg !0
+@constants_mingw.AA = internal unnamed_addr constant i8 1, align 1, !dbg !0
 @constants_mingw.BB = local_unnamed_addr constant i8 -56, align 1, !dbg !4
-@constants_mingw.CC = protected unnamed_addr constant i32 -1, align 4, !dbg !6
-@constants_mingw.FOO = protected unnamed_addr constant i32 -1, align 4, !dbg !9
+@constants_mingw.CC = internal unnamed_addr constant i32 -1, align 4, !dbg !6
+@constants_mingw.FOO = internal unnamed_addr constant i32 -1, align 4, !dbg !9
 
 !llvm.module.flags = !{!11, !12, !13, !14}
 !llvm.dbg.cu = !{!15}
diff --git a/test/test_suite/defer/defer_and_expr_block.c3t b/test/test_suite/defer/defer_and_expr_block.c3t
index 0bc9a09c7..1b02e5e28 100644
--- a/test/test_suite/defer/defer_and_expr_block.c3t
+++ b/test/test_suite/defer/defer_and_expr_block.c3t
@@ -7,7 +7,7 @@ fn void main()
 	defer printf("On exit\n");
 	{|
 		defer printf("Baz\n");
-		defer {|
+		defer (void){|
 			defer printf("Hello!\n");
 			defer printf("1\n");
 			if (true) return 12;
@@ -30,9 +30,9 @@ if.then:                                          ; preds = %entry
   call void (ptr, ...) @printf(ptr @.str.1)
   br label %expr_block.exit
 expr_block.exit:                                  ; preds = %if.then
-  call void (ptr, ...) @printf(ptr @.str.5)
-  call void (ptr, ...) @printf(ptr @.str.6)
-  call void (ptr, ...) @printf(ptr @.str.7)
+  call void (ptr, ...) @printf(ptr @.str.2)
+  call void (ptr, ...) @printf(ptr @.str.3)
+  call void (ptr, ...) @printf(ptr @.str.4)
   ret void
 }
 
diff --git a/test/test_suite/defer/defer_catch_err.c3t b/test/test_suite/defer/defer_catch_err.c3t
index 192f061ef..1c0a96d92 100644
--- a/test/test_suite/defer/defer_catch_err.c3t
+++ b/test/test_suite/defer/defer_catch_err.c3t
@@ -1,4 +1,3 @@
-module baba;
 // #target: macos-x64
 module foo;
 import std::io;
@@ -36,19 +35,19 @@ entry:
   %x = alloca i32, align 4
   %x.f = alloca i64, align 8
   %err = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %err3 = alloca i64, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %retparam5 = alloca i64, align 8
   %x8 = alloca i32, align 4
   %x.f9 = alloca i64, align 8
   %reterr = alloca i64, align 8
   %err14 = alloca i64, align 8
-  %varargslots15 = alloca [1 x %"any*"], align 16
+  %varargslots15 = alloca [1 x %any], align 16
   %retparam16 = alloca i64, align 8
   %err19 = alloca i64, align 8
-  %varargslots20 = alloca [1 x %"any*"], align 16
+  %varargslots20 = alloca [1 x %any], align 16
   %retparam21 = alloca i64, align 8
   store i64 ptrtoint (ptr @"std.core.builtin.SearchResult$MISSING" to i64), ptr %x.f, align 8
   %optval = load i64, ptr %x.f, align 8
@@ -65,16 +64,16 @@ after_check:                                      ; preds = %entry
 opt_block_cleanup:                                ; preds = %assign_optional
   %3 = load i64, ptr %z.f, align 8
   store i64 %3, ptr %err, align 8
-  %4 = insertvalue %"any*" undef, ptr %err, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %err, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %6 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 6, ptr %varargslots, i64 1)
   store i64 ptrtoint (ptr @"foo.Test$FOO" to i64), ptr %err, align 8
   %7 = load i64, ptr %z.f, align 8
   store i64 %7, ptr %err3, align 8
-  %8 = insertvalue %"any*" undef, ptr %err3, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %9, ptr %varargslots4, align 16
+  %8 = insertvalue %any undef, ptr %err3, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %9, ptr %varargslots4, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam5, ptr @.str.2, i64 8, ptr %varargslots4, i64 1)
   br label %after_assign
 expr_block.exit:                                  ; preds = %after_check
@@ -98,16 +97,16 @@ after_check13:                                    ; preds = %after_assign
 err_retblock:                                     ; preds = %assign_optional12
   %14 = load i64, ptr %reterr, align 8
   store i64 %14, ptr %err14, align 8
-  %15 = insertvalue %"any*" undef, ptr %err14, 0
-  %16 = insertvalue %"any*" %15, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %16, ptr %varargslots15, align 16
+  %15 = insertvalue %any undef, ptr %err14, 0
+  %16 = insertvalue %any %15, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %16, ptr %varargslots15, align 16
   %17 = call i64 @std.io.printfn(ptr %retparam16, ptr @.str.4, i64 6, ptr %varargslots15, i64 1)
   store i64 ptrtoint (ptr @"foo.Test$FOO" to i64), ptr %err14, align 8
   %18 = load i64, ptr %reterr, align 8
   store i64 %18, ptr %err19, align 8
-  %19 = insertvalue %"any*" undef, ptr %err19, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %20, ptr %varargslots20, align 16
+  %19 = insertvalue %any undef, ptr %err19, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %20, ptr %varargslots20, align 16
   %21 = call i64 @std.io.printfn(ptr %retparam21, ptr @.str.5, i64 8, ptr %varargslots20, i64 1)
   %22 = load i64, ptr %reterr, align 8
   ret i64 %22
diff --git a/test/test_suite/defer/defer_with_return.c3 b/test/test_suite/defer/defer_with_return.c3
index eeabe94d6..7502af75a 100644
--- a/test/test_suite/defer/defer_with_return.c3
+++ b/test/test_suite/defer/defer_with_return.c3
@@ -1,7 +1,7 @@
 fn int! bar()
 {
 	defer {
-		{|
+		(void){|
 			return 4;
 		|};
 	}
diff --git a/test/test_suite/define/aliased_consts.c3t b/test/test_suite/define/aliased_consts.c3t
index bb05667ee..0d92f09a6 100644
--- a/test/test_suite/define/aliased_consts.c3t
+++ b/test/test_suite/define/aliased_consts.c3t
@@ -16,9 +16,9 @@ fn int main()
 @foo.x = local_unnamed_addr global { { { float, [4 x float], float, [4 x float], float, [4 x float], float } } } { { { float, [4 x float], float, [4 x float], float, [4 x float], float } } { { float, [4 x float], float, [4 x float], float, [4 x float], float } { float 1.000000e+00, [4 x float] zeroinitializer, float 1.000000e+00, [4 x float] zeroinitializer, float 1.000000e+00, [4 x float] zeroinitializer, float 1.000000e+00 } } }, align 4
 
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
-  store %"any*" { ptr @foo.x, i64 ptrtoint (ptr @"$ct.float" to i64) }, ptr %varargslots, align 16
+  store %any { ptr @foo.x, i64 ptrtoint (ptr @"$ct.float" to i64) }, ptr %varargslots, align 16
   %0 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   ret i32 0
 }
diff --git a/test/test_suite/define/forbidden_defines.c3 b/test/test_suite/define/forbidden_defines.c3
index 49f236ec0..67607c812 100644
--- a/test/test_suite/define/forbidden_defines.c3
+++ b/test/test_suite/define/forbidden_defines.c3
@@ -1,3 +1,3 @@
 def Abc = int[*]; // #error: Inferred array types can only
 def Bcd = anyfault;
-def Efd = any*;
+def Efd = any;
diff --git a/test/test_suite/distinct/distinct_invalid.c3 b/test/test_suite/distinct/distinct_invalid.c3
index 66518f58a..eaa93500f 100644
--- a/test/test_suite/distinct/distinct_invalid.c3
+++ b/test/test_suite/distinct/distinct_invalid.c3
@@ -3,8 +3,8 @@ fault Error
 	ABC
 }
 
-distinct Foo1 = Error; // #error: You cannot create a distinct type
+distinct Foo1 = Error;
 
-distinct Foo3 = void; // #error: create a distinct type from 'void'
+distinct Foo3 = void;
 
-distinct Foo4 = typeid; // #error: create a distinct type from 'typeid'
+distinct Foo4 = typeid;
diff --git a/test/test_suite/dynamic/any_cast.c3 b/test/test_suite/dynamic/any_cast.c3
index 930bfdef0..85727eac8 100644
--- a/test/test_suite/dynamic/any_cast.c3
+++ b/test/test_suite/dynamic/any_cast.c3
@@ -8,15 +8,15 @@ interface Def
 
 fn void! test()
 {
-	any* x;
-	Abc* d = x; // #error: cannot implicitly be converted to 'Abc*'
+	any x;
+	Abc d = x; // #error: cannot implicitly be converted to 'Abc'
 }
 
 
 fn void! test2()
 {
-	Abc* x;
-	any* d = x;
-	Def* e = x;
+	Abc x;
+	any d = x;
+	Def e = x;
 	x = e; // #error: is not a parent interface of 'Def'
 }
diff --git a/test/test_suite/dynamic/dynamic_with_default.c3t b/test/test_suite/dynamic/dynamic_with_default.c3t
deleted file mode 100644
index 60afc591d..000000000
--- a/test/test_suite/dynamic/dynamic_with_default.c3t
+++ /dev/null
@@ -1,131 +0,0 @@
-// #target: macos-x64
-module test;
-
-interface Abc
-{
-	fn int[<2>] test() @optional;
-	fn int bye();
-}
-
-fn int[<2>] Abc.test(&self) @default
-{
-	return { 5, 7 };
-}
-
-struct Hello (Abc)
-{
-	int y;
-}
-
-fn int[<2>] Hello.test(&self) @dynamic { return { 5, 10 }; }
-fn int Hello.bye(&self) @dynamic { return 7; }
-fn void main()
-{
-	Hello z = { 32 };
-	Abc* x = &z;
-	int[<2>] z2 = x.test();
-	int w = x.bye();
-}
-/* #expect: test.ll
-
-define double @test.Abc.test(i64 %0, ptr %1) #0 {
-define double @test.Hello.test(ptr %0) #0 {
-define i32 @test.Hello.bye(ptr %0) #0 {
-
-; Function Attrs:
-define void @test.main() #0 {
-entry:
-  %z = alloca %Hello, align 4
-  %x = alloca %"any*", align 8
-  %z2 = alloca <2 x i32>, align 8
-  %.inlinecache = alloca ptr, align 8
-  %.cachedtype = alloca ptr, align 8
-  %result = alloca <2 x i32>, align 8
-  %result3 = alloca <2 x i32>, align 8
-  %w = alloca i32, align 4
-  %.inlinecache6 = alloca ptr, align 8
-  %.cachedtype7 = alloca ptr, align 8
-  store ptr null, ptr %.cachedtype7, align 8
-  store ptr null, ptr %.cachedtype, align 8
-  call void @llvm.memcpy.p0.p0.i32(ptr align 4 %z, ptr align 4 @.__const, i32 4, i1 false)
-  %0 = insertvalue %"any*" undef, ptr %z, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.test.Hello" to i64), 1
-  store %"any*" %1, ptr %x, align 8
-  %ptradd = getelementptr inbounds i8, ptr %x, i64 8
-  %2 = load i64, ptr %ptradd, align 8
-  %3 = inttoptr i64 %2 to ptr
-  %type = load ptr, ptr %.cachedtype, align 8
-  %4 = icmp eq ptr %3, %type
-  br i1 %4, label %cache_hit, label %cache_miss
-
-cache_miss:                                       ; preds = %entry
-  %ptradd1 = getelementptr inbounds i8, ptr %3, i64 16
-  %5 = load ptr, ptr %ptradd1, align 8
-  %6 = call ptr @.dyn_search(ptr %5, ptr @"$sel.test")
-  store ptr %6, ptr %.inlinecache, align 8
-  store ptr %3, ptr %.cachedtype, align 8
-  br label %7
-
-cache_hit:                                        ; preds = %entry
-  %cache_hit_fn = load ptr, ptr %.inlinecache, align 8
-  br label %7
-
-7:                                                ; preds = %cache_hit, %cache_miss
-  %fn_phi = phi ptr [ %cache_hit_fn, %cache_hit ], [ %6, %cache_miss ]
-  %8 = icmp eq ptr %fn_phi, null
-  br i1 %8, label %missing_function, label %match
-
-missing_function:                                 ; preds = %7
-  %lo = load i64, ptr %x, align 8
-  %ptradd2 = getelementptr inbounds i8, ptr %x, i64 8
-  %hi = load ptr, ptr %ptradd2, align 8
-  %9 = call double @test.Abc.test(i64 %lo, ptr %hi)
-  store double %9, ptr %result, align 8
-  %10 = load <2 x i32>, ptr %result, align 8
-  br label %after_call
-
-match:                                            ; preds = %7
-  %11 = load ptr, ptr %x, align 8
-  %12 = call double %fn_phi(ptr %11)
-  store double %12, ptr %result3, align 8
-  %13 = load <2 x i32>, ptr %result3, align 8
-  br label %after_call
-
-after_call:                                       ; preds = %match, %missing_function
-  %result4 = phi <2 x i32> [ %10, %missing_function ], [ %13, %match ]
-  store <2 x i32> %result4, ptr %z2, align 8
-  %ptradd5 = getelementptr inbounds i8, ptr %x, i64 8
-  %14 = load i64, ptr %ptradd5, align 8
-  %15 = inttoptr i64 %14 to ptr
-  %type8 = load ptr, ptr %.cachedtype7, align 8
-  %16 = icmp eq ptr %15, %type8
-  br i1 %16, label %cache_hit11, label %cache_miss9
-
-cache_miss9:                                      ; preds = %after_call
-  %ptradd10 = getelementptr inbounds i8, ptr %15, i64 16
-  %17 = load ptr, ptr %ptradd10, align 8
-  %18 = call ptr @.dyn_search(ptr %17, ptr @"$sel.bye")
-  store ptr %18, ptr %.inlinecache6, align 8
-  store ptr %15, ptr %.cachedtype7, align 8
-  br label %19
-
-cache_hit11:                                      ; preds = %after_call
-  %cache_hit_fn12 = load ptr, ptr %.inlinecache6, align 8
-  br label %19
-
-19:                                               ; preds = %cache_hit11, %cache_miss9
-  %fn_phi13 = phi ptr [ %cache_hit_fn12, %cache_hit11 ], [ %18, %cache_miss9 ]
-  %20 = icmp eq ptr %fn_phi13, null
-  br i1 %20, label %missing_function14, label %match15
-
-missing_function14:                               ; preds = %19
-  %21 = load ptr, ptr @std.core.builtin.panic, align 8
-  call void %21(ptr @.panic_msg, i64 40, ptr @.file, i64 23, ptr @.func, i64 4, i32 26)
-  unreachable
-
-match15:                                          ; preds = %19
-  %22 = load ptr, ptr %x, align 8
-  %23 = call i32 %fn_phi13(ptr %22)
-  store i32 %23, ptr %w, align 4
-  ret void
-}
\ No newline at end of file
diff --git a/test/test_suite/dynamic/inherit_linux.c3t b/test/test_suite/dynamic/inherit_linux.c3t
index d60666056..68dd27ef8 100644
--- a/test/test_suite/dynamic/inherit_linux.c3t
+++ b/test/test_suite/dynamic/inherit_linux.c3t
@@ -31,16 +31,16 @@ struct Test (TestProto, TestProto2)
 
 fn void main()
 {
-	TestProto* z = mem::alloc(Test);
+	TestProto z = mem::alloc(Test);
 	z.tesT();
-	Base* w = z;
+	Base w = z;
 	w.tesT();
 }
 
 /* #expect: inherit.ll
 
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 $.dyn_search = comdat any
 $"$ct.inherit.Test" = comdat any
 $"$sel.tesT" = comdat any
@@ -70,18 +70,18 @@ entry:
 ; Function Attrs:
 define void @inherit.main() #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %.inlinecache = alloca ptr, align 8
   %.cachedtype = alloca ptr, align 8
-  %w = alloca %"any*", align 8
+  %w = alloca %any, align 8
   %.inlinecache3 = alloca ptr, align 8
   %.cachedtype4 = alloca ptr, align 8
   store ptr null, ptr %.cachedtype4, align 8
   store ptr null, ptr %.cachedtype, align 8
   %0 = call ptr @std.core.mem.malloc(i64 8) #1
-  %1 = insertvalue %"any*" undef, ptr %0, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.inherit.Test" to i64), 1
-  store %"any*" %2, ptr %z, align 8
+  %1 = insertvalue %any undef, ptr %0, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.inherit.Test" to i64), 1
+  store %any %2, ptr %z, align 8
   %ptradd = getelementptr inbounds i8, ptr %z, i64 8
   %3 = load i64, ptr %ptradd, align 8
   %4 = inttoptr i64 %3 to ptr
@@ -109,8 +109,8 @@ missing_function:                                 ; preds = %8
 match:                                            ; preds = %8
   %11 = load ptr, ptr %z, align 8
   call void %fn_phi(ptr %11)
-  %12 = load %"any*", ptr %z, align 8
-  store %"any*" %12, ptr %w, align 8
+  %12 = load %any, ptr %z, align 8
+  store %any %12, ptr %w, align 8
   %ptradd2 = getelementptr inbounds i8, ptr %w, i64 8
   %13 = load i64, ptr %ptradd2, align 8
   %14 = inttoptr i64 %13 to ptr
diff --git a/test/test_suite/dynamic/inherit_macos.c3t b/test/test_suite/dynamic/inherit_macos.c3t
index a6fb4a1c5..5cb303e20 100644
--- a/test/test_suite/dynamic/inherit_macos.c3t
+++ b/test/test_suite/dynamic/inherit_macos.c3t
@@ -31,16 +31,16 @@ struct Test (TestProto, TestProto2)
 
 fn void main()
 {
-	TestProto* z = mem::alloc(Test);
+	TestProto z = mem::alloc(Test);
 	z.tesT();
-	Base* w = z;
+	Base w = z;
 	w.tesT();
 }
 
 /* #expect: inherit.ll
 
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 @"$ct.inherit.Test" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 8, i64 0, i64 1, [0 x i64] zeroinitializer }, align 8
 @"$sel.tesT" = linkonce_odr constant [5 x i8] c"tesT\00", align 1
 @.panic_msg = internal constant [42 x i8] c"No method 'tesT' could be found on target\00", align 1
@@ -64,18 +64,18 @@ entry:
 ; Function Attrs:
 define void @inherit.main() #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %.inlinecache = alloca ptr, align 8
   %.cachedtype = alloca ptr, align 8
-  %w = alloca %"any*", align 8
+  %w = alloca %any, align 8
   %.inlinecache3 = alloca ptr, align 8
   %.cachedtype4 = alloca ptr, align 8
   store ptr null, ptr %.cachedtype4, align 8
   store ptr null, ptr %.cachedtype, align 8
   %0 = call ptr @std.core.mem.malloc(i64 8) #1
-  %1 = insertvalue %"any*" undef, ptr %0, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.inherit.Test" to i64), 1
-  store %"any*" %2, ptr %z, align 8
+  %1 = insertvalue %any undef, ptr %0, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.inherit.Test" to i64), 1
+  store %any %2, ptr %z, align 8
   %ptradd = getelementptr inbounds i8, ptr %z, i64 8
   %3 = load i64, ptr %ptradd, align 8
   %4 = inttoptr i64 %3 to ptr
@@ -103,8 +103,8 @@ missing_function:                                 ; preds = %8
 match:                                            ; preds = %8
   %11 = load ptr, ptr %z, align 8
   call void %fn_phi(ptr %11)
-  %12 = load %"any*", ptr %z, align 8
-  store %"any*" %12, ptr %w, align 8
+  %12 = load %any, ptr %z, align 8
+  store %any %12, ptr %w, align 8
   %ptradd2 = getelementptr inbounds i8, ptr %w, i64 8
   %13 = load i64, ptr %ptradd2, align 8
   %14 = inttoptr i64 %13 to ptr
diff --git a/test/test_suite/dynamic/null_and_protocol.c3t b/test/test_suite/dynamic/null_and_protocol.c3t
index be83c91c3..fed630259 100644
--- a/test/test_suite/dynamic/null_and_protocol.c3t
+++ b/test/test_suite/dynamic/null_and_protocol.c3t
@@ -5,31 +5,31 @@ interface Test {}
 
 fn void main()
 {
-	Test* a;
+	Test a;
 	bool x = a == null;
 	a = null;
-	any* z = a;
+	any z = a;
 	z = null;
 }
 
 /* #expect: test.ll
 
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 @"$ct.void" = linkonce global %.introspect { i8 0, i64 0, ptr null, i64 1, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
 
 define void @test.main() #0 {
 entry:
-  %a = alloca %"any*", align 8
+  %a = alloca %any, align 8
   %x = alloca i8, align 1
-  %z = alloca %"any*", align 8
-  store %"any*" zeroinitializer, ptr %a, align 8
+  %z = alloca %any, align 8
+  store %any zeroinitializer, ptr %a, align 8
   %0 = load ptr, ptr %a, align 8
   %eq = icmp eq ptr %0, null
   %1 = zext i1 %eq to i8
   store i8 %1, ptr %x, align 1
-  store %"any*" { ptr null, i64 ptrtoint (ptr @"$ct.void" to i64) }, ptr %a, align 8
-  %2 = load %"any*", ptr %a, align 8
-  store %"any*" %2, ptr %z, align 8
-  store %"any*" { ptr null, i64 ptrtoint (ptr @"$ct.void" to i64) }, ptr %z, align 8
+  store %any { ptr null, i64 ptrtoint (ptr @"$ct.void" to i64) }, ptr %a, align 8
+  %2 = load %any, ptr %a, align 8
+  store %any %2, ptr %z, align 8
+  store %any { ptr null, i64 ptrtoint (ptr @"$ct.void" to i64) }, ptr %z, align 8
   ret void
 }
\ No newline at end of file
diff --git a/test/test_suite/dynamic/overlapping_function_linux.c3t b/test/test_suite/dynamic/overlapping_function_linux.c3t
index 3534d6dac..96d1c926e 100644
--- a/test/test_suite/dynamic/overlapping_function_linux.c3t
+++ b/test/test_suite/dynamic/overlapping_function_linux.c3t
@@ -25,16 +25,16 @@ struct Test (TestProto, TestProto2)
 
 fn void main()
 {
-	TestProto* z = mem::alloc(Test);
+	TestProto z = mem::alloc(Test);
 	z.tesT();
-	TestProto2* w = (TestProto2*)z;
+	TestProto2 w = (TestProto2)z;
 	w.tesT();
 }
 
 /* #expect: overlap.ll
 
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 @"$ct.overlap.Test" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 8, i64 0, i64 1, [0 x i64] zeroinitializer }, comdat, align 8
 @"$sel.tesT" = linkonce_odr constant [5 x i8] c"tesT\00", comdat, align 1
 @.panic_msg = internal constant [42 x i8] c"No method 'tesT' could be found on target\00", align 1
@@ -60,18 +60,18 @@ entry:
 ; Function Attrs:
 define void @overlap.main() #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %.inlinecache = alloca ptr, align 8
   %.cachedtype = alloca ptr, align 8
-  %w = alloca %"any*", align 8
+  %w = alloca %any, align 8
   %.inlinecache3 = alloca ptr, align 8
   %.cachedtype4 = alloca ptr, align 8
   store ptr null, ptr %.cachedtype4, align 8
   store ptr null, ptr %.cachedtype, align 8
   %0 = call ptr @std.core.mem.malloc(i64 8) #1
-  %1 = insertvalue %"any*" undef, ptr %0, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.overlap.Test" to i64), 1
-  store %"any*" %2, ptr %z, align 8
+  %1 = insertvalue %any undef, ptr %0, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.overlap.Test" to i64), 1
+  store %any %2, ptr %z, align 8
   %ptradd = getelementptr inbounds i8, ptr %z, i64 8
   %3 = load i64, ptr %ptradd, align 8
   %4 = inttoptr i64 %3 to ptr
@@ -99,8 +99,8 @@ missing_function:                                 ; preds = %8
 match:                                            ; preds = %8
   %11 = load ptr, ptr %z, align 8
   call void %fn_phi(ptr %11)
-  %12 = load %"any*", ptr %z, align 8
-  store %"any*" %12, ptr %w, align 8
+  %12 = load %any, ptr %z, align 8
+  store %any %12, ptr %w, align 8
   %ptradd2 = getelementptr inbounds i8, ptr %w, i64 8
   %13 = load i64, ptr %ptradd2, align 8
   %14 = inttoptr i64 %13 to ptr
diff --git a/test/test_suite/dynamic/overlapping_function_macos.c3t b/test/test_suite/dynamic/overlapping_function_macos.c3t
index 1da4e2d3f..d00f69357 100644
--- a/test/test_suite/dynamic/overlapping_function_macos.c3t
+++ b/test/test_suite/dynamic/overlapping_function_macos.c3t
@@ -25,15 +25,15 @@ struct Test (TestProto, TestProto2)
 
 fn void main()
 {
-	TestProto* z = mem::alloc(Test);
+	TestProto z = mem::alloc(Test);
 	z.tesT();
-	TestProto2* w = (TestProto2*)z;
+	TestProto2 w = (TestProto2)z;
 	w.tesT();
 }
 
 /* #expect: overlap.ll
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 
 @"$ct.overlap.Test" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 8, i64 0, i64 1, [0 x i64] zeroinitializer }, align 8
 @"$sel.tesT" = linkonce_odr constant [5 x i8] c"tesT\00", align 1
@@ -59,18 +59,18 @@ entry:
 ; Function Attrs:
 define void @overlap.main() #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %.inlinecache = alloca ptr, align 8
   %.cachedtype = alloca ptr, align 8
-  %w = alloca %"any*", align 8
+  %w = alloca %any, align 8
   %.inlinecache3 = alloca ptr, align 8
   %.cachedtype4 = alloca ptr, align 8
   store ptr null, ptr %.cachedtype4, align 8
   store ptr null, ptr %.cachedtype, align 8
   %0 = call ptr @std.core.mem.malloc(i64 8) #1
-  %1 = insertvalue %"any*" undef, ptr %0, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.overlap.Test" to i64), 1
-  store %"any*" %2, ptr %z, align 8
+  %1 = insertvalue %any undef, ptr %0, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.overlap.Test" to i64), 1
+  store %any %2, ptr %z, align 8
   %ptradd = getelementptr inbounds i8, ptr %z, i64 8
   %3 = load i64, ptr %ptradd, align 8
   %4 = inttoptr i64 %3 to ptr
@@ -103,8 +103,8 @@ missing_function:                                 ; preds = %8
 match:                                            ; preds = %8
   %11 = load ptr, ptr %z, align 8
   call void %fn_phi(ptr %11)
-  %12 = load %"any*", ptr %z, align 8
-  store %"any*" %12, ptr %w, align 8
+  %12 = load %any, ptr %z, align 8
+  store %any %12, ptr %w, align 8
   %ptradd2 = getelementptr inbounds i8, ptr %w, i64 8
   %13 = load i64, ptr %ptradd2, align 8
   %14 = inttoptr i64 %13 to ptr
diff --git a/test/test_suite/enumerations/enum_associated_value.c3t b/test/test_suite/enumerations/enum_associated_value.c3t
index c78e43b1e..508ca6e50 100644
--- a/test/test_suite/enumerations/enum_associated_value.c3t
+++ b/test/test_suite/enumerations/enum_associated_value.c3t
@@ -4,8 +4,8 @@ import libc;
 
 enum Foo : uint (int val, char* testme)
 {
-	A(123, "Number A"),
-	B(333, "Number B"),
+	A = { 123, "Number A" },
+	B = { 333, "Number B" },
 }
 
 fn void main()
diff --git a/test/test_suite/enumerations/enum_associated_values_other.c3t b/test/test_suite/enumerations/enum_associated_values_other.c3t
index 792d89901..02fe8fe60 100644
--- a/test/test_suite/enumerations/enum_associated_values_other.c3t
+++ b/test/test_suite/enumerations/enum_associated_values_other.c3t
@@ -16,10 +16,10 @@ module abc;
 int dabc;
 
 struct Abc { int x; }
-enum Foo : int(String val)
+enum Foo : int (String val)
 {
-	ABC("hello"),
-	DEF("world")
+	ABC = "hello" ,
+	DEF = "world"
 }
 
 /* #expect: abc.ll
diff --git a/test/test_suite/enumerations/enum_conversions.c3t b/test/test_suite/enumerations/enum_conversions.c3t
index fb2c3a873..434d0f42f 100644
--- a/test/test_suite/enumerations/enum_conversions.c3t
+++ b/test/test_suite/enumerations/enum_conversions.c3t
@@ -74,82 +74,82 @@ checkok50:                                        ; preds = %checkok43
   ret void
 panic:                                            ; preds = %entry
   store i32 %0, ptr %taddr, align 4
-  %12 = insertvalue %"any*" undef, ptr %taddr, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %13, ptr %varargslots, align 16
-  %14 = insertvalue %"any*[]" undef, ptr %varargslots, 0
-  %"$$temp" = insertvalue %"any*[]" %14, i64 1, 1
-  store %"any*[]" %"$$temp", ptr %indirectarg, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg, i64 7, ptr @.file, i64 19, ptr @.func, i64 4, i32 7, ptr byval(%"any*[]") align 8 %indirectarg)
+  %12 = insertvalue %any undef, ptr %taddr, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %13, ptr %varargslots, align 16
+  %14 = insertvalue %"any[]" undef, ptr %varargslots, 0
+  %"$$temp" = insertvalue %"any[]" %14, i64 1, 1
+  store %"any[]" %"$$temp", ptr %indirectarg, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg
   unreachable
 panic1:                                           ; preds = %checkok
   store i32 %0, ptr %taddr2, align 4
-  %15 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %16 = insertvalue %"any*" %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %16, ptr %varargslots3, align 16
-  %17 = insertvalue %"any*[]" undef, ptr %varargslots3, 0
-  %"$$temp4" = insertvalue %"any*[]" %17, i64 1, 1
-  store %"any*[]" %"$$temp4", ptr %indirectarg5, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 7, ptr byval(%"any*[]") align 8 %indirectarg5)
+  %15 = insertvalue %any undef, ptr %taddr2, 0
+  %16 = insertvalue %any %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %16, ptr %varargslots3, align 16
+  %17 = insertvalue %"any[]" undef, ptr %varargslots3, 0
+  %"$$temp4" = insertvalue %"any[]" %17, i64 1, 1
+  store %"any[]" %"$$temp4", ptr %indirectarg5, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 7, ptr byval(%"any[]") align 8 %indirectarg5)
   unreachable
 panic8:                                           ; preds = %checkok6
   store i64 %3, ptr %taddr9, align 8
-  %18 = insertvalue %"any*" undef, ptr %taddr9, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %19, ptr %varargslots10, align 16
-  %20 = insertvalue %"any*[]" undef, ptr %varargslots10, 0
-  %"$$temp11" = insertvalue %"any*[]" %20, i64 1, 1
-  store %"any*[]" %"$$temp11", ptr %indirectarg12, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.2, i64 8, ptr @.file, i64 19, ptr @.func, i64 4, i32 9, ptr byval(%"any*[]") align 8 %indirectarg12)
+  %18 = insertvalue %any undef, ptr %taddr9, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %19, ptr %varargslots10, align 16
+  %20 = insertvalue %"any[]" undef, ptr %varargslots10, 0
+  %"$$temp11" = insertvalue %"any[]" %20, i64 1, 1
+  store %"any[]" %"$$temp11", ptr %indirectarg12, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg,
   unreachable
 panic15:                                          ; preds = %checkok13
   store i64 %3, ptr %taddr16, align 8
-  %21 = insertvalue %"any*" undef, ptr %taddr16, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %22, ptr %varargslots17, align 16
-  %23 = insertvalue %"any*[]" undef, ptr %varargslots17, 0
-  %"$$temp18" = insertvalue %"any*[]" %23, i64 1, 1
-  store %"any*[]" %"$$temp18", ptr %indirectarg19, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 9, ptr byval(%"any*[]") align 8 %indirectarg19)
+  %21 = insertvalue %any undef, ptr %taddr16, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %22, ptr %varargslots17, align 16
+  %23 = insertvalue %"any[]" undef, ptr %varargslots17, 0
+  %"$$temp18" = insertvalue %"any[]" %23, i64 1, 1
+  store %"any[]" %"$$temp18", ptr %indirectarg19, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 9, ptr byval(%"any[]") align 8 %indirectarg19)
   unreachable
 panic23:                                          ; preds = %checkok20
   store i32 %6, ptr %taddr24, align 4
-  %24 = insertvalue %"any*" undef, ptr %taddr24, 0
-  %25 = insertvalue %"any*" %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %25, ptr %varargslots25, align 16
-  %26 = insertvalue %"any*[]" undef, ptr %varargslots25, 0
-  %"$$temp26" = insertvalue %"any*[]" %26, i64 1, 1
-  store %"any*[]" %"$$temp26", ptr %indirectarg27, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.3, i64 62, ptr @.file, i64 19, ptr @.func, i64 4, i32 11, ptr byval(%"any*[]") align 8 %indirectarg27)
+  %24 = insertvalue %any undef, ptr %taddr24, 0
+  %25 = insertvalue %any %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %25, ptr %varargslots25, align 16
+  %26 = insertvalue %"any[]" undef, ptr %varargslots25, 0
+  %"$$temp26" = insertvalue %"any[]" %26, i64 1, 1
+  store %"any[]" %"$$temp26", ptr %indirectarg27, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg,
   unreachable
 panic30:                                          ; preds = %checkok28
   store i32 %6, ptr %taddr31, align 4
-  %27 = insertvalue %"any*" undef, ptr %taddr31, 0
-  %28 = insertvalue %"any*" %27, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %28, ptr %varargslots32, align 16
-  %29 = insertvalue %"any*[]" undef, ptr %varargslots32, 0
-  %"$$temp33" = insertvalue %"any*[]" %29, i64 1, 1
-  store %"any*[]" %"$$temp33", ptr %indirectarg34, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 11, ptr byval(%"any*[]") align 8 %indirectarg34)
+  %27 = insertvalue %any undef, ptr %taddr31, 0
+  %28 = insertvalue %any %27, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %28, ptr %varargslots32, align 16
+  %29 = insertvalue %"any[]" undef, ptr %varargslots32, 0
+  %"$$temp33" = insertvalue %"any[]" %29, i64 1, 1
+  store %"any[]" %"$$temp33", ptr %indirectarg34, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 11, ptr byval(%"any[]") align 8 %indirectarg34)
   unreachable
 panic38:                                          ; preds = %checkok35
   store i32 %9, ptr %taddr39, align 4
-  %30 = insertvalue %"any*" undef, ptr %taddr39, 0
-  %31 = insertvalue %"any*" %30, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %31, ptr %varargslots40, align 16
-  %32 = insertvalue %"any*[]" undef, ptr %varargslots40, 0
-  %"$$temp41" = insertvalue %"any*[]" %32, i64 1, 1
-  store %"any*[]" %"$$temp41", ptr %indirectarg42, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.3, i64 62, ptr @.file, i64 19, ptr @.func, i64 4, i32 13, ptr byval(%"any*[]") align 8 %indirectarg42)
+  %30 = insertvalue %any undef, ptr %taddr39, 0
+  %31 = insertvalue %any %30, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %31, ptr %varargslots40, align 16
+  %32 = insertvalue %"any[]" undef, ptr %varargslots40, 0
+  %"$$temp41" = insertvalue %"any[]" %32, i64 1, 1
+  store %"any[]" %"$$temp41", ptr %indirectarg42, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg,
   unreachable
 panic45:                                          ; preds = %checkok43
   store i32 %9, ptr %taddr46, align 4
-  %33 = insertvalue %"any*" undef, ptr %taddr46, 0
-  %34 = insertvalue %"any*" %33, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %34, ptr %varargslots47, align 16
-  %35 = insertvalue %"any*[]" undef, ptr %varargslots47, 0
-  %"$$temp48" = insertvalue %"any*[]" %35, i64 1, 1
-  store %"any*[]" %"$$temp48", ptr %indirectarg49, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 13, ptr byval(%"any*[]") align 8 %indirectarg49)
+  %33 = insertvalue %any undef, ptr %taddr46, 0
+  %34 = insertvalue %any %33, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %34, ptr %varargslots47, align 16
+  %35 = insertvalue %"any[]" undef, ptr %varargslots47, 0
+  %"$$temp48" = insertvalue %"any[]" %35, i64 1, 1
+  store %"any[]" %"$$temp48", ptr %indirectarg49, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg.1, i64 87, ptr @.file, i64 19, ptr @.func, i64 4, i32 13, ptr byval(%"any[]") align 8 %indirectarg49)
   unreachable
 }
diff --git a/test/test_suite/enumerations/enum_invalid_param.c3 b/test/test_suite/enumerations/enum_invalid_param.c3
index ff86eb5f9..fb40f9159 100644
--- a/test/test_suite/enumerations/enum_invalid_param.c3
+++ b/test/test_suite/enumerations/enum_invalid_param.c3
@@ -1,9 +1,9 @@
 enum Test : int (int a, int b)
 {
-	FOO(1, 2)
+	FOO = {1, 2}
 }
 
-enum Test2 : int (int a, int nameof) // #error: 'nameof' is not a valid parameter name for enums
+enum Test2 : (int a, int nameof)  // #error: 'nameof' is not a valid parameter name for enums
 {
-	FOO(1, 2)
+	FOO = {1, 2}
 }
diff --git a/test/test_suite/enumerations/enum_reflect_associated.c3t b/test/test_suite/enumerations/enum_reflect_associated.c3t
index f264a038b..f39258d7f 100644
--- a/test/test_suite/enumerations/enum_reflect_associated.c3t
+++ b/test/test_suite/enumerations/enum_reflect_associated.c3t
@@ -4,7 +4,7 @@ import std::io;
 
 enum Abc : int (int x, double y, String z)
 {
-	OFEKFE(1, 2.0, "foek"),
+	OFEKFE = { 1, 2.0, "foek" },
 }
 
 fn int main()
@@ -23,29 +23,29 @@ fn int main()
 ; Function Attrs:
 define i32 @main() #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca %"char[]", align 8
   %retparam = alloca i64, align 8
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %taddr2 = alloca %"char[]", align 8
   %retparam3 = alloca i64, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %taddr5 = alloca %"char[]", align 8
   %retparam6 = alloca i64, align 8
   store %"char[]" { ptr @.str.2, i64 3 }, ptr %taddr, align 8
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %1, ptr %varargslots, align 16
   %2 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.1, i64 2, ptr %varargslots, i64 1)
   store %"char[]" { ptr @.str.4, i64 6 }, ptr %taddr2, align 8
-  %3 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %4 = insertvalue %"any*" %3, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %4, ptr %varargslots1, align 16
+  %3 = insertvalue %any undef, ptr %taddr2, 0
+  %4 = insertvalue %any %3, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %4, ptr %varargslots1, align 16
   %5 = call i64 @std.io.printfn(ptr %retparam3, ptr @.str.3, i64 2, ptr %varargslots1, i64 1)
   store %"char[]" { ptr @.str.6, i64 6 }, ptr %taddr5, align 8
-  %6 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %7, ptr %varargslots4, align 16
+  %6 = insertvalue %any undef, ptr %taddr5, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %7, ptr %varargslots4, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam6, ptr @.str.5, i64 2, ptr %varargslots4, i64 1)
   ret i32 0
 }
diff --git a/test/test_suite/enumerations/enum_same_param.c3 b/test/test_suite/enumerations/enum_same_param.c3
index 1196ed7ca..4f1a928fb 100644
--- a/test/test_suite/enumerations/enum_same_param.c3
+++ b/test/test_suite/enumerations/enum_same_param.c3
@@ -1,9 +1,9 @@
-enum Test : int (int a, int b)
+enum Test : (int a, int b)
 {
-	FOO(1, 2)
+	FOO = { 1, 2 }
 }
 
-enum Test2 : int (int a, int a) // #error: Duplicate parameter name 'a'
+enum Test2 : int (int a, int a)  // #error: Duplicate parameter name 'a'
 {
-	FOO(1, 2)
+	FOO = { 1, 2 }
 }
diff --git a/test/test_suite/enumerations/missing_type.c3 b/test/test_suite/enumerations/missing_type.c3
index 3d02730d2..6f65fdc25 100644
--- a/test/test_suite/enumerations/missing_type.c3
+++ b/test/test_suite/enumerations/missing_type.c3
@@ -1,4 +1,4 @@
-enum Kind : (int x) // #error: A type name
+enum Kind : (x) // #error: A type name
 {
 	FOO (10),
 }
\ No newline at end of file
diff --git a/test/test_suite/errors/error_introspect.c3t b/test/test_suite/errors/error_introspect.c3t
index 0642a604b..9dd2e1bf6 100644
--- a/test/test_suite/errors/error_introspect.c3t
+++ b/test/test_suite/errors/error_introspect.c3t
@@ -42,31 +42,31 @@ define void @foo.main() #0 {
 entry:
   %x = alloca %"char[][]", align 8
   %literal = alloca [2 x %"char[]"], align 16
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %literal2 = alloca [2 x i64], align 16
   %retparam3 = alloca i64, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %taddr = alloca i64, align 8
   %retparam5 = alloca i64, align 8
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal, ptr align 16 @.__const, i32 32, i1 false)
   %0 = insertvalue %"char[][]" undef, ptr %literal, 0
   %1 = insertvalue %"char[][]" %0, i64 2, 1
   store %"char[][]" %1, ptr %x, align 8
-  %2 = insertvalue %"any*" undef, ptr %x, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.sa$String" to i64), 1
-  store %"any*" %3, ptr %varargslots, align 16
+  %2 = insertvalue %any undef, ptr %x, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.sa$String" to i64), 1
+  store %any %3, ptr %varargslots, align 16
   %4 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.3, i64 13, ptr %varargslots, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal2, ptr align 16 @.__const.5, i32 16, i1 false)
-  %5 = insertvalue %"any*" undef, ptr %literal2, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.a2$foo.Foo" to i64), 1
-  store %"any*" %6, ptr %varargslots1, align 16
+  %5 = insertvalue %any undef, ptr %literal2, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.a2$foo.Foo" to i64), 1
+  store %any %6, ptr %varargslots1, align 16
   %7 = call i64 @std.io.printfn(ptr %retparam3, ptr @.str.4, i64 14, ptr %varargslots1, i64 1)
   store i64 2, ptr %taddr, align 8
-  %8 = insertvalue %"any*" undef, ptr %taddr, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %9, ptr %varargslots4, align 16
+  %8 = insertvalue %any undef, ptr %taddr, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %9, ptr %varargslots4, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam5, ptr @.str.6, i64 16, ptr %varargslots4, i64 1)
   ret void
 }
diff --git a/test/test_suite/errors/multiple_catch.c3t b/test/test_suite/errors/multiple_catch.c3t
index ab106fe4e..76112c830 100644
--- a/test/test_suite/errors/multiple_catch.c3t
+++ b/test/test_suite/errors/multiple_catch.c3t
@@ -46,11 +46,11 @@ define void @demo1.main() #0 {
 entry:
   %err = alloca i64, align 8
   %retparam = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam5 = alloca i64, align 8
   %err8 = alloca i64, align 8
   %retparam10 = alloca i32, align 4
-  %varargslots21 = alloca [1 x %"any*"], align 16
+  %varargslots21 = alloca [1 x %any], align 16
   %retparam22 = alloca i64, align 8
   %temp_err = alloca i64, align 8
   %retparam27 = alloca i32, align 4
@@ -61,7 +61,7 @@ entry:
   %error_var49 = alloca i64, align 8
   %err56 = alloca i64, align 8
   %retparam58 = alloca i32, align 4
-  %varargslots69 = alloca [1 x %"any*"], align 16
+  %varargslots69 = alloca [1 x %any], align 16
   %retparam70 = alloca i64, align 8
   br label %testblock
 
@@ -98,9 +98,9 @@ end_block:                                        ; preds = %after_check4, %assi
   br i1 %neq, label %if.then, label %if.exit
 
 if.then:                                          ; preds = %end_block
-  %5 = insertvalue %"any*" undef, ptr %err, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %6, ptr %varargslots, align 16
+  %5 = insertvalue %any undef, ptr %err, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %6, ptr %varargslots, align 16
   %7 = call i64 @std.io.printfn(ptr %retparam5, ptr @.str.3, i64 8, ptr %varargslots, i64 1)
   br label %if.exit
 
@@ -140,9 +140,9 @@ end_block18:                                      ; preds = %after_check17, %ass
   br i1 %neq19, label %if.then20, label %if.exit25
 
 if.then20:                                        ; preds = %end_block18
-  %13 = insertvalue %"any*" undef, ptr %err8, 0
-  %14 = insertvalue %"any*" %13, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %14, ptr %varargslots21, align 16
+  %13 = insertvalue %any undef, ptr %err8, 0
+  %14 = insertvalue %any %13, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %14, ptr %varargslots21, align 16
   %15 = call i64 @std.io.printfn(ptr %retparam22, ptr @.str.4, i64 8, ptr %varargslots21, i64 1)
   br label %if.exit25
 
@@ -276,9 +276,9 @@ end_block66:                                      ; preds = %after_check65, %ass
   br i1 %neq67, label %if.then68, label %if.exit73
 
 if.then68:                                        ; preds = %end_block66
-  %35 = insertvalue %"any*" undef, ptr %err56, 0
-  %36 = insertvalue %"any*" %35, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %36, ptr %varargslots69, align 16
+  %35 = insertvalue %any undef, ptr %err56, 0
+  %36 = insertvalue %any %35, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %36, ptr %varargslots69, align 16
   %37 = call i64 @std.io.printfn(ptr %retparam70, ptr @.str.6, i64 8, ptr %varargslots69, i64 1)
   br label %if.exit73
 
diff --git a/test/test_suite/errors/optional_chained_init.c3t b/test/test_suite/errors/optional_chained_init.c3t
index 624ab87ad..16ba6d881 100644
--- a/test/test_suite/errors/optional_chained_init.c3t
+++ b/test/test_suite/errors/optional_chained_init.c3t
@@ -53,14 +53,14 @@ entry:
   %b = alloca i32, align 4
   %b.f = alloca i64, align 8
   %err = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %err3 = alloca i64, align 8
-  %varargslots12 = alloca [1 x %"any*"], align 16
+  %varargslots12 = alloca [1 x %any], align 16
   %retparam13 = alloca i64, align 8
-  %varargslots17 = alloca [1 x %"any*"], align 16
+  %varargslots17 = alloca [1 x %any], align 16
   %retparam21 = alloca i64, align 8
-  %varargslots24 = alloca [1 x %"any*"], align 16
+  %varargslots24 = alloca [1 x %any], align 16
   %retparam28 = alloca i64, align 8
   store i32 1, ptr %a, align 4
   store i64 0, ptr %a.f, align 8
@@ -91,9 +91,9 @@ end_block:                                        ; preds = %after_check, %assig
   br i1 %neq, label %if.then, label %if.exit
 
 if.then:                                          ; preds = %end_block
-  %2 = insertvalue %"any*" undef, ptr %err, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %3, ptr %varargslots, align 16
+  %2 = insertvalue %any undef, ptr %err, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %3, ptr %varargslots, align 16
   %4 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 13, ptr %varargslots, i64 1)
   br label %if.exit
 
@@ -120,9 +120,9 @@ end_block9:                                       ; preds = %after_check8, %assi
   br i1 %neq10, label %if.then11, label %if.exit16
 
 if.then11:                                        ; preds = %end_block9
-  %7 = insertvalue %"any*" undef, ptr %err3, 0
-  %8 = insertvalue %"any*" %7, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %8, ptr %varargslots12, align 16
+  %7 = insertvalue %any undef, ptr %err3, 0
+  %8 = insertvalue %any %7, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %8, ptr %varargslots12, align 16
   %9 = call i64 @std.io.printfn(ptr %retparam13, ptr @.str.1, i64 13, ptr %varargslots12, i64 1)
   br label %if.exit16
 
@@ -133,9 +133,9 @@ if.exit16:                                        ; preds = %if.then11, %end_blo
   br i1 %10, label %after_check20, label %after_check23
 
 after_check20:                                    ; preds = %if.exit16
-  %11 = insertvalue %"any*" undef, ptr %a, 0
-  %12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %12, ptr %varargslots17, align 16
+  %11 = insertvalue %any undef, ptr %a, 0
+  %12 = insertvalue %any %11, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %12, ptr %varargslots17, align 16
   %13 = call i64 @std.io.printfn(ptr %retparam21, ptr @.str.2, i64 9, ptr %varargslots17, i64 1)
   %not_err22 = icmp eq i64 %13, 0
   %14 = call i1 @llvm.expect.i1(i1 %not_err22, i1 true)
@@ -148,9 +148,9 @@ after_check23:                                    ; preds = %if.exit16, %after_c
   br i1 %15, label %after_check27, label %after_check30
 
 after_check27:                                    ; preds = %after_check23
-  %16 = insertvalue %"any*" undef, ptr %b, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %17, ptr %varargslots24, align 16
+  %16 = insertvalue %any undef, ptr %b, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %17, ptr %varargslots24, align 16
   %18 = call i64 @std.io.printfn(ptr %retparam28, ptr @.str.3, i64 9, ptr %varargslots24, i64 1)
   %not_err29 = icmp eq i64 %18, 0
   %19 = call i1 @llvm.expect.i1(i1 %not_err29, i1 true)
@@ -170,14 +170,14 @@ entry:
   %b = alloca i32, align 4
   %b.f = alloca i64, align 8
   %err = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %err8 = alloca i64, align 8
-  %varargslots17 = alloca [1 x %"any*"], align 16
+  %varargslots17 = alloca [1 x %any], align 16
   %retparam18 = alloca i64, align 8
-  %varargslots22 = alloca [1 x %"any*"], align 16
+  %varargslots22 = alloca [1 x %any], align 16
   %retparam26 = alloca i64, align 8
-  %varargslots29 = alloca [1 x %"any*"], align 16
+  %varargslots29 = alloca [1 x %any], align 16
   %retparam33 = alloca i64, align 8
   store i64 ptrtoint (ptr @"test.Test$FOO" to i64), ptr %x.f, align 8
   store i32 1, ptr %a, align 4
@@ -230,9 +230,9 @@ end_block:                                        ; preds = %after_check5, %assi
   br i1 %neq, label %if.then, label %if.exit
 
 if.then:                                          ; preds = %end_block
-  %4 = insertvalue %"any*" undef, ptr %err, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %err, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %6 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.4, i64 13, ptr %varargslots, i64 1)
   br label %if.exit
 
@@ -259,9 +259,9 @@ end_block14:                                      ; preds = %after_check13, %ass
   br i1 %neq15, label %if.then16, label %if.exit21
 
 if.then16:                                        ; preds = %end_block14
-  %9 = insertvalue %"any*" undef, ptr %err8, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %10, ptr %varargslots17, align 16
+  %9 = insertvalue %any undef, ptr %err8, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %10, ptr %varargslots17, align 16
   %11 = call i64 @std.io.printfn(ptr %retparam18, ptr @.str.5, i64 13, ptr %varargslots17, i64 1)
   br label %if.exit21
 
@@ -272,9 +272,9 @@ if.exit21:                                        ; preds = %if.then16, %end_blo
   br i1 %12, label %after_check25, label %after_check28
 
 after_check25:                                    ; preds = %if.exit21
-  %13 = insertvalue %"any*" undef, ptr %a, 0
-  %14 = insertvalue %"any*" %13, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %14, ptr %varargslots22, align 16
+  %13 = insertvalue %any undef, ptr %a, 0
+  %14 = insertvalue %any %13, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %14, ptr %varargslots22, align 16
   %15 = call i64 @std.io.printfn(ptr %retparam26, ptr @.str.6, i64 9, ptr %varargslots22, i64 1)
   %not_err27 = icmp eq i64 %15, 0
   %16 = call i1 @llvm.expect.i1(i1 %not_err27, i1 true)
@@ -287,9 +287,9 @@ after_check28:                                    ; preds = %if.exit21, %after_c
   br i1 %17, label %after_check32, label %after_check35
 
 after_check32:                                    ; preds = %after_check28
-  %18 = insertvalue %"any*" undef, ptr %b, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %19, ptr %varargslots29, align 16
+  %18 = insertvalue %any undef, ptr %b, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %19, ptr %varargslots29, align 16
   %20 = call i64 @std.io.printfn(ptr %retparam33, ptr @.str.7, i64 9, ptr %varargslots29, i64 1)
   %not_err34 = icmp eq i64 %20, 0
   %21 = call i1 @llvm.expect.i1(i1 %not_err34, i1 true)
@@ -309,14 +309,14 @@ entry:
   %b = alloca i32, align 4
   %b.f = alloca i64, align 8
   %err = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %err8 = alloca i64, align 8
-  %varargslots17 = alloca [1 x %"any*"], align 16
+  %varargslots17 = alloca [1 x %any], align 16
   %retparam18 = alloca i64, align 8
-  %varargslots22 = alloca [1 x %"any*"], align 16
+  %varargslots22 = alloca [1 x %any], align 16
   %retparam26 = alloca i64, align 8
-  %varargslots29 = alloca [1 x %"any*"], align 16
+  %varargslots29 = alloca [1 x %any], align 16
   %retparam33 = alloca i64, align 8
   store i32 23, ptr %x, align 4
   store i64 0, ptr %x.f, align 8
@@ -370,9 +370,9 @@ end_block:                                        ; preds = %after_check5, %assi
   br i1 %neq, label %if.then, label %if.exit
 
 if.then:                                          ; preds = %end_block
-  %4 = insertvalue %"any*" undef, ptr %err, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %err, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %6 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.8, i64 13, ptr %varargslots, i64 1)
   br label %if.exit
 
@@ -399,9 +399,9 @@ end_block14:                                      ; preds = %after_check13, %ass
   br i1 %neq15, label %if.then16, label %if.exit21
 
 if.then16:                                        ; preds = %end_block14
-  %9 = insertvalue %"any*" undef, ptr %err8, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %10, ptr %varargslots17, align 16
+  %9 = insertvalue %any undef, ptr %err8, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %10, ptr %varargslots17, align 16
   %11 = call i64 @std.io.printfn(ptr %retparam18, ptr @.str.9, i64 13, ptr %varargslots17, i64 1)
   br label %if.exit21
 
@@ -412,9 +412,9 @@ if.exit21:                                        ; preds = %if.then16, %end_blo
   br i1 %12, label %after_check25, label %after_check28
 
 after_check25:                                    ; preds = %if.exit21
-  %13 = insertvalue %"any*" undef, ptr %a, 0
-  %14 = insertvalue %"any*" %13, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %14, ptr %varargslots22, align 16
+  %13 = insertvalue %any undef, ptr %a, 0
+  %14 = insertvalue %any %13, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %14, ptr %varargslots22, align 16
   %15 = call i64 @std.io.printfn(ptr %retparam26, ptr @.str.10, i64 9, ptr %varargslots22, i64 1)
   %not_err27 = icmp eq i64 %15, 0
   %16 = call i1 @llvm.expect.i1(i1 %not_err27, i1 true)
@@ -427,9 +427,9 @@ after_check28:                                    ; preds = %if.exit21, %after_c
   br i1 %17, label %after_check32, label %after_check35
 
 after_check32:                                    ; preds = %after_check28
-  %18 = insertvalue %"any*" undef, ptr %b, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %19, ptr %varargslots29, align 16
+  %18 = insertvalue %any undef, ptr %b, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %19, ptr %varargslots29, align 16
   %20 = call i64 @std.io.printfn(ptr %retparam33, ptr @.str.11, i64 9, ptr %varargslots29, i64 1)
   %not_err34 = icmp eq i64 %20, 0
   %21 = call i1 @llvm.expect.i1(i1 %not_err34, i1 true)
diff --git a/test/test_suite/errors/optional_sizeof.c3 b/test/test_suite/errors/optional_sizeof.c3
index c93b724b6..1ad8ae019 100644
--- a/test/test_suite/errors/optional_sizeof.c3
+++ b/test/test_suite/errors/optional_sizeof.c3
@@ -9,12 +9,12 @@ macro test()
 
 fn void a()
 {
-	String s = $typeof(test()).qnameof; // #error: This optional expression is untyped.
+	String s = $typeof(test()).qnameof; // #error: This optional expression lacks
 }
 
 fn void b()
 {
-	$sizeof(test()); // #error: This optional expression is untyped.
+	$sizeof(test()); // #error: This optional expression lacks
 }
 
 fn void c()
@@ -24,7 +24,7 @@ fn void c()
 
 fn void! d()
 {
-	$typeof(test()!) g; // #error: This expression has no concrete type
+	$typeof(test()!) g; // #error: This expression lacks a concrete type
 }
 
 macro e()
diff --git a/test/test_suite/errors/optional_with_optional.c3t b/test/test_suite/errors/optional_with_optional.c3t
index 6b116876a..bc1d5626b 100644
--- a/test/test_suite/errors/optional_with_optional.c3t
+++ b/test/test_suite/errors/optional_with_optional.c3t
@@ -34,38 +34,38 @@ fn int! get_b(int x)
 
 define void @test.main() #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i32, align 4
   %retparam1 = alloca i32, align 4
   %taddr = alloca i32, align 4
   %retparam7 = alloca i64, align 8
-  %varargslots10 = alloca [1 x %"any*"], align 16
+  %varargslots10 = alloca [1 x %any], align 16
   %retparam11 = alloca i32, align 4
   %retparam15 = alloca i32, align 4
   %taddr23 = alloca i32, align 4
   %retparam24 = alloca i64, align 8
-  %varargslots27 = alloca [1 x %"any*"], align 16
+  %varargslots27 = alloca [1 x %any], align 16
   %retparam28 = alloca i32, align 4
   %retparam32 = alloca i32, align 4
   %taddr40 = alloca i32, align 4
   %retparam41 = alloca i64, align 8
-  %varargslots44 = alloca [1 x %"any*"], align 16
+  %varargslots44 = alloca [1 x %any], align 16
   %blockret = alloca i64, align 8
   %f = alloca i64, align 8
   %retparam45 = alloca i64, align 8
-  %varargslots48 = alloca [1 x %"any*"], align 16
+  %varargslots48 = alloca [1 x %any], align 16
   %taddr49 = alloca i32, align 4
   %retparam50 = alloca i64, align 8
-  %varargslots53 = alloca [1 x %"any*"], align 16
+  %varargslots53 = alloca [1 x %any], align 16
   %blockret54 = alloca i64, align 8
   %f55 = alloca i64, align 8
   %retparam62 = alloca i64, align 8
-  %varargslots65 = alloca [1 x %"any*"], align 16
+  %varargslots65 = alloca [1 x %any], align 16
   %blockret66 = alloca i64, align 8
   %f67 = alloca i64, align 8
   %retparam76 = alloca i64, align 8
   %x = alloca i64, align 8
-  %varargslots79 = alloca [1 x %"any*"], align 16
+  %varargslots79 = alloca [1 x %any], align 16
   %retparam80 = alloca i64, align 8
   %xy = alloca i32, align 4
   %xy.f = alloca i64, align 8
@@ -98,9 +98,9 @@ phi_block:                                        ; preds = %else_block4, %after
 phi_block5:                                       ; preds = %phi_block, %after_check
   %val6 = phi i32 [ %2, %after_check ], [ %val, %phi_block ]
   store i32 %val6, ptr %taddr, align 4
-  %6 = insertvalue %"any*" undef, ptr %taddr, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %7, ptr %varargslots, align 16
+  %6 = insertvalue %any undef, ptr %taddr, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %7, ptr %varargslots, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam7, ptr @.str, i64 4, ptr %varargslots, i64 1)
   %9 = call i64 @test.get_a(ptr %retparam11, i32 2)
   %not_err12 = icmp eq i64 %9, 0
@@ -131,9 +131,9 @@ phi_block19:                                      ; preds = %else_block18, %afte
 phi_block21:                                      ; preds = %phi_block19, %after_check13
   %val22 = phi i32 [ %11, %after_check13 ], [ %val20, %phi_block19 ]
   store i32 %val22, ptr %taddr23, align 4
-  %15 = insertvalue %"any*" undef, ptr %taddr23, 0
-  %16 = insertvalue %"any*" %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %16, ptr %varargslots10, align 16
+  %15 = insertvalue %any undef, ptr %taddr23, 0
+  %16 = insertvalue %any %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %16, ptr %varargslots10, align 16
   %17 = call i64 @std.io.printfn(ptr %retparam24, ptr @.str.2, i64 4, ptr %varargslots10, i64 1)
   %18 = call i64 @test.get_a(ptr %retparam28, i32 1)
   %not_err29 = icmp eq i64 %18, 0
@@ -164,9 +164,9 @@ phi_block36:                                      ; preds = %else_block35, %afte
 phi_block38:                                      ; preds = %phi_block36, %after_check30
   %val39 = phi i32 [ %20, %after_check30 ], [ %val37, %phi_block36 ]
   store i32 %val39, ptr %taddr40, align 4
-  %24 = insertvalue %"any*" undef, ptr %taddr40, 0
-  %25 = insertvalue %"any*" %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %25, ptr %varargslots27, align 16
+  %24 = insertvalue %any undef, ptr %taddr40, 0
+  %25 = insertvalue %any %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %25, ptr %varargslots27, align 16
   %26 = call i64 @std.io.printfn(ptr %retparam41, ptr @.str.3, i64 4, ptr %varargslots27, i64 1)
   br label %testblock
 
@@ -189,14 +189,14 @@ if.exit:                                          ; preds = %end_block
   br label %expr_block.exit
 
 expr_block.exit:                                  ; preds = %if.exit, %if.then
-  %29 = insertvalue %"any*" undef, ptr %blockret, 0
-  %30 = insertvalue %"any*" %29, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %30, ptr %varargslots44, align 16
+  %29 = insertvalue %any undef, ptr %blockret, 0
+  %30 = insertvalue %any %29, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %30, ptr %varargslots44, align 16
   %31 = call i64 @std.io.printfn(ptr %retparam45, ptr @.str.4, i64 4, ptr %varargslots44, i64 1)
   store i32 3, ptr %taddr49, align 4
-  %32 = insertvalue %"any*" undef, ptr %taddr49, 0
-  %33 = insertvalue %"any*" %32, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %33, ptr %varargslots48, align 16
+  %32 = insertvalue %any undef, ptr %taddr49, 0
+  %33 = insertvalue %any %32, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %33, ptr %varargslots48, align 16
   %34 = call i64 @std.io.printfn(ptr %retparam50, ptr @.str.5, i64 4, ptr %varargslots48, i64 1)
   br label %testblock56
 
@@ -219,9 +219,9 @@ if.exit60:                                        ; preds = %end_block57
   br label %expr_block.exit61
 
 expr_block.exit61:                                ; preds = %if.exit60, %if.then59
-  %37 = insertvalue %"any*" undef, ptr %blockret54, 0
-  %38 = insertvalue %"any*" %37, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %38, ptr %varargslots53, align 16
+  %37 = insertvalue %any undef, ptr %blockret54, 0
+  %38 = insertvalue %any %37, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %38, ptr %varargslots53, align 16
   %39 = call i64 @std.io.printfn(ptr %retparam62, ptr @.str.6, i64 4, ptr %varargslots53, i64 1)
   br label %testblock68
 
@@ -247,14 +247,14 @@ if.exit74:                                        ; preds = %end_block71
   br label %expr_block.exit75
 
 expr_block.exit75:                                ; preds = %if.exit74, %if.then73
-  %42 = insertvalue %"any*" undef, ptr %blockret66, 0
-  %43 = insertvalue %"any*" %42, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %43, ptr %varargslots65, align 16
+  %42 = insertvalue %any undef, ptr %blockret66, 0
+  %43 = insertvalue %any %42, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %43, ptr %varargslots65, align 16
   %44 = call i64 @std.io.printfn(ptr %retparam76, ptr @.str.7, i64 4, ptr %varargslots65, i64 1)
   store i64 3, ptr %x, align 8
-  %45 = insertvalue %"any*" undef, ptr %x, 0
-  %46 = insertvalue %"any*" %45, i64 ptrtoint (ptr @"$ct.long" to i64), 1
-  store %"any*" %46, ptr %varargslots79, align 16
+  %45 = insertvalue %any undef, ptr %x, 0
+  %46 = insertvalue %any %45, i64 ptrtoint (ptr @"$ct.long" to i64), 1
+  store %any %46, ptr %varargslots79, align 16
   %47 = call i64 @std.io.printfn(ptr %retparam80, ptr @.str.8, i64 4, ptr %varargslots79, i64 1)
   store i64 ptrtoint (ptr @"test.Foo$DEF" to i64), ptr %xy.f, align 8
   ret void
diff --git a/test/test_suite/errors/or_and_rethrow.c3t b/test/test_suite/errors/or_and_rethrow.c3t
index 23312659b..f2eec0004 100644
--- a/test/test_suite/errors/or_and_rethrow.c3t
+++ b/test/test_suite/errors/or_and_rethrow.c3t
@@ -41,7 +41,7 @@ fn void main()
 
 define i64 @foo.test(i32 %0) #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   %error_var = alloca i64, align 8
@@ -58,20 +58,10 @@ entry:
   %error_var34 = alloca i64, align 8
   %error_var42 = alloca i64, align 8
   %blockret43 = alloca i32, align 4
-  %len49 = alloca i64, align 8
-  %error_var50 = alloca i64, align 8
-  %retparam52 = alloca i64, align 8
-  %error_var58 = alloca i64, align 8
-  %error_var64 = alloca i64, align 8
-  %len74 = alloca i64, align 8
-  %error_var75 = alloca i64, align 8
-  %retparam77 = alloca i64, align 8
-  %error_var83 = alloca i64, align 8
-  %error_var89 = alloca i64, align 8
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.1, i64 8, ptr %varargslots, i64 1)
   %intbool = icmp ne i32 %0, 0
   br i1 %intbool, label %or.phi, label %or.rhs
@@ -217,130 +207,12 @@ opt_block_cleanup44:                              ; preds = %voiderr41
 guard_block45:                                    ; preds = %opt_block_cleanup44
   %23 = load i64, ptr %error_var42, align 8
   ret i64 %23
-
-if.then47:                                        ; No predecessors!
-  %24 = call ptr @std.io.stdout()
-  %25 = call i64 @std.io.File.write(ptr %retparam52, ptr %24, ptr @.str.4, i64 3)
-  %not_err53 = icmp eq i64 %25, 0
-  %26 = call i1 @llvm.expect.i1(i1 %not_err53, i1 true)
-  br i1 %26, label %after_check55, label %assign_optional54
-
-assign_optional54:                                ; preds = %if.then47
-  store i64 %25, ptr %error_var50, align 8
-  br label %guard_block56
-
-after_check55:                                    ; preds = %if.then47
-  br label %noerr_block57
-
-guard_block56:                                    ; preds = %assign_optional54
-  br label %voiderr71
-
-noerr_block57:                                    ; preds = %after_check55
-  %27 = load i64, ptr %retparam52, align 8
-  store i64 %27, ptr %len49, align 8
-  %28 = call i64 @std.io.File.write_byte(ptr %24, i8 zeroext 10)
-  %not_err59 = icmp eq i64 %28, 0
-  %29 = call i1 @llvm.expect.i1(i1 %not_err59, i1 true)
-  br i1 %29, label %after_check61, label %assign_optional60
-
-assign_optional60:                                ; preds = %noerr_block57
-  store i64 %28, ptr %error_var58, align 8
-  br label %guard_block62
-
-after_check61:                                    ; preds = %noerr_block57
-  br label %noerr_block63
-
-guard_block62:                                    ; preds = %assign_optional60
-  br label %voiderr71
-
-noerr_block63:                                    ; preds = %after_check61
-  %30 = call i64 @std.io.File.flush(ptr %24)
-  %not_err65 = icmp eq i64 %30, 0
-  %31 = call i1 @llvm.expect.i1(i1 %not_err65, i1 true)
-  br i1 %31, label %after_check67, label %assign_optional66
-
-assign_optional66:                                ; preds = %noerr_block63
-  store i64 %30, ptr %error_var64, align 8
-  br label %guard_block68
-
-after_check67:                                    ; preds = %noerr_block63
-  br label %noerr_block69
-
-guard_block68:                                    ; preds = %assign_optional66
-  br label %voiderr71
-
-noerr_block69:                                    ; preds = %after_check67
-  %32 = load i64, ptr %len49, align 8
-  %add70 = add i64 %32, 1
-  br label %voiderr71
-
-voiderr71:                                        ; preds = %noerr_block69, %guard_block68, %guard_block62, %guard_block56
-  br label %if.exit72
-
-if.exit72:                                        ; preds = %voiderr71
-  %33 = call ptr @std.io.stdout()
-  %34 = call i64 @std.io.File.write(ptr %retparam77, ptr %33, ptr @.str.5, i64 7)
-  %not_err78 = icmp eq i64 %34, 0
-  %35 = call i1 @llvm.expect.i1(i1 %not_err78, i1 true)
-  br i1 %35, label %after_check80, label %assign_optional79
-
-assign_optional79:                                ; preds = %if.exit72
-  store i64 %34, ptr %error_var75, align 8
-  br label %guard_block81
-
-after_check80:                                    ; preds = %if.exit72
-  br label %noerr_block82
-
-guard_block81:                                    ; preds = %assign_optional79
-  br label %voiderr96
-
-noerr_block82:                                    ; preds = %after_check80
-  %36 = load i64, ptr %retparam77, align 8
-  store i64 %36, ptr %len74, align 8
-  %37 = call i64 @std.io.File.write_byte(ptr %33, i8 zeroext 10)
-  %not_err84 = icmp eq i64 %37, 0
-  %38 = call i1 @llvm.expect.i1(i1 %not_err84, i1 true)
-  br i1 %38, label %after_check86, label %assign_optional85
-
-assign_optional85:                                ; preds = %noerr_block82
-  store i64 %37, ptr %error_var83, align 8
-  br label %guard_block87
-
-after_check86:                                    ; preds = %noerr_block82
-  br label %noerr_block88
-
-guard_block87:                                    ; preds = %assign_optional85
-  br label %voiderr96
-
-noerr_block88:                                    ; preds = %after_check86
-  %39 = call i64 @std.io.File.flush(ptr %33)
-  %not_err90 = icmp eq i64 %39, 0
-  %40 = call i1 @llvm.expect.i1(i1 %not_err90, i1 true)
-  br i1 %40, label %after_check92, label %assign_optional91
-
-assign_optional91:                                ; preds = %noerr_block88
-  store i64 %39, ptr %error_var89, align 8
-  br label %guard_block93
-
-after_check92:                                    ; preds = %noerr_block88
-  br label %noerr_block94
-
-guard_block93:                                    ; preds = %assign_optional91
-  br label %voiderr96
-
-noerr_block94:                                    ; preds = %after_check92
-  %41 = load i64, ptr %len74, align 8
-  %add95 = add i64 %41, 1
-  br label %voiderr96
-
-voiderr96:                                        ; preds = %noerr_block94, %guard_block93, %guard_block87, %guard_block81
-  ret i64 0
 }
 
 ; Function Attrs:
 define i64 @foo.test2(i32 %0) #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   %error_var = alloca i64, align 8
@@ -352,15 +224,10 @@ entry:
   %error_var12 = alloca i64, align 8
   %error_var18 = alloca i64, align 8
   %blockret19 = alloca i32, align 4
-  %len25 = alloca i64, align 8
-  %error_var26 = alloca i64, align 8
-  %retparam28 = alloca i64, align 8
-  %error_var34 = alloca i64, align 8
-  %error_var40 = alloca i64, align 8
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.6, i64 9, ptr %varargslots, i64 1)
   %intbool = icmp ne i32 %0, 0
   br i1 %intbool, label %and.rhs, label %and.phi
@@ -447,65 +314,6 @@ opt_block_cleanup20:                              ; preds = %voiderr
 guard_block21:                                    ; preds = %opt_block_cleanup20
   %14 = load i64, ptr %error_var18, align 8
   ret i64 %14
-
-if.exit23:                                        ; No predecessors!
-  %15 = call ptr @std.io.stdout()
-  %16 = call i64 @std.io.File.write(ptr %retparam28, ptr %15, ptr @.str.8, i64 7)
-  %not_err29 = icmp eq i64 %16, 0
-  %17 = call i1 @llvm.expect.i1(i1 %not_err29, i1 true)
-  br i1 %17, label %after_check31, label %assign_optional30
-
-assign_optional30:                                ; preds = %if.exit23
-  store i64 %16, ptr %error_var26, align 8
-  br label %guard_block32
-
-after_check31:                                    ; preds = %if.exit23
-  br label %noerr_block33
-
-guard_block32:                                    ; preds = %assign_optional30
-  br label %voiderr47
-
-noerr_block33:                                    ; preds = %after_check31
-  %18 = load i64, ptr %retparam28, align 8
-  store i64 %18, ptr %len25, align 8
-  %19 = call i64 @std.io.File.write_byte(ptr %15, i8 zeroext 10)
-  %not_err35 = icmp eq i64 %19, 0
-  %20 = call i1 @llvm.expect.i1(i1 %not_err35, i1 true)
-  br i1 %20, label %after_check37, label %assign_optional36
-
-assign_optional36:                                ; preds = %noerr_block33
-  store i64 %19, ptr %error_var34, align 8
-  br label %guard_block38
-
-after_check37:                                    ; preds = %noerr_block33
-  br label %noerr_block39
-
-guard_block38:                                    ; preds = %assign_optional36
-  br label %voiderr47
-
-noerr_block39:                                    ; preds = %after_check37
-  %21 = call i64 @std.io.File.flush(ptr %15)
-  %not_err41 = icmp eq i64 %21, 0
-  %22 = call i1 @llvm.expect.i1(i1 %not_err41, i1 true)
-  br i1 %22, label %after_check43, label %assign_optional42
-
-assign_optional42:                                ; preds = %noerr_block39
-  store i64 %21, ptr %error_var40, align 8
-  br label %guard_block44
-
-after_check43:                                    ; preds = %noerr_block39
-  br label %noerr_block45
-
-guard_block44:                                    ; preds = %assign_optional42
-  br label %voiderr47
-
-noerr_block45:                                    ; preds = %after_check43
-  %23 = load i64, ptr %len25, align 8
-  %add46 = add i64 %23, 1
-  br label %voiderr47
-
-voiderr47:                                        ; preds = %noerr_block45, %guard_block44, %guard_block38, %guard_block32
-  ret i64 0
 }
 
 ; Function Attrs:
diff --git a/test/test_suite/errors/printing_errors.c3t b/test/test_suite/errors/printing_errors.c3t
index 251e06da1..7da486350 100644
--- a/test/test_suite/errors/printing_errors.c3t
+++ b/test/test_suite/errors/printing_errors.c3t
@@ -18,15 +18,15 @@ fn void main()
 define void @test.main() #0 {
 entry:
   %x = alloca i64, align 8
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %taddr = alloca %"char[]", align 8
   %faultname_zero = alloca %"char[]", align 8
   %retparam = alloca i64, align 8
   store i64 ptrtoint (ptr @"test.Cde$WORLD" to i64), ptr %x, align 8
   store %"char[]" { ptr @.str.2, i64 5 }, ptr %taddr, align 8
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %1, ptr %varargslots, align 16
   %2 = load i64, ptr %x, align 8
   %eq = icmp eq i64 %2, 0
   br i1 %eq, label %faultname_no, label %faultname_ok
@@ -42,10 +42,10 @@ faultname_ok:                                     ; preds = %entry
 
 faultname_exit:                                   ; preds = %faultname_ok, %faultname_no
   %faultname = phi ptr [ %faultname_zero, %faultname_no ], [ %4, %faultname_ok ]
-  %5 = insertvalue %"any*" undef, ptr %faultname, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  %5 = insertvalue %any undef, ptr %faultname, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.String" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %6, ptr %ptradd, align 16
+  store %any %6, ptr %ptradd, align 16
   %7 = call i64 @std.io.printf(ptr %retparam, ptr @.str, i64 6, ptr %varargslots, i64 2)
   ret void
 }
diff --git a/test/test_suite/errors/rethrow_macro.c3 b/test/test_suite/errors/rethrow_macro.c3
index 02a0a8f09..2e9f12a46 100644
--- a/test/test_suite/errors/rethrow_macro.c3
+++ b/test/test_suite/errors/rethrow_macro.c3
@@ -1,7 +1,7 @@
 module testing;
 import std::io;
 
-macro char[] read(src, Allocator* allocator, n)
+macro char[] read(src, Allocator allocator, n)
 {
     char* data = allocator::malloc_try(allocator, n)!; // #error: Rethrow is only allowed in macros
     io::read_all(src, data[:n])!;
diff --git a/test/test_suite/expression_block/expr_block_no_assign.c3 b/test/test_suite/expression_block/expr_block_no_assign.c3
new file mode 100644
index 000000000..a27fbcbc1
--- /dev/null
+++ b/test/test_suite/expression_block/expr_block_no_assign.c3
@@ -0,0 +1,6 @@
+module helloworld;
+
+fn void main()
+{
+	{| return 1; |}; // #error: which must be handled
+}
\ No newline at end of file
diff --git a/test/test_suite/expressions/assign_optional.c3t b/test/test_suite/expressions/assign_optional.c3t
new file mode 100644
index 000000000..d61fcf34d
--- /dev/null
+++ b/test/test_suite/expressions/assign_optional.c3t
@@ -0,0 +1,69 @@
+// #target: macos-x64
+module test;
+
+fn void main()
+{
+	anyfault x = SearchResult.MISSING;
+	int! a = x?;
+	int! b = a = x?;
+	int! c = b = a;
+}
+
+/* #expect: test.ll
+
+define void @test.main() #0 {
+entry:
+  %x = alloca i64, align 8
+  %a = alloca i32, align 4
+  %a.f = alloca i64, align 8
+  %b = alloca i32, align 4
+  %b.f = alloca i64, align 8
+  %c = alloca i32, align 4
+  %c.f = alloca i64, align 8
+  store i64 ptrtoint (ptr @"std.core.builtin.SearchResult$MISSING" to i64), ptr %x, align 8
+  %0 = load i64, ptr %x, align 8
+  store i64 %0, ptr %a.f, align 8
+  %1 = load i64, ptr %x, align 8
+  store i64 %1, ptr %a.f, align 8
+  %not_err = icmp eq i64 %1, 0
+  %2 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
+  br i1 %2, label %after_check, label %assign_optional
+
+assign_optional:                                  ; preds = %entry
+  store i64 %1, ptr %b.f, align 8
+  br label %after_assign
+
+after_check:                                      ; preds = %entry
+  store i32 undef, ptr %b, align 4
+  store i64 0, ptr %b.f, align 8
+  br label %after_assign
+
+after_assign:                                     ; preds = %after_check, %assign_optional
+  %optval = load i64, ptr %a.f, align 8
+  %not_err1 = icmp eq i64 %optval, 0
+  %3 = call i1 @llvm.expect.i1(i1 %not_err1, i1 true)
+  br i1 %3, label %after_check3, label %assign_optional2
+
+assign_optional2:                                 ; preds = %after_assign
+  store i64 %optval, ptr %b.f, align 8
+  br label %optional_assign_jump
+
+after_check3:                                     ; preds = %after_assign
+  %4 = load i32, ptr %a, align 4
+  store i32 %4, ptr %b, align 4
+  store i64 0, ptr %b.f, align 8
+  br label %after_assign4
+
+optional_assign_jump:                             ; preds = %assign_optional2
+  %reload_err = load i64, ptr %b.f, align 8
+  store i64 %reload_err, ptr %c.f, align 8
+  br label %after_assign5
+
+after_assign4:                                    ; preds = %after_check3
+  store i32 %4, ptr %c, align 4
+  store i64 0, ptr %c.f, align 8
+  br label %after_assign5
+
+after_assign5:                                    ; preds = %after_assign4, %optional_assign_jump
+  ret void
+}
diff --git a/test/test_suite/expressions/unsafe_comparisons.c3 b/test/test_suite/expressions/unsafe_comparisons.c3
index 013b889e9..8f4bad071 100644
--- a/test/test_suite/expressions/unsafe_comparisons.c3
+++ b/test/test_suite/expressions/unsafe_comparisons.c3
@@ -10,6 +10,11 @@ fn bool test2(uint x)
     return x <= 0; // #error: 'unsigned expression <= 0' is the same as expr == 0
 }
 
+fn bool test22(uint x)
+{
+    return x >= 0; // #error: 'unsigned expression >= 0'
+}
+
 fn bool test3(uint x)
 {
     return x == -1; // #error: Comparing an unsigned value with a negative constant
@@ -25,6 +30,11 @@ fn bool test5(uint x)
     return 0 >= x; // #error: '0 >= unsigned expression' is the same as 0 == expr
 }
 
+fn bool test55(uint x)
+{
+    return 0 <= x; // #error: '0 <= unsigned expression'
+}
+
 fn bool test6(uint x)
 {
     return -1 == x; // #error: an unsigned value with a negative constant
diff --git a/test/test_suite/from_docs/examples_struct.c3 b/test/test_suite/from_docs/examples_struct.c3
index 7b4e2c62f..2e0dee843 100644
--- a/test/test_suite/from_docs/examples_struct.c3
+++ b/test/test_suite/from_docs/examples_struct.c3
@@ -33,7 +33,7 @@ struct MyData
     union
     {
         Person* person;
-        Company* company;
+        Company company;
     }
 
     // named sub-unions (x.either.this)
diff --git a/test/test_suite/functions/func_ptr_conversions_and_names.c3t b/test/test_suite/functions/func_ptr_conversions_and_names.c3t
index 6f8fc2d46..8b3328d8d 100644
--- a/test/test_suite/functions/func_ptr_conversions_and_names.c3t
+++ b/test/test_suite/functions/func_ptr_conversions_and_names.c3t
@@ -55,29 +55,29 @@ define void @test.main() #0 {
 entry:
   %a = alloca ptr, align 8
   %b = alloca ptr, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %taddr2 = alloca i32, align 4
   %retparam3 = alloca i64, align 8
   %z = alloca ptr, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %taddr5 = alloca i32, align 4
   %retparam6 = alloca i64, align 8
-  %varargslots7 = alloca [1 x %"any*"], align 16
+  %varargslots7 = alloca [1 x %any], align 16
   %taddr8 = alloca %"char[]", align 8
   %retparam9 = alloca i64, align 8
-  %varargslots10 = alloca [1 x %"any*"], align 16
+  %varargslots10 = alloca [1 x %any], align 16
   %taddr11 = alloca %"char[]", align 8
   %retparam12 = alloca i64, align 8
-  %varargslots13 = alloca [1 x %"any*"], align 16
+  %varargslots13 = alloca [1 x %any], align 16
   %taddr14 = alloca %"char[]", align 8
   %retparam15 = alloca i64, align 8
-  %varargslots16 = alloca [1 x %"any*"], align 16
+  %varargslots16 = alloca [1 x %any], align 16
   %taddr17 = alloca %"char[]", align 8
   %retparam18 = alloca i64, align 8
-  %varargslots19 = alloca [1 x %"any*"], align 16
+  %varargslots19 = alloca [1 x %any], align 16
   %taddr20 = alloca %"char[]", align 8
   %retparam21 = alloca i64, align 8
   %y = alloca ptr, align 8
@@ -87,48 +87,48 @@ entry:
   %0 = load ptr, ptr %a, align 8
   %1 = call i32 %0(i32 123)
   store i32 %1, ptr %taddr, align 4
-  %2 = insertvalue %"any*" undef, ptr %taddr, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %varargslots, align 16
+  %2 = insertvalue %any undef, ptr %taddr, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %varargslots, align 16
   %4 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   %5 = call i32 @test.test2(i32 3)
   store i32 %5, ptr %taddr2, align 4
-  %6 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %7, ptr %varargslots1, align 16
+  %6 = insertvalue %any undef, ptr %taddr2, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %7, ptr %varargslots1, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam3, ptr @.str.1, i64 2, ptr %varargslots1, i64 1)
   store ptr @test.test2, ptr %z, align 8
   %9 = load ptr, ptr %z, align 8
   %10 = call i32 %9(i32 444)
   store i32 %10, ptr %taddr5, align 4
-  %11 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %12, ptr %varargslots4, align 16
+  %11 = insertvalue %any undef, ptr %taddr5, 0
+  %12 = insertvalue %any %11, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %12, ptr %varargslots4, align 16
   %13 = call i64 @std.io.printfn(ptr %retparam6, ptr @.str.2, i64 2, ptr %varargslots4, i64 1)
   store %"char[]" { ptr @.str.4, i64 12 }, ptr %taddr8, align 8
-  %14 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %15, ptr %varargslots7, align 16
+  %14 = insertvalue %any undef, ptr %taddr8, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %15, ptr %varargslots7, align 16
   %16 = call i64 @std.io.printfn(ptr %retparam9, ptr @.str.3, i64 2, ptr %varargslots7, i64 1)
   store %"char[]" { ptr @.str.6, i64 12 }, ptr %taddr11, align 8
-  %17 = insertvalue %"any*" undef, ptr %taddr11, 0
-  %18 = insertvalue %"any*" %17, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %18, ptr %varargslots10, align 16
+  %17 = insertvalue %any undef, ptr %taddr11, 0
+  %18 = insertvalue %any %17, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %18, ptr %varargslots10, align 16
   %19 = call i64 @std.io.printfn(ptr %retparam12, ptr @.str.5, i64 2, ptr %varargslots10, i64 1)
   store %"char[]" { ptr @.str.8, i64 12 }, ptr %taddr14, align 8
-  %20 = insertvalue %"any*" undef, ptr %taddr14, 0
-  %21 = insertvalue %"any*" %20, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %21, ptr %varargslots13, align 16
+  %20 = insertvalue %any undef, ptr %taddr14, 0
+  %21 = insertvalue %any %20, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %21, ptr %varargslots13, align 16
   %22 = call i64 @std.io.printfn(ptr %retparam15, ptr @.str.7, i64 2, ptr %varargslots13, i64 1)
   store %"char[]" { ptr @.str.10, i64 6 }, ptr %taddr17, align 8
-  %23 = insertvalue %"any*" undef, ptr %taddr17, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %24, ptr %varargslots16, align 16
+  %23 = insertvalue %any undef, ptr %taddr17, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %24, ptr %varargslots16, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam18, ptr @.str.9, i64 2, ptr %varargslots16, i64 1)
   store %"char[]" { ptr @.str.12, i64 13 }, ptr %taddr20, align 8
-  %26 = insertvalue %"any*" undef, ptr %taddr20, 0
-  %27 = insertvalue %"any*" %26, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %27, ptr %varargslots19, align 16
+  %26 = insertvalue %any undef, ptr %taddr20, 0
+  %27 = insertvalue %any %26, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %27, ptr %varargslots19, align 16
   %28 = call i64 @std.io.printfn(ptr %retparam21, ptr @.str.11, i64 2, ptr %varargslots19, i64 1)
   store ptr @test.test2, ptr %y, align 8
   store i64 ptrtoint (ptr @"$ct.p$fn$int$int$" to i64), ptr %zfoke, align 8
diff --git a/test/test_suite/functions/test_regression.c3t b/test/test_suite/functions/test_regression.c3t
index d42b6c3c6..7bbdf5862 100644
--- a/test/test_suite/functions/test_regression.c3t
+++ b/test/test_suite/functions/test_regression.c3t
@@ -134,9 +134,9 @@ fn void main()
     int elements = MyEnum.elements;
     printf("Hello\n");
     IntArray array;
-    array.append(100);
-    array.append(200);
-    array.append(400);
+    array.push(100);
+    array.push(200);
+    array.push(400);
     array.push(600);
     array.insert_at(2, 300);
     for (int i = 0; i < (int)(array.len()); i++)
@@ -238,9 +238,9 @@ fn Type getValue(Blob blob)
 %Blob.0 = type { double }
 %Bobo = type { i16, float, i16, i16, float, i16 }
 %"int[]" = type { ptr, i64 }
-%LinkedList = type { %"any*", i64, ptr, ptr }
-%"any*" = type { ptr, i64 }
-%List = type { i64, i64, %"any*", ptr }
+%LinkedList = type { %any, i64, ptr, ptr }
+%any = type { ptr, i64 }
+%List = type { i64, i64, %any, ptr }
 %Foo = type { i32, i32 }
 
 @"$ct.test.Bobo" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 20, i64 0, i64 6, [0 x i64] zeroinitializer }, align 8
@@ -458,9 +458,9 @@ loop.exit:                                        ; preds = %loop.cond
   store i32 3, ptr %elements, align 4
   %11 = call i32 (ptr, ...) @printf(ptr @.str.4)
   call void @llvm.memset.p0.i64(ptr align 8 %array, i8 0, i64 40, i1 false)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 100)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 200)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 400)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 100)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 200)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 400)
   call void @"std.collections.list$int$.List.push"(ptr %array, i32 600) #3
   call void @"std.collections.list$int$.List.insert_at"(ptr %array, i64 2, i32 300)
   store i32 0, ptr %i1, align 4
diff --git a/test/test_suite/functions/test_regression_mingw.c3t b/test/test_suite/functions/test_regression_mingw.c3t
index cbf7aafab..8a051430c 100644
--- a/test/test_suite/functions/test_regression_mingw.c3t
+++ b/test/test_suite/functions/test_regression_mingw.c3t
@@ -136,9 +136,9 @@ fn void main()
     int elements = MyEnum.elements;
     printf("Hello\n");
     IntArray array;
-    array.append(100);
-    array.append(200);
-    array.append(400);
+    array.push(100);
+    array.push(200);
+    array.push(400);
     array.push(600);
     array.insert_at(2, 300);
     for (int i = 0; i < (int)(array.len()); i++)
@@ -240,9 +240,9 @@ fn Type getValue(Blob blob)
 %Blob.0 = type { double }
 %Bobo = type { i16, float, i16, i16, float, i16 }
 %"int[]" = type { ptr, i64 }
-%LinkedList = type { %"any*", i64, ptr, ptr }
-%"any*" = type { ptr, i64 }
-%List = type { i64, i64, %"any*", ptr }
+%LinkedList = type { %any, i64, ptr, ptr }
+%any = type { ptr, i64 }
+%List = type { i64, i64, %any, ptr }
 %Foo = type { i32, i32 }
 
 $"$ct.test.Bobo" = comdat any
@@ -502,9 +502,9 @@ loop.exit:                                        ; preds = %loop.cond
   store i32 3, ptr %elements, align 4
   %11 = call i32 (ptr, ...) @printf(ptr @.str.4)
   call void @llvm.memset.p0.i64(ptr align 8 %array, i8 0, i64 40, i1 false)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 100)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 200)
-  call void @"std.collections.list$int$.List.append"(ptr %array, i32 400)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 100)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 200)
+  call void @"std.collections.list$int$.List.push"(ptr %array, i32 400)
   call void @"std.collections.list$int$.List.push"(ptr %array, i32 600) #3
   call void @"std.collections.list$int$.List.insert_at"(ptr %array, i64 2, i32 300)
   store i32 0, ptr %i1, align 4
@@ -603,7 +603,6 @@ declare void @"std.collections.linkedlist$int$.LinkedList.push"(ptr, i32) #0
 declare i64 @"std.collections.linkedlist$int$.LinkedList.len"(ptr) #0
 declare i32 @"std.collections.linkedlist$int$.LinkedList.get"(ptr, i64) #0
 declare void @"std.collections.linkedlist$int$.LinkedList.free"(ptr) #0
-declare void @"std.collections.list$int$.List.append"(ptr, i32) #0
 declare void @"std.collections.list$int$.List.push"(ptr, i32) #0
 declare void @"std.collections.list$int$.List.insert_at"(ptr, i64, i32) #0
 declare i64 @"std.collections.list$int$.List.len"(ptr) #0
diff --git a/test/test_suite/functions/typeless_varargs.c3t b/test/test_suite/functions/typeless_varargs.c3t
index 43336607e..e97238ddc 100644
--- a/test/test_suite/functions/typeless_varargs.c3t
+++ b/test/test_suite/functions/typeless_varargs.c3t
@@ -26,7 +26,7 @@ fn int main()
 
 define void @test.retest(ptr %0, i64 %1) #0 {
 entry:
-  %foo = alloca %"any*[]", align 8
+  %foo = alloca %"any[]", align 8
   store ptr %0, ptr %foo, align 8
   %ptradd = getelementptr inbounds i8, ptr %foo, i64 8
   store i64 %1, ptr %ptradd, align 8
@@ -40,7 +40,7 @@ entry:
 ; Function Attrs:
 define void @test.test(ptr %0, i64 %1) #0 {
 entry:
-  %foo = alloca %"any*[]", align 8
+  %foo = alloca %"any[]", align 8
   store ptr %0, ptr %foo, align 8
   %ptradd = getelementptr inbounds i8, ptr %foo, i64 8
   store i64 %1, ptr %ptradd, align 8
@@ -55,20 +55,20 @@ entry:
 define i32 @main() #0 {
 entry:
   %i = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %taddr2 = alloca i32, align 4
   store i32 1, ptr %i, align 4
   store i32 1, ptr %taddr, align 4
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %1, ptr %varargslots, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %1, ptr %varargslots, align 16
   call void @test.test(ptr %varargslots, i64 1)
   store i32 1, ptr %taddr2, align 4
-  %2 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %3, ptr %varargslots1, align 16
+  %2 = insertvalue %any undef, ptr %taddr2, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %3, ptr %varargslots1, align 16
   call void @test.retest(ptr %varargslots1, i64 1)
   ret i32 1
 }
\ No newline at end of file
diff --git a/test/test_suite/functions/varargs_followed_by_named.c3t b/test/test_suite/functions/varargs_followed_by_named.c3t
index 7f3bc86aa..ba5935c0b 100644
--- a/test/test_suite/functions/varargs_followed_by_named.c3t
+++ b/test/test_suite/functions/varargs_followed_by_named.c3t
@@ -40,7 +40,7 @@ entry:
 ; Function Attrs:
 define void @foo.test2(i32 %0, ptr %1, i64 %2, i32 %3) #0 {
 entry:
-  %y = alloca %"any*[]", align 8
+  %y = alloca %"any[]", align 8
   store ptr %1, ptr %y, align 8
   %ptradd = getelementptr inbounds i8, ptr %y, i64 8
   store i64 %2, ptr %ptradd, align 8
@@ -55,11 +55,11 @@ entry:
 define void @foo.main() #0 {
 entry:
   %varargslots = alloca [2 x i32], align 4
-  %varargslots1 = alloca [2 x %"any*"], align 16
+  %varargslots1 = alloca [2 x %any], align 16
   %taddr = alloca i32, align 4
   %taddr2 = alloca i32, align 4
   %varargslots4 = alloca [2 x i32], align 4
-  %varargslots6 = alloca [2 x %"any*"], align 16
+  %varargslots6 = alloca [2 x %any], align 16
   %taddr7 = alloca i32, align 4
   %taddr8 = alloca i32, align 4
   store i32 4, ptr %varargslots, align 4
@@ -67,28 +67,28 @@ entry:
   store i32 5, ptr %ptradd, align 4
   call void @foo.test(i32 3, ptr %varargslots, i64 2, i32 123)
   store i32 4, ptr %taddr, align 4
-  %0 = insertvalue %"any*" undef, ptr %taddr, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %1, ptr %varargslots1, align 16
+  %0 = insertvalue %any undef, ptr %taddr, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %1, ptr %varargslots1, align 16
   store i32 5, ptr %taddr2, align 4
-  %2 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %2 = insertvalue %any undef, ptr %taddr2, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots1, i64 16
-  store %"any*" %3, ptr %ptradd3, align 16
+  store %any %3, ptr %ptradd3, align 16
   call void @foo.test2(i32 3, ptr %varargslots1, i64 2, i32 123)
   store i32 4, ptr %varargslots4, align 4
   %ptradd5 = getelementptr inbounds i8, ptr %varargslots4, i64 4
   store i32 5, ptr %ptradd5, align 4
   call void @foo.test(i32 3, ptr %varargslots4, i64 2, i32 2)
   store i32 4, ptr %taddr7, align 4
-  %4 = insertvalue %"any*" undef, ptr %taddr7, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %5, ptr %varargslots6, align 16
+  %4 = insertvalue %any undef, ptr %taddr7, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %5, ptr %varargslots6, align 16
   store i32 5, ptr %taddr8, align 4
-  %6 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %6 = insertvalue %any undef, ptr %taddr8, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd9 = getelementptr inbounds i8, ptr %varargslots6, i64 16
-  store %"any*" %7, ptr %ptradd9, align 16
+  store %any %7, ptr %ptradd9, align 16
   call void @foo.test2(i32 3, ptr %varargslots6, i64 2, i32 2)
   ret void
 }
\ No newline at end of file
diff --git a/test/test_suite/generic/enum_set_test.c3t b/test/test_suite/generic/enum_set_test.c3t
index 826446eef..a47b3b4da 100644
--- a/test/test_suite/generic/enum_set_test.c3t
+++ b/test/test_suite/generic/enum_set_test.c3t
@@ -30,59 +30,59 @@ fn void main()
 define void @test.main() #0 {
 entry:
   %set = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i8, align 1
   %retparam = alloca i64, align 8
-  %varargslots1 = alloca [1 x %"any*"], align 16
+  %varargslots1 = alloca [1 x %any], align 16
   %taddr2 = alloca i8, align 1
   %retparam3 = alloca i64, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %taddr5 = alloca i8, align 1
   %retparam6 = alloca i64, align 8
   %set2 = alloca i32, align 4
-  %varargslots7 = alloca [1 x %"any*"], align 16
+  %varargslots7 = alloca [1 x %any], align 16
   %taddr8 = alloca i8, align 1
   %retparam9 = alloca i64, align 8
-  %varargslots10 = alloca [1 x %"any*"], align 16
+  %varargslots10 = alloca [1 x %any], align 16
   %taddr11 = alloca i8, align 1
   %retparam12 = alloca i64, align 8
   store i32 0, ptr %set, align 4
   %0 = call i8 @"std.collections.enumset$test.Abc$.EnumSet.has"(ptr %set, i32 1)
   store i8 %0, ptr %taddr, align 1
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printf(ptr %retparam, ptr @.str, i64 14, ptr %varargslots, i64 1)
   call void @"std.collections.enumset$test.Abc$.EnumSet.add"(ptr %set, i32 0)
   %4 = call i8 @"std.collections.enumset$test.Abc$.EnumSet.has"(ptr %set, i32 1)
   store i8 %4, ptr %taddr2, align 1
-  %5 = insertvalue %"any*" undef, ptr %taddr2, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %6, ptr %varargslots1, align 16
+  %5 = insertvalue %any undef, ptr %taddr2, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %6, ptr %varargslots1, align 16
   %7 = call i64 @std.io.printf(ptr %retparam3, ptr @.str.1, i64 14, ptr %varargslots1, i64 1)
   call void @"std.collections.enumset$test.Abc$.EnumSet.add"(ptr %set, i32 1)
   %8 = call i8 @"std.collections.enumset$test.Abc$.EnumSet.has"(ptr %set, i32 1)
   store i8 %8, ptr %taddr5, align 1
-  %9 = insertvalue %"any*" undef, ptr %taddr5, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %10, ptr %varargslots4, align 16
+  %9 = insertvalue %any undef, ptr %taddr5, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %10, ptr %varargslots4, align 16
   %11 = call i64 @std.io.printf(ptr %retparam6, ptr @.str.2, i64 14, ptr %varargslots4, i64 1)
   store i32 0, ptr %set2, align 4
   %12 = load i32, ptr %set, align 4
   call void @"std.collections.enumset$test.Abc$.EnumSet.add_all"(ptr %set2, i32 %12)
   %13 = call i8 @"std.collections.enumset$test.Abc$.EnumSet.has"(ptr %set2, i32 1)
   store i8 %13, ptr %taddr8, align 1
-  %14 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %15, ptr %varargslots7, align 16
+  %14 = insertvalue %any undef, ptr %taddr8, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %15, ptr %varargslots7, align 16
   %16 = call i64 @std.io.printf(ptr %retparam9, ptr @.str.3, i64 14, ptr %varargslots7, i64 1)
   %17 = load i32, ptr %set2, align 4
   call void @"std.collections.enumset$test.Abc$.EnumSet.remove_all"(ptr %set, i32 %17)
   %18 = call i8 @"std.collections.enumset$test.Abc$.EnumSet.has"(ptr %set, i32 1)
   store i8 %18, ptr %taddr11, align 1
-  %19 = insertvalue %"any*" undef, ptr %taddr11, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %20, ptr %varargslots10, align 16
+  %19 = insertvalue %any undef, ptr %taddr11, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %20, ptr %varargslots10, align 16
   %21 = call i64 @std.io.printf(ptr %retparam12, ptr @.str.4, i64 14, ptr %varargslots10, i64 1)
   ret void
 }
diff --git a/test/test_suite/generic/generic_lambda_complex.c3t b/test/test_suite/generic/generic_lambda_complex.c3t
index aa90376cb..feade9ee1 100644
--- a/test/test_suite/generic/generic_lambda_complex.c3t
+++ b/test/test_suite/generic/generic_lambda_complex.c3t
@@ -25,7 +25,7 @@ enum TextTagKind: char
 
 struct TextTemplate
 {
-	Allocator* allocator;
+	Allocator allocator;
 	String template;
 	TextTag[] tags;
 	Type data;
@@ -46,7 +46,7 @@ struct TextTag
  * @require self.tags.len == 0 "template already initialized"
  * @require tag_start != tag_end
  **/
-fn void! TextTemplate.init(&self, String template, String tag_start = "{{", String tag_end = "}}", Allocator* using = allocator::heap())
+fn void! TextTemplate.init(&self, String template, String tag_start = "{{", String tag_end = "}}", Allocator using = allocator::heap())
 {
 
 	TextTagList tags;
@@ -102,7 +102,7 @@ fn void! TextTemplate.free(&self)
 	*self = {};
 }
 
-fn usz! TextTemplate.write_to(&self, OutStream* writer)
+fn usz! TextTemplate.write_to(&self, OutStream writer)
 {
 	usz n;
 	usz pos;
@@ -116,7 +116,7 @@ fn usz! TextTemplate.write_to(&self, OutStream* writer)
 	return n;
 }
 
-fn usz! TextTag.write(&self, OutStream* writer)
+fn usz! TextTag.write(&self, OutStream writer)
 {
 	switch (self.kind)
 	{
@@ -177,10 +177,10 @@ entry:
   %ft = alloca %TextTemplate, align 8
   %error_var = alloca i64, align 8
   %indirectarg = alloca %"char[]", align 8
-  %indirectarg1 = alloca %"any*", align 8
+  %indirectarg1 = alloca %any, align 8
   %error_var2 = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
-  %indirectarg6 = alloca %"any*[]", align 8
+  %varargslots = alloca [1 x %any], align 16
+  %indirectarg6 = alloca %"any[]", align 8
   store %"char[]" { ptr @.str, i64 21 }, ptr %foo_tmpl, align 8
   call void @llvm.memset.p0.i64(ptr align 8 %ft, i8 0, i64 72, i1 false)
   %0 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
@@ -193,14 +193,14 @@ if.then:                                          ; preds = %entry
 
 if.exit:                                          ; preds = %if.then, %entry
   %1 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
-  %2 = insertvalue %"any*" undef, ptr %1, 0
-  %3 = insertvalue %"any*" %2, i64 ptrtoint (ptr @"$ct.std.core.mem.allocator.TempAllocator" to i64), 1
+  %2 = insertvalue %any undef, ptr %1, 0
+  %3 = insertvalue %any %2, i64 ptrtoint (ptr @"$ct.std.core.mem.allocator.TempAllocator" to i64), 1
   %lo = load ptr, ptr %foo_tmpl, align 8
   %ptradd = getelementptr inbounds i8, ptr %foo_tmpl, i64 8
   %hi = load i64, ptr %ptradd, align 8
   store %"char[]" { ptr @.str.2, i64 2 }, ptr %indirectarg, align 8
-  store %"any*" %3, ptr %indirectarg1, align 8
-  %4 = call i64 @"abc$text_test.Foo$.TextTemplate.init"(ptr %ft, ptr %lo, i64 %hi, ptr @.str.1, i64 2, ptr byval(%"char[]") align 8 %indirectarg, ptr byval(%"any*") align 8 %indirectarg1)
+  store %any %3, ptr %indirectarg1, align 8
+  %4 = call i64 @"abc$text_test.Foo$.TextTemplate.init"(ptr %ft, ptr %lo, i64 %hi, ptr @.str.1, i64 2, ptr byval(%"char[]") align 8 %indirectarg, ptr byval(%any) align 8 %indirectarg1)
   %not_err = icmp eq i64 %4, 0
   %5 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
   br i1 %5, label %after_check, label %assign_optional
@@ -230,12 +230,12 @@ after_check5:                                     ; preds = %noerr_block
   br label %noerr_block7
 
 panic_block:                                      ; preds = %assign_optional4
-  %9 = insertvalue %"any*" undef, ptr %error_var2, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %10, ptr %varargslots, align 16
-  %11 = insertvalue %"any*[]" undef, ptr %varargslots, 0
-  %"$$temp" = insertvalue %"any*[]" %11, i64 1, 1
-  store %"any*[]" %"$$temp", ptr %indirectarg6, align 8
+  %9 = insertvalue %any undef, ptr %error_var2, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %10, ptr %varargslots, align 16
+  %11 = insertvalue %"any[]" undef, ptr %varargslots, 0
+  %"$$temp" = insertvalue %"any[]" %11, i64 1, 1
+  store %"any[]" %"$$temp", ptr %indirectarg6, align 8
   call void @std.core.builtin.panicf(ptr @.panic_msg, i64 36, ptr @.file, i64 25
   unreachable
 
diff --git a/test/test_suite/generic/generic_num.c3t b/test/test_suite/generic/generic_num.c3t
index c4e436130..3833d9068 100644
--- a/test/test_suite/generic/generic_num.c3t
+++ b/test/test_suite/generic/generic_num.c3t
@@ -21,14 +21,14 @@ fn void main()
 
 define void @test.main() #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   %0 = call i32 @"hello$int$_123$.x"(i32 4)
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   ret void
 }
diff --git a/test/test_suite/generic/generic_recursion.c3t b/test/test_suite/generic/generic_recursion.c3t
index 992834c81..697907dfb 100644
--- a/test/test_suite/generic/generic_recursion.c3t
+++ b/test/test_suite/generic/generic_recursion.c3t
@@ -17,5 +17,5 @@ TreeNode abc;
 /* #expect: test.ll
 
 %TreeNode = type { ptr, ptr, %List }
-%List = type { i64, i64, %"any*", ptr }
+%List = type { i64, i64, %any, ptr }
 @test.abc = local_unnamed_addr global %TreeNode zeroinitializer, align 8
\ No newline at end of file
diff --git a/test/test_suite/initializer_lists/fasta.c3t b/test/test_suite/initializer_lists/fasta.c3t
index e5985deff..443dff558 100644
--- a/test/test_suite/initializer_lists/fasta.c3t
+++ b/test/test_suite/initializer_lists/fasta.c3t
@@ -117,7 +117,7 @@ fn int main(int argc, char **argv)
 @fasta.SEED = local_unnamed_addr constant i32 42, align 4
 @fasta.seed = local_unnamed_addr global i32 42, align 4
 @.str = private unnamed_addr constant [288 x i8] c"GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA\00", align 1
-@fasta.alu = protected unnamed_addr global %"char[]" { ptr @.str, i64 287 }, align 8
+@fasta.alu = internal unnamed_addr global %"char[]" { ptr @.str, i64 287 }, align 8
 @.str.11 = private unnamed_addr constant [16 x i8] c"acgtBDHKMNRSVWY\00", align 1
 @fasta.iub = local_unnamed_addr global %"char[]" { ptr @.str.11, i64 15 }, align 8
 @.taddr = private global [15 x double] [double 2.700000e-01, double 1.200000e-01, double 1.200000e-01, double 2.700000e-01, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02, double 2.000000e-02], align 8
diff --git a/test/test_suite/initializer_lists/initializers_to_macros.c3 b/test/test_suite/initializer_lists/initializers_to_macros.c3
index 4b5a31f18..8100fd12a 100644
--- a/test/test_suite/initializer_lists/initializers_to_macros.c3
+++ b/test/test_suite/initializer_lists/initializers_to_macros.c3
@@ -7,5 +7,5 @@ macro test(foo)
 fn void main()
 {
 	test(int[] { 1, 2 });
-	test({ 1, 2 }); // #error: A value of type 'untyped_list' can only be passed as a compile time parameter.
+	test({ 1, 2 }); // #error: It is only possible to use an untyped list as a
 }
\ No newline at end of file
diff --git a/test/test_suite/lambda/lambda_checks.c3 b/test/test_suite/lambda/lambda_checks.c3
new file mode 100644
index 000000000..a441e944c
--- /dev/null
+++ b/test/test_suite/lambda/lambda_checks.c3
@@ -0,0 +1,14 @@
+module test;
+def Func = fn void (bool);
+
+fn bool foo (String) => true;
+fn void bar(Func func) => func(false);
+
+fn void main()
+{
+	Func funcX = &foo; // #error: Implicitly casting
+	bar(&foo); // #error: Implicitly casting
+
+	Func func = fn bool (String) { return true; }; // #error: which doesn't match
+	bar(fn bool (String) { return true; }); // #error: which doesn't match
+}
\ No newline at end of file
diff --git a/test/test_suite/lambda/nested_lambda_def.c3t b/test/test_suite/lambda/nested_lambda_def.c3t
index 913620359..7cf23fada 100644
--- a/test/test_suite/lambda/nested_lambda_def.c3t
+++ b/test/test_suite/lambda/nested_lambda_def.c3t
@@ -46,7 +46,7 @@ macro Callback get_callback2()
 
 /* #expect: abc.ll
 
-@main.F = protected unnamed_addr constant ptr @"bar.get_callback$lambda1", align 8
+@main.F = internal unnamed_addr constant ptr @"bar.get_callback$lambda1", align 8
   %0 = call i32 @abc.xy(ptr @"bar.get_callback$lambda1")
   %1 = call i32 @abc.xy(ptr @"bar.get_callback$lambda1")
 declare i32 @"bar.get_callback$lambda1"()
diff --git a/test/test_suite/lambda/simple_lambda.c3t b/test/test_suite/lambda/simple_lambda.c3t
index b75ee7725..226bbbd2b 100644
--- a/test/test_suite/lambda/simple_lambda.c3t
+++ b/test/test_suite/lambda/simple_lambda.c3t
@@ -17,7 +17,7 @@ fn void main()
 
 /* #expect: simple_lambda.ll
 
-@main.F = protected unnamed_addr constant ptr @"simple_lambda.main$lambda1", align 8
+@main.F = internal unnamed_addr constant ptr @"simple_lambda.main$lambda1", align 8
 
 define void @simple_lambda.main() #0 {
 entry:
diff --git a/test/test_suite/literals/bin_literal.c3t b/test/test_suite/literals/bin_literal.c3t
index d07c58da4..ba0f1ea0b 100644
--- a/test/test_suite/literals/bin_literal.c3t
+++ b/test/test_suite/literals/bin_literal.c3t
@@ -21,10 +21,10 @@ entry:
   %b = alloca i32, align 4
   %c = alloca i32, align 4
   %d = alloca i32, align 4
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %z = alloca i8, align 1
-  %varargslots1 = alloca [3 x %"any*"], align 16
+  %varargslots1 = alloca [3 x %any], align 16
   %self = alloca i8, align 1
   %taddr = alloca i8, align 1
   %self3 = alloca i8, align 1
@@ -40,38 +40,38 @@ entry:
   %4 = load i32, ptr %b, align 4
   %5 = call i32 @llvm.smax.i32(i32 %3, i32 %4)
   store i32 %5, ptr %d, align 4
-  %6 = insertvalue %"any*" undef, ptr %c, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %7, ptr %varargslots, align 16
-  %8 = insertvalue %"any*" undef, ptr %d, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %6 = insertvalue %any undef, ptr %c, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %7, ptr %varargslots, align 16
+  %8 = insertvalue %any undef, ptr %d, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %9, ptr %ptradd, align 16
+  store %any %9, ptr %ptradd, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 5, ptr %varargslots, i64 2)
   store i8 -35, ptr %z, align 1
-  %11 = insertvalue %"any*" undef, ptr %z, 0
-  %12 = insertvalue %"any*" %11, i64 ptrtoint (ptr @"$ct.char" to i64), 1
-  store %"any*" %12, ptr %varargslots1, align 16
+  %11 = insertvalue %any undef, ptr %z, 0
+  %12 = insertvalue %any %11, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  store %any %12, ptr %varargslots1, align 16
   %13 = load i8, ptr %z, align 1
   store i8 %13, ptr %self, align 1
   %14 = load i8, ptr %self, align 1
   %15 = load i8, ptr %self, align 1
   %16 = call i8 @llvm.fshr.i8(i8 %14, i8 %15, i8 1)
   store i8 %16, ptr %taddr, align 1
-  %17 = insertvalue %"any*" undef, ptr %taddr, 0
-  %18 = insertvalue %"any*" %17, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  %17 = insertvalue %any undef, ptr %taddr, 0
+  %18 = insertvalue %any %17, i64 ptrtoint (ptr @"$ct.char" to i64), 1
   %ptradd2 = getelementptr inbounds i8, ptr %varargslots1, i64 16
-  store %"any*" %18, ptr %ptradd2, align 16
+  store %any %18, ptr %ptradd2, align 16
   %19 = load i8, ptr %z, align 1
   store i8 %19, ptr %self3, align 1
   %20 = load i8, ptr %self3, align 1
   %21 = load i8, ptr %self3, align 1
   %22 = call i8 @llvm.fshl.i8(i8 %20, i8 %21, i8 1)
   store i8 %22, ptr %taddr4, align 1
-  %23 = insertvalue %"any*" undef, ptr %taddr4, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.char" to i64), 1
+  %23 = insertvalue %any undef, ptr %taddr4, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.char" to i64), 1
   %ptradd5 = getelementptr inbounds i8, ptr %varargslots1, i64 32
-  store %"any*" %24, ptr %ptradd5, align 16
+  store %any %24, ptr %ptradd5, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam6, ptr @.str.1, i64 8, ptr %varargslots1, i64 3)
   ret void
 }
diff --git a/test/test_suite/macros/macro_failable_return_rethrow.c3t b/test/test_suite/macros/macro_failable_return_rethrow.c3t
index 9db803fb6..9110112b2 100644
--- a/test/test_suite/macros/macro_failable_return_rethrow.c3t
+++ b/test/test_suite/macros/macro_failable_return_rethrow.c3t
@@ -21,8 +21,8 @@ entry:
   %error_var = alloca i64, align 8
   %error_var1 = alloca i64, align 8
   %retparam = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
-  %indirectarg = alloca %"any*[]", align 8
+  %varargslots = alloca [1 x %any], align 16
+  %indirectarg = alloca %"any[]", align 8
   %0 = call i64 @test.xy(ptr %retparam)
   %not_err = icmp eq i64 %0, 0
   %1 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
@@ -44,13 +44,13 @@ noerr_block:                                      ; preds = %after_check
   br label %noerr_block2
 
 panic_block:                                      ; preds = %guard_block
-  %3 = insertvalue %"any*" undef, ptr %error_var, 0
-  %4 = insertvalue %"any*" %3, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
-  store %"any*" %4, ptr %varargslots, align 16
-  %5 = insertvalue %"any*[]" undef, ptr %varargslots, 0
-  %"$$temp" = insertvalue %"any*[]" %5, i64 1, 1
-  store %"any*[]" %"$$temp", ptr %indirectarg, align 8
-  call void @std.core.builtin.panicf(ptr @.panic_msg, i64 36, ptr @.file, i64 32, ptr @.func, i64 4, i32 13, ptr byval(%"any*[]") align 8 %indirectarg)
+  %3 = insertvalue %any undef, ptr %error_var, 0
+  %4 = insertvalue %any %3, i64 ptrtoint (ptr @"$ct.anyfault" to i64), 1
+  store %any %4, ptr %varargslots, align 16
+  %5 = insertvalue %"any[]" undef, ptr %varargslots, 0
+  %"$$temp" = insertvalue %"any[]" %5, i64 1, 1
+  store %"any[]" %"$$temp", ptr %indirectarg, align 8
+  call void @std.core.builtin.panicf(ptr @.panic_msg, i64 36, ptr @.file, i64 32, ptr @.func, i64 4, i32 13, ptr byval(%"any[]") align 8 %indirectarg)
   unreachable
 
 noerr_block2:                                     ; preds = %noerr_block
diff --git a/test/test_suite/macros/macro_typed_varargs.c3t b/test/test_suite/macros/macro_typed_varargs.c3t
index 0d2ee5dea..967e306e2 100644
--- a/test/test_suite/macros/macro_typed_varargs.c3t
+++ b/test/test_suite/macros/macro_typed_varargs.c3t
@@ -35,18 +35,18 @@ entry:
   %.anon = alloca i64, align 8
   %.anon1 = alloca i64, align 8
   %i = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
-  %literal2 = alloca [4 x %"any*"], align 16
+  %literal2 = alloca [4 x %any], align 16
   %taddr = alloca i32, align 4
   %taddr4 = alloca i32, align 4
   %taddr6 = alloca i32, align 4
   %taddr8 = alloca i32, align 4
-  %x9 = alloca %"any*[]", align 8
+  %x9 = alloca %"any[]", align 8
   %.anon10 = alloca i64, align 8
   %.anon12 = alloca i64, align 8
-  %i16 = alloca %"any*", align 8
-  %varargslots18 = alloca [1 x %"any*"], align 16
+  %i16 = alloca %any, align 8
+  %varargslots18 = alloca [1 x %any], align 16
   %retparam19 = alloca i64, align 8
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %literal, ptr align 16 @.__const, i32 16, i1 false)
   %0 = insertvalue %"int[]" undef, ptr %literal, 0
@@ -70,9 +70,9 @@ loop.body:                                        ; preds = %loop.cond
   %ptroffset = getelementptr inbounds [4 x i8], ptr %5, i64 %6
   %7 = load i32, ptr %ptroffset, align 4
   store i32 %7, ptr %i, align 4
-  %8 = insertvalue %"any*" undef, ptr %i, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %9, ptr %varargslots, align 16
+  %8 = insertvalue %any undef, ptr %i, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %9, ptr %varargslots, align 16
   %10 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 2, ptr %varargslots, i64 1)
   %11 = load i64, ptr %.anon1, align 8
   %addnuw = add nuw i64 %11, 1
@@ -81,27 +81,27 @@ loop.body:                                        ; preds = %loop.cond
 
 loop.exit:                                        ; preds = %loop.cond
   store i32 1, ptr %taddr, align 4
-  %12 = insertvalue %"any*" undef, ptr %taddr, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %13, ptr %literal2, align 8
+  %12 = insertvalue %any undef, ptr %taddr, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %13, ptr %literal2, align 8
   %ptradd3 = getelementptr inbounds i8, ptr %literal2, i64 16
   store i32 -1, ptr %taddr4, align 4
-  %14 = insertvalue %"any*" undef, ptr %taddr4, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %15, ptr %ptradd3, align 8
+  %14 = insertvalue %any undef, ptr %taddr4, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %15, ptr %ptradd3, align 8
   %ptradd5 = getelementptr inbounds i8, ptr %literal2, i64 32
   store i32 3141, ptr %taddr6, align 4
-  %16 = insertvalue %"any*" undef, ptr %taddr6, 0
-  %17 = insertvalue %"any*" %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %17, ptr %ptradd5, align 8
+  %16 = insertvalue %any undef, ptr %taddr6, 0
+  %17 = insertvalue %any %16, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %17, ptr %ptradd5, align 8
   %ptradd7 = getelementptr inbounds i8, ptr %literal2, i64 48
   store i32 1000, ptr %taddr8, align 4
-  %18 = insertvalue %"any*" undef, ptr %taddr8, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %19, ptr %ptradd7, align 8
-  %20 = insertvalue %"any*[]" undef, ptr %literal2, 0
-  %21 = insertvalue %"any*[]" %20, i64 4, 1
-  store %"any*[]" %21, ptr %x9, align 8
+  %18 = insertvalue %any undef, ptr %taddr8, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %19, ptr %ptradd7, align 8
+  %20 = insertvalue %"any[]" undef, ptr %literal2, 0
+  %21 = insertvalue %"any[]" %20, i64 4, 1
+  store %"any[]" %21, ptr %x9, align 8
   %ptradd11 = getelementptr inbounds i8, ptr %x9, i64 8
   %22 = load i64, ptr %ptradd11, align 8
   store i64 %22, ptr %.anon10, align 8
@@ -120,9 +120,9 @@ loop.body15:                                      ; preds = %loop.cond13
   %ptroffset17 = getelementptr inbounds [16 x i8], ptr %25, i64 %26
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %i16, ptr align 8 %ptroffset17, i32 16, i1 false)
   %27 = load ptr, ptr %i16, align 8
-  %28 = insertvalue %"any*" undef, ptr %27, 0
-  %29 = insertvalue %"any*" %28, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %29, ptr %varargslots18, align 16
+  %28 = insertvalue %any undef, ptr %27, 0
+  %29 = insertvalue %any %28, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %29, ptr %varargslots18, align 16
   %30 = call i64 @std.io.printfn(ptr %retparam19, ptr @.str.1, i64 2, ptr %varargslots18, i64 1)
   %31 = load i64, ptr %.anon12, align 8
   %addnuw20 = add nuw i64 %31, 1
diff --git a/test/test_suite/macros/macro_untyped_varargs_2.c3t b/test/test_suite/macros/macro_untyped_varargs_2.c3t
index 1ce71bc64..e90ee354f 100644
--- a/test/test_suite/macros/macro_untyped_varargs_2.c3t
+++ b/test/test_suite/macros/macro_untyped_varargs_2.c3t
@@ -62,13 +62,13 @@ fn void main()
 
 define i32 @test.ping(i32 %0) #0 {
 entry:
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
   store i32 %0, ptr %taddr, align 4
-  %1 = insertvalue %"any*" undef, ptr %taddr, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %taddr, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 8, ptr %varargslots, i64 1)
   ret i32 %0
 }
@@ -78,36 +78,36 @@ define void @test.main() #0 {
 entry:
   %i = alloca i32, align 4
   %j = alloca i32, align 4
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %taddr = alloca i32, align 4
   %retparam = alloca i64, align 8
-  %varargslots2 = alloca [1 x %"any*"], align 16
+  %varargslots2 = alloca [1 x %any], align 16
   %taddr3 = alloca i32, align 4
   %retparam4 = alloca i64, align 8
-  %varargslots5 = alloca [1 x %"any*"], align 16
+  %varargslots5 = alloca [1 x %any], align 16
   %taddr6 = alloca i32, align 4
   %retparam7 = alloca i64, align 8
-  %varargslots8 = alloca [1 x %"any*"], align 16
+  %varargslots8 = alloca [1 x %any], align 16
   %taddr9 = alloca i32, align 4
   %retparam10 = alloca i64, align 8
   %x = alloca i32, align 4
-  %varargslots11 = alloca [1 x %"any*"], align 16
+  %varargslots11 = alloca [1 x %any], align 16
   %taddr12 = alloca %"char[]", align 8
   %retparam13 = alloca i64, align 8
   %x14 = alloca double, align 8
-  %varargslots15 = alloca [1 x %"any*"], align 16
+  %varargslots15 = alloca [1 x %any], align 16
   %taddr16 = alloca %"char[]", align 8
   %retparam17 = alloca i64, align 8
-  %varargslots18 = alloca [1 x %"any*"], align 16
+  %varargslots18 = alloca [1 x %any], align 16
   %taddr19 = alloca i32, align 4
   %retparam20 = alloca i64, align 8
   %x21 = alloca i32, align 4
   %y = alloca i32, align 4
   %a = alloca i32, align 4
-  %varargslots22 = alloca [2 x %"any*"], align 16
+  %varargslots22 = alloca [2 x %any], align 16
   %retparam23 = alloca i64, align 8
   %a24 = alloca i32, align 4
-  %varargslots25 = alloca [2 x %"any*"], align 16
+  %varargslots25 = alloca [2 x %any], align 16
   %retparam27 = alloca i64, align 8
   %0 = call i32 @test.ping(i32 -1)
   %1 = call i32 @test.ping(i32 1)
@@ -120,41 +120,41 @@ entry:
   %add1 = add i32 %4, %5
   store i32 %add1, ptr %j, align 4
   store i32 %1, ptr %taddr, align 4
-  %6 = insertvalue %"any*" undef, ptr %taddr, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %7, ptr %varargslots, align 16
+  %6 = insertvalue %any undef, ptr %taddr, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %7, ptr %varargslots, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam, ptr @.str.1, i64 2, ptr %varargslots, i64 1)
   store i32 %0, ptr %taddr3, align 4
-  %9 = insertvalue %"any*" undef, ptr %taddr3, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %10, ptr %varargslots2, align 16
+  %9 = insertvalue %any undef, ptr %taddr3, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %10, ptr %varargslots2, align 16
   %11 = call i64 @std.io.printfn(ptr %retparam4, ptr @.str.2, i64 2, ptr %varargslots2, i64 1)
   store i32 %2, ptr %taddr6, align 4
-  %12 = insertvalue %"any*" undef, ptr %taddr6, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %13, ptr %varargslots5, align 16
+  %12 = insertvalue %any undef, ptr %taddr6, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %13, ptr %varargslots5, align 16
   %14 = call i64 @std.io.printfn(ptr %retparam7, ptr @.str.3, i64 2, ptr %varargslots5, i64 1)
   store i32 %3, ptr %taddr9, align 4
-  %15 = insertvalue %"any*" undef, ptr %taddr9, 0
-  %16 = insertvalue %"any*" %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %16, ptr %varargslots8, align 16
+  %15 = insertvalue %any undef, ptr %taddr9, 0
+  %16 = insertvalue %any %15, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %16, ptr %varargslots8, align 16
   %17 = call i64 @std.io.printfn(ptr %retparam10, ptr @.str.4, i64 2, ptr %varargslots8, i64 1)
   store i32 0, ptr %x, align 4
   store %"char[]" { ptr @.str.6, i64 3 }, ptr %taddr12, align 8
-  %18 = insertvalue %"any*" undef, ptr %taddr12, 0
-  %19 = insertvalue %"any*" %18, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %19, ptr %varargslots11, align 16
+  %18 = insertvalue %any undef, ptr %taddr12, 0
+  %19 = insertvalue %any %18, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %19, ptr %varargslots11, align 16
   %20 = call i64 @std.io.printfn(ptr %retparam13, ptr @.str.5, i64 2, ptr %varargslots11, i64 1)
   store double 0.000000e+00, ptr %x14, align 8
   store %"char[]" { ptr @.str.8, i64 6 }, ptr %taddr16, align 8
-  %21 = insertvalue %"any*" undef, ptr %taddr16, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.String" to i64), 1
-  store %"any*" %22, ptr %varargslots15, align 16
+  %21 = insertvalue %any undef, ptr %taddr16, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.String" to i64), 1
+  store %any %22, ptr %varargslots15, align 16
   %23 = call i64 @std.io.printfn(ptr %retparam17, ptr @.str.7, i64 2, ptr %varargslots15, i64 1)
   store i32 105, ptr %taddr19, align 4
-  %24 = insertvalue %"any*" undef, ptr %taddr19, 0
-  %25 = insertvalue %"any*" %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %25, ptr %varargslots18, align 16
+  %24 = insertvalue %any undef, ptr %taddr19, 0
+  %25 = insertvalue %any %24, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %25, ptr %varargslots18, align 16
   %26 = call i64 @std.io.printfn(ptr %retparam20, ptr @.str.9, i64 2, ptr %varargslots18, i64 1)
   store i32 123, ptr %x21, align 4
   store i32 33, ptr %y, align 4
@@ -164,13 +164,13 @@ entry:
   store i32 %28, ptr %x21, align 4
   %29 = load i32, ptr %a, align 4
   store i32 %29, ptr %y, align 4
-  %30 = insertvalue %"any*" undef, ptr %x21, 0
-  %31 = insertvalue %"any*" %30, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %31, ptr %varargslots22, align 16
-  %32 = insertvalue %"any*" undef, ptr %y, 0
-  %33 = insertvalue %"any*" %32, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %30 = insertvalue %any undef, ptr %x21, 0
+  %31 = insertvalue %any %30, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %31, ptr %varargslots22, align 16
+  %32 = insertvalue %any undef, ptr %y, 0
+  %33 = insertvalue %any %32, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots22, i64 16
-  store %"any*" %33, ptr %ptradd, align 16
+  store %any %33, ptr %ptradd, align 16
   %34 = call i64 @std.io.printfn(ptr %retparam23, ptr @.str.10, i64 6, ptr %varargslots22, i64 2)
   %35 = load i32, ptr %x21, align 4
   store i32 %35, ptr %a24, align 4
@@ -178,13 +178,13 @@ entry:
   store i32 %36, ptr %x21, align 4
   %37 = load i32, ptr %a24, align 4
   store i32 %37, ptr %y, align 4
-  %38 = insertvalue %"any*" undef, ptr %x21, 0
-  %39 = insertvalue %"any*" %38, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %39, ptr %varargslots25, align 16
-  %40 = insertvalue %"any*" undef, ptr %y, 0
-  %41 = insertvalue %"any*" %40, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %38 = insertvalue %any undef, ptr %x21, 0
+  %39 = insertvalue %any %38, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %39, ptr %varargslots25, align 16
+  %40 = insertvalue %any undef, ptr %y, 0
+  %41 = insertvalue %any %40, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd26 = getelementptr inbounds i8, ptr %varargslots25, i64 16
-  store %"any*" %41, ptr %ptradd26, align 16
+  store %any %41, ptr %ptradd26, align 16
   %42 = call i64 @std.io.printfn(ptr %retparam27, ptr @.str.11, i64 6, ptr %varargslots25, i64 2)
   ret void
 }
\ No newline at end of file
diff --git a/test/test_suite/macros/macro_vasplat.c3t b/test/test_suite/macros/macro_vasplat.c3t
index 7d967faea..56d615db5 100644
--- a/test/test_suite/macros/macro_vasplat.c3t
+++ b/test/test_suite/macros/macro_vasplat.c3t
@@ -68,73 +68,73 @@ entry:
   %.anon = alloca i64, align 8
   %i = alloca i64, align 8
   %x = alloca i32, align 4
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %a1 = alloca [1 x i32], align 4
   %.anon2 = alloca i64, align 8
   %i3 = alloca i64, align 8
   %x4 = alloca i32, align 4
-  %varargslots5 = alloca [2 x %"any*"], align 16
+  %varargslots5 = alloca [2 x %any], align 16
   %retparam7 = alloca i64, align 8
   %a8 = alloca [4 x i32], align 16
   %.anon9 = alloca i64, align 8
   %i13 = alloca i64, align 8
   %x14 = alloca i32, align 4
-  %varargslots16 = alloca [2 x %"any*"], align 16
+  %varargslots16 = alloca [2 x %any], align 16
   %retparam18 = alloca i64, align 8
   %a21 = alloca [2 x i32], align 4
   %.anon22 = alloca i64, align 8
   %i26 = alloca i64, align 8
   %x27 = alloca i32, align 4
-  %varargslots29 = alloca [2 x %"any*"], align 16
+  %varargslots29 = alloca [2 x %any], align 16
   %retparam31 = alloca i64, align 8
   %a34 = alloca [3 x i32], align 4
   %.anon35 = alloca i64, align 8
   %i39 = alloca i64, align 8
   %x40 = alloca i32, align 4
-  %varargslots42 = alloca [2 x %"any*"], align 16
+  %varargslots42 = alloca [2 x %any], align 16
   %retparam44 = alloca i64, align 8
   %a47 = alloca [1 x i32], align 4
   %.anon48 = alloca i64, align 8
   %i49 = alloca i64, align 8
   %x50 = alloca i32, align 4
-  %varargslots51 = alloca [2 x %"any*"], align 16
+  %varargslots51 = alloca [2 x %any], align 16
   %retparam53 = alloca i64, align 8
   %a54 = alloca [2 x i32], align 4
   %.anon55 = alloca i64, align 8
   %i59 = alloca i64, align 8
   %x60 = alloca i32, align 4
-  %varargslots62 = alloca [2 x %"any*"], align 16
+  %varargslots62 = alloca [2 x %any], align 16
   %retparam64 = alloca i64, align 8
   %a67 = alloca [5 x i32], align 16
   %.anon68 = alloca i64, align 8
   %i72 = alloca i64, align 8
   %x73 = alloca i32, align 4
-  %varargslots75 = alloca [2 x %"any*"], align 16
+  %varargslots75 = alloca [2 x %any], align 16
   %retparam77 = alloca i64, align 8
   %a80 = alloca [8 x i32], align 16
   %.anon81 = alloca i64, align 8
   %i85 = alloca i64, align 8
   %x86 = alloca i32, align 4
-  %varargslots88 = alloca [2 x %"any*"], align 16
+  %varargslots88 = alloca [2 x %any], align 16
   %retparam90 = alloca i64, align 8
   %b = alloca [7 x i32], align 16
   %.anon93 = alloca i64, align 8
   %i97 = alloca i64, align 8
   %x98 = alloca i32, align 4
-  %varargslots100 = alloca [2 x %"any*"], align 16
+  %varargslots100 = alloca [2 x %any], align 16
   %retparam102 = alloca i64, align 8
   %c = alloca [8 x i32], align 16
   %.anon105 = alloca i64, align 8
   %i109 = alloca i64, align 8
   %x110 = alloca i32, align 4
-  %varargslots112 = alloca [2 x %"any*"], align 16
+  %varargslots112 = alloca [2 x %any], align 16
   %retparam114 = alloca i64, align 8
   %a117 = alloca [6 x i32], align 16
   %.anon118 = alloca i64, align 8
   %i122 = alloca i64, align 8
   %x123 = alloca i32, align 4
-  %varargslots125 = alloca [2 x %"any*"], align 16
+  %varargslots125 = alloca [2 x %any], align 16
   %retparam127 = alloca i64, align 8
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %a, ptr align 4 @.__const, i32 12, i1 false)
   store i64 0, ptr %.anon, align 8
@@ -150,13 +150,13 @@ loop.body:                                        ; preds = %loop.cond
   %ptroffset = getelementptr inbounds [4 x i8], ptr %a, i64 %2
   %3 = load i32, ptr %ptroffset, align 4
   store i32 %3, ptr %x, align 4
-  %4 = insertvalue %"any*" undef, ptr %i, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
-  %6 = insertvalue %"any*" undef, ptr %x, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %4 = insertvalue %any undef, ptr %i, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %5, ptr %varargslots, align 16
+  %6 = insertvalue %any undef, ptr %x, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %7, ptr %ptradd, align 16
+  store %any %7, ptr %ptradd, align 16
   %8 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 8, ptr %varargslots, i64 2)
   %9 = load i64, ptr %.anon, align 8
   %addnuw = add nuw i64 %9, 1
@@ -169,13 +169,13 @@ loop.exit:                                        ; preds = %loop.cond
   store i64 %10, ptr %i3, align 8
   %11 = load i32, ptr %a1, align 4
   store i32 %11, ptr %x4, align 4
-  %12 = insertvalue %"any*" undef, ptr %i3, 0
-  %13 = insertvalue %"any*" %12, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %13, ptr %varargslots5, align 16
-  %14 = insertvalue %"any*" undef, ptr %x4, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %12 = insertvalue %any undef, ptr %i3, 0
+  %13 = insertvalue %any %12, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %13, ptr %varargslots5, align 16
+  %14 = insertvalue %any undef, ptr %x4, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd6 = getelementptr inbounds i8, ptr %varargslots5, i64 16
-  store %"any*" %15, ptr %ptradd6, align 16
+  store %any %15, ptr %ptradd6, align 16
   %16 = call i64 @std.io.printfn(ptr %retparam7, ptr @.str.2, i64 8, ptr %varargslots5, i64 2)
   call void @llvm.memcpy.p0.p0.i32(ptr align 16 %a8, ptr align 16 @.__const.3, i32 16, i1 false)
   store i64 0, ptr %.anon9, align 8
@@ -191,13 +191,13 @@ loop.body12:                                      ; preds = %loop.cond10
   %ptroffset15 = getelementptr inbounds [4 x i8], ptr %a8, i64 %19
   %20 = load i32, ptr %ptroffset15, align 4
   store i32 %20, ptr %x14, align 4
-  %21 = insertvalue %"any*" undef, ptr %i13, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %22, ptr %varargslots16, align 16
-  %23 = insertvalue %"any*" undef, ptr %x14, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %21 = insertvalue %any undef, ptr %i13, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %22, ptr %varargslots16, align 16
+  %23 = insertvalue %any undef, ptr %x14, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd17 = getelementptr inbounds i8, ptr %varargslots16, i64 16
-  store %"any*" %24, ptr %ptradd17, align 16
+  store %any %24, ptr %ptradd17, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam18, ptr @.str.4, i64 6, ptr %varargslots16, i64 2)
   %26 = load i64, ptr %.anon9, align 8
   %addnuw19 = add nuw i64 %26, 1
@@ -218,13 +218,13 @@ loop.body25:                                      ; preds = %loop.cond23
   %ptroffset28 = getelementptr inbounds [4 x i8], ptr %a21, i64 %29
   %30 = load i32, ptr %ptroffset28, align 4
   store i32 %30, ptr %x27, align 4
-  %31 = insertvalue %"any*" undef, ptr %i26, 0
-  %32 = insertvalue %"any*" %31, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %32, ptr %varargslots29, align 16
-  %33 = insertvalue %"any*" undef, ptr %x27, 0
-  %34 = insertvalue %"any*" %33, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %31 = insertvalue %any undef, ptr %i26, 0
+  %32 = insertvalue %any %31, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %32, ptr %varargslots29, align 16
+  %33 = insertvalue %any undef, ptr %x27, 0
+  %34 = insertvalue %any %33, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd30 = getelementptr inbounds i8, ptr %varargslots29, i64 16
-  store %"any*" %34, ptr %ptradd30, align 16
+  store %any %34, ptr %ptradd30, align 16
   %35 = call i64 @std.io.printfn(ptr %retparam31, ptr @.str.6, i64 6, ptr %varargslots29, i64 2)
   %36 = load i64, ptr %.anon22, align 8
   %addnuw32 = add nuw i64 %36, 1
@@ -245,13 +245,13 @@ loop.body38:                                      ; preds = %loop.cond36
   %ptroffset41 = getelementptr inbounds [4 x i8], ptr %a34, i64 %39
   %40 = load i32, ptr %ptroffset41, align 4
   store i32 %40, ptr %x40, align 4
-  %41 = insertvalue %"any*" undef, ptr %i39, 0
-  %42 = insertvalue %"any*" %41, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %42, ptr %varargslots42, align 16
-  %43 = insertvalue %"any*" undef, ptr %x40, 0
-  %44 = insertvalue %"any*" %43, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %41 = insertvalue %any undef, ptr %i39, 0
+  %42 = insertvalue %any %41, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %42, ptr %varargslots42, align 16
+  %43 = insertvalue %any undef, ptr %x40, 0
+  %44 = insertvalue %any %43, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd43 = getelementptr inbounds i8, ptr %varargslots42, i64 16
-  store %"any*" %44, ptr %ptradd43, align 16
+  store %any %44, ptr %ptradd43, align 16
   %45 = call i64 @std.io.printfn(ptr %retparam44, ptr @.str.8, i64 8, ptr %varargslots42, i64 2)
   %46 = load i64, ptr %.anon35, align 8
   %addnuw45 = add nuw i64 %46, 1
@@ -264,13 +264,13 @@ loop.exit46:                                      ; preds = %loop.cond36
   store i64 %47, ptr %i49, align 8
   %48 = load i32, ptr %a47, align 4
   store i32 %48, ptr %x50, align 4
-  %49 = insertvalue %"any*" undef, ptr %i49, 0
-  %50 = insertvalue %"any*" %49, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %50, ptr %varargslots51, align 16
-  %51 = insertvalue %"any*" undef, ptr %x50, 0
-  %52 = insertvalue %"any*" %51, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %49 = insertvalue %any undef, ptr %i49, 0
+  %50 = insertvalue %any %49, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %50, ptr %varargslots51, align 16
+  %51 = insertvalue %any undef, ptr %x50, 0
+  %52 = insertvalue %any %51, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd52 = getelementptr inbounds i8, ptr %varargslots51, i64 16
-  store %"any*" %52, ptr %ptradd52, align 16
+  store %any %52, ptr %ptradd52, align 16
   %53 = call i64 @std.io.printfn(ptr %retparam53, ptr @.str.10, i64 8, ptr %varargslots51, i64 2)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %a54, ptr align 4 @.__const.11, i32 8, i1 false)
   store i64 0, ptr %.anon55, align 8
@@ -286,13 +286,13 @@ loop.body58:                                      ; preds = %loop.cond56
   %ptroffset61 = getelementptr inbounds [4 x i8], ptr %a54, i64 %56
   %57 = load i32, ptr %ptroffset61, align 4
   store i32 %57, ptr %x60, align 4
-  %58 = insertvalue %"any*" undef, ptr %i59, 0
-  %59 = insertvalue %"any*" %58, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %59, ptr %varargslots62, align 16
-  %60 = insertvalue %"any*" undef, ptr %x60, 0
-  %61 = insertvalue %"any*" %60, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %58 = insertvalue %any undef, ptr %i59, 0
+  %59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %59, ptr %varargslots62, align 16
+  %60 = insertvalue %any undef, ptr %x60, 0
+  %61 = insertvalue %any %60, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd63 = getelementptr inbounds i8, ptr %varargslots62, i64 16
-  store %"any*" %61, ptr %ptradd63, align 16
+  store %any %61, ptr %ptradd63, align 16
   %62 = call i64 @std.io.printfn(ptr %retparam64, ptr @.str.12, i64 8, ptr %varargslots62, i64 2)
   %63 = load i64, ptr %.anon55, align 8
   %addnuw65 = add nuw i64 %63, 1
@@ -313,13 +313,13 @@ loop.body71:                                      ; preds = %loop.cond69
   %ptroffset74 = getelementptr inbounds [4 x i8], ptr %a67, i64 %66
   %67 = load i32, ptr %ptroffset74, align 4
   store i32 %67, ptr %x73, align 4
-  %68 = insertvalue %"any*" undef, ptr %i72, 0
-  %69 = insertvalue %"any*" %68, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %69, ptr %varargslots75, align 16
-  %70 = insertvalue %"any*" undef, ptr %x73, 0
-  %71 = insertvalue %"any*" %70, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %68 = insertvalue %any undef, ptr %i72, 0
+  %69 = insertvalue %any %68, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %69, ptr %varargslots75, align 16
+  %70 = insertvalue %any undef, ptr %x73, 0
+  %71 = insertvalue %any %70, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd76 = getelementptr inbounds i8, ptr %varargslots75, i64 16
-  store %"any*" %71, ptr %ptradd76, align 16
+  store %any %71, ptr %ptradd76, align 16
   %72 = call i64 @std.io.printfn(ptr %retparam77, ptr @.str.14, i64 8, ptr %varargslots75, i64 2)
   %73 = load i64, ptr %.anon68, align 8
   %addnuw78 = add nuw i64 %73, 1
@@ -340,13 +340,13 @@ loop.body84:                                      ; preds = %loop.cond82
   %ptroffset87 = getelementptr inbounds [4 x i8], ptr %a80, i64 %76
   %77 = load i32, ptr %ptroffset87, align 4
   store i32 %77, ptr %x86, align 4
-  %78 = insertvalue %"any*" undef, ptr %i85, 0
-  %79 = insertvalue %"any*" %78, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %79, ptr %varargslots88, align 16
-  %80 = insertvalue %"any*" undef, ptr %x86, 0
-  %81 = insertvalue %"any*" %80, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %78 = insertvalue %any undef, ptr %i85, 0
+  %79 = insertvalue %any %78, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %79, ptr %varargslots88, align 16
+  %80 = insertvalue %any undef, ptr %x86, 0
+  %81 = insertvalue %any %80, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd89 = getelementptr inbounds i8, ptr %varargslots88, i64 16
-  store %"any*" %81, ptr %ptradd89, align 16
+  store %any %81, ptr %ptradd89, align 16
   %82 = call i64 @std.io.printfn(ptr %retparam90, ptr @.str.16, i64 8, ptr %varargslots88, i64 2)
   %83 = load i64, ptr %.anon81, align 8
   %addnuw91 = add nuw i64 %83, 1
@@ -367,13 +367,13 @@ loop.body96:                                      ; preds = %loop.cond94
   %ptroffset99 = getelementptr inbounds [4 x i8], ptr %b, i64 %86
   %87 = load i32, ptr %ptroffset99, align 4
   store i32 %87, ptr %x98, align 4
-  %88 = insertvalue %"any*" undef, ptr %i97, 0
-  %89 = insertvalue %"any*" %88, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %89, ptr %varargslots100, align 16
-  %90 = insertvalue %"any*" undef, ptr %x98, 0
-  %91 = insertvalue %"any*" %90, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %88 = insertvalue %any undef, ptr %i97, 0
+  %89 = insertvalue %any %88, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %89, ptr %varargslots100, align 16
+  %90 = insertvalue %any undef, ptr %x98, 0
+  %91 = insertvalue %any %90, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd101 = getelementptr inbounds i8, ptr %varargslots100, i64 16
-  store %"any*" %91, ptr %ptradd101, align 16
+  store %any %91, ptr %ptradd101, align 16
   %92 = call i64 @std.io.printfn(ptr %retparam102, ptr @.str.18, i64 8, ptr %varargslots100, i64 2)
   %93 = load i64, ptr %.anon93, align 8
   %addnuw103 = add nuw i64 %93, 1
@@ -394,13 +394,13 @@ loop.body108:                                     ; preds = %loop.cond106
   %ptroffset111 = getelementptr inbounds [4 x i8], ptr %c, i64 %96
   %97 = load i32, ptr %ptroffset111, align 4
   store i32 %97, ptr %x110, align 4
-  %98 = insertvalue %"any*" undef, ptr %i109, 0
-  %99 = insertvalue %"any*" %98, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %99, ptr %varargslots112, align 16
-  %100 = insertvalue %"any*" undef, ptr %x110, 0
-  %101 = insertvalue %"any*" %100, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %98 = insertvalue %any undef, ptr %i109, 0
+  %99 = insertvalue %any %98, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %99, ptr %varargslots112, align 16
+  %100 = insertvalue %any undef, ptr %x110, 0
+  %101 = insertvalue %any %100, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd113 = getelementptr inbounds i8, ptr %varargslots112, i64 16
-  store %"any*" %101, ptr %ptradd113, align 16
+  store %any %101, ptr %ptradd113, align 16
   %102 = call i64 @std.io.printfn(ptr %retparam114, ptr @.str.20, i64 9, ptr %varargslots112, i64 2)
   %103 = load i64, ptr %.anon105, align 8
   %addnuw115 = add nuw i64 %103, 1
@@ -421,13 +421,13 @@ loop.body121:                                     ; preds = %loop.cond119
   %ptroffset124 = getelementptr inbounds [4 x i8], ptr %a117, i64 %106
   %107 = load i32, ptr %ptroffset124, align 4
   store i32 %107, ptr %x123, align 4
-  %108 = insertvalue %"any*" undef, ptr %i122, 0
-  %109 = insertvalue %"any*" %108, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
-  store %"any*" %109, ptr %varargslots125, align 16
-  %110 = insertvalue %"any*" undef, ptr %x123, 0
-  %111 = insertvalue %"any*" %110, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  %108 = insertvalue %any undef, ptr %i122, 0
+  %109 = insertvalue %any %108, i64 ptrtoint (ptr @"$ct.ulong" to i64), 1
+  store %any %109, ptr %varargslots125, align 16
+  %110 = insertvalue %any undef, ptr %x123, 0
+  %111 = insertvalue %any %110, i64 ptrtoint (ptr @"$ct.int" to i64), 1
   %ptradd126 = getelementptr inbounds i8, ptr %varargslots125, i64 16
-  store %"any*" %111, ptr %ptradd126, align 16
+  store %any %111, ptr %ptradd126, align 16
   %112 = call i64 @std.io.printfn(ptr %retparam127, ptr @.str.22, i64 6, ptr %varargslots125, i64 2)
   %113 = load i64, ptr %.anon118, align 8
   %addnuw128 = add nuw i64 %113, 1
diff --git a/test/test_suite/macros/unifying_implicit_void.c3t b/test/test_suite/macros/unifying_implicit_void.c3t
index 2b3bb37e4..3eb38e246 100644
--- a/test/test_suite/macros/unifying_implicit_void.c3t
+++ b/test/test_suite/macros/unifying_implicit_void.c3t
@@ -5,7 +5,7 @@ import std::io;
 fn void! main()
 {
 	ByteReader r;
-	InStream* s = &r;
+	InStream s = &r;
 	s.foo()!;
 }
 
@@ -26,9 +26,8 @@ macro InStream.foo(&self)
 define i64 @oups.main() #0 {
 entry:
   %r = alloca %ByteReader, align 8
-  %s = alloca %"any*", align 8
+  %s = alloca %any, align 8
   %error_var = alloca i64, align 8
-  %self = alloca %"any*", align 8
   %c = alloca i8, align 1
   %c.f = alloca i64, align 8
   %.inlinecache = alloca ptr, align 8
@@ -37,17 +36,15 @@ entry:
   %err = alloca i64, align 8
   store ptr null, ptr %.cachedtype, align 8
   call void @llvm.memset.p0.i64(ptr align 8 %r, i8 0, i64 24, i1 false)
-  %0 = insertvalue %"any*" undef, ptr %r, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.std.io.ByteReader" to i64), 1
-  store %"any*" %1, ptr %s, align 8
-  call void @llvm.memcpy.p0.p0.i32(ptr align 8 %self, ptr align 8 %s, i32 16, i1 false)
-  %ptradd = getelementptr inbounds i8, ptr %self, i64 8
+  %0 = insertvalue %any undef, ptr %r, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.std.io.ByteReader" to i64), 1
+  store %any %1, ptr %s, align 8
+  %ptradd = getelementptr inbounds i8, ptr %s, i64 8
   %2 = load i64, ptr %ptradd, align 8
   %3 = inttoptr i64 %2 to ptr
   %type = load ptr, ptr %.cachedtype, align 8
   %4 = icmp eq ptr %3, %type
   br i1 %4, label %cache_hit, label %cache_miss
-
 cache_miss:                                       ; preds = %entry
   %ptradd1 = getelementptr inbounds i8, ptr %3, i64 16
   %5 = load ptr, ptr %ptradd1, align 8
@@ -55,72 +52,57 @@ cache_miss:                                       ; preds = %entry
   store ptr %6, ptr %.inlinecache, align 8
   store ptr %3, ptr %.cachedtype, align 8
   br label %7
-
 cache_hit:                                        ; preds = %entry
   %cache_hit_fn = load ptr, ptr %.inlinecache, align 8
   br label %7
-
 7:                                                ; preds = %cache_hit, %cache_miss
   %fn_phi = phi ptr [ %cache_hit_fn, %cache_hit ], [ %6, %cache_miss ]
   %8 = icmp eq ptr %fn_phi, null
   br i1 %8, label %missing_function, label %match
-
 missing_function:                                 ; preds = %7
   %9 = load ptr, ptr @std.core.builtin.panic, align 8
   call void %9(ptr @.panic_msg, i64 46, ptr @.file, i64 25, ptr @.func, i64 4, i32 13)
   unreachable
-
 match:                                            ; preds = %7
-  %10 = load ptr, ptr %self, align 8
+  %10 = load ptr, ptr %s, align 8
   %11 = call i64 %fn_phi(ptr %retparam, ptr %10)
   %not_err = icmp eq i64 %11, 0
   %12 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
   br i1 %12, label %after_check, label %assign_optional
-
 assign_optional:                                  ; preds = %match
   store i64 %11, ptr %c.f, align 8
   br label %after_assign
-
 after_check:                                      ; preds = %match
   %13 = load i8, ptr %retparam, align 1
   store i8 %13, ptr %c, align 1
   store i64 0, ptr %c.f, align 8
   br label %after_assign
-
 after_assign:                                     ; preds = %after_check, %assign_optional
   br label %testblock
-
 testblock:                                        ; preds = %after_assign
   %optval = load i64, ptr %c.f, align 8
   %not_err2 = icmp eq i64 %optval, 0
   %14 = call i1 @llvm.expect.i1(i1 %not_err2, i1 true)
   br i1 %14, label %after_check4, label %assign_optional3
-
 assign_optional3:                                 ; preds = %testblock
   store i64 %optval, ptr %err, align 8
   br label %end_block
-
 after_check4:                                     ; preds = %testblock
   store i64 0, ptr %err, align 8
   br label %end_block
-
 end_block:                                        ; preds = %after_check4, %assign_optional3
   %15 = load i64, ptr %err, align 8
   %neq = icmp ne i64 %15, 0
   br i1 %neq, label %if.then, label %if.exit
-
 if.then:                                          ; preds = %end_block
   %16 = load i64, ptr %err, align 8
   store i64 %16, ptr %error_var, align 8
   br label %guard_block
-
 if.exit:                                          ; preds = %end_block
   br label %noerr_block
-
 guard_block:                                      ; preds = %if.then
   %17 = load i64, ptr %error_var, align 8
   ret i64 %17
-
 noerr_block:                                      ; preds = %if.exit
   ret i64 0
 }
\ No newline at end of file
diff --git a/test/test_suite/methods/dynamic_method_fails.c3 b/test/test_suite/methods/dynamic_method_fails.c3
new file mode 100644
index 000000000..5db7d1067
--- /dev/null
+++ b/test/test_suite/methods/dynamic_method_fails.c3
@@ -0,0 +1,6 @@
+
+interface Abc {}
+
+fn void any.blob(any* x) @dynamic {} // #error: 'any' may not implement
+fn void Abc.blob(Abc* y) @dynamic {} // #error: Interfaces may not implement
+fn void int.blob(int z) @dynamic {}  // #error: The first parameter must always
diff --git a/test/test_suite/methods/extension_method_generic.c3 b/test/test_suite/methods/extension_method_generic.c3
index 203bd926d..06e36cdd8 100644
--- a/test/test_suite/methods/extension_method_generic.c3
+++ b/test/test_suite/methods/extension_method_generic.c3
@@ -5,8 +5,9 @@ def IntArray = List(<int>);
 
 extern fn void printf(char*, ...);
 
-fn void IntArray.someFunc(IntArray *this, usz param) {
-//do something
+fn void IntArray.someFunc(IntArray *this, usz param)
+{
+	//do something
     this.push((int)param);
 }
 
@@ -15,12 +16,14 @@ fn int main(String[] argv)
     IntArray stk;
     stk.someFunc(256);
 
-    for (int i = 0; i < 256; i++) {
+    for (int i = 0; i < 256; i++)
+    {
         stk.push(i);
     }
 
-    for (;!stk.is_empty();) {
-        int value = stk.pop();
+    for (;!stk.is_empty();)
+    {
+        int value = stk.pop()!!;
         printf("%i\n", value);
     }
 
diff --git a/test/test_suite/methods/operator_defined_twice.c3 b/test/test_suite/methods/operator_defined_twice.c3
new file mode 100644
index 000000000..9720ec498
--- /dev/null
+++ b/test/test_suite/methods/operator_defined_twice.c3
@@ -0,0 +1,9 @@
+distinct Foo = int;
+
+fn int Foo.fadd(&self, int x) @operator([]) { return 1; }
+fn int Foo.badd(&self, int x) @operator([]) { return 1; } // #error: This operator is already defined
+
+fn void main()
+{
+	Foo x = 1;
+}
diff --git a/test/test_suite/methods/operator_mismatch.c3 b/test/test_suite/methods/operator_mismatch.c3
new file mode 100644
index 000000000..a73b9a308
--- /dev/null
+++ b/test/test_suite/methods/operator_mismatch.c3
@@ -0,0 +1,10 @@
+struct Foo { int a; }
+struct Bar { int a; }
+
+fn int Foo.x(&self, int x) @operator([]) => 1;
+fn int Foo.y(&self, int x) @operator(&[]) => 1;       // #error: The return type must be a pointer
+fn int** Foo.y2(&self, int x) @operator(&[]) => null; // #error: There is a mismatch of the 'value' type
+fn void Foo.z(&self, uint x, int a) @operator([]=) {} // #error: There is a mismatch of the 'index'
+
+fn double Bar.x(&self, int x) @operator([]) => 0.1;
+fn void Bar.y(&self, int x, float y) @operator([]=) {} // #error: There is a mismatch of the 'value'
diff --git a/test/test_suite/methods/unsupported_operator.c3 b/test/test_suite/methods/unsupported_operator.c3
new file mode 100644
index 000000000..7a19fbf46
--- /dev/null
+++ b/test/test_suite/methods/unsupported_operator.c3
@@ -0,0 +1,3 @@
+import std::io;
+
+fn int int.fadd(&self, int x) @operator([]) { return 1; } // #error: Only user-defined types support operator oveloading
\ No newline at end of file
diff --git a/test/test_suite/module/module_section_export.c3t b/test/test_suite/module/module_section_export.c3t
index 37e75a5a8..f92a4b5d0 100644
--- a/test/test_suite/module/module_section_export.c3t
+++ b/test/test_suite/module/module_section_export.c3t
@@ -20,7 +20,7 @@ int d @private;
 
 
 @TEST_a = local_unnamed_addr global i32 0, align 4
-@TEST.b = protected unnamed_addr global i32 0, align 4
+@TEST.b = internal unnamed_addr global i32 0, align 4
 @TEST_c = local_unnamed_addr global i32 0, align 4
 @TEST_d = local_unnamed_addr global i32 0, align 4
 
diff --git a/test/test_suite/pointers/const_pointer.c3t b/test/test_suite/pointers/const_pointer.c3t
index f8e0b169b..c1ac447c1 100644
--- a/test/test_suite/pointers/const_pointer.c3t
+++ b/test/test_suite/pointers/const_pointer.c3t
@@ -10,7 +10,7 @@ void*[3] data @private = { &foo, &bar, &xx };
 
 /* #expect: const_pointer.ll
 
-@const_pointer.foo = protected global double 1.700000e+01, align 8
-@const_pointer.bar = protected global double 1.200000e+01, align 8
-@const_pointer.xx = protected global float 1.200000e+01, align 4
-@const_pointer.data = protected unnamed_addr global [3 x ptr] [ptr @const_pointer.foo, ptr @const_pointer.bar, ptr @const_pointer.xx], align 16
+@const_pointer.foo = internal global double 1.700000e+01, align 8
+@const_pointer.bar = internal global double 1.200000e+01, align 8
+@const_pointer.xx = internal global float 1.200000e+01, align 4
+@const_pointer.data = internal unnamed_addr global [3 x ptr] [ptr @const_pointer.foo, ptr @const_pointer.bar, ptr @const_pointer.xx], align 16
diff --git a/test/test_suite/pointers/subarray_variant_to_ptr.c3t b/test/test_suite/pointers/subarray_variant_to_ptr.c3t
index 5caf1569d..cc9f4d29f 100644
--- a/test/test_suite/pointers/subarray_variant_to_ptr.c3t
+++ b/test/test_suite/pointers/subarray_variant_to_ptr.c3t
@@ -3,7 +3,7 @@ module foo;
 
 extern fn void printf(char*, ...);
 
-fn void test1(any* z)
+fn void test1(any z)
 {
     int* w = z.ptr;
     printf("%d\n", *w);
@@ -26,14 +26,14 @@ fn void main()
 
 /* #expect: foo.ll
 
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 %"int[]" = type { ptr, i64 }
 
 @"$ct.int" = linkonce global %.introspect { i8 2, i64 0, ptr null, i64 4, i64 0, i64 0, [0 x i64] zeroinitializer }, align 8
 
 define void @foo.test1(i64 %0, ptr %1) #0 {
 entry:
-  %z = alloca %"any*", align 8
+  %z = alloca %any, align 8
   %w = alloca ptr, align 8
   store i64 %0, ptr %z, align 8
   %ptradd = getelementptr inbounds i8, ptr %z, i64 8
@@ -68,13 +68,13 @@ entry:
   %x = alloca i32, align 4
   %y = alloca i32, align 4
   %w = alloca [2 x i32], align 4
-  %taddr = alloca %"any*", align 8
+  %taddr = alloca %any, align 8
   store i32 123, ptr %x, align 4
   store i32 293483, ptr %y, align 4
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %w, ptr align 4 @.__const, i32 8, i1 false)
-  %0 = insertvalue %"any*" undef, ptr %x, 0
-  %1 = insertvalue %"any*" %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %1, ptr %taddr, align 8
+  %0 = insertvalue %any undef, ptr %x, 0
+  %1 = insertvalue %any %0, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %1, ptr %taddr, align 8
   %lo = load i64, ptr %taddr, align 8
   %ptradd = getelementptr inbounds i8, ptr %taddr, i64 8
   %hi = load ptr, ptr %ptradd, align 8
diff --git a/test/test_suite/slices/slice_to_slice_assign.c3t b/test/test_suite/slices/slice_to_slice_assign.c3t
index 99f8a3f83..8f4412060 100644
--- a/test/test_suite/slices/slice_to_slice_assign.c3t
+++ b/test/test_suite/slices/slice_to_slice_assign.c3t
@@ -25,10 +25,10 @@ entry:
   %z = alloca [7 x i32], align 16
   %y = alloca [6 x i32], align 16
   %taddr = alloca %"int[]", align 8
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %taddr6 = alloca %"int[]", align 8
-  %varargslots8 = alloca [2 x %"any*"], align 16
+  %varargslots8 = alloca [2 x %any], align 16
   %retparam10 = alloca i64, align 8
   %a = alloca %"int[][]", align 8
   %literal = alloca [1 x %"int[]"], align 16
@@ -36,12 +36,12 @@ entry:
   %b = alloca %"int[][]", align 8
   %literal12 = alloca [1 x %"int[]"], align 16
   %literal13 = alloca [1 x i32], align 4
-  %varargslots14 = alloca [1 x %"any*"], align 16
+  %varargslots14 = alloca [1 x %any], align 16
   %retparam15 = alloca i64, align 8
   %taddr16 = alloca %"int[][]", align 8
-  %varargslots18 = alloca [1 x %"any*"], align 16
+  %varargslots18 = alloca [1 x %any], align 16
   %retparam19 = alloca i64, align 8
-  %varargslots21 = alloca [1 x %"any*"], align 16
+  %varargslots21 = alloca [1 x %any], align 16
   %retparam22 = alloca i64, align 8
   call void @llvm.memcpy.p0.p0.i32(ptr align 16 %z, ptr align 16 @.__const, i32 28, i1 false)
   call void @llvm.memset.p0.i64(ptr align 16 %y, i8 0, i64 24, i1 false)
@@ -58,13 +58,13 @@ entry:
   %6 = load i64, ptr %ptradd2, align 8
   %7 = mul i64 %6, 4
   call void @llvm.memmove.p0.p0.i64(ptr align 4 %4, ptr align 4 %5, i64 %7, i1 false)
-  %8 = insertvalue %"any*" undef, ptr %y, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.a6$int" to i64), 1
-  store %"any*" %9, ptr %varargslots, align 16
-  %10 = insertvalue %"any*" undef, ptr %z, 0
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.a7$int" to i64), 1
+  %8 = insertvalue %any undef, ptr %y, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.a6$int" to i64), 1
+  store %any %9, ptr %varargslots, align 16
+  %10 = insertvalue %any undef, ptr %z, 0
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.a7$int" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %11, ptr %ptradd3, align 16
+  store %any %11, ptr %ptradd3, align 16
   %12 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 5, ptr %varargslots, i64 2)
   %ptradd4 = getelementptr inbounds i8, ptr %z, i64 20
   %13 = insertvalue %"int[]" undef, ptr %ptradd4, 0
@@ -79,13 +79,13 @@ entry:
   %19 = load i64, ptr %ptradd7, align 8
   %20 = mul i64 %19, 4
   call void @llvm.memmove.p0.p0.i64(ptr align 4 %17, ptr align 4 %18, i64 %20, i1 false)
-  %21 = insertvalue %"any*" undef, ptr %y, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.a6$int" to i64), 1
-  store %"any*" %22, ptr %varargslots8, align 16
-  %23 = insertvalue %"any*" undef, ptr %z, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.a7$int" to i64), 1
+  %21 = insertvalue %any undef, ptr %y, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.a6$int" to i64), 1
+  store %any %22, ptr %varargslots8, align 16
+  %23 = insertvalue %any undef, ptr %z, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.a7$int" to i64), 1
   %ptradd9 = getelementptr inbounds i8, ptr %varargslots8, i64 16
-  store %"any*" %24, ptr %ptradd9, align 16
+  store %any %24, ptr %ptradd9, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam10, ptr @.str.1, i64 5, ptr %varargslots8, i64 2)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %literal11, ptr align 4 @.__const.2, i32 4, i1 false)
   %26 = insertvalue %"int[]" undef, ptr %literal11, 0
@@ -101,9 +101,9 @@ entry:
   %32 = insertvalue %"int[][]" undef, ptr %literal12, 0
   %33 = insertvalue %"int[][]" %32, i64 1, 1
   store %"int[][]" %33, ptr %b, align 8
-  %34 = insertvalue %"any*" undef, ptr %a, 0
-  %35 = insertvalue %"any*" %34, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %35, ptr %varargslots14, align 16
+  %34 = insertvalue %any undef, ptr %a, 0
+  %35 = insertvalue %any %34, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %35, ptr %varargslots14, align 16
   %36 = call i64 @std.io.printfn(ptr %retparam15, ptr @.str.4, i64 2, ptr %varargslots14, i64 1)
   %37 = load %"int[][]", ptr %b, align 8
   %38 = extractvalue %"int[][]" %37, 0
@@ -120,9 +120,9 @@ entry:
   %47 = load i64, ptr %ptradd17, align 8
   %48 = mul i64 %47, 16
   call void @llvm.memmove.p0.p0.i64(ptr align 8 %45, ptr align 8 %46, i64 %48, i1 false)
-  %49 = insertvalue %"any*" undef, ptr %a, 0
-  %50 = insertvalue %"any*" %49, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %50, ptr %varargslots18, align 16
+  %49 = insertvalue %any undef, ptr %a, 0
+  %50 = insertvalue %any %49, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %50, ptr %varargslots18, align 16
   %51 = call i64 @std.io.printfn(ptr %retparam19, ptr @.str.5, i64 2, ptr %varargslots18, i64 1)
   %ptradd20 = getelementptr inbounds i8, ptr %y, i64 8
   %52 = insertvalue %"int[]" undef, ptr %ptradd20, 0
@@ -130,9 +130,9 @@ entry:
   %54 = load %"int[][]", ptr %a, align 8
   %55 = extractvalue %"int[][]" %54, 0
   store %"int[]" %53, ptr %55, align 8
-  %56 = insertvalue %"any*" undef, ptr %a, 0
-  %57 = insertvalue %"any*" %56, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %57, ptr %varargslots21, align 16
+  %56 = insertvalue %any undef, ptr %a, 0
+  %57 = insertvalue %any %56, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %57, ptr %varargslots21, align 16
   %58 = call i64 @std.io.printfn(ptr %retparam22, ptr @.str.6, i64 2, ptr %varargslots21, i64 1)
   ret void
 }
diff --git a/test/test_suite/slices/slice_to_slice_vector_assign.c3t b/test/test_suite/slices/slice_to_slice_vector_assign.c3t
index 471d8f4cc..a2bbb8494 100644
--- a/test/test_suite/slices/slice_to_slice_vector_assign.c3t
+++ b/test/test_suite/slices/slice_to_slice_vector_assign.c3t
@@ -26,10 +26,10 @@ entry:
   %z = alloca <7 x i32>, align 32
   %y = alloca <6 x i32>, align 32
   %taddr = alloca %"int[]", align 8
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %taddr6 = alloca %"int[]", align 8
-  %varargslots8 = alloca [2 x %"any*"], align 16
+  %varargslots8 = alloca [2 x %any], align 16
   %retparam10 = alloca i64, align 8
   %a = alloca %"int[][]", align 8
   %literal = alloca [1 x %"int[]"], align 16
@@ -37,12 +37,12 @@ entry:
   %b = alloca %"int[][]", align 8
   %literal12 = alloca [1 x %"int[]"], align 16
   %literal13 = alloca [1 x i32], align 4
-  %varargslots14 = alloca [1 x %"any*"], align 16
+  %varargslots14 = alloca [1 x %any], align 16
   %retparam15 = alloca i64, align 8
   %taddr16 = alloca %"int[][]", align 8
-  %varargslots18 = alloca [1 x %"any*"], align 16
+  %varargslots18 = alloca [1 x %any], align 16
   %retparam19 = alloca i64, align 8
-  %varargslots21 = alloca [1 x %"any*"], align 16
+  %varargslots21 = alloca [1 x %any], align 16
   %retparam22 = alloca i64, align 8
   store <7 x i32> <i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7>, ptr %z, align 32
   store <6 x i32> zeroinitializer, ptr %y, align 32
@@ -59,13 +59,13 @@ entry:
   %6 = load i64, ptr %ptradd2, align 8
   %7 = mul i64 %6, 4
   call void @llvm.memmove.p0.p0.i64(ptr align 4 %4, ptr align 4 %5, i64 %7, i1 false)
-  %8 = insertvalue %"any*" undef, ptr %y, 0
-  %9 = insertvalue %"any*" %8, i64 ptrtoint (ptr @"$ct.v6$int" to i64), 1
-  store %"any*" %9, ptr %varargslots, align 16
-  %10 = insertvalue %"any*" undef, ptr %z, 0
-  %11 = insertvalue %"any*" %10, i64 ptrtoint (ptr @"$ct.v7$int" to i64), 1
+  %8 = insertvalue %any undef, ptr %y, 0
+  %9 = insertvalue %any %8, i64 ptrtoint (ptr @"$ct.v6$int" to i64), 1
+  store %any %9, ptr %varargslots, align 16
+  %10 = insertvalue %any undef, ptr %z, 0
+  %11 = insertvalue %any %10, i64 ptrtoint (ptr @"$ct.v7$int" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %11, ptr %ptradd3, align 16
+  store %any %11, ptr %ptradd3, align 16
   %12 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 5, ptr %varargslots, i64 2)
   %ptradd4 = getelementptr inbounds i8, ptr %z, i64 20
   %13 = insertvalue %"int[]" undef, ptr %ptradd4, 0
@@ -80,13 +80,13 @@ entry:
   %19 = load i64, ptr %ptradd7, align 8
   %20 = mul i64 %19, 4
   call void @llvm.memmove.p0.p0.i64(ptr align 4 %17, ptr align 4 %18, i64 %20, i1 false)
-  %21 = insertvalue %"any*" undef, ptr %y, 0
-  %22 = insertvalue %"any*" %21, i64 ptrtoint (ptr @"$ct.v6$int" to i64), 1
-  store %"any*" %22, ptr %varargslots8, align 16
-  %23 = insertvalue %"any*" undef, ptr %z, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.v7$int" to i64), 1
+  %21 = insertvalue %any undef, ptr %y, 0
+  %22 = insertvalue %any %21, i64 ptrtoint (ptr @"$ct.v6$int" to i64), 1
+  store %any %22, ptr %varargslots8, align 16
+  %23 = insertvalue %any undef, ptr %z, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.v7$int" to i64), 1
   %ptradd9 = getelementptr inbounds i8, ptr %varargslots8, i64 16
-  store %"any*" %24, ptr %ptradd9, align 16
+  store %any %24, ptr %ptradd9, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam10, ptr @.str.1, i64 5, ptr %varargslots8, i64 2)
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %literal11, ptr align 4 @.__const, i32 4, i1 false)
   %26 = insertvalue %"int[]" undef, ptr %literal11, 0
@@ -102,9 +102,9 @@ entry:
   %32 = insertvalue %"int[][]" undef, ptr %literal12, 0
   %33 = insertvalue %"int[][]" %32, i64 1, 1
   store %"int[][]" %33, ptr %b, align 8
-  %34 = insertvalue %"any*" undef, ptr %a, 0
-  %35 = insertvalue %"any*" %34, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %35, ptr %varargslots14, align 16
+  %34 = insertvalue %any undef, ptr %a, 0
+  %35 = insertvalue %any %34, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %35, ptr %varargslots14, align 16
   %36 = call i64 @std.io.printfn(ptr %retparam15, ptr @.str.3, i64 2, ptr %varargslots14, i64 1)
   %37 = load %"int[][]", ptr %b, align 8
   %38 = extractvalue %"int[][]" %37, 0
@@ -121,9 +121,9 @@ entry:
   %47 = load i64, ptr %ptradd17, align 8
   %48 = mul i64 %47, 16
   call void @llvm.memmove.p0.p0.i64(ptr align 8 %45, ptr align 8 %46, i64 %48, i1 false)
-  %49 = insertvalue %"any*" undef, ptr %a, 0
-  %50 = insertvalue %"any*" %49, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %50, ptr %varargslots18, align 16
+  %49 = insertvalue %any undef, ptr %a, 0
+  %50 = insertvalue %any %49, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %50, ptr %varargslots18, align 16
   %51 = call i64 @std.io.printfn(ptr %retparam19, ptr @.str.4, i64 2, ptr %varargslots18, i64 1)
   %ptradd20 = getelementptr inbounds i8, ptr %y, i64 8
   %52 = insertvalue %"int[]" undef, ptr %ptradd20, 0
@@ -131,9 +131,9 @@ entry:
   %54 = load %"int[][]", ptr %a, align 8
   %55 = extractvalue %"int[][]" %54, 0
   store %"int[]" %53, ptr %55, align 8
-  %56 = insertvalue %"any*" undef, ptr %a, 0
-  %57 = insertvalue %"any*" %56, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
-  store %"any*" %57, ptr %varargslots21, align 16
+  %56 = insertvalue %any undef, ptr %a, 0
+  %57 = insertvalue %any %56, i64 ptrtoint (ptr @"$ct.sa$sa$int" to i64), 1
+  store %any %57, ptr %varargslots21, align 16
   %58 = call i64 @std.io.printfn(ptr %retparam22, ptr @.str.5, i64 2, ptr %varargslots21, i64 1)
   ret void
 }
diff --git a/test/test_suite/statements/foreach_more_implementations.c3t b/test/test_suite/statements/foreach_more_implementations.c3t
index 79d9ffca4..e494abe3b 100644
--- a/test/test_suite/statements/foreach_more_implementations.c3t
+++ b/test/test_suite/statements/foreach_more_implementations.c3t
@@ -49,14 +49,14 @@ entry:
   %.anon1 = alloca i64, align 8
   %ref = alloca ptr, align 8
   %element = alloca i64, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %.anon3 = alloca i64, align 8
   %vector4 = alloca %Vector, align 8
   %.anon5 = alloca i64, align 8
   %i = alloca i32, align 4
   %element9 = alloca i64, align 8
-  %varargslots12 = alloca [1 x %"any*"], align 16
+  %varargslots12 = alloca [1 x %any], align 16
   %retparam13 = alloca i64, align 8
   call void @llvm.memcpy.p0.p0.i32(ptr align 4 %x, ptr align 4 @.__const, i32 8, i1 false)
   store i64 2, ptr %v, align 8
@@ -83,9 +83,9 @@ loop.body:                                        ; preds = %loop.cond
   %ptroffset = getelementptr inbounds [4 x i8], ptr %4, i64 %5
   store ptr %ptroffset, ptr %ref, align 8
   %6 = load ptr, ptr %ref, align 8
-  %7 = insertvalue %"any*" undef, ptr %6, 0
-  %8 = insertvalue %"any*" %7, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %8, ptr %varargslots, align 16
+  %7 = insertvalue %any undef, ptr %6, 0
+  %8 = insertvalue %any %7, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %8, ptr %varargslots, align 16
   %9 = call i64 @std.io.printf(ptr %retparam, ptr @.str, i64 3, ptr %varargslots, i64 1)
   %10 = load ptr, ptr %ref, align 8
   %11 = load i32, ptr %10, align 4
@@ -118,9 +118,9 @@ loop.body8:                                       ; preds = %loop.cond6
   %ptroffset11 = getelementptr inbounds [4 x i8], ptr %17, i64 %18
   %19 = load i32, ptr %ptroffset11, align 4
   store i32 %19, ptr %i, align 4
-  %20 = insertvalue %"any*" undef, ptr %i, 0
-  %21 = insertvalue %"any*" %20, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %21, ptr %varargslots12, align 16
+  %20 = insertvalue %any undef, ptr %i, 0
+  %21 = insertvalue %any %20, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %21, ptr %varargslots12, align 16
   %22 = call i64 @std.io.printf(ptr %retparam13, ptr @.str.1, i64 3, ptr %varargslots12, i64 1)
   %23 = load i64, ptr %.anon5, align 8
   %addnuw14 = add nuw i64 %23, 1
diff --git a/test/test_suite/stdlib/map_linux.c3t b/test/test_suite/stdlib/map_linux.c3t
index 1ad4247fb..82b6476ba 100644
--- a/test/test_suite/stdlib/map_linux.c3t
+++ b/test/test_suite/stdlib/map_linux.c3t
@@ -9,7 +9,7 @@ struct Foo (Printable) { int x; void* bar; }
 def IntFooMap = HashMap(<int, Foo>);
 def IntDoubleMap = HashMap(<int, double>);
 
-fn String Foo.to_new_string(Foo* foo, Allocator* allocator = allocator::heap()) @dynamic
+fn String Foo.to_new_string(Foo* foo, Allocator allocator = allocator::heap()) @dynamic
 {
 	DString s = dstring::new_with_capacity(128, allocator);
 	s.appendf("{%s, %p}", foo.x, foo.bar);
@@ -57,9 +57,9 @@ fn void main()
 
 define { ptr, i64 } @test.Foo.to_new_string(ptr %0, i64 %1, ptr %2) #0 {
 entry:
-  %allocator = alloca %"any*", align 8
+  %allocator = alloca %any, align 8
   %s = alloca ptr, align 8
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %result = alloca %"char[]", align 8
   store i64 %1, ptr %allocator, align 8
@@ -70,14 +70,14 @@ entry:
   %hi = load ptr, ptr %ptradd1, align 8
   %3 = call ptr @std.core.dstring.new_with_capacity(i64 128, i64 %lo, ptr %hi)
   store ptr %3, ptr %s, align 8
-  %4 = insertvalue %"any*" undef, ptr %0, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %0, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %ptradd2 = getelementptr inbounds i8, ptr %0, i64 8
-  %6 = insertvalue %"any*" undef, ptr %ptradd2, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.p$void" to i64), 1
+  %6 = insertvalue %any undef, ptr %ptradd2, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.p$void" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %7, ptr %ptradd3, align 16
+  store %any %7, ptr %ptradd3, align 16
   %8 = call i64 @std.core.dstring.DString.appendf(ptr %retparam, ptr %s, ptr @.str.14, i64 8, ptr %varargslots, i64 2)
   %9 = load ptr, ptr %s, align 8
   %10 = call { ptr, i64 } @std.core.dstring.DString.str_view(ptr %9)
@@ -90,44 +90,44 @@ entry:
 define void @test.main() #0 {
 entry:
   %map = alloca %HashMap, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %literal = alloca %Foo, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %retparam6 = alloca i64, align 8
   %literal7 = alloca %Foo, align 8
-  %varargslots11 = alloca [1 x %"any*"], align 16
+  %varargslots11 = alloca [1 x %any], align 16
   %retparam13 = alloca i64, align 8
-  %varargslots14 = alloca [1 x %"any*"], align 16
+  %varargslots14 = alloca [1 x %any], align 16
   %retparam15 = alloca %Foo, align 8
   %retparam16 = alloca i64, align 8
-  %varargslots19 = alloca [1 x %"any*"], align 16
+  %varargslots19 = alloca [1 x %any], align 16
   %taddr = alloca i8, align 1
   %retparam20 = alloca i64, align 8
-  %varargslots23 = alloca [1 x %"any*"], align 16
+  %varargslots23 = alloca [1 x %any], align 16
   %taddr24 = alloca i8, align 1
   %retparam25 = alloca i64, align 8
   %literal28 = alloca %Foo, align 8
-  %varargslots32 = alloca [1 x %"any*"], align 16
+  %varargslots32 = alloca [1 x %any], align 16
   %result = alloca %"Foo[]", align 8
   %retparam35 = alloca i64, align 8
   %map2 = alloca %HashMap.0, align 8
-  %varargslots40 = alloca [1 x %"any*"], align 16
+  %varargslots40 = alloca [1 x %any], align 16
   %taddr41 = alloca i8, align 1
   %retparam42 = alloca i64, align 8
-  %varargslots45 = alloca [1 x %"any*"], align 16
+  %varargslots45 = alloca [1 x %any], align 16
   %taddr46 = alloca i8, align 1
   %retparam47 = alloca i64, align 8
-  %varargslots50 = alloca [1 x %"any*"], align 16
+  %varargslots50 = alloca [1 x %any], align 16
   %result53 = alloca %"int[]", align 8
   %retparam54 = alloca i64, align 8
-  %varargslots57 = alloca [1 x %"any*"], align 16
+  %varargslots57 = alloca [1 x %any], align 16
   %result60 = alloca %"double[]", align 8
   %retparam61 = alloca i64, align 8
   %current = alloca ptr, align 8
   %mark = alloca i64, align 8
   %map3 = alloca %HashMap.0, align 8
-  %varargslots67 = alloca [1 x %"any*"], align 16
+  %varargslots67 = alloca [1 x %any], align 16
   %result70 = alloca %"int[]", align 8
   %retparam71 = alloca i64, align 8
   call void @llvm.memset.p0.i64(ptr align 8 %map, i8 0, i64 48, i1 false)
@@ -135,9 +135,9 @@ entry:
   %hi = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %0 = call ptr @"std.collections.map$int$test.Foo$.HashMap.new_init"(ptr %map, i32 16, float 7.500000e-01, i64 %lo, ptr %hi)
   %ptradd = getelementptr inbounds i8, ptr %map, i64 32
-  %1 = insertvalue %"any*" undef, ptr %ptradd, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %ptradd, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 12, ptr %varargslots, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal, ptr align 8 @.__const, i32 16, i1 false)
   %lo1 = load i32, ptr %literal, align 8
@@ -145,9 +145,9 @@ entry:
   %hi3 = load ptr, ptr %ptradd2, align 8
   %4 = call i8 @"std.collections.map$int$test.Foo$.HashMap.set"(ptr %map, i32 1, i32 %lo1, ptr %hi3)
   %ptradd5 = getelementptr inbounds i8, ptr %map, i64 32
-  %5 = insertvalue %"any*" undef, ptr %ptradd5, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %6, ptr %varargslots4, align 16
+  %5 = insertvalue %any undef, ptr %ptradd5, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %6, ptr %varargslots4, align 16
   %7 = call i64 @std.io.printfn(ptr %retparam6, ptr @.str.1, i64 12, ptr %varargslots4, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal7, ptr align 8 @.__const.2, i32 16, i1 false)
   %lo8 = load i32, ptr %literal7, align 8
@@ -155,9 +155,9 @@ entry:
   %hi10 = load ptr, ptr %ptradd9, align 8
   %8 = call i8 @"std.collections.map$int$test.Foo$.HashMap.set"(ptr %map, i32 1, i32 %lo8, ptr %hi10)
   %ptradd12 = getelementptr inbounds i8, ptr %map, i64 32
-  %9 = insertvalue %"any*" undef, ptr %ptradd12, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %10, ptr %varargslots11, align 16
+  %9 = insertvalue %any undef, ptr %ptradd12, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %10, ptr %varargslots11, align 16
   %11 = call i64 @std.io.printfn(ptr %retparam13, ptr @.str.3, i64 12, ptr %varargslots11, i64 1)
   %12 = call i64 @"std.collections.map$int$test.Foo$.HashMap.get"(ptr %retparam15, ptr %map, i32 1)
   %not_err = icmp eq i64 %12, 0
@@ -165,9 +165,9 @@ entry:
   br i1 %13, label %after_check, label %after_check18
 
 after_check:                                      ; preds = %entry
-  %14 = insertvalue %"any*" undef, ptr %retparam15, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %15, ptr %varargslots14, align 16
+  %14 = insertvalue %any undef, ptr %retparam15, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %15, ptr %varargslots14, align 16
   %16 = call i64 @std.io.printfn(ptr %retparam16, ptr @.str.4, i64 7, ptr %varargslots14, i64 1)
   %not_err17 = icmp eq i64 %16, 0
   %17 = call i1 @llvm.expect.i1(i1 %not_err17, i1 true)
@@ -176,15 +176,15 @@ after_check:                                      ; preds = %entry
 after_check18:                                    ; preds = %entry, %after_check, %after_check
   %18 = call i8 @"std.collections.map$int$test.Foo$.HashMap.has_key"(ptr %map, i32 1)
   store i8 %18, ptr %taddr, align 1
-  %19 = insertvalue %"any*" undef, ptr %taddr, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %20, ptr %varargslots19, align 16
+  %19 = insertvalue %any undef, ptr %taddr, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %20, ptr %varargslots19, align 16
   %21 = call i64 @std.io.printfn(ptr %retparam20, ptr @.str.5, i64 9, ptr %varargslots19, i64 1)
   %22 = call i8 @"std.collections.map$int$test.Foo$.HashMap.has_key"(ptr %map, i32 2)
   store i8 %22, ptr %taddr24, align 1
-  %23 = insertvalue %"any*" undef, ptr %taddr24, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %24, ptr %varargslots23, align 16
+  %23 = insertvalue %any undef, ptr %taddr24, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %24, ptr %varargslots23, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam25, ptr @.str.6, i64 9, ptr %varargslots23, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal28, ptr align 8 @.__const.7, i32 16, i1 false)
   %lo29 = load i32, ptr %literal28, align 8
@@ -195,9 +195,9 @@ after_check18:                                    ; preds = %entry, %after_check
   %hi34 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %27 = call { ptr, i64 } @"std.collections.map$int$test.Foo$.HashMap.value_new_list"(ptr %map, i64 %lo33, ptr %hi34)
   store { ptr, i64 } %27, ptr %result, align 8
-  %28 = insertvalue %"any*" undef, ptr %result, 0
-  %29 = insertvalue %"any*" %28, i64 ptrtoint (ptr @"$ct.sa$test.Foo" to i64), 1
-  store %"any*" %29, ptr %varargslots32, align 16
+  %28 = insertvalue %any undef, ptr %result, 0
+  %29 = insertvalue %any %28, i64 ptrtoint (ptr @"$ct.sa$test.Foo" to i64), 1
+  store %any %29, ptr %varargslots32, align 16
   %30 = call i64 @std.io.printfn(ptr %retparam35, ptr @.str.8, i64 10, ptr %varargslots32, i64 1)
   call void @llvm.memset.p0.i64(ptr align 8 %map2, i8 0, i64 48, i1 false)
   %lo38 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
@@ -206,32 +206,32 @@ after_check18:                                    ; preds = %entry, %after_check
   %32 = call i8 @"std.collections.map$int$double$.HashMap.set"(ptr %map2, i32 4, double 1.300000e+00)
   %33 = call i8 @"std.collections.map$int$double$.HashMap.has_value"(ptr %map2, double 1.300000e+00)
   store i8 %33, ptr %taddr41, align 1
-  %34 = insertvalue %"any*" undef, ptr %taddr41, 0
-  %35 = insertvalue %"any*" %34, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %35, ptr %varargslots40, align 16
+  %34 = insertvalue %any undef, ptr %taddr41, 0
+  %35 = insertvalue %any %34, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %35, ptr %varargslots40, align 16
   %36 = call i64 @std.io.printfn(ptr %retparam42, ptr @.str.9, i64 12, ptr %varargslots40, i64 1)
   %37 = call i8 @"std.collections.map$int$double$.HashMap.has_value"(ptr %map2, double 1.200000e+00)
   store i8 %37, ptr %taddr46, align 1
-  %38 = insertvalue %"any*" undef, ptr %taddr46, 0
-  %39 = insertvalue %"any*" %38, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %39, ptr %varargslots45, align 16
+  %38 = insertvalue %any undef, ptr %taddr46, 0
+  %39 = insertvalue %any %38, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %39, ptr %varargslots45, align 16
   %40 = call i64 @std.io.printfn(ptr %retparam47, ptr @.str.10, i64 12, ptr %varargslots45, i64 1)
   %41 = call i8 @"std.collections.map$int$double$.HashMap.set"(ptr %map2, i32 100, double 3.400000e+00)
   %lo51 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
   %hi52 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %42 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.key_new_list"(ptr %map2, i64 %lo51, ptr %hi52)
   store { ptr, i64 } %42, ptr %result53, align 8
-  %43 = insertvalue %"any*" undef, ptr %result53, 0
-  %44 = insertvalue %"any*" %43, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
-  store %"any*" %44, ptr %varargslots50, align 16
+  %43 = insertvalue %any undef, ptr %result53, 0
+  %44 = insertvalue %any %43, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
+  store %any %44, ptr %varargslots50, align 16
   %45 = call i64 @std.io.printfn(ptr %retparam54, ptr @.str.11, i64 2, ptr %varargslots50, i64 1)
   %lo58 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
   %hi59 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %46 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.value_new_list"(ptr %map2, i64 %lo58, ptr %hi59)
   store { ptr, i64 } %46, ptr %result60, align 8
-  %47 = insertvalue %"any*" undef, ptr %result60, 0
-  %48 = insertvalue %"any*" %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
-  store %"any*" %48, ptr %varargslots57, align 16
+  %47 = insertvalue %any undef, ptr %result60, 0
+  %48 = insertvalue %any %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
+  store %any %48, ptr %varargslots57, align 16
   %49 = call i64 @std.io.printfn(ptr %retparam61, ptr @.str.12, i64 2, ptr %varargslots57, i64 1)
   %50 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
   %not = icmp eq ptr %50, null
@@ -258,9 +258,9 @@ if.exit:                                          ; preds = %if.then, %after_che
   %hi69 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %57 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.key_new_list"(ptr %map3, i64 %lo68, ptr %hi69)
   store { ptr, i64 } %57, ptr %result70, align 8
-  %58 = insertvalue %"any*" undef, ptr %result70, 0
-  %59 = insertvalue %"any*" %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
-  store %"any*" %59, ptr %varargslots67, align 16
+  %58 = insertvalue %any undef, ptr %result70, 0
+  %59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
+  store %any %59, ptr %varargslots67, align 16
   %60 = call i64 @std.io.printfn(ptr %retparam71, ptr @.str.13, i64 2, ptr %varargslots67, i64 1)
   %61 = load ptr, ptr %current, align 8
   %62 = load i64, ptr %mark, align 8
diff --git a/test/test_suite/stdlib/map_macos.c3t b/test/test_suite/stdlib/map_macos.c3t
index fb6fa43c4..a1ea00e12 100644
--- a/test/test_suite/stdlib/map_macos.c3t
+++ b/test/test_suite/stdlib/map_macos.c3t
@@ -9,7 +9,7 @@ struct Foo (Printable) { int x; void* bar; }
 def IntFooMap = HashMap(<int, Foo>);
 def IntDoubleMap = HashMap(<int, double>);
 
-fn String Foo.to_new_string(Foo* foo, Allocator* allocator = allocator::heap()) @dynamic
+fn String Foo.to_new_string(Foo* foo, Allocator allocator = allocator::heap()) @dynamic
 {
 	DString s = dstring::new_with_capacity(128, allocator);
 	s.appendf("{%s, %p}", foo.x, foo.bar);
@@ -57,9 +57,9 @@ fn void main()
 
 define { ptr, i64 } @test.Foo.to_new_string(ptr %0, i64 %1, ptr %2) #0 {
 entry:
-  %allocator = alloca %"any*", align 8
+  %allocator = alloca %any, align 8
   %s = alloca ptr, align 8
-  %varargslots = alloca [2 x %"any*"], align 16
+  %varargslots = alloca [2 x %any], align 16
   %retparam = alloca i64, align 8
   %result = alloca %"char[]", align 8
   store i64 %1, ptr %allocator, align 8
@@ -70,14 +70,14 @@ entry:
   %hi = load ptr, ptr %ptradd1, align 8
   %3 = call ptr @std.core.dstring.new_with_capacity(i64 128, i64 %lo, ptr %hi)
   store ptr %3, ptr %s, align 8
-  %4 = insertvalue %"any*" undef, ptr %0, 0
-  %5 = insertvalue %"any*" %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %5, ptr %varargslots, align 16
+  %4 = insertvalue %any undef, ptr %0, 0
+  %5 = insertvalue %any %4, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %5, ptr %varargslots, align 16
   %ptradd2 = getelementptr inbounds i8, ptr %0, i64 8
-  %6 = insertvalue %"any*" undef, ptr %ptradd2, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.p$void" to i64), 1
+  %6 = insertvalue %any undef, ptr %ptradd2, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.p$void" to i64), 1
   %ptradd3 = getelementptr inbounds i8, ptr %varargslots, i64 16
-  store %"any*" %7, ptr %ptradd3, align 16
+  store %any %7, ptr %ptradd3, align 16
   %8 = call i64 @std.core.dstring.DString.appendf(ptr %retparam, ptr %s, ptr @.str.14, i64 8, ptr %varargslots, i64 2)
   %9 = load ptr, ptr %s, align 8
   %10 = call { ptr, i64 } @std.core.dstring.DString.str_view(ptr %9)
@@ -90,44 +90,44 @@ entry:
 define void @test.main() #0 {
 entry:
   %map = alloca %HashMap, align 8
-  %varargslots = alloca [1 x %"any*"], align 16
+  %varargslots = alloca [1 x %any], align 16
   %retparam = alloca i64, align 8
   %literal = alloca %Foo, align 8
-  %varargslots4 = alloca [1 x %"any*"], align 16
+  %varargslots4 = alloca [1 x %any], align 16
   %retparam6 = alloca i64, align 8
   %literal7 = alloca %Foo, align 8
-  %varargslots11 = alloca [1 x %"any*"], align 16
+  %varargslots11 = alloca [1 x %any], align 16
   %retparam13 = alloca i64, align 8
-  %varargslots14 = alloca [1 x %"any*"], align 16
+  %varargslots14 = alloca [1 x %any], align 16
   %retparam15 = alloca %Foo, align 8
   %retparam16 = alloca i64, align 8
-  %varargslots19 = alloca [1 x %"any*"], align 16
+  %varargslots19 = alloca [1 x %any], align 16
   %taddr = alloca i8, align 1
   %retparam20 = alloca i64, align 8
-  %varargslots23 = alloca [1 x %"any*"], align 16
+  %varargslots23 = alloca [1 x %any], align 16
   %taddr24 = alloca i8, align 1
   %retparam25 = alloca i64, align 8
   %literal28 = alloca %Foo, align 8
-  %varargslots32 = alloca [1 x %"any*"], align 16
+  %varargslots32 = alloca [1 x %any], align 16
   %result = alloca %"Foo[]", align 8
   %retparam35 = alloca i64, align 8
   %map2 = alloca %HashMap.0, align 8
-  %varargslots40 = alloca [1 x %"any*"], align 16
+  %varargslots40 = alloca [1 x %any], align 16
   %taddr41 = alloca i8, align 1
   %retparam42 = alloca i64, align 8
-  %varargslots45 = alloca [1 x %"any*"], align 16
+  %varargslots45 = alloca [1 x %any], align 16
   %taddr46 = alloca i8, align 1
   %retparam47 = alloca i64, align 8
-  %varargslots50 = alloca [1 x %"any*"], align 16
+  %varargslots50 = alloca [1 x %any], align 16
   %result53 = alloca %"int[]", align 8
   %retparam54 = alloca i64, align 8
-  %varargslots57 = alloca [1 x %"any*"], align 16
+  %varargslots57 = alloca [1 x %any], align 16
   %result60 = alloca %"double[]", align 8
   %retparam61 = alloca i64, align 8
   %current = alloca ptr, align 8
   %mark = alloca i64, align 8
   %map3 = alloca %HashMap.0, align 8
-  %varargslots67 = alloca [1 x %"any*"], align 16
+  %varargslots67 = alloca [1 x %any], align 16
   %result70 = alloca %"int[]", align 8
   %retparam71 = alloca i64, align 8
   call void @llvm.memset.p0.i64(ptr align 8 %map, i8 0, i64 48, i1 false)
@@ -135,9 +135,9 @@ entry:
   %hi = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %0 = call ptr @"std.collections.map$int$test.Foo$.HashMap.new_init"(ptr %map, i32 16, float 7.500000e-01, i64 %lo, ptr %hi)
   %ptradd = getelementptr inbounds i8, ptr %map, i64 32
-  %1 = insertvalue %"any*" undef, ptr %ptradd, 0
-  %2 = insertvalue %"any*" %1, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %2, ptr %varargslots, align 16
+  %1 = insertvalue %any undef, ptr %ptradd, 0
+  %2 = insertvalue %any %1, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %2, ptr %varargslots, align 16
   %3 = call i64 @std.io.printfn(ptr %retparam, ptr @.str, i64 12, ptr %varargslots, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal, ptr align 8 @.__const, i32 16, i1 false)
   %lo1 = load i32, ptr %literal, align 8
@@ -145,9 +145,9 @@ entry:
   %hi3 = load ptr, ptr %ptradd2, align 8
   %4 = call i8 @"std.collections.map$int$test.Foo$.HashMap.set"(ptr %map, i32 1, i32 %lo1, ptr %hi3)
   %ptradd5 = getelementptr inbounds i8, ptr %map, i64 32
-  %5 = insertvalue %"any*" undef, ptr %ptradd5, 0
-  %6 = insertvalue %"any*" %5, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %6, ptr %varargslots4, align 16
+  %5 = insertvalue %any undef, ptr %ptradd5, 0
+  %6 = insertvalue %any %5, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %6, ptr %varargslots4, align 16
   %7 = call i64 @std.io.printfn(ptr %retparam6, ptr @.str.1, i64 12, ptr %varargslots4, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal7, ptr align 8 @.__const.2, i32 16, i1 false)
   %lo8 = load i32, ptr %literal7, align 8
@@ -155,9 +155,9 @@ entry:
   %hi10 = load ptr, ptr %ptradd9, align 8
   %8 = call i8 @"std.collections.map$int$test.Foo$.HashMap.set"(ptr %map, i32 1, i32 %lo8, ptr %hi10)
   %ptradd12 = getelementptr inbounds i8, ptr %map, i64 32
-  %9 = insertvalue %"any*" undef, ptr %ptradd12, 0
-  %10 = insertvalue %"any*" %9, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
-  store %"any*" %10, ptr %varargslots11, align 16
+  %9 = insertvalue %any undef, ptr %ptradd12, 0
+  %10 = insertvalue %any %9, i64 ptrtoint (ptr @"$ct.uint" to i64), 1
+  store %any %10, ptr %varargslots11, align 16
   %11 = call i64 @std.io.printfn(ptr %retparam13, ptr @.str.3, i64 12, ptr %varargslots11, i64 1)
   %12 = call i64 @"std.collections.map$int$test.Foo$.HashMap.get"(ptr %retparam15, ptr %map, i32 1)
   %not_err = icmp eq i64 %12, 0
@@ -165,9 +165,9 @@ entry:
   br i1 %13, label %after_check, label %after_check18
 
 after_check:                                      ; preds = %entry
-  %14 = insertvalue %"any*" undef, ptr %retparam15, 0
-  %15 = insertvalue %"any*" %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
-  store %"any*" %15, ptr %varargslots14, align 16
+  %14 = insertvalue %any undef, ptr %retparam15, 0
+  %15 = insertvalue %any %14, i64 ptrtoint (ptr @"$ct.int" to i64), 1
+  store %any %15, ptr %varargslots14, align 16
   %16 = call i64 @std.io.printfn(ptr %retparam16, ptr @.str.4, i64 7, ptr %varargslots14, i64 1)
   %not_err17 = icmp eq i64 %16, 0
   %17 = call i1 @llvm.expect.i1(i1 %not_err17, i1 true)
@@ -176,15 +176,15 @@ after_check:                                      ; preds = %entry
 after_check18:                                    ; preds = %entry, %after_check, %after_check
   %18 = call i8 @"std.collections.map$int$test.Foo$.HashMap.has_key"(ptr %map, i32 1)
   store i8 %18, ptr %taddr, align 1
-  %19 = insertvalue %"any*" undef, ptr %taddr, 0
-  %20 = insertvalue %"any*" %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %20, ptr %varargslots19, align 16
+  %19 = insertvalue %any undef, ptr %taddr, 0
+  %20 = insertvalue %any %19, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %20, ptr %varargslots19, align 16
   %21 = call i64 @std.io.printfn(ptr %retparam20, ptr @.str.5, i64 9, ptr %varargslots19, i64 1)
   %22 = call i8 @"std.collections.map$int$test.Foo$.HashMap.has_key"(ptr %map, i32 2)
   store i8 %22, ptr %taddr24, align 1
-  %23 = insertvalue %"any*" undef, ptr %taddr24, 0
-  %24 = insertvalue %"any*" %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %24, ptr %varargslots23, align 16
+  %23 = insertvalue %any undef, ptr %taddr24, 0
+  %24 = insertvalue %any %23, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %24, ptr %varargslots23, align 16
   %25 = call i64 @std.io.printfn(ptr %retparam25, ptr @.str.6, i64 9, ptr %varargslots23, i64 1)
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %literal28, ptr align 8 @.__const.7, i32 16, i1 false)
   %lo29 = load i32, ptr %literal28, align 8
@@ -195,9 +195,9 @@ after_check18:                                    ; preds = %entry, %after_check
   %hi34 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %27 = call { ptr, i64 } @"std.collections.map$int$test.Foo$.HashMap.value_new_list"(ptr %map, i64 %lo33, ptr %hi34)
   store { ptr, i64 } %27, ptr %result, align 8
-  %28 = insertvalue %"any*" undef, ptr %result, 0
-  %29 = insertvalue %"any*" %28, i64 ptrtoint (ptr @"$ct.sa$test.Foo" to i64), 1
-  store %"any*" %29, ptr %varargslots32, align 16
+  %28 = insertvalue %any undef, ptr %result, 0
+  %29 = insertvalue %any %28, i64 ptrtoint (ptr @"$ct.sa$test.Foo" to i64), 1
+  store %any %29, ptr %varargslots32, align 16
   %30 = call i64 @std.io.printfn(ptr %retparam35, ptr @.str.8, i64 10, ptr %varargslots32, i64 1)
   call void @llvm.memset.p0.i64(ptr align 8 %map2, i8 0, i64 48, i1 false)
   %lo38 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
@@ -206,32 +206,32 @@ after_check18:                                    ; preds = %entry, %after_check
   %32 = call i8 @"std.collections.map$int$double$.HashMap.set"(ptr %map2, i32 4, double 1.300000e+00)
   %33 = call i8 @"std.collections.map$int$double$.HashMap.has_value"(ptr %map2, double 1.300000e+00)
   store i8 %33, ptr %taddr41, align 1
-  %34 = insertvalue %"any*" undef, ptr %taddr41, 0
-  %35 = insertvalue %"any*" %34, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %35, ptr %varargslots40, align 16
+  %34 = insertvalue %any undef, ptr %taddr41, 0
+  %35 = insertvalue %any %34, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %35, ptr %varargslots40, align 16
   %36 = call i64 @std.io.printfn(ptr %retparam42, ptr @.str.9, i64 12, ptr %varargslots40, i64 1)
   %37 = call i8 @"std.collections.map$int$double$.HashMap.has_value"(ptr %map2, double 1.200000e+00)
   store i8 %37, ptr %taddr46, align 1
-  %38 = insertvalue %"any*" undef, ptr %taddr46, 0
-  %39 = insertvalue %"any*" %38, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
-  store %"any*" %39, ptr %varargslots45, align 16
+  %38 = insertvalue %any undef, ptr %taddr46, 0
+  %39 = insertvalue %any %38, i64 ptrtoint (ptr @"$ct.bool" to i64), 1
+  store %any %39, ptr %varargslots45, align 16
   %40 = call i64 @std.io.printfn(ptr %retparam47, ptr @.str.10, i64 12, ptr %varargslots45, i64 1)
   %41 = call i8 @"std.collections.map$int$double$.HashMap.set"(ptr %map2, i32 100, double 3.400000e+00)
   %lo51 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
   %hi52 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %42 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.key_new_list"(ptr %map2, i64 %lo51, ptr %hi52)
   store { ptr, i64 } %42, ptr %result53, align 8
-  %43 = insertvalue %"any*" undef, ptr %result53, 0
-  %44 = insertvalue %"any*" %43, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
-  store %"any*" %44, ptr %varargslots50, align 16
+  %43 = insertvalue %any undef, ptr %result53, 0
+  %44 = insertvalue %any %43, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
+  store %any %44, ptr %varargslots50, align 16
   %45 = call i64 @std.io.printfn(ptr %retparam54, ptr @.str.11, i64 2, ptr %varargslots50, i64 1)
   %lo58 = load i64, ptr @std.core.mem.allocator.thread_allocator, align 8
   %hi59 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %46 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.value_new_list"(ptr %map2, i64 %lo58, ptr %hi59)
   store { ptr, i64 } %46, ptr %result60, align 8
-  %47 = insertvalue %"any*" undef, ptr %result60, 0
-  %48 = insertvalue %"any*" %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
-  store %"any*" %48, ptr %varargslots57, align 16
+  %47 = insertvalue %any undef, ptr %result60, 0
+  %48 = insertvalue %any %47, i64 ptrtoint (ptr @"$ct.sa$double" to i64), 1
+  store %any %48, ptr %varargslots57, align 16
   %49 = call i64 @std.io.printfn(ptr %retparam61, ptr @.str.12, i64 2, ptr %varargslots57, i64 1)
   %50 = load ptr, ptr @std.core.mem.allocator.thread_temp_allocator, align 8
   %not = icmp eq ptr %50, null
@@ -258,9 +258,9 @@ if.exit:                                          ; preds = %if.then, %after_che
   %hi69 = load ptr, ptr getelementptr inbounds (i8, ptr @std.core.mem.allocator.thread_allocator, i64 8), align 8
   %57 = call { ptr, i64 } @"std.collections.map$int$double$.HashMap.key_new_list"(ptr %map3, i64 %lo68, ptr %hi69)
   store { ptr, i64 } %57, ptr %result70, align 8
-  %58 = insertvalue %"any*" undef, ptr %result70, 0
-  %59 = insertvalue %"any*" %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
-  store %"any*" %59, ptr %varargslots67, align 16
+  %58 = insertvalue %any undef, ptr %result70, 0
+  %59 = insertvalue %any %58, i64 ptrtoint (ptr @"$ct.sa$int" to i64), 1
+  store %any %59, ptr %varargslots67, align 16
   %60 = call i64 @std.io.printfn(ptr %retparam71, ptr @.str.13, i64 2, ptr %varargslots67, i64 1)
   %61 = load ptr, ptr %current, align 8
   %62 = load i64, ptr %mark, align 8
diff --git a/test/test_suite/struct/simple_struct.c3t b/test/test_suite/struct/simple_struct.c3t
index 2a34a3d81..89a87c560 100644
--- a/test/test_suite/struct/simple_struct.c3t
+++ b/test/test_suite/struct/simple_struct.c3t
@@ -11,4 +11,4 @@ struct Foo
 /* #expect: test.ll
 
 %Foo = type { i32, double }
-@test.a = protected unnamed_addr global %Foo zeroinitializer, align 8
\ No newline at end of file
+@test.a = internal unnamed_addr global %Foo zeroinitializer, align 8
\ No newline at end of file
diff --git a/test/test_suite/struct/struct_bad_member.c3 b/test/test_suite/struct/struct_bad_member.c3
index fffaf25d7..49486d7ed 100644
--- a/test/test_suite/struct/struct_bad_member.c3
+++ b/test/test_suite/struct/struct_bad_member.c3
@@ -6,7 +6,14 @@ def Void = void;
 struct Foo2 {
   Void bar; // #error: Members cannot be of
 }
+
+distinct Void2 = void;
+struct Foo3 {
+  Void2 bar; // #error: has unknown size
+}
+
 fn void main(String[] args) {
   Foo foo;
   Foo2 foo2;
+  Foo3 foo3;
 }
diff --git a/test/test_suite/struct/struct_const_construct_simple.c3t b/test/test_suite/struct/struct_const_construct_simple.c3t
index 2cf67dad1..2a81d9db5 100644
--- a/test/test_suite/struct/struct_const_construct_simple.c3t
+++ b/test/test_suite/struct/struct_const_construct_simple.c3t
@@ -21,12 +21,12 @@ Foo foo8 @private = FOO7;
 /* #expect: structo.ll
 
 @"$ct.structo.Foo" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 16, i64 0, i64 2, [0 x i64] zeroinitializer }, align 8
-@structo.x = protected unnamed_addr global i64 16, align 8
-@structo.foo1 = protected unnamed_addr global %Foo { i32 1, i64 2 }, align 8
-@structo.foo2 = protected unnamed_addr global %Foo { i32 2, i64 0 }, align 8
-@structo.foo3 = protected unnamed_addr global %Foo { i32 0, i64 3 }, align 8
-@structo.foo4 = protected unnamed_addr global %Foo { i32 4, i64 1 }, align 8
-@structo.foo5 = protected unnamed_addr global %Foo zeroinitializer, align 8
-@structo.foo6 = protected unnamed_addr global %Foo zeroinitializer, align 8
-@structo.FOO7 = protected unnamed_addr constant %Foo { i32 1, i64 2 }, align 8
-@structo.foo8 = protected unnamed_addr global %Foo { i32 1, i64 2 }, align 8
+@structo.x = internal unnamed_addr global i64 16, align 8
+@structo.foo1 = internal unnamed_addr global %Foo { i32 1, i64 2 }, align 8
+@structo.foo2 = internal unnamed_addr global %Foo { i32 2, i64 0 }, align 8
+@structo.foo3 = internal unnamed_addr global %Foo { i32 0, i64 3 }, align 8
+@structo.foo4 = internal unnamed_addr global %Foo { i32 4, i64 1 }, align 8
+@structo.foo5 = internal unnamed_addr global %Foo zeroinitializer, align 8
+@structo.foo6 = internal unnamed_addr global %Foo zeroinitializer, align 8
+@structo.FOO7 = internal unnamed_addr constant %Foo { i32 1, i64 2 }, align 8
+@structo.foo8 = internal unnamed_addr global %Foo { i32 1, i64 2 }, align 8
diff --git a/test/test_suite/subarrays/slice_comparison.c3t b/test/test_suite/subarrays/slice_comparison.c3t
index 5e6edee7c..4b64e34cd 100644
--- a/test/test_suite/subarrays/slice_comparison.c3t
+++ b/test/test_suite/subarrays/slice_comparison.c3t
@@ -50,18 +50,18 @@ entry:
   %1 = extractvalue %"char[]" %0, 1
   %2 = extractvalue %"char[]" %0, 0
   %eq = icmp eq i64 %1, 4
-  br i1 %eq, label %subarray_cmp_values, label %subarray_cmp_exit
+  br i1 %eq, label %slice_cmp_values, label %slice_cmp_exit
 
-subarray_cmp_values:                              ; preds = %entry
+slice_cmp_values:                                 ; preds = %entry
   store i64 0, ptr %cmp.idx, align 8
-  br label %subarray_loop_start
+  br label %slice_loop_start
 
-subarray_loop_start:                              ; preds = %subarray_loop_comparison, %subarray_cmp_values
+slice_loop_start:                                 ; preds = %slice_loop_comparison, %slice_cmp_values
   %3 = load i64, ptr %cmp.idx, align 8
   %lt = icmp ult i64 %3, %1
-  br i1 %lt, label %subarray_loop_comparison, label %subarray_cmp_exit
+  br i1 %lt, label %slice_loop_comparison, label %slice_cmp_exit
 
-subarray_loop_comparison:                         ; preds = %subarray_loop_start
+slice_loop_comparison:                            ; preds = %slice_loop_start
   %ptradd = getelementptr inbounds i8, ptr %2, i64 %3
   %ptradd1 = getelementptr inbounds i8, ptr @.str.2, i64 %3
   %4 = load i8, ptr %ptradd, align 1
@@ -69,17 +69,17 @@ subarray_loop_comparison:                         ; preds = %subarray_loop_start
   %eq2 = icmp eq i8 %4, %5
   %6 = add i64 %3, 1
   store i64 %6, ptr %cmp.idx, align 8
-  br i1 %eq2, label %subarray_loop_start, label %subarray_cmp_exit
+  br i1 %eq2, label %slice_loop_start, label %slice_cmp_exit
 
-subarray_cmp_exit:                                ; preds = %subarray_loop_comparison, %subarray_loop_start, %entry
-  %subarray_cmp_phi = phi i1 [ true, %subarray_loop_start ], [ false, %entry ], [ false, %subarray_loop_comparison ]
-  br i1 %subarray_cmp_phi, label %if.then, label %if.exit
+slice_cmp_exit:                                   ; preds = %slice_loop_comparison, %slice_loop_start, %entry
+  %slice_cmp_phi = phi i1 [ true, %slice_loop_start ], [ false, %entry ], [ false, %slice_loop_comparison ]
+  br i1 %slice_cmp_phi, label %if.then, label %if.exit
 
-if.then:                                          ; preds = %subarray_cmp_exit
+if.then:                                          ; preds = %slice_cmp_exit
   call void (ptr, ...) @printf(ptr @.str.3)
   br label %if.exit
 
-if.exit:                                          ; preds = %if.then, %subarray_cmp_exit
+if.exit:                                          ; preds = %if.then, %slice_cmp_exit
   %7 = load %"char[]", ptr %y, align 8
   %8 = load %"char[]", ptr %z, align 8
   %9 = extractvalue %"char[]" %7, 1
@@ -87,18 +87,18 @@ if.exit:                                          ; preds = %if.then, %subarray_
   %11 = extractvalue %"char[]" %7, 0
   %12 = extractvalue %"char[]" %8, 0
   %eq3 = icmp eq i64 %9, %10
-  br i1 %eq3, label %subarray_cmp_values4, label %subarray_cmp_exit12
+  br i1 %eq3, label %slice_cmp_values4, label %slice_cmp_exit12
 
-subarray_cmp_values4:                             ; preds = %if.exit
+slice_cmp_values4:                                ; preds = %if.exit
   store i64 0, ptr %cmp.idx5, align 8
-  br label %subarray_loop_start6
+  br label %slice_loop_start6
 
-subarray_loop_start6:                             ; preds = %subarray_loop_comparison8, %subarray_cmp_values4
+slice_loop_start6:                                ; preds = %slice_loop_comparison8, %slice_cmp_values4
   %13 = load i64, ptr %cmp.idx5, align 8
   %lt7 = icmp ult i64 %13, %9
-  br i1 %lt7, label %subarray_loop_comparison8, label %subarray_cmp_exit12
+  br i1 %lt7, label %slice_loop_comparison8, label %slice_cmp_exit12
 
-subarray_loop_comparison8:                        ; preds = %subarray_loop_start6
+slice_loop_comparison8:                           ; preds = %slice_loop_start6
   %ptradd9 = getelementptr inbounds i8, ptr %11, i64 %13
   %ptradd10 = getelementptr inbounds i8, ptr %12, i64 %13
   %14 = load i8, ptr %ptradd9, align 1
@@ -106,17 +106,17 @@ subarray_loop_comparison8:                        ; preds = %subarray_loop_start
   %eq11 = icmp eq i8 %14, %15
   %16 = add i64 %13, 1
   store i64 %16, ptr %cmp.idx5, align 8
-  br i1 %eq11, label %subarray_loop_start6, label %subarray_cmp_exit12
+  br i1 %eq11, label %slice_loop_start6, label %slice_cmp_exit12
 
-subarray_cmp_exit12:                              ; preds = %subarray_loop_comparison8, %subarray_loop_start6, %if.exit
-  %subarray_cmp_phi13 = phi i1 [ true, %subarray_loop_start6 ], [ false, %if.exit ], [ false, %subarray_loop_comparison8 ]
-  br i1 %subarray_cmp_phi13, label %if.then14, label %if.exit15
+slice_cmp_exit12:                                 ; preds = %slice_loop_comparison8, %slice_loop_start6, %if.exit
+  %slice_cmp_phi13 = phi i1 [ true, %slice_loop_start6 ], [ false, %if.exit ], [ false, %slice_loop_comparison8 ]
+  br i1 %slice_cmp_phi13, label %if.then14, label %if.exit15
 
-if.then14:                                        ; preds = %subarray_cmp_exit12
+if.then14:                                        ; preds = %slice_cmp_exit12
   call void (ptr, ...) @printf(ptr @.str.4)
   br label %if.exit15
 
-if.exit15:                                        ; preds = %if.then14, %subarray_cmp_exit12
+if.exit15:                                        ; preds = %if.then14, %slice_cmp_exit12
   call void @llvm.memcpy.p0.p0.i32(ptr align 8 %switch, ptr align 8 %y, i32 16, i1 false)
   br label %switch.entry
 
@@ -125,18 +125,18 @@ switch.entry:                                     ; preds = %if.exit15
   %18 = extractvalue %"char[]" %17, 1
   %19 = extractvalue %"char[]" %17, 0
   %eq16 = icmp eq i64 4, %18
-  br i1 %eq16, label %subarray_cmp_values17, label %subarray_cmp_exit25
+  br i1 %eq16, label %slice_cmp_values17, label %slice_cmp_exit25
 
-subarray_cmp_values17:                            ; preds = %switch.entry
+slice_cmp_values17:                               ; preds = %switch.entry
   store i64 0, ptr %cmp.idx18, align 8
-  br label %subarray_loop_start19
+  br label %slice_loop_start19
 
-subarray_loop_start19:                            ; preds = %subarray_loop_comparison21, %subarray_cmp_values17
+slice_loop_start19:                               ; preds = %slice_loop_comparison21, %slice_cmp_values17
   %20 = load i64, ptr %cmp.idx18, align 8
   %lt20 = icmp ult i64 %20, 4
-  br i1 %lt20, label %subarray_loop_comparison21, label %subarray_cmp_exit25
+  br i1 %lt20, label %slice_loop_comparison21, label %slice_cmp_exit25
 
-subarray_loop_comparison21:                       ; preds = %subarray_loop_start19
+slice_loop_comparison21:                          ; preds = %slice_loop_start19
   %ptradd22 = getelementptr inbounds i8, ptr @.str.5, i64 %20
   %ptradd23 = getelementptr inbounds i8, ptr %19, i64 %20
   %21 = load i8, ptr %ptradd22, align 1
@@ -144,32 +144,32 @@ subarray_loop_comparison21:                       ; preds = %subarray_loop_start
   %eq24 = icmp eq i8 %21, %22
   %23 = add i64 %20, 1
   store i64 %23, ptr %cmp.idx18, align 8
-  br i1 %eq24, label %subarray_loop_start19, label %subarray_cmp_exit25
+  br i1 %eq24, label %slice_loop_start19, label %slice_cmp_exit25
 
-subarray_cmp_exit25:                              ; preds = %subarray_loop_comparison21, %subarray_loop_start19, %switch.entry
-  %subarray_cmp_phi26 = phi i1 [ true, %subarray_loop_start19 ], [ false, %switch.entry ], [ false, %subarray_loop_comparison21 ]
-  br i1 %subarray_cmp_phi26, label %switch.case, label %next_if
+slice_cmp_exit25:                                 ; preds = %slice_loop_comparison21, %slice_loop_start19, %switch.entry
+  %slice_cmp_phi26 = phi i1 [ true, %slice_loop_start19 ], [ false, %switch.entry ], [ false, %slice_loop_comparison21 ]
+  br i1 %slice_cmp_phi26, label %switch.case, label %next_if
 
-switch.case:                                      ; preds = %subarray_cmp_exit25
+switch.case:                                      ; preds = %slice_cmp_exit25
   call void (ptr, ...) @printf(ptr @.str.6)
   br label %switch.exit
 
-next_if:                                          ; preds = %subarray_cmp_exit25
+next_if:                                          ; preds = %slice_cmp_exit25
   %24 = extractvalue %"char[]" %17, 1
   %25 = extractvalue %"char[]" %17, 0
   %eq27 = icmp eq i64 5, %24
-  br i1 %eq27, label %subarray_cmp_values28, label %subarray_cmp_exit36
+  br i1 %eq27, label %slice_cmp_values28, label %slice_cmp_exit36
 
-subarray_cmp_values28:                            ; preds = %next_if
+slice_cmp_values28:                               ; preds = %next_if
   store i64 0, ptr %cmp.idx29, align 8
-  br label %subarray_loop_start30
+  br label %slice_loop_start30
 
-subarray_loop_start30:                            ; preds = %subarray_loop_comparison32, %subarray_cmp_values28
+slice_loop_start30:                               ; preds = %slice_loop_comparison32, %slice_cmp_values28
   %26 = load i64, ptr %cmp.idx29, align 8
   %lt31 = icmp ult i64 %26, 5
-  br i1 %lt31, label %subarray_loop_comparison32, label %subarray_cmp_exit36
+  br i1 %lt31, label %slice_loop_comparison32, label %slice_cmp_exit36
 
-subarray_loop_comparison32:                       ; preds = %subarray_loop_start30
+slice_loop_comparison32:                          ; preds = %slice_loop_start30
   %ptradd33 = getelementptr inbounds i8, ptr @.str.7, i64 %26
   %ptradd34 = getelementptr inbounds i8, ptr %25, i64 %26
   %27 = load i8, ptr %ptradd33, align 1
@@ -177,32 +177,32 @@ subarray_loop_comparison32:                       ; preds = %subarray_loop_start
   %eq35 = icmp eq i8 %27, %28
   %29 = add i64 %26, 1
   store i64 %29, ptr %cmp.idx29, align 8
-  br i1 %eq35, label %subarray_loop_start30, label %subarray_cmp_exit36
+  br i1 %eq35, label %slice_loop_start30, label %slice_cmp_exit36
 
-subarray_cmp_exit36:                              ; preds = %subarray_loop_comparison32, %subarray_loop_start30, %next_if
-  %subarray_cmp_phi37 = phi i1 [ true, %subarray_loop_start30 ], [ false, %next_if ], [ false, %subarray_loop_comparison32 ]
-  br i1 %subarray_cmp_phi37, label %switch.case38, label %next_if39
+slice_cmp_exit36:                                 ; preds = %slice_loop_comparison32, %slice_loop_start30, %next_if
+  %slice_cmp_phi37 = phi i1 [ true, %slice_loop_start30 ], [ false, %next_if ], [ false, %slice_loop_comparison32 ]
+  br i1 %slice_cmp_phi37, label %switch.case38, label %next_if39
 
-switch.case38:                                    ; preds = %subarray_cmp_exit36
+switch.case38:                                    ; preds = %slice_cmp_exit36
   call void (ptr, ...) @printf(ptr @.str.8)
   br label %switch.exit
 
-next_if39:                                        ; preds = %subarray_cmp_exit36
+next_if39:                                        ; preds = %slice_cmp_exit36
   %30 = extractvalue %"char[]" %17, 1
   %31 = extractvalue %"char[]" %17, 0
   %eq40 = icmp eq i64 4, %30
-  br i1 %eq40, label %subarray_cmp_values41, label %subarray_cmp_exit49
+  br i1 %eq40, label %slice_cmp_values41, label %slice_cmp_exit49
 
-subarray_cmp_values41:                            ; preds = %next_if39
+slice_cmp_values41:                               ; preds = %next_if39
   store i64 0, ptr %cmp.idx42, align 8
-  br label %subarray_loop_start43
+  br label %slice_loop_start43
 
-subarray_loop_start43:                            ; preds = %subarray_loop_comparison45, %subarray_cmp_values41
+slice_loop_start43:                               ; preds = %slice_loop_comparison45, %slice_cmp_values41
   %32 = load i64, ptr %cmp.idx42, align 8
   %lt44 = icmp ult i64 %32, 4
-  br i1 %lt44, label %subarray_loop_comparison45, label %subarray_cmp_exit49
+  br i1 %lt44, label %slice_loop_comparison45, label %slice_cmp_exit49
 
-subarray_loop_comparison45:                       ; preds = %subarray_loop_start43
+slice_loop_comparison45:                          ; preds = %slice_loop_start43
   %ptradd46 = getelementptr inbounds i8, ptr @.str.9, i64 %32
   %ptradd47 = getelementptr inbounds i8, ptr %31, i64 %32
   %33 = load i8, ptr %ptradd46, align 1
@@ -210,17 +210,17 @@ subarray_loop_comparison45:                       ; preds = %subarray_loop_start
   %eq48 = icmp eq i8 %33, %34
   %35 = add i64 %32, 1
   store i64 %35, ptr %cmp.idx42, align 8
-  br i1 %eq48, label %subarray_loop_start43, label %subarray_cmp_exit49
+  br i1 %eq48, label %slice_loop_start43, label %slice_cmp_exit49
 
-subarray_cmp_exit49:                              ; preds = %subarray_loop_comparison45, %subarray_loop_start43, %next_if39
-  %subarray_cmp_phi50 = phi i1 [ true, %subarray_loop_start43 ], [ false, %next_if39 ], [ false, %subarray_loop_comparison45 ]
-  br i1 %subarray_cmp_phi50, label %switch.case51, label %next_if52
+slice_cmp_exit49:                                 ; preds = %slice_loop_comparison45, %slice_loop_start43, %next_if39
+  %slice_cmp_phi50 = phi i1 [ true, %slice_loop_start43 ], [ false, %next_if39 ], [ false, %slice_loop_comparison45 ]
+  br i1 %slice_cmp_phi50, label %switch.case51, label %next_if52
 
-switch.case51:                                    ; preds = %subarray_cmp_exit49
+switch.case51:                                    ; preds = %slice_cmp_exit49
   call void (ptr, ...) @printf(ptr @.str.10)
   br label %switch.exit
 
-next_if52:                                        ; preds = %subarray_cmp_exit49
+next_if52:                                        ; preds = %slice_cmp_exit49
   br label %switch.default
 
 switch.default:                                   ; preds = %next_if52
diff --git a/test/test_suite/switch/simple_jump.c3t b/test/test_suite/switch/simple_jump.c3t
new file mode 100644
index 000000000..6adc8bd1d
--- /dev/null
+++ b/test/test_suite/switch/simple_jump.c3t
@@ -0,0 +1,284 @@
+// #target: macos-x64
+import std::io;
+
+fn void res(int a)
+{
+	io::printn(a);
+}
+fn void test1(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		case 0:
+		case 2: res(2);
+	}
+	res(0);
+}
+
+fn void test2(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		case 2: res(2);
+	}
+}
+
+fn void test3(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		case 3: res(3);
+	}
+}
+
+fn void test4(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		default: res(-1);
+	}
+}
+
+fn void test5(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		case 4: res(4);
+		default: res(-1);
+	}
+}
+
+fn void test6(int a)
+{
+	switch (a) @jump
+	{
+		case 1: res(1);
+		case 4: res(4);
+		case 5: nextcase(a * 2);
+		default: res(-1);
+	}
+}
+
+/* #expect: simple_jump.ll
+
+@jumptable = private constant [3 x ptr] [ptr blockaddress(@simple_jump.test1, %switch.case1), ptr blockaddress(@simple_jump.test1, %switch.case), ptr blockaddress(@simple_jump.test1, %switch.case1)], align 4
+@jumptable.1 = private constant [2 x ptr] [ptr blockaddress(@simple_jump.test2, %switch.case), ptr blockaddress(@simple_jump.test2, %switch.case1)], align 4
+@jumptable.2 = private constant [3 x ptr] [ptr blockaddress(@simple_jump.test3, %switch.case), ptr blockaddress(@simple_jump.test3, %switch.exit), ptr blockaddress(@simple_jump.test3, %switch.case1)], align 4
+@jumptable.3 = private constant [1 x ptr] [ptr blockaddress(@simple_jump.test4, %switch.case)], align 4
+@jumptable.4 = private constant [4 x ptr] [ptr blockaddress(@simple_jump.test5, %switch.case), ptr blockaddress(@simple_jump.test5, %switch.default), ptr blockaddress(@simple_jump.test5, %switch.default), ptr blockaddress(@simple_jump.test5, %switch.case1)], align 4
+
+after_check12:                                    ; preds = %noerr_block8
+  br label %noerr_block14
+
+guard_block13:                                    ; preds = %assign_optional11
+  br label %voiderr
+
+noerr_block14:                                    ; preds = %after_check12
+  %14 = load i64, ptr %len, align 8
+  %add = add i64 %14, 1
+  br label %voiderr
+
+voiderr:                                          ; preds = %noerr_block14, %guard_block13, %guard_block7, %guard_block
+  ret void
+}
+
+; Function Attrs: nounwind uwtable
+define void @simple_jump.test1(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 0
+  %3 = icmp ugt i32 %2, 2
+  br i1 %3, label %switch.exit, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case, label %switch.case1]
+
+switch.case:                                      ; preds = %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.case1:                                     ; preds = %jumpblock
+  call void @simple_jump.res(i32 2)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %switch.case1, %switch.case, %switch.entry
+  call void @simple_jump.res(i32 0)
+  ret void
+}
+
+define void @simple_jump.test2(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 1
+  %3 = icmp ugt i32 %2, 1
+  br i1 %3, label %switch.exit, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable.1, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case, label %switch.case1]
+
+switch.case:                                      ; preds = %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.case1:                                     ; preds = %jumpblock
+  call void @simple_jump.res(i32 2)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %switch.case1, %switch.case, %switch.entry
+  ret void
+}
+
+define void @simple_jump.test3(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 1
+  %3 = icmp ugt i32 %2, 2
+  br i1 %3, label %switch.exit, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable.2, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case, label %switch.case1, label %switch.exit]
+
+switch.case:                                      ; preds = %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.case1:                                     ; preds = %jumpblock
+  call void @simple_jump.res(i32 3)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %jumpblock, %switch.case1, %switch.case, %switch.entry
+  ret void
+}
+
+define void @simple_jump.test4(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 1
+  %3 = icmp ugt i32 %2, 0
+  br i1 %3, label %switch.default, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable.3, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case]
+
+switch.case:                                      ; preds = %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.default:                                   ; preds = %switch.entry
+  call void @simple_jump.res(i32 -1)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %switch.default, %switch.case
+  ret void
+}
+
+define void @simple_jump.test5(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 1
+  %3 = icmp ugt i32 %2, 3
+  br i1 %3, label %switch.default, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable.4, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case, label %switch.case1, label %switch.default]
+
+switch.case:                                      ; preds = %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.case1:                                     ; preds = %jumpblock
+  call void @simple_jump.res(i32 4)
+  br label %switch.exit
+
+switch.default:                                   ; preds = %jumpblock, %switch.entry
+  call void @simple_jump.res(i32 -1)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %switch.default, %switch.case1, %switch.case
+  ret void
+}
+
+; Function Attrs: nounwind uwtable
+define void @simple_jump.test6(i32 %0) #0 {
+entry:
+  %switch = alloca i32, align 4
+  store i32 %0, ptr %switch, align 4
+  br label %switch.entry
+
+switch.entry:                                     ; preds = %entry
+  %1 = load i32, ptr %switch, align 4
+  %2 = sub i32 %1, 1
+  %3 = icmp ugt i32 %2, 4
+  br i1 %3, label %switch.default, label %jumpblock
+
+jumpblock:                                        ; preds = %switch.entry
+  %ptroffset = getelementptr inbounds [8 x i8], ptr @jumptable.5, i32 %2
+  %target = load ptr, ptr %ptroffset, align 8
+  indirectbr ptr %target, [label %switch.case, label %switch.case1, label %switch.case2, label %switch.default]
+
+switch.case:                                      ; preds = %jumpblock3, %jumpblock
+  call void @simple_jump.res(i32 1)
+  br label %switch.exit
+
+switch.case1:                                     ; preds = %jumpblock3, %jumpblock
+  call void @simple_jump.res(i32 4)
+  br label %switch.exit
+
+switch.case2:                                     ; preds = %jumpblock3, %jumpblock
+  %mul = mul i32 %0, 2
+  %4 = sub i32 %mul, 1
+  %5 = icmp ugt i32 %4, 4
+  br i1 %5, label %switch.default, label %jumpblock3
+
+jumpblock3:                                       ; preds = %switch.case2
+  %ptroffset4 = getelementptr inbounds [8 x i8], ptr @jumptable.5, i32 %4
+  %target5 = load ptr, ptr %ptroffset4, align 8
+  indirectbr ptr %target5, [label %switch.case, label %switch.case1, label %switch.case2, label %switch.default]
+
+switch.default:                                   ; preds = %jumpblock, %jumpblock3, %switch.case2, %switch.entry
+  call void @simple_jump.res(i32 -1)
+  br label %switch.exit
+
+switch.exit:                                      ; preds = %switch.default, %switch.case1, %switch.case
+  ret void
+}
\ No newline at end of file
diff --git a/test/test_suite/switch/switch_in_defer_macro.c3t b/test/test_suite/switch/switch_in_defer_macro.c3t
index bda83e598..182cde8a3 100644
--- a/test/test_suite/switch/switch_in_defer_macro.c3t
+++ b/test/test_suite/switch/switch_in_defer_macro.c3t
@@ -32,8 +32,8 @@ def Ident = fn bool (usz index, char c);
 
 struct Lexer
 {
-    Allocator* allocator;
-    InStream* reader;
+    Allocator allocator;
+    InStream reader;
     char[] buf;
     TokenTrie tokens;
     Ident ident;
@@ -50,7 +50,7 @@ struct Lexer
     }
 }
 
-fn void! Lexer.init(&self, InStream* reader, Ident ident, Allocator* using = allocator::heap())
+fn void! Lexer.init(&self, InStream reader, Ident ident, Allocator using = allocator::heap())
 {
     TokenTrie trie;
     ushort max_token;
@@ -418,16 +418,16 @@ def Kind = Kind(<Token, Comment>);
 
 enum Token : char (String token)
 {
-    KEYWORD1 ("keword1"),
-    KEYWORD2 ("keyword2"),
-    SINGLE   ("//"),
-    MULTI    ("/*"),
+    KEYWORD1 = "keword1",
+    KEYWORD2 = "keyword2",
+    SINGLE   = "//",
+    MULTI    = "/*",
 }
 
 enum Comment : char (Token start, String end)
 {
-    SINGLE (SINGLE, "\n"),
-    MULTI  (MULTI, "*/"),
+    SINGLE = { SINGLE, "\n" },
+    MULTI  = { MULTI, "*/" },
 }
 
 fn bool is_ident_char(usz i, char c)
@@ -489,7 +489,7 @@ struct TrieNode
     bool valid;
 }
 
-fn void Trie.init(&self, usz initial_capacity = 8, Allocator* using = allocator::heap())
+fn void Trie.init(&self, usz initial_capacity = 8, Allocator using = allocator::heap())
 {
     *self = {};
     self.nodes.new_init(initial_capacity, .allocator = using);
@@ -603,7 +603,7 @@ fn void! TrieNode.del(&self, Trie* t, char[] key, TriePath path) @private
         }
         return;
     }
-    Index current = path.pop();
+    Index current = path.pop()!;
     for (isz i = path.len() - 1; i >= 0; i--)
     {
         Index parent = path[i];
@@ -657,17 +657,17 @@ fn void test()
     Trie t;
     t.init();
     String! v = t.get("a");
-    if (try v) assert(false, "key 'a' should not exist");
-    if (catch t.set("a", "va")) assert(false, "key 'a' not added");
+    if (try v) unreachable("key 'a' should not exist");
+    if (catch t.set("a", "va")) unreachable("key 'a' not added");
     String w = t.get("a")!!;
     assert(w == "va");
 
-    if (catch t.set("hello world", "hi")) assert(false, "key not added");
+    if (catch t.set("hello world", "hi")) unreachable("key not added");
     w = t.get("hello world")!!;
     assert(w == "hi");
-    if (try invalid = t.get("hello")) assert(false, "key 'hello' should not exist");
+    if (try invalid = t.get("hello")) unreachable("key 'hello' should not exist");
 
-    if (catch t.set("hello", "hoi")) assert(false, "key not added");
+    if (catch t.set("hello", "hoi")) unreachable("key not added");
     String ww = t.get("hello")!!;
     assert(ww == "hoi");
     ww = t.get_best("hello world")!!;
@@ -675,20 +675,20 @@ fn void test()
 
     t.del("a")!!;
     String! x = t.get("a");
-    if (try x) assert(false, "key 'a' should not exist");
+    if (try x) unreachable("key 'a' should not exist");
 }
 
 /* #expect: lexer_test.ll
 
 %.introspect = type { i8, i64, ptr, i64, i64, i64, [0 x i64] }
 %"char[]" = type { ptr, i64 }
-%"any*" = type { ptr, i64 }
+%any = type { ptr, i64 }
 %"UintTest[]" = type { ptr, i64 }
 %UintTest = type { %"char[]", i64 }
 %ByteReader = type { %"char[]", i64 }
-%Lexer = type { %"any*", %"any*", %"char[]", %Trie, ptr, i8, i8, i32, i32, i32, %.anon }
+%Lexer = type { %any, %any, %"char[]", %Trie, ptr, i8, i8, i32, i32, i32, %.anon }
 %Trie = type { %List }
-%List = type { i64, i64, %"any*", ptr }
+%List = type { i64, i64, %any, ptr }
 %.anon = type { %"char[]" }
 
 @"$ct.lexer_test.UintTest" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 24, i64 0, i64 2, [0 x i64] zeroinitializer }, align 8
@@ -709,7 +709,7 @@ fn void test()
 @.str.5 = private unnamed_addr constant [3 x i8] c"*/\00", align 1
 @"lexer_test.Comment$end" = linkonce constant [2 x %"char[]"] [%"char[]" { ptr @.str.4, i64 1 }, %"char[]" { ptr @.str.5, i64 2 }], align 8
 @"$ct.std.io.ByteReader" = linkonce global %.introspect { i8 10, i64 0, ptr null, i64 24, i64 0, i64 2, [0 x i64] zeroinitializer }, align 8
-@std.core.mem.allocator.thread_allocator = external thread_local global %"any*", align 8
+@std.core.mem.allocator.thread_allocator = external thread_local global %any, align 8
 
 ; Function Attrs:
 define zeroext i8 @lexer_test.is_ident_char(i64 %0, i8 zeroext %1) #0 {
@@ -755,7 +755,7 @@ entry:
   %br = alloca %ByteReader, align 8
   %lex = alloca %Lexer, align 8
   %error_var = alloca i64, align 8
-  %taddr = alloca %"any*", align 8
+  %taddr = alloca %any, align 8
   %kind = alloca i8, align 1
   %error_var8 = alloca i64, align 8
   %retparam = alloca i8, align 1
@@ -783,9 +783,9 @@ loop.body:                                        ; preds = %loop.cond
   %ptradd2 = getelementptr inbounds i8, ptr %tc, i64 8
   %hi = load i64, ptr %ptradd2, align 8
   %5 = call ptr @std.io.ByteReader.init(ptr %br, ptr %lo, i64 %hi)
-  %6 = insertvalue %"any*" undef, ptr %5, 0
-  %7 = insertvalue %"any*" %6, i64 ptrtoint (ptr @"$ct.std.io.ByteReader" to i64), 1
-  store %"any*" %7, ptr %taddr, align 8
+  %6 = insertvalue %any undef, ptr %5, 0
+  %7 = insertvalue %any %6, i64 ptrtoint (ptr @"$ct.std.io.ByteReader" to i64), 1
+  store %any %7, ptr %taddr, align 8
   %lo3 = load i64, ptr %taddr, align 8
   %ptradd4 = getelementptr inbounds i8, ptr %taddr, i64 8
   %hi5 = load ptr, ptr %ptradd4, align 8
diff --git a/test/test_suite/types/enum_ok.c3 b/test/test_suite/types/enum_ok.c3
index 589b9d418..c75c8c005 100644
--- a/test/test_suite/types/enum_ok.c3
+++ b/test/test_suite/types/enum_ok.c3
@@ -19,9 +19,9 @@ enum EnumTestDefault
 }
 
 
-enum EnumWithErrorData2 : int (int bar, )
+enum EnumWithErrorData2 : int (int bar,)
 {
-    TEST // #error: Expected associated value
+    TEST // #error: associated value
 }
 
 enum EnumTestErrorType4
diff --git a/test/test_suite/types/enum_parse_errors.c3 b/test/test_suite/types/enum_parse_errors.c3
index cda82d151..09b5c5355 100644
--- a/test/test_suite/types/enum_parse_errors.c3
+++ b/test/test_suite/types/enum_parse_errors.c3
@@ -1,15 +1,15 @@
 
-enum EnumWithErrorWithMissingName : int (int) // #error: Expected a member name here
+enum EnumWithErrorWithMissingName : (int)  // #error: Expected a member name here
 {
     TEST
 }
 
-enum EnumWithErrorData : int (int
+enum EnumWithErrorData : ( int
 { // #error: Expected a member name here
     TEST
 }
 
-enum EnumWithErrorData2 : int (int, int bar) // #error: Expected a member name here
+enum EnumWithErrorData2 :  ( int, int bar ) // #error: Expected a member name here
 {
     TEST
 }
diff --git a/test/test_suite/union/union_codegen_const.c3t b/test/test_suite/union/union_codegen_const.c3t
index 0374cf7fc..7aeb313ca 100644
--- a/test/test_suite/union/union_codegen_const.c3t
+++ b/test/test_suite/union/union_codegen_const.c3t
@@ -14,7 +14,7 @@ Foo i = { .b = 2.3, .a = 23 };
 
 /* #expect: test.ll
 
-@test.f = protected unnamed_addr global { i32, [4 x i8] } { i32 23, [4 x i8] undef }, align 8
-@test.g = protected unnamed_addr global %Foo { double 2.300000e+00 }, align 8
-@test.h = protected unnamed_addr global %Foo { double 2.300000e+00 }, align 8
+@test.f = internal unnamed_addr global { i32, [4 x i8] } { i32 23, [4 x i8] undef }, align 8
+@test.g = internal unnamed_addr global %Foo { double 2.300000e+00 }, align 8
+@test.h = internal unnamed_addr global %Foo { double 2.300000e+00 }, align 8
 @test.i = local_unnamed_addr global { i32, [4 x i8] } { i32 23, [4 x i8] undef }, align 8
diff --git a/test/test_suite/vector/swizzling.c3 b/test/test_suite/vector/swizzling.c3
new file mode 100644
index 000000000..eaf9e69e1
--- /dev/null
+++ b/test/test_suite/vector/swizzling.c3
@@ -0,0 +1,11 @@
+// #target: macos-x64
+
+fn void! swizzle_test()
+{
+	int[<4>] abc = { 1, 2, 3, 4 };
+	int[<3>] z = abc.rbx; // #error: Mixing
+	int[<2>] gh;
+	int[<2>] uh = gh.xz; // #error: component is not present
+
+}
+
diff --git a/test/unit/regression/any.c3 b/test/unit/regression/any.c3
index 08e021ebe..120f05d0a 100644
--- a/test/unit/regression/any.c3
+++ b/test/unit/regression/any.c3
@@ -3,10 +3,10 @@ module any_tests @test;
 fn void any_compare()
 {
 	int x;
-	any* a = &x;
-	any* b = &x;
+	any a = &x;
+	any b = &x;
 	void* v = &x;
-	any* c = v;
+	any c = v;
 	assert(a == b);
 	assert(a == a);
 	assert(a.ptr == c.ptr);
@@ -15,7 +15,7 @@ fn void any_compare()
 	assert(!aisc);
 }
 
-def AnyAlias = any*;
+def AnyAlias = any;
 
 fn void test_aliasing()
 {
diff --git a/test/unit/regression/catch_err.c3 b/test/unit/regression/catch_err.c3
new file mode 100644
index 000000000..0840207d9
--- /dev/null
+++ b/test/unit/regression/catch_err.c3
@@ -0,0 +1,21 @@
+module catch_err @test;
+
+fn void test()
+{
+	anyfault a;
+	int! z = {|
+		const ABC = 4;
+		int! x = SearchResult.MISSING?;
+		defer (catch err) a = err;
+		return x;
+	|};
+	assert(a == SearchResult.MISSING);
+	anyfault y;
+	z = {|
+		const ABC = 4;
+		int! x = 1;
+		defer (catch err) y = err;
+		return x;
+	|};
+	assert(!y);
+}
\ No newline at end of file
diff --git a/test/unit/regression/liveness_any.c3 b/test/unit/regression/liveness_any.c3
index e9c6baf5a..8ae500eb1 100644
--- a/test/unit/regression/liveness_any.c3
+++ b/test/unit/regression/liveness_any.c3
@@ -15,6 +15,6 @@ struct Test (TestProto)
 
 fn void reflect_test() @test
 {
-	TestProto* b = mem::alloc(Test);
+	TestProto b = mem::alloc(Test);
 	b.tesT();
 }
\ No newline at end of file
diff --git a/test/unit/regression/subtype.c3 b/test/unit/regression/subtype.c3
index 1a95935c3..a73c1ac17 100644
--- a/test/unit/regression/subtype.c3
+++ b/test/unit/regression/subtype.c3
@@ -17,7 +17,7 @@ fn void switch_subtyping()
 {
 	Foo f = {};
 	f.z = 123;
-	any* x = &f;
+	any x = &f;
 	switch (x)
 	{
 		case int:
diff --git a/test/unit/regression/swizzle.c3 b/test/unit/regression/swizzle.c3
index 66f4a0b86..c83197a24 100644
--- a/test/unit/regression/swizzle.c3
+++ b/test/unit/regression/swizzle.c3
@@ -6,4 +6,13 @@ fn void test_swizzle()
 	int[<4>] b = { 100, 1000, 10000, 100000 };
 	assert($$swizzle(a, 0, 1, 1, 3) == int[<4>] { 1, 2, 2, 4 });
 	assert($$swizzle2(a, b, 0, 1, 4, 6, 2) == int[<5>] { 1, 2, 100, 10000, 3 });
-}
\ No newline at end of file
+}
+
+fn void! swizzle_builtin()
+{
+	int[<4>] abc = { 1, 2, 3, 4 };
+	assert(abc.rb == { 1, 3 });
+	assert(abc.xxww == { 1, 1, 4, 4 });
+	abc = abc.abgr;
+	assert(abc == { 4, 3, 2, 1 });
+}
diff --git a/test/unit/stdlib/collections/generic_list.c3 b/test/unit/stdlib/collections/generic_list.c3
index 17fd1cb53..3190cf1bd 100644
--- a/test/unit/stdlib/collections/generic_list.c3
+++ b/test/unit/stdlib/collections/generic_list.c3
@@ -3,7 +3,7 @@ import std::collections;
 
 fn void simple_use()
 {
-	GenericList l;
+	AnyList l;
 	l.push(1);
 	l.push("Hello");
 	assert(l.get(1, String)!! == "Hello");
diff --git a/test/unit/stdlib/collections/linkedlist.c3 b/test/unit/stdlib/collections/linkedlist.c3
index dbdc5bcaf..a6ad62911 100644
--- a/test/unit/stdlib/collections/linkedlist.c3
+++ b/test/unit/stdlib/collections/linkedlist.c3
@@ -3,27 +3,27 @@ import std::collections::linkedlist;
 
 def IntList = LinkedList(<int>);
 
-fn void! test_push()
+fn void! test_push_front()
 {
 	IntList list;
-	list.push(23);
+	list.push_front(23);
 	assert(list.len() == 1);
 	assert(list.first()! == 23);
 	assert(list.last()! == 23);
-	list.push(55);
+	list.push_front(55);
 	assert(list.len() == 2);
 	assert(list.last()! == 23);
 	assert(list.first()! == 55);
 }
 
-fn void! test_push_last()
+fn void! test_push()
 {
 	IntList list;
-	list.push_last(23);
+	list.push(23);
 	assert(list.len() == 1);
 	assert(list.first()! == 23);
 	assert(list.last()! == 23);
-	list.push_last(55);
+	list.push(55);
 	assert(list.len() == 2);
 	assert(list.last()! == 55);
 	assert(list.first()! == 23);
@@ -35,21 +35,21 @@ fn void! test_get()
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.get(0) == -3);
+	assert(list.get(2) == -3);
 	assert(list.get(1) == 55);
-	assert(list.get(2) == 23);
+	assert(list.get(0) == 23);
 }
 
 fn void! test_insert()
 {
 	IntList list;
-	list.push(23);
-	list.push(55);
 	list.push(-3);
-	list.insert(0, 1);
-	list.insert(2, 11);
-	list.insert(4, 111);
-	list.insert(6, 1111);
+	list.push(55);
+	list.push(23);
+	list.insert_at(0, 1);
+	list.insert_at(2, 11);
+	list.insert_at(4, 111);
+	list.insert_at(6, 1111);
 	assert(list.get(0) == 1);
 	assert(list.get(1) == -3);
 	assert(list.get(2) == 11);
@@ -62,35 +62,46 @@ fn void! test_insert()
 fn void! test_set()
 {
 	IntList list;
-	list.push(23);
+    list.push(-3);
 	list.push(55);
-	list.push(-3);
+	list.push(23);
 	for (int i = 0; i < 3; i++) list.set(i, list.get(i) + 1);
 	assert(list.get(0) == -2);
 	assert(list.get(1) == 56);
 	assert(list.get(2) == 24);
 }
 
-fn void! test_remove()
+fn void! test_remove_at()
 {
 	IntList list;
 	for (int i = 0; i < 10; i++) list.push(i);
-	list.remove(0);
-	list.remove(1);
-	list.remove(7);
+	list.remove_at(0);
+	list.remove_at(1);
+	list.remove_at(7);
+	list.remove_at(5);
+	assert(list.get(0) == 1);
+	assert(list.get(1) == 3);
+	assert(list.get(5) == 8);
+	assert(list.get(4) == 6);
+}
+
+fn void! test_remove()
+{
+	IntList list;
+	list.push(2);
+	for (int i = 0; i < 10; i++) list.push(5);
+	list.push(2);
 	list.remove(5);
-	assert(list.get(0) == 8);
-	assert(list.get(1) == 6);
-	assert(list.get(5) == 1);
-	assert(list.get(4) == 3);
+	assert(list.len() == 2);
 }
-fn void! test_remove_value()
+
+fn void! test_remove_first_match()
 {
 	IntList list;
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_value(23));
+	assert(list.remove_first_match(23));
 	assert(list.pop()! == -3);
 	assert(list.pop()! == 55);
 	assert(!list.len());
@@ -98,7 +109,7 @@ fn void! test_remove_value()
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_value(55));
+	assert(list.remove_first_match(55));
 	assert(list.pop()! == -3);
 	assert(list.pop()! == 23);
 	assert(!list.len());
@@ -106,19 +117,19 @@ fn void! test_remove_value()
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_value(-3));
+	assert(list.remove_first_match(-3));
 	assert(list.pop()! == 55);
 	assert(list.pop()! == 23);
 	assert(!list.len());
 }
 
-fn void! test_remove_last_value()
+fn void! test_remove_last_match()
 {
 	IntList list;
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_last_value(23));
+	assert(list.remove_last_match(23));
 	assert(list.pop()! == -3);
 	assert(list.pop()! == 55);
 	assert(!list.len());
@@ -126,7 +137,7 @@ fn void! test_remove_last_value()
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_last_value(55));
+	assert(list.remove_last_match(55));
 	assert(list.pop()! == -3);
 	assert(list.pop()! == 23);
 	assert(!list.len());
@@ -134,7 +145,7 @@ fn void! test_remove_last_value()
 	list.push(23);
 	list.push(55);
 	list.push(-3);
-	assert(list.remove_last_value(-3));
+	assert(list.remove_last_match(-3));
 	assert(list.pop()! == 55);
 	assert(list.pop()! == 23);
 	assert(!list.len());
@@ -147,15 +158,15 @@ fn void! test_pop()
 	list.push(55);
 	list.push(-3);
 	assert(list.len() == 3);
-	assert(list.last()! == 23);
-	assert(list.first()! == -3);
+	assert(list.first()! == 23);
+	assert(list.last()! == -3);
 	assert(list.pop()! == -3);
 	assert(list.len() == 2);
-	assert(list.last()! == 23);
-	assert(list.first()! == 55);
+	assert(list.first()! == 23);
+	assert(list.last()! == 55);
 	assert(list.pop()! == 55);
-	assert(list.last()! == 23);
 	assert(list.first()! == 23);
+	assert(list.last()! == 23);
 	assert(list.pop()! == 23);
 	assert(list.len() == 0);
 	assert(@catch(list.pop()));
@@ -164,23 +175,23 @@ fn void! test_pop()
 	assert(list.len() == 1);
 }
 
-fn void! test_remove_first()
+fn void! test_remove_last()
 {
 	IntList list;
 	list.push(23);
 	list.push(55);
 	list.push(-3);
 	assert(list.len() == 3);
-	assert(list.last()! == 23);
-	assert(list.first()! == -3);
-	assert(@ok(list.remove_first()));
+	assert(list.first()! == 23);
+	assert(list.last()! == -3);
+	assert(@ok(list.remove_last()));
 	assert(list.len() == 2);
-	assert(list.last()! == 23);
-	assert(list.first()! == 55);
-	assert(@ok(list.remove_first()));
-	assert(list.last()! == 23);
 	assert(list.first()! == 23);
-	assert(@ok(list.remove_first()));
+	assert(list.last()! == 55);
+	assert(@ok(list.remove_last()));
+	assert(list.first()! == 23);
+	assert(list.last()! == 23);
+	assert(@ok(list.remove_last()));
 	assert(list.len() == 0);
 	assert(@catch(list.pop()));
 	assert(list.len() == 0);
@@ -188,25 +199,25 @@ fn void! test_remove_first()
 	assert(list.len() == 1);
 }
 
-fn void! test_remove_last()
+fn void! test_remove_first()
 {
 	IntList list;
 	list.push(23);
 	list.push(55);
 	list.push(-3);
 	assert(list.len() == 3);
-	assert(list.last()! == 23);
-	assert(list.first()! == -3);
-	assert(@ok(list.remove_last()));
+	assert(list.first()! == 23);
+	assert(list.last()! == -3);
+	assert(@ok(list.remove_first()));
 	assert(list.len() == 2);
-	assert(list.first()! == -3);
-	assert(list.last()! == 55);
-	assert(@ok(list.remove_last()));
-	assert(list.first()! == -3);
 	assert(list.last()! == -3);
-	assert(@ok(list.remove_last()));
+	assert(list.first()! == 55);
+	assert(@ok(list.remove_first()));
+	assert(list.last()! == -3);
+	assert(list.first()! == -3);
+	assert(@ok(list.remove_first()));
 	assert(list.len() == 0);
-	assert(@catch(list.remove_last()));
+	assert(@catch(list.remove_first()));
 	assert(list.len() == 0);
 	list.push(55);
 	assert(list.len() == 1);
diff --git a/test/unit/stdlib/collections/list.c3 b/test/unit/stdlib/collections/list.c3
index 358791ec7..faaf23c34 100644
--- a/test/unit/stdlib/collections/list.c3
+++ b/test/unit/stdlib/collections/list.c3
@@ -32,7 +32,7 @@ fn void! delete_contains_index()
 	assert(test.contains(3));
 	test[0] = 10;
 	assert(test.contains(10));
-	test.remove(10);
+	test.remove_all_matches(10);
 	assert(test.array_view() == int[]{ 2, 3 });
 	assert(!test.contains(1));
 	assert(test.contains(2));
@@ -42,7 +42,7 @@ fn void! delete_contains_index()
 	assert(test.array_view() == int[]{ 0, 2, 3, 0 });
 	assert(test.index_of(0)! == 0);
 	assert(test.rindex_of(0)! == 3);
-	test.remove(0);
+	test.remove_all_matches(0);
 	assert(test.len() == 2);
 	assert(test.array_view() == int[]{ 2, 3 });
 }
diff --git a/test/unit/stdlib/collections/object.c3 b/test/unit/stdlib/collections/object.c3
index ed01ca5f1..b9c8f0123 100644
--- a/test/unit/stdlib/collections/object.c3
+++ b/test/unit/stdlib/collections/object.c3
@@ -9,8 +9,8 @@ fn void test_general()
 	assert(root.get_int("foo")! == 1);
 	assert(root.get_string("bar")! == "baz");
 	Object* goo = root.set("goo", object::new_obj(allocator::heap()));
-	goo.append("hello");
-	goo.append(132);
+	goo.push("hello");
+	goo.push(132);
 	assert(root.get("goo").get_int_at(1)! == 132);
 	assert(root.get("goo").get_string_at(0)! == "hello");
 	Object* abc = root.get_or_create_obj("abc80");
diff --git a/test/unit/stdlib/collections/ringbuffer.c3 b/test/unit/stdlib/collections/ringbuffer.c3
index 158c732e7..f827d0c3f 100644
--- a/test/unit/stdlib/collections/ringbuffer.c3
+++ b/test/unit/stdlib/collections/ringbuffer.c3
@@ -4,26 +4,26 @@ import std::io;
 
 def Buffer = RingBuffer(<char, 4>);
 
-fn void! putc_getc()
+fn void! push_get()
 {
 	Buffer rb;
 	rb.init();
-	rb.putc(1);
-	rb.putc(2);
-	rb.putc(3);
-	rb.putc(4);
+	rb.push(1);
+	rb.push(2);
+	rb.push(3);
+	rb.push(4);
 
-	assert(rb.getc(0) == 1);
-	assert(rb.getc(1) == 2);
-	assert(rb.getc(2) == 3);
-	assert(rb.getc(3) == 4);
+	assert(rb.get(0) == 1);
+	assert(rb.get(1) == 2);
+	assert(rb.get(2) == 3);
+	assert(rb.get(3) == 4);
 
-	rb.putc(5);
-	assert(rb.getc(0) == 2);
-	assert(rb.getc(1) == 3);
-	assert(rb.getc(2) == 4);
-	assert(rb.getc(3) == 5);
+	rb.push(5);
+	assert(rb.get(0) == 2);
+	assert(rb.get(1) == 3);
+	assert(rb.get(2) == 4);
+	assert(rb.get(3) == 5);
 
-	char c = rb.popc()!;
+	char c = rb.pop()!;
 	assert(c == 5);
 }
\ No newline at end of file
diff --git a/test/unit/stdlib/core/builtintests.c3 b/test/unit/stdlib/core/builtintests.c3
index 618b284d8..7e7e24a90 100644
--- a/test/unit/stdlib/core/builtintests.c3
+++ b/test/unit/stdlib/core/builtintests.c3
@@ -3,7 +3,7 @@ module std::core::builtins @test;
 fn void! test_anycast()
 {
 	int a;
-	any* b = &a;
+	any b = &a;
 	assert(anycast(b, int)! == &a);
 	assert(@catch(anycast(b, double)) == CastResult.TYPE_MISMATCH);
 }
diff --git a/test/unit/stdlib/io/bytestream.c3 b/test/unit/stdlib/io/bytestream.c3
index a375390b5..a405fcad4 100644
--- a/test/unit/stdlib/io/bytestream.c3
+++ b/test/unit/stdlib/io/bytestream.c3
@@ -4,7 +4,7 @@ fn void! bytestream()
 {
 	ByteReader r;
 	r.init("abc");
-	InStream* s = &r;
+	InStream s = &r;
 	assert(s.len() == 3);
 	char[5] buffer;
 	assert('a' == s.read_byte()!);
@@ -13,7 +13,7 @@ fn void! bytestream()
 	assert((String)buffer[:len] == "abc");
 	ByteWriter w;
 	w.new_init();
-	OutStream* ws = &w;
+	OutStream ws = &w;
 	ws.write("helloworld")!;
 	assert(w.str_view() == "helloworld");
 	s.seek(0, SET)!;
@@ -28,7 +28,7 @@ fn void! bytewriter_buffer()
 	ByteWriter writer;
 	char[8] z;
 	writer.init_with_buffer(&z);
-	OutStream* s = &writer;
+	OutStream s = &writer;
 	s.write("hello")!!;
 	s.write_byte(0)!!;
 	String o = ((ZString)&z).str_view();
@@ -40,7 +40,7 @@ fn void! bytewriter_read_from()
 {
     char[] data = "Lorem ipsum dolor sit amet biam.";
     TestReader r = { .bytes = data };
-    InStream* s = &r;
+    InStream s = &r;
 
     ByteWriter bw;
     bw.temp_init();
diff --git a/test/unit/stdlib/io/dstringstream.c3 b/test/unit/stdlib/io/dstringstream.c3
index 8dadc019e..1555ef5c8 100644
--- a/test/unit/stdlib/io/dstringstream.c3
+++ b/test/unit/stdlib/io/dstringstream.c3
@@ -4,7 +4,7 @@ fn void! test_writing()
 {
 	DString foo;
 	foo.new_init();
-	OutStream* s = &foo;
+	OutStream s = &foo;
 	s.write("hello")!!;
 	s.write_byte('-')!!;
 	s.write("what?-------------------------------------------------------")!!;
diff --git a/test/unit/stdlib/io/path.c3 b/test/unit/stdlib/io/path.c3
index 8ac294fa4..448cdd418 100644
--- a/test/unit/stdlib/io/path.c3
+++ b/test/unit/stdlib/io/path.c3
@@ -1,5 +1,22 @@
 module std::io::path @test;
 
+fn void! test_dot()
+{
+	Path p = path::new(".")!;
+	assert(@catch(p.parent()));
+	// It must be possible to form the absolute version.
+	Path p2 = p.absolute()!;
+	p2 = p.append("/hello/world")!;
+	if (p2.env == POSIX)
+	{
+		assert(p2.str_view() == "hello/world");
+	}
+	else
+	{
+		assert(p2.str_view() == `hello\world`);
+	}
+}
+
 fn void! test_parent()
 {
 	Path p = path::new("")!;
@@ -71,10 +88,10 @@ fn void! test_path_normalized()
 	assert(path::new(`a/b/..`, .path_env = PathEnv.POSIX).str_view()! == `a`);
 	assert(path::new(`a/b/../`, .path_env = PathEnv.WIN32).str_view()! == `a`);
 	assert(path::new(`a/b/../`, .path_env = PathEnv.POSIX).str_view()! == `a`);
-	assert(path::new(`a/b/../..`, .path_env = PathEnv.WIN32).str_view()! == "");
-	assert(path::new(`a/b/../..`, .path_env = PathEnv.POSIX).str_view()! == "");
-	assert(path::new(`a/b/../../`, .path_env = PathEnv.WIN32).str_view()! == "");
-	assert(path::new(`a/b/../../`, .path_env = PathEnv.POSIX).str_view()! == "");
+	assert(path::new(`a/b/../..`, .path_env = PathEnv.WIN32).str_view()! == ".");
+	assert(path::new(`a/b/../..`, .path_env = PathEnv.POSIX).str_view()! == ".");
+	assert(path::new(`a/b/../../`, .path_env = PathEnv.WIN32).str_view()! == ".");
+	assert(path::new(`a/b/../../`, .path_env = PathEnv.POSIX).str_view()! == ".");
 	assert(path::new(`a/b/../c/../d`, .path_env = PathEnv.WIN32).str_view()! == `a\d`);
 	assert(path::new(`a/b/../c/../d`, .path_env = PathEnv.POSIX).str_view()! == `a/d`);
 	assert(path::new(`a/b/../c/../d/`, .path_env = PathEnv.WIN32).str_view()! == `a\d`);
@@ -87,10 +104,10 @@ fn void! test_path_normalized()
 	assert(path::new(`a/b/./././`, .path_env = PathEnv.POSIX).str_view()! == `a/b`);
 	assert(path::new(`./a/`, .path_env = PathEnv.WIN32).str_view()! == `a`);
 	assert(path::new(`./a/`, .path_env = PathEnv.POSIX).str_view()! == `a`);
-	assert(path::new(`./`, .path_env = PathEnv.WIN32).str_view()! == ``);
-	assert(path::new(`./`, .path_env = PathEnv.POSIX).str_view()! == ``);
-	assert(path::new(`.`, .path_env = PathEnv.WIN32).str_view()! == ``);
-	assert(path::new(`.`, .path_env = PathEnv.POSIX).str_view()! == ``);
+	assert(path::new(`./`, .path_env = PathEnv.WIN32).str_view()! == `.`);
+	assert(path::new(`./`, .path_env = PathEnv.POSIX).str_view()! == `.`);
+	assert(path::new(`.`, .path_env = PathEnv.WIN32).str_view()! == `.`);
+	assert(path::new(`.`, .path_env = PathEnv.POSIX).str_view()! == `.`);
 	assert(path::new(``, .path_env = PathEnv.WIN32).str_view()! == ``);
 	assert(path::new(``, .path_env = PathEnv.POSIX).str_view()! == ``);
 	assert(path::new(`/a`, .path_env = PathEnv.WIN32).str_view()! == `\a`);
@@ -139,7 +156,7 @@ fn void! test_path_normalized()
 	assert(path::new(`C:/./`, .path_env = PathEnv.WIN32).str_view()! == `C:\`);
 	assert(path::new(`C:/./`, .path_env = PathEnv.POSIX).str_view()! == `C:`);
 	assert(path::new(`C:/../a`, .path_env = PathEnv.POSIX).str_view()! == `a`);
-	assert(path::new(`C:/..`, .path_env = PathEnv.POSIX).str_view()! == ``);
+	assert(path::new(`C:/..`, .path_env = PathEnv.POSIX).str_view()! == `.`);
 	assert(path::new(`C:/`, .path_env = PathEnv.WIN32).str_view()! == `C:\`);
 	assert(path::new(`C:/`, .path_env = PathEnv.POSIX).str_view()! == `C:`);
 	assert(path::new(`C:a`, .path_env = PathEnv.WIN32).str_view()! == `C:a`);
@@ -154,7 +171,7 @@ fn void! test_path_normalized()
 	assert(path::new(`C:a/b/..`, .path_env = PathEnv.WIN32).str_view()! == `C:a`);
 	assert(path::new(`C:a/b/..`, .path_env = PathEnv.POSIX).str_view()! == `C:a`);
 	assert(path::new(`C:a/b/../..`, .path_env = PathEnv.WIN32).str_view()! == `C:`);
-	assert(path::new(`C:a/b/../..`, .path_env = PathEnv.POSIX).str_view()! == ``);
+	assert(path::new(`C:a/b/../..`, .path_env = PathEnv.POSIX).str_view()! == `.`);
 	assert(path::new(`C:a/b/../c/../d`, .path_env = PathEnv.WIN32).str_view()! == `C:a\d`);
 	assert(path::new(`C:a/b/../c/../d`, .path_env = PathEnv.POSIX).str_view()! == `C:a/d`);
 	assert(path::new(`C:a/b//d`, .path_env = PathEnv.WIN32).str_view()! == `C:a\b\d`);
@@ -173,18 +190,18 @@ fn void! test_path_normalized()
 	assert(path::new(`C:`, .path_env = PathEnv.WIN32).str_view()! == `C:`);
 	assert(path::new(`C:`, .path_env = PathEnv.POSIX).str_view()! == `C:`);
 
-	assert(path::new(`\\server/a`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a`);
-	assert(path::new(`\\server/a`, .path_env = PathEnv.POSIX).str_view()! == `\\server/a`);
-	assert(path::new(`\\server\a\b\..\c`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a\c`);
-	assert(path::new(`\\server\a\b\..\..\c`, .path_env = PathEnv.WIN32).str_view()! == `\\server\c`);
-	assert(path::new(`\\server\a\b\..`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a`);
-	assert(path::new(`\\server\a\..`, .path_env = PathEnv.WIN32).str_view()! == `\\server\`);
-	assert(path::new(`\\server\a\b\..\c\..\d`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a\d`);
-	assert(path::new(`\\server\a\b\\d`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a\b\d`);
-	assert(path::new(`\\server\a\b\.\.\.`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a\b`);
-	assert(path::new(`\\server\.\a`, .path_env = PathEnv.WIN32).str_view()! == `\\server\a`);
-	assert(path::new(`\\server\.`, .path_env = PathEnv.WIN32).str_view()! == `\\server\`);
-	assert(path::new(`\\server\`, .path_env = PathEnv.WIN32).str_view()! == `\\server\`);
+	assert(path::new(`\\server\foo/a`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a`);
+	assert(path::new(`\\server\foo/a`, .path_env = PathEnv.POSIX).str_view()! == `\\server\foo/a`);
+	assert(path::new(`\\server\foo\a\b\..\c`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a\c`);
+	assert(path::new(`\\server\foo\a\b\..\..\c`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\c`);
+	assert(path::new(`\\server\foo\a\b\..`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a`);
+	assert(path::new(`\\server\foo\a\..`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\`);
+	assert(path::new(`\\server\foo\a\b\..\c\..\d`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a\d`);
+	assert(path::new(`\\server\foo\a\b\\d`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a\b\d`);
+	assert(path::new(`\\server\foo\a\b\.\.\.`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a\b`);
+	assert(path::new(`\\server\foo\.\a`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\a`);
+	assert(path::new(`\\server\foo\.`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\`);
+	assert(path::new(`\\server\foo\`, .path_env = PathEnv.WIN32).str_view()! == `\\server\foo\`);
 
 }
 
@@ -245,14 +262,21 @@ fn void! test_basename()
 	assert(path::new_windows("../..").basename()! == "..");
 	assert(path::new_posix("../..").basename()! == "..");
 
-	assert(path::new_windows(`\\server\`).basename()! == "");
-	assert(path::new_posix(`\\server\`).basename()! == `\\server\`);
+	assert(path::new_windows(`\\server\abc`).basename()! == "");
+	assert(path::new_posix(`\\server\abc`).basename()! == `\\server\abc`);
 }
 
 fn void! test_dirname()
 {
-	assert(path::new_windows("file.txt").dirname()! == "");
-	assert(path::new_posix("file.txt").dirname()! == "");
+	assert(path::new_posix("").dirname()! == ".");
+	assert(path::new_posix("/file").dirname()! == "/");
+	assert(path::new_posix("///").dirname()! == "/");
+	assert(path::new_windows("d:").dirname()! == "d:");
+	assert(path::new_windows("d:file").dirname()! == "d:");
+	assert(path::new_windows(`d:\file`).dirname()! == `d:\`);
+
+	assert(path::new_windows("file.txt").dirname()! == ".");
+	assert(path::new_posix("file.txt").dirname()! == ".");
 
 	assert(path::new_windows("a/b/file.txt").dirname()! == `a\b`);
 	assert(path::new_posix("a/b/file.txt").dirname()! == "a/b");
@@ -264,10 +288,10 @@ fn void! test_dirname()
 	assert(path::new_posix("../filename.ext").dirname()! == "..");
 
 	assert(path::new_windows("C:").dirname()! == "C:");
-	assert(path::new_posix("C:").dirname()! == "");
+	assert(path::new_posix("C:").dirname()! == ".");
 
 	assert(path::new_windows("C:/").dirname()! == "C:\\");
-	assert(path::new_posix("C:/").dirname()! == "");
+	assert(path::new_posix("C:/").dirname()! == ".");
 
 	assert(path::new_windows("C:/a").dirname()! == "C:\\");
 	assert(path::new_posix("C:/a").dirname()! == "C:");
@@ -275,8 +299,11 @@ fn void! test_dirname()
 	assert(path::new_windows("../..").dirname()! == "..");
 	assert(path::new_posix("../..").dirname()! == "..");
 
-	assert(path::new_windows(`\\server\`).dirname()! == `\\server\`);
-	assert(path::new_posix(`\\server\`).dirname()! == ``);
+	assert(path::new_windows(`\\server\share\dir\file`).dirname()! == `\\server\share\dir`);
+	assert(path::new_windows(`\\server\share\file`).dirname()! == `\\server\share`);
+	assert(path::new_windows(`\\server\share\`).dirname()! == `\\server\share`);
+	assert(path::new_windows(`\\server\share`).dirname()! == `\\server\share`);
+	assert(path::new_posix(`\\server\`).dirname()! == `.`);
 }
 
 fn void! test_path_volume()
@@ -285,8 +312,8 @@ fn void! test_path_volume()
 	assert(path::new_windows(`C:abs`).volume_name()! == `C:`);
 	assert(path::new_posix(`C:/abs`).volume_name()! == ``);
 	assert(path::new_posix(`C:abs`).volume_name()! == ``);
-	assert(path::new_windows(`\\server\`).volume_name()! == `\\server`);
-    assert(path::new_windows(`\\server\abc`).volume_name()! == `\\server`);
+	assert(path::new_windows(`\\server\foo`).volume_name()! == `\\server\foo`);
+    assert(path::new_windows(`\\server\foo\abc`).volume_name()! == `\\server\foo`);
 }
 
 fn void! test_path_is_absolute()
@@ -299,14 +326,16 @@ fn void! test_path_is_absolute()
 	assert(!path::new_windows(`C:`).is_absolute()!);
 	assert(path::new_windows(`C:\abs`).is_absolute()!);
 	assert(!path::new_windows(`C:abs`).is_absolute()!);
-	assert(path::new_windows(`\\server\`).is_absolute()!);
-	assert(path::new_windows(`\\server\abc`).is_absolute()!);
+	assert(path::new_windows(`\\server\foo`).is_absolute()!);
+	assert(path::new_windows(`\\server\foo\abc`).is_absolute()!);
 }
 
 fn void! test_path_absolute()
 {
+$if env::WIN32:
+	assert(path::new_windows(`C:\abs`).absolute()!.str_view() == `C:\abs`);
+$else
     assert(path::new_posix("/").absolute()!.str_view() == "/");
     assert(path::new_posix(".").absolute()!.str_view() == path::getcwd(allocator::temp())!!.str_view());
-
-	assert(path::new_windows(`C:\abs`).absolute()!.str_view() == `C:\abs`);
+$endif
 }
\ No newline at end of file
diff --git a/test/unit/stdlib/mem/temp_mem.c3 b/test/unit/stdlib/mem/temp_mem.c3
index 2b6437402..c94434dae 100644
--- a/test/unit/stdlib/mem/temp_mem.c3
+++ b/test/unit/stdlib/mem/temp_mem.c3
@@ -1,6 +1,6 @@
 module test;
 
-fn String add(String s, Allocator* a, int x)
+fn String add(String s, Allocator a, int x)
 {
     if (x < 0) return s.copy(a);
     String tmp;
@@ -14,7 +14,7 @@ fn String add(String s, Allocator* a, int x)
     return tmp.concat("a", .allocator = a);
 }
 
-fn String breakit(String s, Allocator* a)
+fn String breakit(String s, Allocator a)
 {
     @pool(a)
     {
@@ -22,7 +22,7 @@ fn String breakit(String s, Allocator* a)
     };
 }
 
-fn String inner2(String s, Allocator* a)
+fn String inner2(String s, Allocator a)
 {
     @pool(a)
     {
@@ -35,7 +35,7 @@ fn String inner2(String s, Allocator* a)
     };
 }
 
-fn String inner3(String s, Allocator* a)
+fn String inner3(String s, Allocator a)
 {
     @pool(a)
     {
@@ -48,7 +48,7 @@ fn String inner3(String s, Allocator* a)
     };
 }
 
-fn String inner4(String s, Allocator* a)
+fn String inner4(String s, Allocator a)
 {
     @pool(a)
     {
diff --git a/test/unit/stdlib/os/env.c3 b/test/unit/stdlib/os/env.c3
index d288c6b0c..599e90c60 100644
--- a/test/unit/stdlib/os/env.c3
+++ b/test/unit/stdlib/os/env.c3
@@ -12,6 +12,6 @@ module std::os::env @test;
  	env::clear_var(NAME);
  	if (try env::get_var(NAME))
  	{
- 		assert(false, "environment variable should no longer exist");
+ 	    unreachable("environment variable should no longer exist");
  	}
  }
\ No newline at end of file
diff --git a/test/unit/stdlib/threads/simple_thread.c3 b/test/unit/stdlib/threads/simple_thread.c3
index afcfc5ad0..6e54b5115 100644
--- a/test/unit/stdlib/threads/simple_thread.c3
+++ b/test/unit/stdlib/threads/simple_thread.c3
@@ -66,7 +66,7 @@ fn void! testrun_mutex_timeout() @test
 	m.lock()!;
 	if (try m.lock_timeout(20))
 	{
-		assert(false, "lock_timeout should fail");
+		unreachable("lock_timeout should fail");
 	}
 	m.unlock()!;
 	m.lock_timeout(20)!;