Update compiler version

Removed the naive check for compile time modification, which fixes #1997 but regresses in detection.
Incorrect ensure on String.split.
2026-02-27 12:01:16 +00:00 · 2025-06-02 10:12:04 +02:00 · 2025-06-01 23:50:13 +02:00 · 2025-06-01 20:28:32 +02:00 · 2025-06-01 20:06:34 +02:00 · 2025-05-31 17:35:29 +02:00
2229 changed files with 19895 additions and 126080 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ env:
  LLVM_RELEASE_VERSION_WINDOWS: 18
  LLVM_RELEASE_VERSION_MAC: 17
  LLVM_RELEASE_VERSION_LINUX: 17
-  LLVM_RELEASE_VERSION_UBUNTU20: 17
+  LLVM_RELEASE_VERSION_UBUNTU22: 17
  LLVM_DEV_VERSION: 21
 jobs:

@@ -77,15 +77,15 @@ jobs:

      - name: Vendor-fetch
        run: |
-          build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib5
+          build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib55

      - name: Try raylib5
        run: |
          cd resources
-          ..\build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib5
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib5 --print-linking examples\raylib\raylib_arkanoid.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib5 --print-linking examples\raylib\raylib_snake.c3
-          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib5 --print-linking examples\raylib\raylib_tetris.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe vendor-fetch raylib55
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_arkanoid.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_snake.c3
+          ..\build\${{ matrix.build_type }}\c3c.exe compile --lib raylib55 --print-linking examples\raylib\raylib_tetris.c3

      - name: Compile run unit tests
        run: |
@@ -95,7 +95,7 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ..\build\${{ matrix.build_type }}\c3c.exe compile-run -O1 src/test_suite_runner.c3 --stdlib ..\lib7 --enable-new-generics -- ..\build\${{ matrix.build_type }}\c3c.exe test_suite7/ --stdlib ../lib7 --no-terminal
+          ..\build\${{ matrix.build_type }}\c3c.exe compile-run -O1 src/test_suite_runner.c3 -- ..\build\${{ matrix.build_type }}\c3c.exe test_suite/ --no-terminal

      - name: Test python script
        run: |
@@ -112,7 +112,7 @@ jobs:

  build-msys2-mingw:
    runs-on: windows-latest
-    # if: ${{ false }}
+    if: ${{ false }}
    strategy:
      # Don't abort runners if a single one fails
      fail-fast: false
@@ -132,11 +132,11 @@ jobs:
          install: git binutils mingw-w64-x86_64-clang mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-python
      - shell: msys2 {0}
        run: |
-            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-19.1.7-1-any.pkg.tar.zst
-            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-19.1.7-1-any.pkg.tar.zst
+            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-20.1.0-1-any.pkg.tar.zst
+            pacman --noconfirm -U https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-20.1.0-1-any.pkg.tar.zst
      - name: CMake
        run: |
-          cmake -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          cmake -B build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_LINKER=lld
          cmake --build build

      - name: Compile and run some examples
@@ -158,7 +158,7 @@ jobs:

      - name: Vendor-fetch
        run: |
-          ./build/c3c vendor-fetch raylib5
+          ./build/c3c vendor-fetch raylib55

      - name: Build testproject lib
        run: |
@@ -168,8 +168,8 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c.exe compile --target windows-x64 -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics
-          ./test_suite_runner.exe ../build/c3c.exe test_suite7/ --stdlib ../lib7 --no-terminal
+          ../build/c3c.exe compile --target windows-x64 -O1 src/test_suite_runner.c3
+          ./test_suite_runner.exe ../build/c3c.exe test_suite/ --no-terminal

  build-msys2-clang:
    runs-on: windows-latest
@@ -220,7 +220,7 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c.exe compile-run -O1 --stdlib ../lib7 src/test_suite_runner.c3 --enable-new-generics -- ../build/c3c.exe test_suite7/ --stdlib ../lib7 --no-terminal
+          ../build/c3c.exe compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c.exe test_suite/ --no-terminal

  build-linux:
    runs-on: ubuntu-22.04
@@ -229,7 +229,7 @@ jobs:
      fail-fast: false
      matrix:
        build_type: [Release, Debug]
-        llvm_version: [17, 18, 19, 20, 21]
+        llvm_version: [17, 18, 19, 20]

    steps:
      - uses: actions/checkout@v4
@@ -381,7 +381,7 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics -- ../build/c3c  test_suite7/ --stdlib ../lib7
+          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c  test_suite/

      - name: bundle_output
        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_LINUX
@@ -391,6 +391,7 @@ jobs:
          cp msvc_build_libraries.py c3
          cp build/c3c c3
          cp README.md c3
+          cp releasenotes.md c3
          tar czf c3-linux-${{matrix.build_type}}.tar.gz c3

      - name: upload artifacts
@@ -400,14 +401,14 @@ jobs:
          name: c3-linux-${{matrix.build_type}}
          path: c3-linux-${{matrix.build_type}}.tar.gz

-  build-linux-ubuntu20:
-    runs-on: ubuntu-20.04
+  build-linux-ubuntu22:
+    runs-on: ubuntu-22.04
    strategy:
      # Don't abort runners if a single one fails
      fail-fast: false
      matrix:
        build_type: [Release, Debug]
-        llvm_version: [17, 18, 19, 20, 21]
+        llvm_version: [17, 18, 19, 20]
    steps:
      - uses: actions/checkout@v4
      - name: Install common deps
@@ -503,25 +504,26 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics -- ../build/c3c  test_suite7/ --stdlib ../lib7
+          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite/

      - name: bundle_output
-        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU20
+        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU22
        run: |
          mkdir c3
          cp -r lib c3
          cp README.md c3
+          cp releasenotes.md c3          
          cp msvc_build_libraries.py c3
          cp build/c3c c3
-          tar czf c3-ubuntu-20-${{matrix.build_type}}.tar.gz c3
+          tar czf c3-ubuntu-22-${{matrix.build_type}}.tar.gz c3

      - name: upload artifacts
-        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU20
+        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_UBUNTU22
        uses: actions/upload-artifact@v4
        with:
-          name: c3-ubuntu-20-${{matrix.build_type}}
-          path: c3-ubuntu-20-${{matrix.build_type}}.tar.gz
-  
+          name: c3-ubuntu-22-${{matrix.build_type}}
+          path: c3-ubuntu-22-${{matrix.build_type}}.tar.gz
+
  build-with-docker:
    runs-on: ubuntu-22.04
    strategy:
@@ -608,7 +610,7 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c compile-run -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics -- ../build/c3c  test_suite7/ --stdlib ../lib7
+          ../build/c3c compile-run -O1 src/test_suite_runner.c3 -- ../build/c3c test_suite/

  build-mac:
    runs-on: macos-latest
@@ -640,7 +642,7 @@ jobs:

      - name: Vendor-fetch
        run: |
-          ./build/c3c vendor-fetch raylib5
+          ./build/c3c vendor-fetch raylib55

      - name: Compile and run some examples
        run: |
@@ -688,13 +690,13 @@ jobs:
      - name: run compiler tests
        run: |
          cd test
-          ../build/c3c compile -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics
-          ./test_suite_runner ../build/c3c test_suite7/ --stdlib ../lib7
+          ../build/c3c compile -O1 src/test_suite_runner.c3
+          ./test_suite_runner ../build/c3c test_suite/

      - name: run build test suite runner
        run: |
          cd test
-          ../build/c3c compile -O1 src/test_suite_runner.c3 --stdlib ../lib7 --enable-new-generics
+          ../build/c3c compile -O1 src/test_suite_runner.c3

      - name: bundle_output
        if: matrix.llvm_version == env.LLVM_RELEASE_VERSION_MAC
@@ -703,6 +705,7 @@ jobs:
          cp -r lib macos
          cp msvc_build_libraries.py macos
          cp README.md macos
+          cp releasenotes.md macos          
          cp build/c3c macos
          zip -r c3-macos-${{matrix.build_type}}.zip macos

@@ -746,33 +749,13 @@ jobs:

  release:
    runs-on: ubuntu-22.04
-    needs: [build-msvc, build-linux, build-mac, build-linux-ubuntu20]
+    needs: [build-msvc, build-linux, build-mac, build-linux-ubuntu22]
    if: github.ref == 'refs/heads/master'
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

    steps:
      - uses: actions/checkout@v4
-      - name: delete tag
-        continue-on-error: true
-        uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.git.deleteRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'tags/latest',
-              sha: context.sha
-            })
-      - name: create tag
-        uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'refs/tags/latest',
-              sha: context.sha
-            })
-
      - uses: actions/download-artifact@v4
      - run: cp -r lib c3-windows-Release
      - run: cp -r lib c3-windows-Debug
@@ -780,22 +763,26 @@ jobs:
      - run: cp msvc_build_libraries.py c3-windows-Debug
      - run: cp README.md c3-windows-Release
      - run: cp README.md c3-windows-Debug
+      - run: cp releasenotes.md c3-windows-Release
+      - run: cp releasenotes.md c3-windows-Debug
      - run: zip -r c3-windows.zip c3-windows-Release
      - run: zip -r c3-windows-debug.zip c3-windows-Debug
      - run: mv c3-linux-Release/c3-linux-Release.tar.gz c3-linux-Release/c3-linux.tar.gz
      - run: mv c3-linux-Debug/c3-linux-Debug.tar.gz c3-linux-Debug/c3-linux-debug.tar.gz
-      - run: mv c3-ubuntu-20-Release/c3-ubuntu-20-Release.tar.gz c3-ubuntu-20-Release/c3-ubuntu-20.tar.gz
-      - run: mv c3-ubuntu-20-Debug/c3-ubuntu-20-Debug.tar.gz c3-ubuntu-20-Debug/c3-ubuntu-20-debug.tar.gz
+      - run: mv c3-ubuntu-22-Release/c3-ubuntu-22-Release.tar.gz c3-ubuntu-22-Release/c3-ubuntu-22.tar.gz
+      - run: mv c3-ubuntu-22-Debug/c3-ubuntu-22-Debug.tar.gz c3-ubuntu-22-Debug/c3-ubuntu-22-debug.tar.gz
      - run: mv c3-macos-Release/c3-macos-Release.zip c3-macos-Release/c3-macos.zip
      - run: mv c3-macos-Debug/c3-macos-Debug.zip c3-macos-Debug/c3-macos-debug.zip
+      - run: gh release delete latest-prerelease --cleanup-tag -y || true
+      - run: echo "RELEASE_NAME=latest-prerelease-$(date +'%Y%m%d-%H%M')" >> $GITHUB_ENV

      - id: create_release
        uses: softprops/action-gh-release@v2
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          tag_name: latest
-          release_name: latest
+          tag_name: latest-prerelease
+          name: ${{ env.RELEASE_NAME }}
          draft: false
          prerelease: true
          files: |
@@ -803,7 +790,7 @@ jobs:
            c3-windows-debug.zip
            c3-linux-Release/c3-linux.tar.gz
            c3-linux-Debug/c3-linux-debug.tar.gz
-            c3-ubuntu-20-Release/c3-ubuntu-20.tar.gz
-            c3-ubuntu-20-Debug/c3-ubuntu-20-debug.tar.gz
+            c3-ubuntu-22-Release/c3-ubuntu-22.tar.gz
+            c3-ubuntu-22-Debug/c3-ubuntu-22-debug.tar.gz
            c3-macos-Release/c3-macos.zip
            c3-macos-Debug/c3-macos-debug.zip
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ result
 # tests
 /test/tmp/*
 /test/testrun
+/test/test_suite_runner
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,20 @@ if(C3_WITH_LLVM)
        find_package(LLVM REQUIRED CONFIG)
        find_package(LLD REQUIRED CONFIG)
    else()
+        # Add paths for LLVM CMake files of version 19 and higher as they follow a new installation 
+        # layout and are now in /usr/lib/llvm/*/lib/cmake/llvm/ rather than /usr/lib/cmake/llvm/
+        # 
+        # Because of CMAKE_FIND_PACKAGE_SORT_ORDER CMAKE_FIND_PACKAGE_SORT_DIRECTION,
+        # the newest version will always be found first.
+        message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+        if (DEFINED LLVM_DIR) 
+            message(STATUS "Looking for LLVM CMake files in user-specified directory ${LLVM_DIR}")
+        else()
+            file (GLOB LLVM_CMAKE_PATHS "/usr/lib/llvm/*/lib/cmake/llvm/")
+            list (APPEND CMAKE_PREFIX_PATH ${LLVM_CMAKE_PATHS} "/usr/lib/")
+            message(STATUS "No LLVM_DIR specified, searching default directories ${CMAKE_PREFIX_PATH}")
+        endif()
+
        if (NOT C3_LLVM_VERSION STREQUAL "auto")
            find_package(LLVM ${C3_LLVM_VERSION} REQUIRED CONFIG)
        else()
@@ -151,6 +165,10 @@ if(C3_WITH_LLVM)
        endif()
    endif()

+    if (EXISTS /opt/homebrew/lib)
+        list(APPEND LLVM_LIBRARY_DIRS /opt/homebrew/lib)
+    endif()
+
    if (EXISTS /usr/lib)
        # Some systems (such as Alpine Linux) seem to put some of the relevant
        # LLVM files in /usr/lib, but this doesn't seem to be included in the
--- a/CODESTYLE.md
+++ b/CODESTYLE.md
@@ -74,7 +74,7 @@ No space inside parenthesis:

 ### Tab vs spaces

-Recommendation: tabs, 4 spaces wide. No CRLF in the source.
+Use tabs for indentation, no CRLF in the source.

 ### If, braces and new lines

@@ -147,4 +147,114 @@ Iterating over the elements are done using `VECEACH`.
 ### Scratch buffer for strings.

 There is a scratch buffer for strings in the `global_context` prefer using that
-one with related functions when working on temporary strings.
+one with related functions when working on temporary strings.
+
+# C3 Standard library style guide.
+
+When contributing to the standard library please try your best to adhere to the
+following style requirements to ensure a consistent style in the stdlib and to
+facilitate accepting PRs more quickly.
+
+### Braces are placed on the next line
+
+**NO:**
+```c
+fn void foo(String bar) {
+  @pool() {
+    ...
+  };
+} 
+```
+
+**YES:**
+```c
+fn void foo(String bar)
+{
+  @pool() 
+  {
+    ...
+  };
+}
+```
+
+### Indentation with tabs
+
+Use tab for indentation, not spaces, no CRLF in the sources 
+
+### Type names
+
+Use `PascalCase` not `Ada_Case` for type names.
+
+**YES:**
+```c
+enum MyEnum
+{
+  ABC,
+  DEF
+}  
+```
+
+**NO:**
+```c
+enum My_Enum
+{
+  ABC,
+  DEF
+}  
+```
+
+### Type names when binding to OS libraries
+
+When doing bindings (for instance, adding declarations referring to Win32 APIs),
+try to retain the original name when possible. If it isn't possible use (consistently)
+one of two options:
+
+1. Prefix: `HANDLE` -> `Win32_HANDLE`
+2. Change the first letter to upper case: `mode_t` -> `Mode_t`
+
+### Variables, function, methods and globals
+
+Use `snake_case`, not `camelCase`.
+
+**YES:**
+```c
+int some_global = 1;
+
+fn void open_file(String special_file)
+{
+  ...
+}
+```
+
+**NO:**
+```c
+int someGlobal = 1;
+
+fn void openFile(String specialFile)
+{
+  ...
+}
+```
+
+### Variables, function, methods and globals when binding to OS libraries
+
+When doing bindings (for instance, adding declarations referring to Win32 APIs),
+try to retain the original name when possible. If it isn't possible use (consistently)
+one of two options:
+
+1. Prefix: `win32_GetWindowLongPtrW`. However, this is usually only recommended if it is builtin.
+2. Change first character to lower case: `GetWindowLongPtrW` -> `getWindowLongPtrW`
+
+### Use `self` as the first method argument
+
+Unless there is a strong reason not to, use `self` for the first parameter in a method.
+
+### The allocator argument
+
+Prefer always calling the allocator parameter `allocator`, and make it the first regular
+argument.
+
+## Add tests to your changes
+
+If you add or fix things, then there should always be tests in `test/unit/stdlib` to verify
+the functionality.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,70 @@
+# How to contribute to C3
+
+The C3 project consists of
+
+1. The C3 language itself.
+2. The C3 compiler, called c3c.
+3. The C3 standard library
+4. Various tools, such as the editor plugins
+
+## 1. How to contribute to the C3 language
+
+The C3 language is essentially the language specification. You can contribute to the language by:
+
+1. Filing enhancement requests for changes to the language.
+2. Offering feedback on existing features, on Discord or by filing issues.
+3. Help working on the language specification.
+4. Help working on the grammar.
+
+## 2. How to contribute to the C3 compiler
+
+The C3 compiler consists for the compiler itself + test suites for testing the compiler. 
+You can contribute by:
+
+1. File bugs (by far the most important thing).
+2. Suggest improved diagnostics / error messages.
+3. Refactoring existing code (needs deep understanding of the compiler).
+4. Add support for more architectures.
+5. Add support for more backends.
+
+## 3. How to contribute to the standard library
+
+The standard library is the library itself + test suites for testing the standard library.
+You can contribute by:
+
+1. Filing bugs on the standard library.
+2. Write additional unit tests.
+3. Suggest new functionality by filing an issue.
+4. Work on stdlib additions.
+5. Fix bugs in the stdlib
+6. Maintain a section of the standard library
+
+### How to work on small stdlib additions
+
+If there is just a matter of adding a function or two to an existing module, a pull request
+is sufficient. However, please make sure that:
+
+1. It follows the guidelines for the code to ensure a uniform experience (naming standard, indentation, braces etc).
+2. Add a line in the release notes about the change.
+3. Make sure it has unit tests.
+
+### How to work on non-trivial additions to the stdlib
+
+Regardless whether an addition is approved for inclusion or not, it needs to incubate:
+
+1. First implement it standalone, showing that it’s working well and has a solid design. This has the advantage of people being able to contribute or even create competing implementations
+2. Once it is considered finished it can be proposed for inclusion.
+
+This will greatly help improving the quality of additions.
+
+Note that any new addition needs a full set of unit tests before being included into the standard library.
+
+### Maintain a part of the standard library
+
+A single maintainer is insufficient for a standard library, instead we need one or more maintainer
+for each module. The maintainer(s) will review pull requests and actively work on making the module
+pristine with the highest possible quality.
+
+## 4. How to contribute to various tools
+
+In general, file a pull request. Depending on who maintains it, rules may differ.
--- a/README.md
+++ b/README.md
@@ -8,16 +8,18 @@ for programmers who like C.

 Precompiled binaries for the following operating systems are available:
 
- Windows x64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip), [install instructions](#installing-on-windows-with-precompiled-binaries).
- Debian x64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz), [install instructions](#installing-on-debian-with-precompiled-binaries).
- Ubuntu x86 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-ubuntu-20.tar.gz), [install instructions](#installing-on-ubuntu-with-precompiled-binaries).
- MacOS Arm64 [download](https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip), [install instructions](#installing-on-mac-with-precompiled-binaries).
+- Windows x64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip), [install instructions](#installing-on-windows-with-precompiled-binaries).
+- Debian x64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz), [install instructions](#installing-on-debian-with-precompiled-binaries).
+- Ubuntu x86 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz), [install instructions](#installing-on-ubuntu-with-precompiled-binaries).
+- MacOS Arm64 [download](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip), [install instructions](#installing-on-macos-with-precompiled-binaries).

 The manual for C3 can be found at [www.c3-lang.org](http://www.c3-lang.org).

 ![vkQuake](https://github.com/c3lang/c3c/blob/master/resources/images/vkQuake.png?raw=true)

-Thanks to full ABI compatibility with C, it's possible to mix C and C3 in the same project with no effort. As a demonstration, vkQuake was compiled with a small portion of the code converted to C3 and compiled with the c3c compiler. (The fork can be found at https://github.com/c3lang/vkQuake)
+Thanks to full ABI compatibility with C, it's possible to mix C and C3 in the same project with no effort. As a demonstration, vkQuake was compiled with a small portion of the code converted to C3 and compiled with the c3c compiler. (The aging fork can be found at https://github.com/c3lang/vkQuake)
+
+A non-curated list of user written projects and other resources can be found [here](https://github.com/c3lang/c3-showcase).

 ### Design Principles
 - Procedural "get things done"-type of language.
@@ -33,10 +35,10 @@ whole new language.

 ### Example code

-The following code shows [generic modules](https://c3-lang.org/references/docs/generics/) (more examples can be found at https://c3-lang.org/references/docs/examples/). 
+The following code shows [generic modules](https://c3-lang.org/generic-programming/generics/) (more examples can be found at https://c3-lang.org/language-overview/examples/). 

 ```cpp
-module stack (<Type>);
+module stack {Type};
 // Above: the parameterized type is applied to the entire module.

 struct Stack
@@ -80,13 +82,13 @@ import stack;

 // Define our new types, the first will implicitly create 
 // a complete copy of the entire Stack module with "Type" set to "int"
-def IntStack = Stack(<int>);
+alias IntStack = Stack {int};
 // The second creates another copy with "Type" set to "double"
-def DoubleStack = Stack(<double>);
+alias DoubleStack = Stack {double};

-// If we had added "define IntStack2 = Stack(<int>)"
+// If we had added "alias IntStack2 = Stack {int}"
 // no additional copy would have been made (since we already
-// have an parameterization of Stack(<int>)) so it would
+// have an parameterization of Stack {int} so it would
 // be same as declaring IntStack2 an alias of IntStack

 // Importing an external C function is straightforward
@@ -124,6 +126,7 @@ fn void main()
 - New semantic macro system
 - Module based name spacing
 - Slices
+- Operator overloading
 - Compile time reflection
 - Enhanced compile time execution
 - Generics based on generic modules
@@ -138,9 +141,10 @@ fn void main()

 ### Current status

-The current stable version of the compiler is **version 0.6.8**.
+The current stable version of the compiler is **version 0.7.2**.

-The the next version is 0.7.0 which will be a breaking release.
+The upcoming 0.7.x releases will focus on expanding the standard library,
+fixing bugs and improving compile time analysis. 
 Follow the issues [here](https://github.com/c3lang/c3c/issues).

 If you have suggestions on how to improve the language, either [file an issue](https://github.com/c3lang/c3c/issues) 
@@ -193,29 +197,31 @@ More platforms will be supported in the future.

 ### Installing

+This installs the latest prerelease build, as opposed to the latest released version.
+
 #### Installing on Windows with precompiled binaries
-1. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip](https://github.com/c3lang/c3c/releases/download/latest/c3-windows.zip) 
-(debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-windows-debug.zip))
+1. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows.zip)
+(debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-windows-debug.zip))
 2. Unzip exe and standard lib.
 3. If you don't have Visual Studio 17 installed you can either do so, or run the `msvc_build_libraries.py` Python script which will download the necessary files to compile on Windows. 
 4. Run `c3c.exe`.

 #### Installing on Debian with precompiled binaries
-1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz](https://github.com/c3lang/c3c/releases/download/latest/c3-linux.tar.gz)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-linux-debug.tar.gz))
+1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux.tar.gz)
+   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-linux-debug.tar.gz))
 2. Unpack executable and standard lib.
 3. Run `./c3c`.

 #### Installing on Ubuntu with precompiled binaries
-1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest/c3-ubuntu-20.tar.gz](https://github.com/c3lang/c3c/releases/download/latest/c3-ubuntu-20.tar.gz)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-ubuntu-20-debug.tar.gz))
+1. Download tar file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20.tar.gz)
+   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-ubuntu-20-debug.tar.gz))
 2. Unpack executable and standard lib.
 3. Run `./c3c`.

 #### Installing on MacOS with precompiled binaries
 1. Make sure you have XCode with command line tools installed.
-2. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip](https://github.com/c3lang/c3c/releases/download/latest/c3-macos.zip)
-   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest/c3-macos-debug.zip))
+2. Download the zip file: [https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos.zip)
+   (debug version [here](https://github.com/c3lang/c3c/releases/download/latest-prerelease/c3-macos-debug.zip))
 3. Unzip executable and standard lib.
 4. Run `./c3c`.

@@ -249,20 +255,13 @@ makepkg -si

 #### Building via Docker

-You can build `c3c` using either an Ubuntu 18.04 or 20.04 container:
+You can build `c3c` using an Ubuntu container. By default, the script will build through Ubuntu 22.04. You can specify the version by passing the `UBUNTU_VERSION` environment variable.

 ```
-./build-with-docker.sh 18
+UBUNTU_VERSION=20.04 ./build-with-docker.sh
 ```

-Replace `18` with `20` to build through Ubuntu 20.04.
-
-For a release build specify:
-```
-./build-with-docker.sh 20 Release
-```
-
-A `c3c` executable will be found under `bin/`.
+See the `build-with-docker.sh` script for more information on other configurable environment variables.

 #### Installing on OS X using Homebrew

@@ -410,3 +409,7 @@ Editor plugins can be found at https://github.com/c3lang/editor-plugins.
 A huge **THANK YOU** goes out to all contributors and sponsors.

 A special thank you to sponsors [Caleb-o](https://github.com/Caleb-o) and [devdad](https://github.com/devdad) for going the extra mile.
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=c3lang/c3c&type=Date)](https://www.star-history.com/#c3lang/c3c&Date)
--- a/lib/std/ascii.c3
+++ b/lib/std/ascii.c3
@@ -1,77 +1,42 @@
+<* This module is scheduled for removal, use std::core::ascii *>
 module std::ascii;

 macro bool in_range_m(c, start, len) => (uint)(c - start) < len;
-macro bool is_lower_m(c) => in_range_m(c, 0x61, 26);
-macro bool is_upper_m(c) => in_range_m(c, 0x41, 26);
-macro bool is_digit_m(c) => in_range_m(c, 0x30, 10);
+macro bool is_lower_m(c)  => in_range_m(c, 0x61, 26);
+macro bool is_upper_m(c)  => in_range_m(c, 0x41, 26);
+macro bool is_digit_m(c)  => in_range_m(c, 0x30, 10);
 macro bool is_bdigit_m(c) => in_range_m(c, 0x30, 2);
 macro bool is_odigit_m(c) => in_range_m(c, 0x30, 8);
 macro bool is_xdigit_m(c) => in_range_m(c | 32, 0x61, 6) || is_digit_m(c);
-macro bool is_alpha_m(c) => in_range_m(c | 32, 0x61, 26);
-macro bool is_print_m(c) => in_range_m(c, 0x20, 95);
-macro bool is_graph_m(c) => in_range_m(c, 0x21, 94);
-macro bool is_space_m(c) => in_range_m(c, 0x9, 5) || c == 0x20;
-macro bool is_alnum_m(c) => is_alpha_m(c) || is_digit_m(c);
-macro bool is_punct_m(c) => !is_alnum_m(c) && is_graph_m(c);
-macro bool is_blank_m(c) => c == 0x20 || c == 0x9;
-macro bool is_cntrl_m(c) => c < 0x20 || c == 0x7f;
+macro bool is_alpha_m(c)  => in_range_m(c | 32, 0x61, 26);
+macro bool is_print_m(c)  => in_range_m(c, 0x20, 95);
+macro bool is_graph_m(c)  => in_range_m(c, 0x21, 94);
+macro bool is_space_m(c)  => in_range_m(c, 0x9, 5) || c == 0x20;
+macro bool is_alnum_m(c)  => is_alpha_m(c) || is_digit_m(c);
+macro bool is_punct_m(c)  => !is_alnum_m(c) && is_graph_m(c);
+macro bool is_blank_m(c)  => c == 0x20 || c == 0x9;
+macro bool is_cntrl_m(c)  => c < 0x20 || c == 0x7f;
 macro to_lower_m(c) => is_upper_m(c) ? c + 0x20 : c;
 macro to_upper_m(c) => is_lower_m(c) ? c - 0x20 : c;

 fn bool in_range(char c, char start, char len) => in_range_m(c, start, len);
-fn bool is_lower(char c) => is_lower_m(c);
-fn bool is_upper(char c) => is_upper_m(c);
-fn bool is_digit(char c) => is_digit_m(c);
-fn bool is_bdigit(char c) => is_bdigit_m(c);
-fn bool is_odigit(char c) => is_odigit_m(c);
-fn bool is_xdigit(char c) => is_xdigit_m(c);
-fn bool is_alpha(char c) => is_alpha_m(c);
-fn bool is_print(char c) => is_print_m(c);
-fn bool is_graph(char c) => is_graph_m(c);
-fn bool is_space(char c) => is_space_m(c);
-fn bool is_alnum(char c) => is_alnum_m(c);
-fn bool is_punct(char c) => is_punct_m(c);
-fn bool is_blank(char c) => is_blank_m(c);
-fn bool is_cntrl(char c) => is_cntrl_m(c);
-fn char to_lower(char c) => (char)to_lower_m(c);
-fn char to_upper(char c) => (char)to_upper_m(c);

 fn bool char.in_range(char c, char start, char len) => in_range_m(c, start, len);
-fn bool char.is_lower(char c) => is_lower_m(c);
-fn bool char.is_upper(char c) => is_upper_m(c);
-fn bool char.is_digit(char c) => is_digit_m(c);
-fn bool char.is_bdigit(char c) => is_bdigit_m(c);
-fn bool char.is_odigit(char c) => is_odigit_m(c);
-fn bool char.is_xdigit(char c) => is_xdigit_m(c);
-fn bool char.is_alpha(char c) => is_alpha_m(c);
-fn bool char.is_print(char c) => is_print_m(c);
-fn bool char.is_graph(char c) => is_graph_m(c);
-fn bool char.is_space(char c) => is_space_m(c);
-fn bool char.is_alnum(char c) => is_alnum_m(c);
-fn bool char.is_punct(char c) => is_punct_m(c);
-fn bool char.is_blank(char c) => is_blank_m(c);
-fn bool char.is_cntrl(char c) => is_cntrl_m(c);
-fn char char.to_lower(char c) => (char)to_lower_m(c);
-fn char char.to_upper(char c) => (char)to_upper_m(c);
-<*
- @require c.is_xdigit()
-*>
-fn char char.from_hex(char c) => c.is_digit() ? c - '0' : 10 + (c | 0x20) - 'a';

 fn bool uint.in_range(uint c, uint start, uint len) => in_range_m(c, start, len);
-fn bool uint.is_lower(uint c) => is_lower_m(c);
-fn bool uint.is_upper(uint c) => is_upper_m(c);
-fn bool uint.is_digit(uint c) => is_digit_m(c);
-fn bool uint.is_bdigit(uint c) => is_bdigit_m(c);
-fn bool uint.is_odigit(uint c) => is_odigit_m(c);
-fn bool uint.is_xdigit(uint c) => is_xdigit_m(c);
-fn bool uint.is_alpha(uint c) => is_alpha_m(c);
-fn bool uint.is_print(uint c) => is_print_m(c);
-fn bool uint.is_graph(uint c) => is_graph_m(c);
-fn bool uint.is_space(uint c) => is_space_m(c);
-fn bool uint.is_alnum(uint c) => is_alnum_m(c);
-fn bool uint.is_punct(uint c) => is_punct_m(c);
-fn bool uint.is_blank(uint c) => is_blank_m(c);
-fn bool uint.is_cntrl(uint c) => is_cntrl_m(c);
-fn uint uint.to_lower(uint c) => (uint)to_lower_m(c);
-fn uint uint.to_upper(uint c) => (uint)to_upper_m(c);
+fn bool uint.is_lower(uint c)  @deprecated => is_lower_m(c);
+fn bool uint.is_upper(uint c)  @deprecated => is_upper_m(c);
+fn bool uint.is_digit(uint c)  @deprecated => is_digit_m(c);
+fn bool uint.is_bdigit(uint c) @deprecated => is_bdigit_m(c);
+fn bool uint.is_odigit(uint c) @deprecated => is_odigit_m(c);
+fn bool uint.is_xdigit(uint c) @deprecated => is_xdigit_m(c);
+fn bool uint.is_alpha(uint c)  @deprecated => is_alpha_m(c);
+fn bool uint.is_print(uint c)  @deprecated => is_print_m(c);
+fn bool uint.is_graph(uint c)  @deprecated => is_graph_m(c);
+fn bool uint.is_space(uint c)  @deprecated => is_space_m(c);
+fn bool uint.is_alnum(uint c)  @deprecated => is_alnum_m(c);
+fn bool uint.is_punct(uint c)  @deprecated => is_punct_m(c);
+fn bool uint.is_blank(uint c)  @deprecated => is_blank_m(c);
+fn bool uint.is_cntrl(uint c)  @deprecated => is_cntrl_m(c);
+fn uint uint.to_lower(uint c)  @deprecated => (uint)to_lower_m(c);
+fn uint uint.to_upper(uint c)  @deprecated => (uint)to_upper_m(c);
--- a/lib/std/atomic.c3
+++ b/lib/std/atomic.c3
@@ -1,7 +1,7 @@
-// Copyright (c) 2023 Eduardo José Gómez Hernández. All rights reserved.
+// Copyright (c) 2023-2025 Eduardo José Gómez Hernández. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-module std::atomic::types(<Type>);
+module std::atomic::types{Type};

 struct Atomic
 {
@@ -11,7 +11,7 @@ struct Atomic
 <*
 Loads data atomically, by default this uses SEQ_CONSISTENT ordering.

- @param ordering "The ordering, cannot be release or acquire-release."
+ @param ordering : "The ordering, cannot be release or acquire-release."
 @require ordering != RELEASE && ordering != ACQUIRE_RELEASE : "Release and acquire-release are not valid for load"
 *>
 macro Type Atomic.load(&self, AtomicOrdering ordering = SEQ_CONSISTENT)
@@ -31,7 +31,7 @@ macro Type Atomic.load(&self, AtomicOrdering ordering = SEQ_CONSISTENT)
 <*
 Stores data atomically, by default this uses SEQ_CONSISTENT ordering.

- @param ordering "The ordering, cannot be acquire or acquire-release."
+ @param ordering : "The ordering, cannot be acquire or acquire-release."
 @require ordering != ACQUIRE && ordering != ACQUIRE_RELEASE : "Acquire and acquire-release are not valid for store"
 *>
 macro void Atomic.store(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
@@ -76,7 +76,7 @@ macro Type Atomic.div(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTEN
 macro Type Atomic.max(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
 {
 	Type* data = &self.data;
-	return @atomic_exec(atomic::fetch_div, data, value, ordering);
+	return @atomic_exec(atomic::fetch_max, data, value, ordering);
 }

 macro Type Atomic.min(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT)
@@ -85,36 +85,49 @@ macro Type Atomic.min(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTEN
 	return @atomic_exec(atomic::fetch_min, data, value, ordering);
 }

-macro Type Atomic.or(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
+macro Type Atomic.or(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_or, data, value, ordering);
 }

-fn Type Atomic.xor(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
+fn Type Atomic.xor(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_xor, data, value, ordering);
 }

-macro Type Atomic.and(&self, uint value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
+macro Type Atomic.and(&self, Type value, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_and, data, value, ordering);
 }

-macro Type Atomic.shift_right(&self, uint amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
+macro Type Atomic.shr(&self, Type amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_shift_right, data, amount, ordering);
 }

-macro Type Atomic.shift_left(&self, uint amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(!types::is_float(Type))
+macro Type Atomic.shl(&self, Type amount, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) != FLOAT)
 {
 	Type* data = &self.data;
 	return @atomic_exec(atomic::fetch_shift_left, data, amount, ordering);
 }

+macro Type Atomic.set(&self, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) == BOOL)
+{
+	Type* data = &self.data;
+	return @atomic_exec_no_arg(atomic::flag_set, data, ordering);
+}
+
+macro Type Atomic.clear(&self, AtomicOrdering ordering = SEQ_CONSISTENT) @if(types::flat_kind(Type) == BOOL)
+{
+	Type* data = &self.data;
+
+	return @atomic_exec_no_arg(atomic::flag_clear, data, ordering);
+}
+
 macro @atomic_exec(#func, data, value, ordering) @local
 {
 	switch(ordering) 
@@ -128,18 +141,58 @@ macro @atomic_exec(#func, data, value, ordering) @local
 	}
 }

+macro @atomic_exec_no_arg(#func, data, ordering) @local
+{
+	switch(ordering)
+	{
+		case RELAXED: return #func(data, RELAXED);
+		case ACQUIRE: return #func(data, ACQUIRE);
+		case RELEASE: return #func(data, RELEASE);
+		case ACQUIRE_RELEASE: return #func(data, ACQUIRE_RELEASE);
+		case SEQ_CONSISTENT: return #func(data, SEQ_CONSISTENT);
+		default: unreachable("Ordering may not be non-atomic or unordered.");
+	}
+}
+
 module std::atomic;
 import std::math;

+macro bool @is_native_atomic_value(#value) @private
+{
+	return is_native_atomic_type($typeof(#value));
+}
+
+macro bool is_native_atomic_type($Type)
+{
+	$if $Type.sizeof > void*.sizeof:
+		return false;
+	$else
+		$switch $Type.kindof:
+			$case SIGNED_INT:
+			$case UNSIGNED_INT:
+			$case POINTER:
+			$case FLOAT:
+			$case BOOL:
+				return true;
+			$case DISTINCT:
+				return is_native_atomic_type($typefrom($Type.inner));
+			$default:
+				return false;
+		$endswitch
+	$endif
+}
+
 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to be added to ptr."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr + y) : "+ must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_add(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
@@ -150,14 +203,16 @@ macro fetch_add(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to be subtracted from ptr."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr - y) : "- must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_sub(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
@@ -168,13 +223,15 @@ macro fetch_sub(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to be multiplied with ptr."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr * y) : "* must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_mul(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
@@ -193,25 +250,28 @@ macro fetch_mul(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_old_value;
 	$StorageType storage_new_value;

-
-	do {
+	do
+	{
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = old_value * y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	}
+	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);

 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to divide ptr by."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr * y) : "/ must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_div(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
@@ -230,154 +290,80 @@ macro fetch_div(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_old_value;
 	$StorageType storage_new_value;
 	
-	do {
+	do
+	{
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = old_value / y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	}
+	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);

 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to perform a bitwise or with."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require types::is_int($typeof(y)) "The value for or must be an int"
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr | y) : "| must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_or(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	$if	types::is_int($typeof(*ptr)):
-		return $$atomic_fetch_or(ptr, y, $volatile, $ordering.ordinal, $alignment);
-	$endif
-
-	var $load_ordering = $ordering;
-	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
-	$endif
-	
-	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
-
-	$StorageType* storage_ptr = ($StorageType*)ptr;
-
-	$typeof(*ptr) old_value;
-	$typeof(*ptr) new_value;
-
-	$StorageType storage_old_value;
-	$StorageType storage_new_value;
-	$StorageType storage_y = ($StorageType)y;
-	
-	do {
-		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
-		old_value = bitcast(storage_old_value, $typeof(*ptr));
-		new_value = storage_old_value | storage_y;
-		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
-
-	return old_value;
+	return $$atomic_fetch_or(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to perform a bitwise xor with."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require types::is_int($typeof(y)) "The value for or must be an int"
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr ^ y) : "^ must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_xor(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	$if	types::is_int($typeof(*ptr)):
-		return $$atomic_fetch_xor(ptr, y, $volatile, $ordering.ordinal, $alignment);
-	$endif
-
-	var $load_ordering = $ordering;
-	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
-	$endif
-	
-	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
-
-	$StorageType* storage_ptr = ($StorageType*)ptr;
-
-	$typeof(*ptr) old_value;
-	$typeof(*ptr) new_value;
-
-	$StorageType storage_old_value;
-	$StorageType storage_new_value;
-	$StorageType storage_y = ($StorageType)y;
-	
-	do {
-		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
-		old_value = bitcast(storage_old_value, $typeof(*ptr));
-		new_value = storage_old_value ^ storage_y;
-		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
-
-	return old_value;
+	return $$atomic_fetch_xor(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to perform a bitwise and with."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require !$alignment || math::is_power_of_2($alignment) "Alignment must be a power of two."
- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require types::is_int($typeof(y)) "The value for or must be an int"
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require !$alignment || math::is_power_of_2($alignment) : "Alignment must be a power of two."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr ^ y) : "& must be defined between the values."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_and(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
-	$if	types::is_int($typeof(*ptr)):
-		return $$atomic_fetch_and(ptr, y, $volatile, $ordering.ordinal, $alignment);
-	$endif
-
-	var $load_ordering = $ordering;
-	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
-	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
-	$endif
-	
-	var $StorageType = $typefrom(types::lower_to_atomic_compatible_type($typeof(*ptr)));
-
-	$StorageType* storage_ptr = ($StorageType*)ptr;
-
-	$typeof(*ptr) old_value;
-	$typeof(*ptr) new_value;
-
-	$StorageType storage_old_value;
-	$StorageType storage_new_value;
-	$StorageType storage_y = ($StorageType)y;
-	
-	do {
-		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
-		old_value = bitcast(storage_old_value, $typeof(*ptr));
-		new_value = storage_old_value & storage_y;
-		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
-
-	return old_value;
+	return $$atomic_fetch_and(ptr, y, $volatile, $ordering.ordinal, $alignment);
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to shift ptr by."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require types::is_int($typeof(y)) "The value for or must be an int"
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require types::is_int($typeof(*ptr)) : "Only integer pointers may be used."
+ @require types::is_int($typeof(y)) : "The value for shift right must be an integer"
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_shift_right(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
@@ -397,25 +383,29 @@ macro fetch_shift_right(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_new_value;
 	$StorageType storage_y = ($StorageType)y;
 	
-	do {
+	do
+	{
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = storage_old_value >> storage_y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	}
+	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);

 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to shift ptr by."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require types::is_int($typeof(y)) "The value for or must be an int"
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require types::is_int($typeof(*ptr)) : "Only integer pointers may be used."
+ @require types::is_int($typeof(y)) : "The value for shift left must be an integer"
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_shift_left(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
@@ -435,64 +425,83 @@ macro fetch_shift_left(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT)
 	$StorageType storage_new_value;
 	$StorageType storage_y = ($StorageType)y;
 	
-	do {
+	do
+	{
 		storage_old_value = $$atomic_load(storage_ptr, false, $load_ordering.ordinal);
 		old_value = bitcast(storage_old_value, $typeof(*ptr));
 		new_value = storage_old_value << storage_y;
 		storage_new_value = bitcast(new_value, $StorageType);
-	} while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);
+	}
+	while (mem::compare_exchange(storage_ptr, storage_old_value, storage_new_value, $ordering, $load_ordering) != storage_old_value);

 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require types::flat_kind($typeof(*ptr)) == BOOL : "Only bool pointers may be used."
+
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro flag_set(ptr, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	$typeof(*ptr) old_value;
 	$typeof(*ptr) new_value = true;
+	var $load_ordering = $ordering;
+	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
+	$endif
+	do
+	{
+		old_value = $$atomic_load(ptr, false, $load_ordering.ordinal);
+	}
+	while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);

-	do {
-		old_value = $$atomic_load(ptr, false, $ordering.ordinal);
-	} while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
-	
 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&inout] ptr : "the variable or dereferenced pointer to the data."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) "Only integer pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require types::flat_kind($typeof(*ptr)) == BOOL : "Only bool pointers may be used."
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro flag_clear(ptr, AtomicOrdering $ordering = SEQ_CONSISTENT)
 {
 	$typeof(*ptr) old_value;
 	$typeof(*ptr) new_value = false;
-
-	do {
-		old_value = $$atomic_load(ptr, false, $ordering.ordinal);
-	} while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);
+	var $load_ordering = $ordering;
+	$if $ordering == RELEASE || $ordering == ACQUIRE_RELEASE:
+	    $load_ordering = AtomicOrdering.SEQ_CONSISTENT;
+	$endif
+	do
+	{
+		old_value = $$atomic_load(ptr, false, $load_ordering.ordinal);
+	}
+	while (mem::compare_exchange(ptr, old_value, new_value, $ordering, $load_ordering) != old_value);

 	return old_value;
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&in] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to be compared to ptr."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr > y) : "Only values that are comparable with > may be used"
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_max(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
@@ -503,13 +512,15 @@ macro fetch_max(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatil
 }

 <*
- @param [&in] ptr "the variable or dereferenced pointer to the data."
- @param [in] y "the value to be added to ptr."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param [&in] ptr : "the variable or dereferenced pointer to the data."
+ @param [in] y : "the value to be compared to ptr."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
 @return "returns the old value of ptr"

- @require types::is_int($typeof(*ptr)) || types::is_float($typeof(*ptr)) "Only integer/float pointers may be used."
- @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
+ @require $defined(*ptr) : "Expected a pointer"
+ @require @is_native_atomic_value(*ptr) : "Only types that are native atomic may be used."
+ @require $defined(*ptr > y) : "Only values that are comparable with > may be used"
+ @require $ordering != AtomicOrdering.NOT_ATOMIC && $ordering != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
 *>
 macro fetch_min(ptr, y, AtomicOrdering $ordering = SEQ_CONSISTENT, bool $volatile = false, usz $alignment = 0)
 {
--- a/lib/std/atomic_nolibc.c3
+++ b/lib/std/atomic_nolibc.c3
@@ -3,8 +3,9 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::atomic;

-macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $success, failure, $alignment) {
-	switch(failure)
+macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $success, failure, $alignment)
+{
+	switch (failure)
 	{
 		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);
@@ -16,7 +17,7 @@ macro @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, $succe

 macro @__atomic_compare_exchange_ordering_success(ptr, expected, desired, success, failure, $alignment)
 {
-	switch(success)
+	switch (success)
 	{
 		case AtomicOrdering.RELAXED.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.RELAXED.ordinal, failure, $alignment);
 		case AtomicOrdering.ACQUIRE.ordinal: return @__atomic_compare_exchange_ordering_failure(ptr, expected, desired, AtomicOrdering.ACQUIRE.ordinal, failure, $alignment);
@@ -28,7 +29,7 @@ macro @__atomic_compare_exchange_ordering_success(ptr, expected, desired, succes
 	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) @weak @export("__atomic_compare_exchange")
 {
 	switch (size)
 	{
--- a/lib/std/bits.c3
+++ b/lib/std/bits.c3
@@ -1,94 +1,94 @@
 module std::bits;

 <*
- @require types::is_intlike($typeof(i)) `The input must be an integer or integer vector`
+ @require types::is_intlike($typeof(i)) : `The input must be an integer or integer vector`
 *>
 macro reverse(i) => $$bitreverse(i);

 <*
- @require types::is_intlike($typeof(i)) `The input must be an integer or integer vector`
+ @require types::is_intlike($typeof(i)) : `The input must be an integer or integer vector`
 *>
 macro bswap(i) @builtin => $$bswap(i);

-macro uint[<?>].popcount(self) => $$popcount(self);
-macro uint[<?>].ctz(self) => $$ctz(self);
-macro uint[<?>].clz(self) => $$clz(self);
-macro uint[<?>] uint[<?>].fshl(hi, uint[<?>] lo, uint[<?>] shift) => $$fshl(hi, lo, shift);
-macro uint[<?>] uint[<?>].fshr(hi, uint[<?>] lo, uint[<?>] shift) => $$fshr(hi, lo, shift);
-macro uint[<?>] uint[<?>].rotl(self, uint[<?>] shift) => $$fshl(self, self, shift);
-macro uint[<?>] uint[<?>].rotr(self, uint[<?>] shift) => $$fshr(self, self, shift);
+macro uint[<*>].popcount(self) => $$popcount(self);
+macro uint[<*>].ctz(self) => $$ctz(self);
+macro uint[<*>].clz(self) => $$clz(self);
+macro uint[<*>] uint[<*>].fshl(hi, uint[<*>] lo, uint[<*>] shift) => $$fshl(hi, lo, shift);
+macro uint[<*>] uint[<*>].fshr(hi, uint[<*>] lo, uint[<*>] shift) => $$fshr(hi, lo, shift);
+macro uint[<*>] uint[<*>].rotl(self, uint[<*>] shift) => $$fshl(self, self, shift);
+macro uint[<*>] uint[<*>].rotr(self, uint[<*>] shift) => $$fshr(self, self, shift);

-macro int[<?>].popcount(self) => $$popcount(self);
-macro int[<?>].ctz(self) => $$ctz(self);
-macro int[<?>].clz(self) => $$clz(self);
-macro int[<?>] int[<?>].fshl(hi, int[<?>] lo, int[<?>] shift) => $$fshl(hi, lo, shift);
-macro int[<?>] int[<?>].fshr(hi, int[<?>] lo, int[<?>] shift) => $$fshr(hi, lo, shift);
-macro int[<?>] int[<?>].rotl(self, int[<?>] shift) => $$fshl(self, self, shift);
-macro int[<?>] int[<?>].rotr(self, int[<?>] shift) => $$fshr(self, self, shift);
+macro int[<*>].popcount(self) => $$popcount(self);
+macro int[<*>].ctz(self) => $$ctz(self);
+macro int[<*>].clz(self) => $$clz(self);
+macro int[<*>] int[<*>].fshl(hi, int[<*>] lo, int[<*>] shift) => $$fshl(hi, lo, shift);
+macro int[<*>] int[<*>].fshr(hi, int[<*>] lo, int[<*>] shift) => $$fshr(hi, lo, shift);
+macro int[<*>] int[<*>].rotl(self, int[<*>] shift) => $$fshl(self, self, shift);
+macro int[<*>] int[<*>].rotr(self, int[<*>] shift) => $$fshr(self, self, shift);

-macro ushort[<?>].popcount(self) => $$popcount(self);
-macro ushort[<?>].ctz(self) => $$ctz(self);
-macro ushort[<?>].clz(self) => $$clz(self);
-macro ushort[<?>] ushort[<?>].fshl(hi, ushort[<?>] lo, ushort[<?>] shift) => $$fshl(hi, lo, shift);
-macro ushort[<?>] ushort[<?>].fshr(hi, ushort[<?>] lo, ushort[<?>] shift) => $$fshr(hi, lo, shift);
-macro ushort[<?>] ushort[<?>].rotl(self, ushort[<?>] shift) => $$fshl(self, self, shift);
-macro ushort[<?>] ushort[<?>].rotr(self, ushort[<?>] shift) => $$fshr(self, self, shift);
+macro ushort[<*>].popcount(self) => $$popcount(self);
+macro ushort[<*>].ctz(self) => $$ctz(self);
+macro ushort[<*>].clz(self) => $$clz(self);
+macro ushort[<*>] ushort[<*>].fshl(hi, ushort[<*>] lo, ushort[<*>] shift) => $$fshl(hi, lo, shift);
+macro ushort[<*>] ushort[<*>].fshr(hi, ushort[<*>] lo, ushort[<*>] shift) => $$fshr(hi, lo, shift);
+macro ushort[<*>] ushort[<*>].rotl(self, ushort[<*>] shift) => $$fshl(self, self, shift);
+macro ushort[<*>] ushort[<*>].rotr(self, ushort[<*>] shift) => $$fshr(self, self, shift);

-macro short[<?>].popcount(self) => $$popcount(self);
-macro short[<?>].ctz(self) => $$ctz(self);
-macro short[<?>].clz(self) => $$clz(self);
-macro short[<?>] short[<?>].fshl(hi, short[<?>] lo, short[<?>] shift) => $$fshl(hi, lo, shift);
-macro short[<?>] short[<?>].fshr(hi, short[<?>] lo, short[<?>] shift) => $$fshr(hi, lo, shift);
-macro short[<?>] short[<?>].rotl(self, short[<?>] shift) => $$fshl(self, self, shift);
-macro short[<?>] short[<?>].rotr(self, short[<?>] shift) => $$fshr(self, self, shift);
+macro short[<*>].popcount(self) => $$popcount(self);
+macro short[<*>].ctz(self) => $$ctz(self);
+macro short[<*>].clz(self) => $$clz(self);
+macro short[<*>] short[<*>].fshl(hi, short[<*>] lo, short[<*>] shift) => $$fshl(hi, lo, shift);
+macro short[<*>] short[<*>].fshr(hi, short[<*>] lo, short[<*>] shift) => $$fshr(hi, lo, shift);
+macro short[<*>] short[<*>].rotl(self, short[<*>] shift) => $$fshl(self, self, shift);
+macro short[<*>] short[<*>].rotr(self, short[<*>] shift) => $$fshr(self, self, shift);

-macro char[<?>].popcount(self) => $$popcount(self);
-macro char[<?>].ctz(self) => $$ctz(self);
-macro char[<?>].clz(self) => $$clz(self);
-macro char[<?>] char[<?>].fshl(hi, char[<?>] lo, char[<?>] shift) => $$fshl(hi, lo, shift);
-macro char[<?>] char[<?>].fshr(hi, char[<?>] lo, char[<?>] shift) => $$fshr(hi, lo, shift);
-macro char[<?>] char[<?>].rotl(self, char[<?>] shift) => $$fshl(self, self, shift);
-macro char[<?>] char[<?>].rotr(self, char[<?>] shift) => $$fshr(self, self, shift);
+macro char[<*>].popcount(self) => $$popcount(self);
+macro char[<*>].ctz(self) => $$ctz(self);
+macro char[<*>].clz(self) => $$clz(self);
+macro char[<*>] char[<*>].fshl(hi, char[<*>] lo, char[<*>] shift) => $$fshl(hi, lo, shift);
+macro char[<*>] char[<*>].fshr(hi, char[<*>] lo, char[<*>] shift) => $$fshr(hi, lo, shift);
+macro char[<*>] char[<*>].rotl(self, char[<*>] shift) => $$fshl(self, self, shift);
+macro char[<*>] char[<*>].rotr(self, char[<*>] shift) => $$fshr(self, self, shift);

-macro ichar[<?>].popcount(self) => $$popcount(self);
-macro ichar[<?>].ctz(self) => $$ctz(self);
-macro ichar[<?>].clz(self) => $$clz(self);
-macro ichar[<?>] ichar[<?>].fshl(hi, ichar[<?>] lo, ichar[<?>] shift) => $$fshl(hi, lo, shift);
-macro ichar[<?>] ichar[<?>].fshr(hi, ichar[<?>] lo, ichar[<?>] shift) => $$fshr(hi, lo, shift);
-macro ichar[<?>] ichar[<?>].rotl(self, ichar[<?>] shift) => $$fshl(self, self, shift);
-macro ichar[<?>] ichar[<?>].rotr(self, ichar[<?>] shift) => $$fshr(self, self, shift);
+macro ichar[<*>].popcount(self) => $$popcount(self);
+macro ichar[<*>].ctz(self) => $$ctz(self);
+macro ichar[<*>].clz(self) => $$clz(self);
+macro ichar[<*>] ichar[<*>].fshl(hi, ichar[<*>] lo, ichar[<*>] shift) => $$fshl(hi, lo, shift);
+macro ichar[<*>] ichar[<*>].fshr(hi, ichar[<*>] lo, ichar[<*>] shift) => $$fshr(hi, lo, shift);
+macro ichar[<*>] ichar[<*>].rotl(self, ichar[<*>] shift) => $$fshl(self, self, shift);
+macro ichar[<*>] ichar[<*>].rotr(self, ichar[<*>] shift) => $$fshr(self, self, shift);

-macro ulong[<?>].popcount(self) => $$popcount(self);
-macro ulong[<?>].ctz(self) => $$ctz(self);
-macro ulong[<?>].clz(self) => $$clz(self);
-macro ulong[<?>] ulong[<?>].fshl(hi, ulong[<?>] lo, ulong[<?>] shift) => $$fshl(hi, lo, shift);
-macro ulong[<?>] ulong[<?>].fshr(hi, ulong[<?>] lo, ulong[<?>] shift) => $$fshr(hi, lo, shift);
-macro ulong[<?>] ulong[<?>].rotl(self, ulong[<?>] shift) => $$fshl(self, self, shift);
-macro ulong[<?>] ulong[<?>].rotr(self, ulong[<?>] shift) => $$fshr(self, self, shift);
+macro ulong[<*>].popcount(self) => $$popcount(self);
+macro ulong[<*>].ctz(self) => $$ctz(self);
+macro ulong[<*>].clz(self) => $$clz(self);
+macro ulong[<*>] ulong[<*>].fshl(hi, ulong[<*>] lo, ulong[<*>] shift) => $$fshl(hi, lo, shift);
+macro ulong[<*>] ulong[<*>].fshr(hi, ulong[<*>] lo, ulong[<*>] shift) => $$fshr(hi, lo, shift);
+macro ulong[<*>] ulong[<*>].rotl(self, ulong[<*>] shift) => $$fshl(self, self, shift);
+macro ulong[<*>] ulong[<*>].rotr(self, ulong[<*>] shift) => $$fshr(self, self, shift);

-macro long[<?>].popcount(self) => $$popcount(self);
-macro long[<?>].ctz(self) => $$ctz(self);
-macro long[<?>].clz(self) => $$clz(self);
-macro long[<?>] long[<?>].fshl(hi, long[<?>] lo, long[<?>] shift) => $$fshl(hi, lo, shift);
-macro long[<?>] long[<?>].fshr(hi, long[<?>] lo, long[<?>] shift) => $$fshr(hi, lo, shift);
-macro long[<?>] long[<?>].rotl(self, long[<?>] shift) => $$fshl(self, self, shift);
-macro long[<?>] long[<?>].rotr(self, long[<?>] shift) => $$fshr(self, self, shift);
+macro long[<*>].popcount(self) => $$popcount(self);
+macro long[<*>].ctz(self) => $$ctz(self);
+macro long[<*>].clz(self) => $$clz(self);
+macro long[<*>] long[<*>].fshl(hi, long[<*>] lo, long[<*>] shift) => $$fshl(hi, lo, shift);
+macro long[<*>] long[<*>].fshr(hi, long[<*>] lo, long[<*>] shift) => $$fshr(hi, lo, shift);
+macro long[<*>] long[<*>].rotl(self, long[<*>] shift) => $$fshl(self, self, shift);
+macro long[<*>] long[<*>].rotr(self, long[<*>] shift) => $$fshr(self, self, shift);

-macro uint128[<?>].popcount(self) => $$popcount(self);
-macro uint128[<?>].ctz(self) => $$ctz(self);
-macro uint128[<?>].clz(self) => $$clz(self);
-macro uint128[<?>] uint128[<?>].fshl(hi, uint128[<?>] lo, uint128[<?>] shift) => $$fshl(hi, lo, shift);
-macro uint128[<?>] uint128[<?>].fshr(hi, uint128[<?>] lo, uint128[<?>] shift) => $$fshr(hi, lo, shift);
-macro uint128[<?>] uint128[<?>].rotl(self, uint128[<?>] shift) => $$fshl(self, self, shift);
-macro uint128[<?>] uint128[<?>].rotr(self, uint128[<?>] shift) => $$fshr(self, self, shift);
+macro uint128[<*>].popcount(self) => $$popcount(self);
+macro uint128[<*>].ctz(self) => $$ctz(self);
+macro uint128[<*>].clz(self) => $$clz(self);
+macro uint128[<*>] uint128[<*>].fshl(hi, uint128[<*>] lo, uint128[<*>] shift) => $$fshl(hi, lo, shift);
+macro uint128[<*>] uint128[<*>].fshr(hi, uint128[<*>] lo, uint128[<*>] shift) => $$fshr(hi, lo, shift);
+macro uint128[<*>] uint128[<*>].rotl(self, uint128[<*>] shift) => $$fshl(self, self, shift);
+macro uint128[<*>] uint128[<*>].rotr(self, uint128[<*>] shift) => $$fshr(self, self, shift);

-macro int128[<?>].popcount(self) => $$popcount(self);
-macro int128[<?>].ctz(self) => $$ctz(self);
-macro int128[<?>].clz(self) => $$clz(self);
-macro int128[<?>] int128[<?>].fshl(hi, int128[<?>] lo, int128[<?>] shift) => $$fshl(hi, lo, shift);
-macro int128[<?>] int128[<?>].fshr(hi, int128[<?>] lo, int128[<?>] shift) => $$fshr(hi, lo, shift);
-macro int128[<?>] int128[<?>].rotl(self, int128[<?>] shift) => $$fshl(self, self, shift);
-macro int128[<?>] int128[<?>].rotr(self, int128[<?>] shift) => $$fshr(self, self, shift);
+macro int128[<*>].popcount(self) => $$popcount(self);
+macro int128[<*>].ctz(self) => $$ctz(self);
+macro int128[<*>].clz(self) => $$clz(self);
+macro int128[<*>] int128[<*>].fshl(hi, int128[<*>] lo, int128[<*>] shift) => $$fshl(hi, lo, shift);
+macro int128[<*>] int128[<*>].fshr(hi, int128[<*>] lo, int128[<*>] shift) => $$fshr(hi, lo, shift);
+macro int128[<*>] int128[<*>].rotl(self, int128[<*>] shift) => $$fshl(self, self, shift);
+macro int128[<*>] int128[<*>].rotr(self, int128[<*>] shift) => $$fshr(self, self, shift);

 macro uint.popcount(self) => $$popcount(self);
 macro uint.ctz(self) => $$ctz(self);
--- a/lib/std/collections/anylist.c3
+++ b/lib/std/collections/anylist.c3
@@ -1,12 +1,23 @@
-// Copyright (c) 2024 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2024-2025 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::anylist;
 import std::io,std::math;

-def AnyPredicate = fn bool(any value);
-def AnyTest = fn bool(any type, any context);
+alias AnyPredicate = fn bool(any value);
+alias AnyTest = fn bool(any type, any context);

+<*
+ The AnyList contains a heterogenous set of types. Anything placed in the
+ list will shallowly copied in order to be stored as an `any`. This means
+ that the list will copy and free its elements.
+
+ However, because we're getting `any` values back when we pop, those operations
+ need to take an allocator, as we can only copy then pop then return the copy.
+
+ If we're not doing pop, then things are easier, since we can just hand over
+ the existing any.
+*>
 struct AnyList (Printable)
 {
 	usz size;
@@ -17,18 +28,11 @@ struct AnyList (Printable)


 <*
- Use `init` for to use a custom allocator.
+ Initialize the list. If not initialized then it will use the temp allocator
+ when something is pushed to it.

- @param initial_capacity "The initial capacity to reserve"
-*>
-fn AnyList* AnyList.new_init(&self, usz initial_capacity = 16, Allocator allocator = null) @deprecated("Use init(mem)")
-{
-	return self.init(allocator ?: allocator::heap(), initial_capacity) @inline;
-}
-
-<*
- @param [&inout] allocator "The allocator to use"
- @param initial_capacity "The initial capacity to reserve"
+ @param [&inout] allocator : "The allocator to use"
+ @param initial_capacity : "The initial capacity to reserve, defaults to 16"
 *>
 fn AnyList* AnyList.init(&self, Allocator allocator, usz initial_capacity = 16)
 {
@@ -50,25 +54,371 @@ fn AnyList* AnyList.init(&self, Allocator allocator, usz initial_capacity = 16)
 <*
 Initialize the list using the temp allocator.

- @param initial_capacity "The initial capacity to reserve"
+ @param initial_capacity : "The initial capacity to reserve"
 *>
-fn AnyList* AnyList.temp_init(&self, usz initial_capacity = 16) @deprecated("Use tinit")
+fn AnyList* AnyList.tinit(&self, usz initial_capacity = 16)
 {
-	return self.init(allocator::temp(), initial_capacity) @inline;
+	return self.init(tmem, initial_capacity) @inline;
+}
+
+fn bool AnyList.is_initialized(&self) @inline => self.allocator != null;
+
+<*
+ Push an element on the list by cloning it.
+*>
+macro void AnyList.push(&self, element)
+{
+	if (!self.allocator) self.allocator = tmem;
+	self._append(allocator::clone(self.allocator, element));
+}
+
+<*
+ Free a retained element removed using *_retained.
+*>
+fn void AnyList.free_element(&self, any element) @inline
+{
+	allocator::free(self.allocator, element.ptr);
+}
+
+<*
+ Pop a value who's type is known. If the type is incorrect, this
+ will still pop the element.
+
+ @param $Type : "The type we assume the value has"
+ @return "The last value as the type given"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+*>
+macro AnyList.pop(&self, $Type)
+{
+	if (!self.size) return NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	return *anycast(self.entries[--self.size], $Type);
+}
+
+<*
+ Copy the last value, pop it and return the copy of it.
+
+ @param [&inout] allocator : "The allocator to use for copying"
+ @return "A copy of the last value if it exists"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.copy_pop(&self, Allocator allocator)
+{
+	if (!self.size) return NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	return allocator::clone_any(allocator, self.entries[--self.size]);
 }


 <*
- Initialize the list using the temp allocator.
+ Copy the last value, pop it and return the copy of it.

- @param initial_capacity "The initial capacity to reserve"
+ @return "A temp copy of the last value if it exists"
+ @return? NO_MORE_ELEMENT
 *>
-fn AnyList* AnyList.tinit(&self, usz initial_capacity = 16)
+fn any? AnyList.tcopy_pop(&self) => self.copy_pop(tmem);
+
+
+<*
+ Pop the last value. It must later be released using `list.free_element()`.
+
+ @return "The last value if it exists"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.pop_retained(&self)
 {
-	return self.init(allocator::temp(), initial_capacity) @inline;
+	if (!self.size) return NO_MORE_ELEMENT?;
+	return self.entries[--self.size];
 }

-fn usz! AnyList.to_format(&self, Formatter* formatter) @dynamic
+<*
+ Remove all elements in the list.
+*>
+fn void AnyList.clear(&self)
+{
+	for (usz i = 0; i < self.size; i++)
+	{
+		self.free_element(self.entries[i]);
+	}
+	self.size = 0;
+}
+
+<*
+ Pop a value who's type is known. If the type is incorrect, this
+ will still pop the element.
+
+ @param $Type : "The type we assume the value has"
+ @return "The first value as the type given"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+*>
+macro AnyList.pop_first(&self, $Type)
+{
+	if (!self.size) return NO_MORE_ELEMENT?;
+	defer self.remove_at(0);
+	return *anycast(self.entries[0], $Type);
+}
+
+<*
+ Pop the first value. It must later be released using `list.free_element()`.
+
+ @return "The first value if it exists"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.pop_first_retained(&self)
+{
+	if (!self.size) return NO_MORE_ELEMENT?;
+	defer self.remove_at(0);
+	return self.entries[0];
+}
+
+
+<*
+ Copy the first value, pop it and return the copy of it.
+
+ @param [&inout] allocator : "The allocator to use for copying"
+ @return "A copy of the first value if it exists"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.copy_pop_first(&self, Allocator allocator)
+{
+	if (!self.size) return NO_MORE_ELEMENT?;
+	defer self.free_element(self.entries[self.size]);
+	defer self.remove_at(0);
+	return allocator::clone_any(allocator, self.entries[0]);
+}
+
+<*
+ Copy the first value, pop it and return the temp copy of it.
+
+ @return "A temp copy of the first value if it exists"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.tcopy_pop_first(&self) => self.copy_pop_first(tmem);
+
+<*
+ Remove the element at the particular index.
+
+ @param index : "The index of the element to remove"
+ @require index < self.size
+*>
+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];
+}
+
+<*
+ Add all the elements in another AnyList.
+
+ @param [&in] other_list : "The list to add"
+*>
+fn void AnyList.add_all(&self, AnyList* other_list)
+{
+	if (!other_list.size) return;
+	self.reserve(other_list.size);
+	foreach (value : other_list)
+	{
+		self.entries[self.size++] = allocator::clone_any(self.allocator, value);
+	}
+}
+
+<*
+ Reverse the order of the elements in the list.
+*>
+fn void AnyList.reverse(&self)
+{
+	if (self.size < 2) return;
+	usz half = self.size / 2U;
+	usz end = self.size - 1;
+	for (usz i = 0; i < half; i++)
+	{
+		self.swap(i, end - i);
+	}
+}
+
+<*
+ Return a view of the data as a slice.
+
+ @return "The slice view"
+*>
+fn any[] AnyList.array_view(&self)
+{
+	return self.entries[:self.size];
+}
+
+<*
+ Push an element to the front of the list.
+
+ @param value : "The value to push to the list"
+*>
+macro void AnyList.push_front(&self, value)
+{
+	self.insert_at(0, value);
+}
+
+<*
+ Insert an element at a particular index.
+
+ @param index : "the index where the element should be inserted"
+ @param type : "the value to insert"
+ @require index <= self.size : "The index is out of bounds"
+*>
+macro void AnyList.insert_at(&self, usz index, type)
+{
+	if (index == self.size)
+	{
+		self.push(type);
+		return;
+	}
+	any value = allocator::copy(self.allocator, type);
+	self._insert_at(self, index, value);
+}
+
+<*
+ Remove the last element in the list. The list may not be empty.
+
+ @require self.size > 0 : "The list was already empty"
+*>
+fn void AnyList.remove_last(&self)
+{
+	self.free_element(self.entries[--self.size]);
+}
+
+<*
+ Remove the first element in the list, the list may not be empty.
+
+ @require self.size > 0
+*>
+fn void AnyList.remove_first(&self)
+{
+	self.remove_at(0);
+}
+
+<*
+ Return the first element by value, assuming it is the given type.
+
+ @param $Type : "The type of the first element"
+ @return "The first element"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+*>
+macro AnyList.first(&self, $Type)
+{
+	return *anycast(self.first_any(), $Type);
+}
+
+<*
+ Return the first element
+
+ @return "The first element"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.first_any(&self) @inline
+{
+	return self.size ? self.entries[0] : NO_MORE_ELEMENT?;
+}
+
+<*
+ Return the last element by value, assuming it is the given type.
+
+ @param $Type : "The type of the last element"
+ @return "The last element"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+*>
+macro AnyList.last(&self, $Type)
+{
+	return *anycast(self.last_any(), $Type);
+}
+
+<*
+ Return the last element
+
+ @return "The last element"
+ @return? NO_MORE_ELEMENT
+*>
+fn any? AnyList.last_any(&self) @inline
+{
+	return self.size ? self.entries[self.size - 1] : NO_MORE_ELEMENT?;
+}
+
+<*
+ Return whether the list is empty.
+
+ @return "True if the list is empty"
+*>
+fn bool AnyList.is_empty(&self) @inline
+{
+	return !self.size;
+}
+
+<*
+ Return the length of the list.
+
+ @return "The number of elements in the list"
+*>
+fn usz AnyList.len(&self) @operator(len) @inline
+{
+	return self.size;
+}
+
+<*
+ Return an element in the list by value, assuming it is the given type.
+
+ @param index : "The index of the element to retrieve"
+ @param $Type : "The type of the element"
+ @return "The element at the index"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+ @require index < self.size : "Index out of range"
+*>
+macro AnyList.get(&self, usz index, $Type)
+{
+	return *anycast(self.entries[index], $Type);
+}
+
+<*
+ Return an element in the list.
+
+ @param index : "The index of the element to retrieve"
+ @return "The element at the index"
+ @return? TYPE_MISMATCH, NO_MORE_ELEMENT
+ @require index < self.size : "Index out of range"
+*>
+fn any AnyList.get_any(&self, usz index) @inline @operator([])
+{
+	return self.entries[index];
+}
+
+<*
+ Completely free and clear a list.
+*>
+fn void AnyList.free(&self)
+{
+	if (!self.allocator) return;
+	self.clear();
+	allocator::free(self.allocator, self.entries);
+	self.capacity = 0;
+	self.entries = null;
+}
+
+<*
+ Swap two elements in a list.
+
+ @param i : "Index of one of the elements"
+ @param j : "Index of the other element"
+ @require i < self.size : "The first index is out of range"
+ @require j < self.size : "The second index is out of range"
+*>
+fn void AnyList.swap(&self, usz i, usz j)
+{
+	any temp = self.entries[i];
+	self.entries[i] = self.entries[j];
+	self.entries[j] = temp;
+}
+
+<*
+ Print the list to a formatter.
+*>
+fn usz? AnyList.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -88,310 +438,10 @@ fn usz! AnyList.to_format(&self, Formatter* formatter) @dynamic
 	}
 }

-fn String AnyList.to_new_string(&self, Allocator allocator = null) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator ?: allocator::heap());
-}
-
-
-fn String AnyList.to_string(&self, Allocator allocator) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator);
-}
-
-fn String AnyList.to_tstring(&self) => string::tformat("%s", *self);
-
 <*
- Push an element on the list by cloning it.
-*>
-macro void AnyList.push(&self, element)
-{
-	if (!self.allocator) self.allocator = allocator::heap();
-	self.append_internal(allocator::clone(self.allocator, element));
-}
+ Remove any elements matching the predicate.

-fn void AnyList.append_internal(&self, any element) @local
-{
-	self.ensure_capacity();
-	self.entries[self.size++] = element;
-}
-
-<*
- Free a retained element removed using *_retained.
-*>
-fn void AnyList.free_element(&self, any element) @inline
-{
-	allocator::free(self.allocator, element.ptr);
-}
-
-<*
- Pop a value who's type is known. If the type is incorrect, this
- will still pop the element.
-
- @return! CastResult.TYPE_MISMATCH, IteratorResult.NO_MORE_ELEMENT
-*>
-macro AnyList.pop(&self, $Type)
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	return *anycast(self.entries[--self.size], $Type);
-}
-
-<*
- Pop the last value and allocate the copy using the given allocator.
- @return! IteratorResult.NO_MORE_ELEMENT
-*>
-fn any! AnyList.copy_pop(&self, Allocator allocator = allocator::heap())
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	return allocator::clone_any(allocator, self.entries[--self.size]);
-}
-
-<*
- Pop the last value and allocate the copy using the given allocator.
- @return! IteratorResult.NO_MORE_ELEMENT
- @deprecated `use copy_pop`
-*>
-fn any! AnyList.new_pop(&self, Allocator allocator = allocator::heap())
-{
-	return self.copy_pop(allocator);
-}
-
-<*
- Pop the last value and allocate the copy using the temp allocator
- @return! IteratorResult.NO_MORE_ELEMENT
- @deprecated `use tcopy_pop`
-*>
-fn any! AnyList.temp_pop(&self) => self.copy_pop(allocator::temp());
-
-<*
- Pop the last value and allocate the copy using the temp allocator
- @return! IteratorResult.NO_MORE_ELEMENT
-*>
-fn any! AnyList.tcopy_pop(&self) => self.copy_pop(allocator::temp());
-
-<*
- Pop the last value. It must later be released using list.free_element()
- @return! IteratorResult.NO_MORE_ELEMENT
-*>
-fn any! AnyList.pop_retained(&self)
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	return self.entries[--self.size];
-}
-
-fn void AnyList.clear(&self)
-{
-	for (usz i = 0; i < self.size; i++)
-	{
-		self.free_element(self.entries[i]);
-	}
-	self.size = 0;
-}
-
-<*
- Same as pop() but pops the first value instead.
-*>
-macro AnyList.pop_first(&self, $Type)
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	defer self.remove_at(0);
-	return *anycast(self.entries[0], $Type);
-}
-
-<*
- Same as pop_retained() but pops the first value instead.
-*>
-fn any! AnyList.pop_first_retained(&self)
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	defer self.remove_at(0);
-	return self.entries[0];
-}
-
-<*
- Same as new_pop() but pops the first value instead.
- @deprecated `use copy_pop_first`
-*>
-fn any! AnyList.new_pop_first(&self, Allocator allocator = allocator::heap())
-{
-	return self.copy_pop_first(allocator) @inline;
-}
-
-<*
- Same as new_pop() but pops the first value instead.
-*>
-fn any! AnyList.copy_pop_first(&self, Allocator allocator = allocator::heap())
-{
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
-	defer self.free_element(self.entries[self.size]);
-	defer self.remove_at(0);
-	return allocator::clone_any(allocator, self.entries[0]);
-}
-
-<*
- Same as temp_pop() but pops the first value instead.
-*>
-fn any! AnyList.tcopy_pop_first(&self) => self.copy_pop_first(allocator::temp());
-
-<*
- Same as temp_pop() but pops the first value instead.
- @deprecated `use tcopy_pop_first`
-*>
-fn any! AnyList.temp_pop_first(&self) => self.new_pop_first(allocator::temp());
-
-<*
- @require index < self.size
-*>
-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 AnyList.add_all(&self, AnyList* other_list)
-{
-	if (!other_list.size) return;
-	self.reserve(other_list.size);
-	foreach (value : other_list)
-	{
-		self.entries[self.size++] = allocator::clone_any(self.allocator, value);
-	}
-}
-
-<*
- Reverse the elements in a list.
-*>
-fn void AnyList.reverse(&self)
-{
-	if (self.size < 2) return;
-	usz half = self.size / 2U;
-	usz end = self.size - 1;
-	for (usz i = 0; i < half; i++)
-	{
-		self.swap(i, end - i);
-	}
-}
-
-fn any[] AnyList.array_view(&self)
-{
-	return self.entries[:self.size];
-}
-
-<*
- Push an element to the front of the list.
-*>
-macro void AnyList.push_front(&self, type)
-{
-	self.insert_at(0, type);
-}
-
-<*
- @require index < self.size
-*>
-macro void AnyList.insert_at(&self, usz index, type) @local
-{
-	any value = allocator::copy(self.allocator, type);
-	self.insert_at_internal(self, index, value);
-}
-
-<*
- @require index < self.size
-*>
-fn void AnyList.insert_at_internal(&self, usz index, any value) @local
-{
-	self.ensure_capacity();
-	for (usz i = self.size; i > index; i--)
-	{
-		self.entries[i] = self.entries[i - 1];
-	}
-	self.size++;
-	self.entries[index] = value;
-}
-
-
-<*
- @require self.size > 0
-*>
-fn void AnyList.remove_last(&self)
-{
-	self.free_element(self.entries[--self.size]);
-}
-
-<*
- @require self.size > 0
-*>
-fn void AnyList.remove_first(&self)
-{
-	self.remove_at(0);
-}
-
-macro AnyList.first(&self, $Type)
-{
-	return *anycast(self.first_any(), $Type);
-}
-
-fn any! AnyList.first_any(&self) @inline
-{
-	return self.size ? self.entries[0] : IteratorResult.NO_MORE_ELEMENT?;
-}
-
-macro AnyList.last(&self, $Type)
-{
-	return *anycast(self.last_any(), $Type);
-}
-
-fn any! AnyList.last_any(&self) @inline
-{
-	return self.size ? self.entries[self.size - 1] : IteratorResult.NO_MORE_ELEMENT?;
-}
-
-fn bool AnyList.is_empty(&self) @inline
-{
-	return !self.size;
-}
-
-fn usz AnyList.len(&self) @operator(len) @inline
-{
-	return self.size;
-}
-
-<*
- @require index < self.size "Index out of range"
-*>
-macro AnyList.get(&self, usz index, $Type)
-{
-	return *anycast(self.entries[index], $Type);
-}
-
-<*
- @require index < self.size "Index out of range"
-*>
-fn any AnyList.get_any(&self, usz index) @inline
-{
-	return self.entries[index];
-}
-
-fn void AnyList.free(&self)
-{
-	if (!self.allocator) return;
-	self.clear();
-	allocator::free(self.allocator, self.entries);
-	self.capacity = 0;
-	self.entries = null;
-}
-
-fn void AnyList.swap(&self, usz i, usz j)
-{
-	any temp = self.entries[i];
-	self.entries[i] = self.entries[j];
-	self.entries[j] = temp;
-}
-
-<*
- @param filter "The function to determine if it should be removed or not"
+ @param filter : "The function to determine if it should be removed or not"
 @return "the number of deleted elements"
 *>
 fn usz AnyList.remove_if(&self, AnyPredicate filter)
@@ -400,7 +450,9 @@ fn usz AnyList.remove_if(&self, AnyPredicate filter)
 }

 <*
- @param selection "The function to determine if it should be kept or not"
+ Retain the elements matching the predicate.
+
+ @param selection : "The function to determine if it should be kept or not"
 @return "the number of deleted elements"
 *>
 fn usz AnyList.retain_if(&self, AnyPredicate selection)
@@ -408,40 +460,95 @@ fn usz AnyList.retain_if(&self, AnyPredicate selection)
 	return self._remove_if(selection, true);
 }

-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)
-	{
-		// Find last index of item to be deleted.
-		$if $invert:
-			while (i > 0 && !filter(&self.entries[i - 1])) i--;
-		$else
-			while (i > 0 && filter(&self.entries[i - 1])) i--;
-		$endif
-		// Remove the items from this index up to the one not to be deleted.
-		usz n = self.size - k;
-		for (usz j = i; j < k; j++) self.free_element(self.entries[j]);
-		self.entries[i:n] = self.entries[k:n];
-		self.size -= k - i;
-		// Find last index of item not to be deleted.
-		$if $invert:
-			while (i > 0 && filter(&self.entries[i - 1])) i--;
-		$else
-			while (i > 0 && !filter(&self.entries[i - 1])) i--;
-		$endif
-	}
-	return size - self.size;
-}
+<*
+ Remove any elements matching the predicate.

+ @param filter : "The function to determine if it should be removed or not"
+ @param context : "The context to the function"
+ @return "the number of deleted elements"
+*>
 fn usz AnyList.remove_using_test(&self, AnyTest filter, any context)
 {
 	return self._remove_using_test(filter, false, context);
 }

-fn usz AnyList.retain_using_test(&self, AnyTest filter, any context)
+<*
+ Retain any elements matching the predicate.
+
+ @param selection : "The function to determine if it should be retained or not"
+ @param context : "The context to the function"
+ @return "the number of deleted elements"
+*>
+fn usz AnyList.retain_using_test(&self, AnyTest selection, any context)
 {
-	return self._remove_using_test(filter, true, context);
+	return self._remove_using_test(selection, true, context);
+}
+
+
+<*
+ Reserve memory so that at least the `min_capacity` exists.
+
+ @param min_capacity : "The min capacity to hold"
+*>
+fn void AnyList.reserve(&self, usz min_capacity)
+{
+	if (!min_capacity) return;
+	if (self.capacity >= min_capacity) return;
+	if (!self.allocator) self.allocator = tmem;
+	min_capacity = math::next_power_of_2(min_capacity);
+	self.entries = allocator::realloc(self.allocator, self.entries, any.sizeof * min_capacity);
+	self.capacity = min_capacity;
+}
+
+<*
+ Set the element at any index.
+
+ @param index : "The index where to set the value."
+ @param value : "The value to set"
+ @require index <= self.size : "Index out of range"
+*>
+macro void AnyList.set(&self, usz index, value)
+{
+	if (index == self.size)
+	{
+		self.push(value);
+		return;
+	}
+	self.free_element(self.entries[index]);
+	self.entries[index] = allocator::copy(self.allocator, value);
+}
+
+// -- private
+
+fn void AnyList.ensure_capacity(&self, usz added = 1) @inline @private
+{
+	usz new_size = self.size + added;
+	if (self.capacity >= new_size) return;
+
+	assert(new_size < usz.max / 2U);
+	usz new_capacity = self.capacity ? 2U * self.capacity : 16U;
+	while (new_capacity < new_size) new_capacity *= 2U;
+	self.reserve(new_capacity);
+}
+
+fn void AnyList._append(&self, any element) @local
+{
+	self.ensure_capacity();
+	self.entries[self.size++] = element;
+}
+
+<*
+ @require index < self.size
+*>
+fn void AnyList._insert_at(&self, usz index, any value) @local
+{
+	self.ensure_capacity();
+	for (usz i = self.size; i > index; i--)
+	{
+		self.entries[i] = self.entries[i - 1];
+	}
+	self.size++;
+	self.entries[index] = value;
 }

 macro usz AnyList._remove_using_test(&self, AnyTest filter, bool $invert, ctx) @local
@@ -470,45 +577,28 @@ macro usz AnyList._remove_using_test(&self, AnyTest filter, bool $invert, ctx) @
 	return size - self.size;
 }

-<*
- Reserve at least min_capacity
-*>
-fn void AnyList.reserve(&self, usz min_capacity)
+macro usz AnyList._remove_if(&self, AnyPredicate filter, bool $invert) @local
 {
-	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.capacity = min_capacity;
-}
-
-macro any AnyList.@item_at(&self, usz index) @operator([])
-{
-	return self.entries[index];
-}
-
-<*
- @require index <= self.size "Index out of range"
-*>
-macro void AnyList.set(&self, usz index, value)
-{
-	if (index == self.size)
+	usz size = self.size;
+	for (usz i = size, usz k = size; k > 0; k = i)
 	{
-		self.push(value);
-		return;
+		// Find last index of item to be deleted.
+		$if $invert:
+			while (i > 0 && !filter(&self.entries[i - 1])) i--;
+		$else
+			while (i > 0 && filter(&self.entries[i - 1])) i--;
+		$endif
+		// Remove the items from this index up to the one not to be deleted.
+		usz n = self.size - k;
+		for (usz j = i; j < k; j++) self.free_element(self.entries[j]);
+		self.entries[i:n] = self.entries[k:n];
+		self.size -= k - i;
+		// Find last index of item not to be deleted.
+		$if $invert:
+			while (i > 0 && filter(&self.entries[i - 1])) i--;
+		$else
+			while (i > 0 && !filter(&self.entries[i - 1])) i--;
+		$endif
 	}
-	self.free_element(self.entries[index]);
-	self.entries[index] = allocator::copy(self.allocator, value);
-}
-
-fn void AnyList.ensure_capacity(&self, usz added = 1) @inline @private
-{
-	usz new_size = self.size + added;
-	if (self.capacity >= new_size) return;
-
-	assert(new_size < usz.max / 2U);
-	usz new_capacity = self.capacity ? 2U * self.capacity : 16U;
-	while (new_capacity < new_size) new_capacity *= 2U;
-	self.reserve(new_capacity);
+	return size - self.size;
 }
--- a/lib/std/collections/bitset.c3
+++ b/lib/std/collections/bitset.c3
@@ -1,18 +1,22 @@
+// Copyright (c) 2023-2025 C3 team. 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.
 <*
- @require SIZE > 0
+ @require SIZE > 0 : "The size of the bitset in bits must be at least 1"
 *>
-module std::collections::bitset(<SIZE>);
+module std::collections::bitset {SIZE};

-def Type = uint;
-
-const BITS = Type.sizeof * 8;
+const BITS = uint.sizeof * 8;
 const SZ = (SIZE + BITS - 1) / BITS;

 struct BitSet
 {
-	Type[SZ] data;
+	uint[SZ] data;
 }

+<*
+ @return "The number of bits set"
+*>
 fn usz BitSet.cardinality(&self)
 {
 	usz n;
@@ -24,7 +28,11 @@ fn usz BitSet.cardinality(&self)
 }

 <*
- @require i < SIZE
+ Set a bit in the bitset.
+
+ @param i : "The index to set"
+
+ @require i < SIZE : "Index was out of range"
 *>
 fn void BitSet.set(&self, usz i)
 {
@@ -34,7 +42,86 @@ fn void BitSet.set(&self, usz i)
 }

 <*
- @require i < SIZE
+ Perform xor over all bits, mutating itself
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+macro BitSet BitSet.xor_self(&self, BitSet set) @operator(^=)
+{
+	foreach (i, &x : self.data) *x ^= set.data[i];
+	return *self;
+}
+
+<*
+ Perform xor over all bits, returning a new bit set.
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+fn BitSet BitSet.xor(&self, BitSet set) @operator(^)
+{
+	BitSet new_set @noinit;
+	foreach (i, x : self.data) new_set.data[i] = x ^ set.data[i];
+	return new_set;
+}
+
+<*
+ Perform or over all bits, returning a new bit set.
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+fn BitSet BitSet.or(&self, BitSet set) @operator(|)
+{
+	BitSet new_set @noinit;
+	foreach (i, x : self.data) new_set.data[i] = x | set.data[i];
+	return new_set;
+}
+
+<*
+ Perform or over all bits, mutating itself
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+macro BitSet BitSet.or_self(&self, BitSet set) @operator(|=)
+{
+	foreach (i, &x : self.data) *x |= set.data[i];
+	return *self;
+}
+
+<*
+ Perform & over all bits, returning a new bit set.
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+fn BitSet BitSet.and(&self, BitSet set) @operator(&)
+{
+	BitSet new_set @noinit;
+	foreach (i, x : self.data) new_set.data[i] = x & set.data[i];
+	return new_set;
+}
+
+<*
+ Perform & over all bits, mutating itself.
+
+ @param set : "The bit set to xor with"
+ @return "The resulting bit set"
+*>
+macro BitSet BitSet.and_self(&self, BitSet set) @operator(&=)
+{
+	foreach (i, &x : self.data) *x &= set.data[i];
+	return *self;
+}
+
+<*
+ Unset (clear) a bit in the bitset.
+
+ @param i : "The index to set"
+
+ @require i < SIZE : "Index was out of range"
 *>
 fn void BitSet.unset(&self, usz i)
 {
@@ -44,7 +131,11 @@ fn void BitSet.unset(&self, usz i)
 }

 <*
- @require i < SIZE
+ Get a particular bit in the bitset
+
+ @param i : "The index of the bit"
+
+ @require i < SIZE : "Index was out of range"
 *>
 fn bool BitSet.get(&self, usz i) @operator([]) @inline
 {
@@ -59,7 +150,12 @@ fn usz BitSet.len(&self) @operator(len) @inline
 }

 <*
- @require i < SIZE
+ Change a particular bit in the bitset
+
+ @param i : "The index of the bit"
+ @param value : "The value to set the bit to"
+
+ @require i < SIZE : "Index was out of range"
 *>
 fn void BitSet.set_bool(&self, usz i, bool value) @operator([]=) @inline
 {
@@ -70,12 +166,12 @@ fn void BitSet.set_bool(&self, usz i, bool value) @operator([]=) @inline
 <*
 @require Type.kindof == UNSIGNED_INT
 *>
-module std::collections::growablebitset(<Type>);
+module std::collections::growablebitset{Type};
 import std::collections::list;

 const BITS = Type.sizeof * 8;

-def GrowableBitSetList = List(<Type>);
+alias GrowableBitSetList = List{Type};

 struct GrowableBitSet
 {
@@ -84,17 +180,7 @@ 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()) @deprecated("Use init(mem)")
-{
-	self.data.init(allocator, initial_capacity);
-	return self;
-}
-
-<*
- @param initial_capacity
- @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
 *>
 fn GrowableBitSet* GrowableBitSet.init(&self, Allocator allocator, usz initial_capacity = 1)
 {
@@ -102,14 +188,9 @@ fn GrowableBitSet* GrowableBitSet.init(&self, Allocator allocator, usz initial_c
 	return self;
 }

-fn GrowableBitSet* GrowableBitSet.temp_init(&self, usz initial_capacity = 1) @deprecated("Use tinit()")
-{
-	return self.init(allocator::temp(), initial_capacity) @inline;
-}
-
 fn GrowableBitSet* GrowableBitSet.tinit(&self, usz initial_capacity = 1)
 {
-	return self.init(allocator::temp(), initial_capacity) @inline;
+	return self.init(tmem, initial_capacity) @inline;
 }

 fn void GrowableBitSet.free(&self)
--- a/lib/std/collections/elastic_array.c3
+++ b/lib/std/collections/elastic_array.c3
@@ -2,13 +2,13 @@
 // Use of self source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 <*
- @require MAX_SIZE >= 1 `The size must be at least 1 element big.`
+ @require MAX_SIZE >= 1 : `The size must be at least 1 element big.`
 *>
-module std::collections::elastic_array(<Type, MAX_SIZE>);
+module std::collections::elastic_array {Type, MAX_SIZE};
 import std::io, std::math, std::collections::list_common;

-def ElementPredicate = fn bool(Type *type);
-def ElementTest = fn bool(Type *type, any context);
+alias ElementPredicate = fn bool(Type *type);
+alias ElementTest = fn bool(Type *type, any context);
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 const ELEMENT_IS_POINTER = Type.kindof == POINTER;
 macro type_is_overaligned() => Type.alignof > mem::DEFAULT_MEM_ALIGNMENT;
@@ -19,7 +19,7 @@ struct ElasticArray (Printable)
 	Type[MAX_SIZE] entries;
 }

-fn usz! ElasticArray.to_format(&self, Formatter* formatter) @dynamic
+fn usz? ElasticArray.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -39,38 +39,28 @@ fn usz! ElasticArray.to_format(&self, Formatter* formatter) @dynamic
 	}
 }

-fn String ElasticArray.to_string(&self, Allocator allocator) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator);
-}
-
-fn String ElasticArray.to_new_string(&self, Allocator allocator = nul) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator ?: allocator::heap());
-}
-
 fn String ElasticArray.to_tstring(&self)
 {
 	return string::tformat("%s", *self);
 }

-fn void! ElasticArray.push_try(&self, Type element) @inline
+fn void? ElasticArray.push_try(&self, Type element) @inline
 {
-	if (self.size == MAX_SIZE) return AllocationFailure.OUT_OF_MEMORY?;
+	if (self.size == MAX_SIZE) return mem::OUT_OF_MEMORY?;
 	self.entries[self.size++] = element;
 }

 <*
- @require self.size < MAX_SIZE `Tried to exceed the max size`
+ @require self.size < MAX_SIZE : `Tried to exceed the max size`
 *>
 fn void ElasticArray.push(&self, Type element) @inline
 {
 	self.entries[self.size++] = element;
 }

-fn Type! ElasticArray.pop(&self)
+fn Type? ElasticArray.pop(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	return self.entries[--self.size];
 }

@@ -82,9 +72,9 @@ fn void ElasticArray.clear(&self)
 <*
 @require self.size > 0
 *>
-fn Type! ElasticArray.pop_first(&self)
+fn Type? ElasticArray.pop_first(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
 	return self.entries[0];
 }
@@ -146,7 +136,7 @@ fn usz ElasticArray.add_array_to_limit(&self, Type[] array)
 Add the values of an array to this list.

 @param [in] array
- @require array.len + self.size <= MAX_SIZE `Size would exceed max.`
+ @require array.len + self.size <= MAX_SIZE : `Size would exceed max.`
 @ensure self.size >= array.len
 *>
 fn void ElasticArray.add_array(&self, Type[] array)
@@ -160,28 +150,12 @@ fn void ElasticArray.add_array(&self, Type[] array)



-<*
- IMPORTANT The returned array must be freed using free_aligned.
-*>
-fn Type[] ElasticArray.to_new_aligned_array(&self)
-{
-	return list_common::list_to_new_aligned_array(Type, self, allocator::heap());
-}
-
 <*
 IMPORTANT The returned array must be freed using free_aligned.
 *>
 fn Type[] ElasticArray.to_aligned_array(&self, Allocator allocator)
 {
-	return list_common::list_to_new_aligned_array(Type, self, allocator);
-}
-
-<*
- @require !type_is_overaligned() : "This function is not available on overaligned types"
-*>
-macro Type[] ElasticArray.to_new_array(&self)
-{
-	return list_common::list_to_array(Type, self, allocator::heap());
+	return list_common::list_to_aligned_array(Type, self, allocator);
 }

 <*
@@ -189,15 +163,15 @@ macro Type[] ElasticArray.to_new_array(&self)
 *>
 macro Type[] ElasticArray.to_array(&self, Allocator allocator)
 {
-	return list_common::list_to_new_array(Type, self, allocator);
+	return list_common::list_to_array(Type, self, allocator);
 }

 fn Type[] ElasticArray.to_tarray(&self)
 {
 	$if type_is_overaligned():
-	return self.to_aligned_array(allocator::temp());
+	return self.to_aligned_array(tmem);
 	$else
-	return self.to_array(allocator::temp());
+	return self.to_array(tmem);
 	$endif;
 }

@@ -215,7 +189,7 @@ fn Type[] ElasticArray.array_view(&self)
 }

 <*
- @require self.size < MAX_SIZE `List would exceed max size`
+ @require self.size < MAX_SIZE : `List would exceed max size`
 *>
 fn void ElasticArray.push_front(&self, Type type) @inline
 {
@@ -223,9 +197,9 @@ fn void ElasticArray.push_front(&self, Type type) @inline
 }

 <*
- @require self.size < MAX_SIZE `List would exceed max size`
+ @require self.size < MAX_SIZE : `List would exceed max size`
 *>
-fn void! ElasticArray.push_front_try(&self, Type type) @inline
+fn void? ElasticArray.push_front_try(&self, Type type) @inline
 {
 	return self.insert_at_try(0, type);
 }
@@ -233,14 +207,14 @@ fn void! ElasticArray.push_front_try(&self, Type type) @inline
 <*
 @require index <= self.size
 *>
-fn void! ElasticArray.insert_at_try(&self, usz index, Type value)
+fn void? ElasticArray.insert_at_try(&self, usz index, Type value)
 {
-	if (self.size == MAX_SIZE) return AllocationFailure.OUT_OF_MEMORY?;
+	if (self.size == MAX_SIZE) return mem::OUT_OF_MEMORY?;
 	self.insert_at(index, value);
 }

 <*
- @require self.size < MAX_SIZE `List would exceed max size`
+ @require self.size < MAX_SIZE : `List would exceed max size`
 @require index <= self.size
 *>
 fn void ElasticArray.insert_at(&self, usz index, Type type)
@@ -261,27 +235,27 @@ fn void ElasticArray.set_at(&self, usz index, Type type)
 	self.entries[index] = type;
 }

-fn void! ElasticArray.remove_last(&self) @maydiscard
+fn void? ElasticArray.remove_last(&self) @maydiscard
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	self.size--;
 }

-fn void! ElasticArray.remove_first(&self) @maydiscard
+fn void? ElasticArray.remove_first(&self) @maydiscard
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	self.remove_at(0);
 }

-fn Type! ElasticArray.first(&self)
+fn Type? ElasticArray.first(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	return self.entries[0];
 }

-fn Type! ElasticArray.last(&self)
+fn Type? ElasticArray.last(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	return self.entries[self.size - 1];
 }

@@ -311,7 +285,7 @@ fn void ElasticArray.swap(&self, usz i, usz j)
 }

 <*
- @param filter "The function to determine if it should be removed or not"
+ @param filter : "The function to determine if it should be removed or not"
 @return "the number of deleted elements"
 *>
 fn usz ElasticArray.remove_if(&self, ElementPredicate filter)
@@ -320,7 +294,7 @@ fn usz ElasticArray.remove_if(&self, ElementPredicate filter)
 }

 <*
- @param selection "The function to determine if it should be kept or not"
+ @param selection : "The function to determine if it should be kept or not"
 @return "the number of deleted elements"
 *>
 fn usz ElasticArray.retain_if(&self, ElementPredicate selection)
@@ -356,22 +330,22 @@ fn void ElasticArray.set(&self, usz index, Type value) @operator([]=)


 // Functions for equatable types
-fn usz! ElasticArray.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz? ElasticArray.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

-fn usz! ElasticArray.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz? ElasticArray.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach_r (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 fn bool ElasticArray.equals(&self, ElasticArray other_list) @if(ELEMENT_IS_EQUATABLE)
@@ -387,8 +361,8 @@ fn bool ElasticArray.equals(&self, ElasticArray other_list) @if(ELEMENT_IS_EQUAT
 <*
 Check for presence of a value in a list.

- @param [&in] self "the list to find elements in"
- @param value "The value to search for"
+ @param [&in] self : "the list to find elements in"
+ @param value : "The value to search for"
 @return "True if the value is found, false otherwise"
 *>
 fn bool ElasticArray.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -401,8 +375,8 @@ fn bool ElasticArray.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 }

 <*
- @param [&inout] self "The list to remove elements from"
- @param value "The value to remove"
+ @param [&inout] self : "The list to remove elements from"
+ @param value : "The value to remove"
 @return "true if the value was found"
 *>
 fn bool ElasticArray.remove_last_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -411,8 +385,8 @@ fn bool ElasticArray.remove_last_item(&self, Type value) @if(ELEMENT_IS_EQUATABL
 }

 <*
- @param [&inout] self "The list to remove elements from"
- @param value "The value to remove"
+ @param [&inout] self : "The list to remove elements from"
+ @param value : "The value to remove"
 @return "true if the value was found"
 *>
 fn bool ElasticArray.remove_first_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -421,8 +395,8 @@ fn bool ElasticArray.remove_first_item(&self, Type value) @if(ELEMENT_IS_EQUATAB
 }

 <*
- @param [&inout] self "The list to remove elements from"
- @param value "The value to remove"
+ @param [&inout] self : "The list to remove elements from"
+ @param value : "The value to remove"
 @return "the number of deleted elements."
 *>
 fn usz ElasticArray.remove_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
--- a/lib/std/collections/enummap.c3
+++ b/lib/std/collections/enummap.c3
@@ -1,11 +1,12 @@
 <*
 @require Enum.kindof == TypeKind.ENUM : "Only enums may be used with an enummap"
 *>
-module std::collections::enummap(<Enum, ValueType>);
+module std::collections::enummap{Enum, ValueType};
 import std::io;
+
 struct EnumMap (Printable)
 {
-	ValueType[Enum.len] values;
+	ValueType[Enum.values.len] values;
 }

 fn void EnumMap.init(&self, ValueType init_value)
@@ -16,7 +17,7 @@ fn void EnumMap.init(&self, ValueType init_value)
 	}
 }

-fn usz! EnumMap.to_format(&self, Formatter* formatter) @dynamic
+fn usz? EnumMap.to_format(&self, Formatter* formatter) @dynamic
 {
 	usz n = formatter.print("{ ")!;
 	foreach (i, &value : self.values)
@@ -28,21 +29,6 @@ fn usz! EnumMap.to_format(&self, Formatter* formatter) @dynamic
 	return n;
 }

-fn String EnumMap.to_string(&self, Allocator allocator) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator);
-}
-
-fn String EnumMap.to_new_string(&self, Allocator allocator = null) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator ?: allocator::heap());
-}
-
-fn String EnumMap.to_tstring(&self) @dynamic
-{
-	return string::tformat("%s", *self);
-}
-
 <*
 @return "The total size of this map, which is the same as the number of enum values"
 @pure
--- a/lib/std/collections/enumset.c3
+++ b/lib/std/collections/enumset.c3
@@ -5,13 +5,14 @@
 <*
 @require Enum.kindof == TypeKind.ENUM : "Only enums may be used with an enumset"
 *>
-module std::collections::enumset(<Enum>);
+module std::collections::enumset{Enum};
 import std::io;

-def EnumSetType = $typefrom(private::type_for_enum_elements(Enum.elements)) @private;
+const ENUM_COUNT @private = Enum.values.len;
+alias EnumSetType @private = $typefrom(type_for_enum_elements(ENUM_COUNT));

-const IS_CHAR_ARRAY = Enum.elements > 128;
-distinct EnumSet (Printable) = EnumSetType;
+const IS_CHAR_ARRAY = ENUM_COUNT > 128;
+typedef EnumSet (Printable) = EnumSetType;

 fn void EnumSet.add(&self, Enum v)
 {
@@ -126,7 +127,7 @@ fn EnumSet EnumSet.xor_of(&self, EnumSet s)
 	$endif
 }

-fn usz! EnumSet.to_format(&set, Formatter* formatter) @dynamic
+fn usz? EnumSet.to_format(&set, Formatter* formatter) @dynamic
 {
 	usz n = formatter.print("[")!;
 	bool found;
@@ -141,26 +142,9 @@ fn usz! EnumSet.to_format(&set, Formatter* formatter) @dynamic
 	return n;
 }

-fn String EnumSet.to_new_string(&set, Allocator allocator = allocator::heap()) @dynamic
+macro typeid type_for_enum_elements(usz $elements) @local
 {
-	return string::format("%s", *set, allocator: allocator);
-}
-
-fn String EnumSet.to_string(&set, Allocator allocator) @dynamic
-{
-	return string::format("%s", *set, allocator: allocator);
-}
-
-fn String EnumSet.to_tstring(&set) @dynamic
-{
-	return string::tformat("%s", *set);
-}
-
-module std::collections::enumset::private;
-
-macro typeid type_for_enum_elements(usz $elements)
-{
-	$switch
+	$switch:
 		$case ($elements > 128):
 			return char[($elements + 7) / 8].typeid;
 		$case ($elements > 64):
--- a/lib/std/collections/hashmap.c3
+++ b/lib/std/collections/hashmap.c3
@@ -2,12 +2,30 @@
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 <*
- @require $defined((Key){}.hash()) `No .hash function found on the key`
+ @require $defined((Key){}.hash()) : `No .hash function found on the key`
 *>
-module std::collections::map(<Key, Value>);
+module std::collections::map{Key, Value};
 import std::math;
 import std::io @norecurse;

+const uint DEFAULT_INITIAL_CAPACITY = 16;
+const uint MAXIMUM_CAPACITY = 1u << 31;
+const float DEFAULT_LOAD_FACTOR = 0.75;
+const VALUE_IS_EQUATABLE = Value.is_eq;
+const bool COPY_KEYS = types::implements_copy(Key);
+
+const Allocator MAP_HEAP_ALLOCATOR = (Allocator)&dummy;
+
+const HashMap ONHEAP = { .allocator = MAP_HEAP_ALLOCATOR };
+
+struct Entry
+{
+	uint hash;
+	Key key;
+	Value value;
+	Entry* next;
+}
+
 struct HashMap (Printable)
 {
 	Entry*[] table;
@@ -17,24 +35,13 @@ struct HashMap (Printable)
 	float load_factor;
 }

-<*
- @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 !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 = null) @deprecated("Use init(mem)")
-{
-	return self.init(allocator ?: allocator::heap(), capacity, load_factor);
-}

 <*
- @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 !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ @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 !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
 *>
 fn HashMap* HashMap.init(&self, Allocator allocator, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
@@ -47,55 +54,56 @@ fn HashMap* HashMap.init(&self, Allocator allocator, uint capacity = DEFAULT_INI
 }

 <*
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.temp_init(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR) @deprecated("Use tinit()")
-{
-	return self.init(allocator::temp(), capacity, load_factor) @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 !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ @require capacity > 0 : "The capacity must be 1 or higher"
+ @require load_factor > 0.0 : "The load factor must be higher than 0"
+ @require !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
 *>
 fn HashMap* HashMap.tinit(&self, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
-	return self.init(allocator::temp(), capacity, load_factor) @inline;
+	return self.init(tmem, capacity, load_factor) @inline;
 }

 <*
- @param [&inout] allocator "The allocator to use"
- @require $vacount % 2 == 0 "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ @param [&inout] allocator : "The allocator to use"
+ @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
+ @require capacity > 0 : "The capacity must be 1 or higher"
+ @require load_factor > 0.0 : "The load factor must be higher than 0"
+ @require !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
 *>
-macro HashMap* HashMap.new_init_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap()) @deprecated("Use init_with_key_values(mem)")
+macro HashMap* HashMap.init_with_key_values(&self, Allocator allocator, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
-	self.init(capacity, load_factor, allocator);
-	$for (var $i = 0; $i < $vacount; $i += 2)
-		self.set($vaarg[$i], $vaarg[$i+1]);
+	self.init(allocator, capacity, load_factor);
+	$for var $i = 0; $i < $vacount; $i += 2:
+		self.set($vaarg[$i], $vaarg[$i + 1]);
 	$endfor
 	return self;
 }

 <*
- @param [in] keys "The keys for the HashMap entries"
- @param [in] values "The values for the HashMap entries"
- @param [&inout] allocator "The allocator to use"
- @require keys.len == values.len "Both keys and values arrays must be the same length"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ @require $vacount % 2 == 0 : "There must be an even number of arguments provided for keys and values"
+ @require capacity > 0 : "The capacity must be 1 or higher"
+ @require load_factor > 0.0 : "The load factor must be higher than 0"
+ @require !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
 *>
-fn HashMap* HashMap.new_init_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap()) @deprecated("Use init_from_keys_and_values(mem)")
+macro HashMap* HashMap.tinit_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
+{
+	return self.tinit_with_key_values(tmem, capacity, load_factor);
+}
+
+<*
+ @param [in] keys : "The keys for the HashMap entries"
+ @param [in] values : "The values for the HashMap entries"
+ @param [&inout] allocator : "The allocator to use"
+ @require keys.len == values.len : "Both keys and values arrays must be the same length"
+ @require capacity > 0 : "The capacity must be 1 or higher"
+ @require load_factor > 0.0 : "The load factor must be higher than 0"
+ @require !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
+*>
+fn HashMap* HashMap.init_from_keys_and_values(&self, Allocator allocator, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
 	assert(keys.len == values.len);
 	self.init(allocator, capacity, load_factor);
@@ -106,102 +114,36 @@ fn HashMap* HashMap.new_init_from_keys_and_values(&self, Key[] keys, Value[] val
 	return self;
 }

-<*
- @require $vacount % 2 == 0 "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-macro HashMap* HashMap.temp_init_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR) @deprecated("Use tinit_with_key_values")
-{
-	self.tinit(capacity, load_factor);
-	$for (var $i = 0; $i < $vacount; $i += 2)
-		self.set($vaarg[$i], $vaarg[$i+1]);
-	$endfor
-	return self;
-}

 <*
- @require $vacount % 2 == 0 "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
+ @param [in] keys : "The keys for the HashMap entries"
+ @param [in] values : "The values for the HashMap entries"
+ @require keys.len == values.len : "Both keys and values arrays must be the same length"
+ @require capacity > 0 : "The capacity must be 1 or higher"
+ @require load_factor > 0.0 : "The load factor must be higher than 0"
+ @require !self.is_initialized() : "Map was already initialized"
+ @require capacity < MAXIMUM_CAPACITY : "Capacity cannot exceed maximum"
 *>
-macro HashMap* HashMap.tinit_with_key_values(&self, ..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
+fn HashMap* HashMap.tinit_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
 {
-	self.tinit(capacity, load_factor);
-	$for (var $i = 0; $i < $vacount; $i += 2)
-		self.set($vaarg[$i], $vaarg[$i+1]);
-	$endfor
-	return self;
-}
-
-<*
- @param [in] keys "The keys for the HashMap entries"
- @param [in] values "The values for the HashMap entries"
- @param [&inout] allocator "The allocator to use"
- @require keys.len == values.len "Both keys and values arrays must be the same length"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.temp_init_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap()) @deprecated("Use tinit_from_keys_and_values")
-{
-	assert(keys.len == values.len);
-	self.tinit(capacity, load_factor);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		self.set(keys[i], values[i]);
-	}
-	return self;
-}
-
-<*
- @param [in] keys "The keys for the HashMap entries"
- @param [in] values "The values for the HashMap entries"
- @param [&inout] allocator "The allocator to use"
- @require keys.len == values.len "Both keys and values arrays must be the same length"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require !self.allocator "Map was already initialized"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn HashMap* HashMap.tinit_from_keys_and_values(&self, Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
-{
-	assert(keys.len == values.len);
-	self.tinit(capacity, load_factor);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		self.set(keys[i], values[i]);
-	}
-	return self;
+	return self.init_from_keys_and_values(tmem, keys, values, capacity, load_factor);
 }

 <*
 Has this hash map been initialized yet?

- @param [&in] map "The hash map we are testing"
+ @param [&in] map : "The hash map we are testing"
 @return "Returns true if it has been initialized, false otherwise"
 *>
 fn bool HashMap.is_initialized(&map)
 {
-	return (bool)map.allocator;
+	return map.allocator && map.allocator.ptr != &dummy;
 }

 <*
- @param [&in] other_map "The map to copy from."
-*>
-fn HashMap* HashMap.new_init_from_map(&self, HashMap* other_map) @deprecated("Use init_from_map(mem, map)")
-{
-	return self.init_from_map(allocator::heap(), other_map) @inline;
-}
-
-<*
- @param [&inout] allocator "The allocator to use"
- @param [&in] other_map "The map to copy from."
+ @param [&inout] allocator : "The allocator to use"
+ @param [&in] other_map : "The map to copy from."
+ @require !self.is_initialized() : "Map was already initialized"
 *>
 fn HashMap* HashMap.init_from_map(&self, Allocator allocator, HashMap* other_map)
 {
@@ -211,19 +153,12 @@ fn HashMap* HashMap.init_from_map(&self, Allocator allocator, HashMap* other_map
 }

 <*
- @param [&in] other_map "The map to copy from."
-*>
-fn HashMap* HashMap.temp_init_from_map(&map, HashMap* other_map) @deprecated("Use tinit_from_map")
-{
-	return map.init_from_map(allocator::temp(), other_map) @inline;
-}
-
-<*
- @param [&in] other_map "The map to copy from."
+ @param [&in] other_map : "The map to copy from."
+ @require !map.is_initialized() : "Map was already initialized"
 *>
 fn HashMap* HashMap.tinit_from_map(&map, HashMap* other_map)
 {
-	return map.init_from_map(allocator::temp(), other_map) @inline;
+	return map.init_from_map(tmem, other_map) @inline;
 }

 fn bool HashMap.is_empty(&map) @inline
@@ -236,26 +171,26 @@ fn usz HashMap.len(&map) @inline
 	return map.count;
 }

-fn Value*! HashMap.get_ref(&map, Key key)
+fn Value*? HashMap.get_ref(&map, Key key)
 {
-	if (!map.count) return SearchResult.MISSING?;
+	if (!map.count) return NOT_FOUND?;
 	uint hash = rehash(key.hash());
 	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
 	{
 		if (e.hash == hash && equals(key, e.key)) return &e.value;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

-fn Entry*! HashMap.get_entry(&map, Key key)
+fn Entry*? HashMap.get_entry(&map, Key key)
 {
-	if (!map.count) return SearchResult.MISSING?;
+	if (!map.count) return NOT_FOUND?;
 	uint hash = rehash(key.hash());
 	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
 	{
 		if (e.hash == hash && equals(key, e.key)) return e;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 <*
@@ -281,7 +216,7 @@ macro Value HashMap.@get_or_set(&map, Key key, Value #expr)
 	return val;
 }

-fn Value! HashMap.get(&map, Key key) @operator([])
+fn Value? HashMap.get(&map, Key key) @operator([])
 {
 	return *map.get_ref(key) @inline;
 }
@@ -294,10 +229,15 @@ fn bool HashMap.has_key(&map, Key key)
 fn bool HashMap.set(&map, Key key, Value value) @operator([]=)
 {
 	// If the map isn't initialized, use the defaults to initialize it.
-	if (!map.allocator)
-	{
-		map.init(allocator::heap());
-	}
+    switch (map.allocator.ptr)
+    {
+    	case &dummy:
+    	    map.init(mem);
+    	case null:
+    	    map.tinit();
+    	default:
+    		break;
+    }
 	uint hash = rehash(key.hash());
 	uint index = index_for(hash, map.table.len);
 	for (Entry *e = map.table[index]; e != null; e = e.next)
@@ -312,9 +252,9 @@ fn bool HashMap.set(&map, Key key, Value value) @operator([]=)
 	return false;
 }

-fn void! HashMap.remove(&map, Key key) @maydiscard
+fn void? HashMap.remove(&map, Key key) @maydiscard
 {
-	if (!map.remove_entry_for_key(key)) return SearchResult.MISSING?;
+	if (!map.remove_entry_for_key(key)) return NOT_FOUND?;
 }

 fn void HashMap.clear(&map)
@@ -339,37 +279,24 @@ fn void HashMap.clear(&map)

 fn void HashMap.free(&map)
 {
-	if (!map.allocator) return;
+	if (!map.is_initialized()) return;
 	map.clear();
 	map.free_internal(map.table.ptr);
 	map.table = {};
 }

-fn Key[] HashMap.tcopy_keys(&map)
+fn Key[] HashMap.tkeys(&self)
 {
-	return map.copy_keys(allocator::temp()) @inline;
+	return self.keys(tmem) @inline;
 }

-fn Key[] HashMap.key_tlist(&map) @deprecated("Use 'tcopy_keys'")
+fn Key[] HashMap.keys(&self, Allocator allocator)
 {
-	return map.copy_keys(allocator::temp()) @inline;
-}
+	if (!self.count) return {};

-<*
- @deprecated "use copy_keys"
-*>
-fn Key[] HashMap.key_new_list(&map, Allocator allocator = allocator::heap())
-{
-	return map.copy_keys(allocator) @inline;
-}
-
-fn Key[] HashMap.copy_keys(&map, Allocator allocator = allocator::heap())
-{
-	if (!map.count) return {};
-
-	Key[] list = allocator::alloc_array(allocator, Key, map.count);
+	Key[] list = allocator::alloc_array(allocator, Key, self.count);
 	usz index = 0;
-	foreach (Entry* entry : map.table)
+	foreach (Entry* entry : self.table)
 	{
 		while (entry)
 		{
@@ -386,53 +313,36 @@ fn Key[] HashMap.copy_keys(&map, Allocator allocator = allocator::heap())

 macro HashMap.@each(map; @body(key, value))
 {
-	map.@each_entry(; Entry* entry) {
+	map.@each_entry(; Entry* entry)
+	{
 		@body(entry.key, entry.value);
 	};
 }

 macro HashMap.@each_entry(map; @body(entry))
 {
-	if (map.count)
+	if (!map.count) return;
+	foreach (Entry* entry : map.table)
 	{
-		foreach (Entry* entry : map.table)
+		while (entry)
 		{
-			while (entry)
-			{
-				@body(entry);
-				entry = entry.next;
-			}
+			@body(entry);
+			entry = entry.next;
 		}
 	}
 }

-<*
- @deprecated `use tcopy_values`
-*>
-fn Value[] HashMap.value_tlist(&map)
+fn Value[] HashMap.tvalues(&map)
 {
-	return map.copy_values(allocator::temp()) @inline;
+	return map.values(tmem) @inline;
 }

-fn Value[] HashMap.tcopy_values(&map)
+fn Value[] HashMap.values(&self, Allocator allocator)
 {
-	return map.copy_values(allocator::temp()) @inline;
-}
-
-<*
- @deprecated `use copy_values`
-*>
-fn Value[] HashMap.value_new_list(&map, Allocator allocator = allocator::heap())
-{
-	return map.copy_values(allocator);
-}
-
-fn Value[] HashMap.copy_values(&map, Allocator allocator = allocator::heap())
-{
-	if (!map.count) return {};
-	Value[] list = allocator::alloc_array(allocator, Value, map.count);
+	if (!self.count) return {};
+	Value[] list = allocator::alloc_array(allocator, Value, self.count);
 	usz index = 0;
-	foreach (Entry* entry : map.table)
+	foreach (Entry* entry : self.table)
 	{
 		while (entry)
 		{
@@ -503,7 +413,7 @@ fn void HashMap.resize(&map, uint new_capacity) @private
 	map.threshold = (uint)(new_capacity * map.load_factor);
 }

-fn usz! HashMap.to_format(&self, Formatter* f) @dynamic
+fn usz? HashMap.to_format(&self, Formatter* f) @dynamic
 {
 	usz len;
 	len += f.print("{ ")!;
@@ -625,8 +535,8 @@ struct HashMapIterator
 	Entry* current_entry;
 }

-distinct HashMapValueIterator = HashMapIterator;
-distinct HashMapKeyIterator = HashMapIterator;
+typedef HashMapValueIterator = HashMapIterator;
+typedef HashMapKeyIterator = HashMapIterator;


 <*
@@ -667,3 +577,16 @@ fn Key HashMapKeyIterator.get(&self, usz idx) @operator([])
 fn usz HashMapValueIterator.len(self) @operator(len) => self.map.count;
 fn usz HashMapKeyIterator.len(self) @operator(len) => self.map.count;
 fn usz HashMapIterator.len(self) @operator(len) => self.map.count;
+
+fn uint rehash(uint hash) @inline @private
+{
+	hash ^= (hash >> 20) ^ (hash >> 12);
+	return hash ^ ((hash >> 7) ^ (hash >> 4));
+}
+
+macro uint index_for(uint hash, uint capacity) @private
+{
+	return hash & (capacity - 1);
+}
+
+int dummy @local;
--- a/lib/std/collections/linkedlist.c3
+++ b/lib/std/collections/linkedlist.c3
@@ -1,7 +1,7 @@
 // Copyright (c) 2021-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::linkedlist(<Type>);
+module std::collections::linkedlist{Type};

 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);

@@ -21,7 +21,7 @@ struct LinkedList
 }

 <*
- @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
 @return "the initialized list"
 *>
 fn LinkedList* LinkedList.init(&self, Allocator allocator)
@@ -30,27 +30,15 @@ fn LinkedList* LinkedList.init(&self, Allocator allocator)
 	return self;
 }

-<*
- @return "the initialized list"
-*>
-fn LinkedList* LinkedList.new_init(&self) @deprecated("Use init(mem)")
-{
-	return self.init(allocator::heap()) @inline;
-}
-
-
-fn LinkedList* LinkedList.temp_init(&self) @deprecated("Use tinit()")
-{
-	return self.init(allocator::temp()) @inline;
-}
-
 fn LinkedList* LinkedList.tinit(&self)
 {
-	return self.init(allocator::temp()) @inline;
+	return self.init(tmem) @inline;
 }

+fn bool LinkedList.is_initialized(&self) @inline => self.allocator != null;
+
 <*
- @require self.allocator != null
+ @require self.is_initialized()
 *>
 macro void LinkedList.free_node(&self, Node* node) @private
 {
@@ -59,7 +47,7 @@ macro void LinkedList.free_node(&self, Node* node) @private

 macro Node* LinkedList.alloc_node(&self) @private
 {
-	if (!self.allocator) self.allocator = allocator::heap();
+	if (!self.allocator) self.allocator = tmem;
 	return allocator::alloc(self.allocator, Node);
 }

@@ -97,18 +85,18 @@ fn void LinkedList.push(&self, Type value)
 	self.size++;
 }

-fn Type! LinkedList.peek(&self) => self.first() @inline;
-fn Type! LinkedList.peek_last(&self) => self.last() @inline;
+fn Type? LinkedList.peek(&self) => self.first() @inline;
+fn Type? LinkedList.peek_last(&self) => self.last() @inline;

-fn Type! LinkedList.first(&self)
+fn Type? LinkedList.first(&self)
 {
-	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._first) return NO_MORE_ELEMENT?;
 	return self._first.value;
 }

-fn Type! LinkedList.last(&self)
+fn Type? LinkedList.last(&self)
 {
-	if (!self._last) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._last) return NO_MORE_ELEMENT?;
 	return self._last.value;
 }

@@ -243,9 +231,9 @@ fn usz LinkedList.remove(&self, Type t) @if(ELEMENT_IS_EQUATABLE)
 	return start - self.size;
 }

-fn Type! LinkedList.pop(&self)
+fn Type? LinkedList.pop(&self)
 {
-	if (!self._last) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._last) return NO_MORE_ELEMENT?;
 	defer self.unlink_last();
 	return self._last.value;
 }
@@ -255,22 +243,22 @@ fn bool LinkedList.is_empty(&self)
 	return !self._first;
 }

-fn Type! LinkedList.pop_front(&self)
+fn Type? LinkedList.pop_front(&self)
 {
-	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._first) return NO_MORE_ELEMENT?;
 	defer self.unlink_first();
 	return self._first.value;
 }

-fn void! LinkedList.remove_last(&self) @maydiscard
+fn void? LinkedList.remove_last(&self) @maydiscard
 {
-	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._first) return NO_MORE_ELEMENT?;
 	self.unlink_last();
 }

-fn void! LinkedList.remove_first(&self) @maydiscard
+fn void? LinkedList.remove_first(&self) @maydiscard
 {
-	if (!self._first) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self._first) return NO_MORE_ELEMENT?;
 	self.unlink_first();
 }

--- a/lib/std/collections/list.c3
+++ b/lib/std/collections/list.c3
@@ -1,14 +1,18 @@
 // Copyright (c) 2021-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::list(<Type>);
+module std::collections::list{Type};
 import std::io, std::math, std::collections::list_common;

-def ElementPredicate = fn bool(Type *type);
-def ElementTest = fn bool(Type *type, any context);
+alias ElementPredicate = fn bool(Type *type);
+alias ElementTest = fn bool(Type *type, any context);
 const ELEMENT_IS_EQUATABLE = types::is_equatable_type(Type);
 const ELEMENT_IS_POINTER = Type.kindof == POINTER;

+const Allocator LIST_HEAP_ALLOCATOR = (Allocator)&dummy;
+
+const List ONHEAP = { .allocator = LIST_HEAP_ALLOCATOR };
+
 macro type_is_overaligned() => Type.alignof > mem::DEFAULT_MEM_ALIGNMENT;

 struct List (Printable)
@@ -20,8 +24,8 @@ struct List (Printable)
 }

 <*
- @param initial_capacity "The initial capacity to reserve"
- @param [&inout] allocator "The allocator to use, defaults to the heap allocator"
+ @param initial_capacity : "The initial capacity to reserve"
+ @param [&inout] allocator : "The allocator to use, defaults to the heap allocator"
 *>
 fn List* List.init(&self, Allocator allocator, usz initial_capacity = 16)
 {
@@ -33,56 +37,22 @@ fn List* List.init(&self, Allocator allocator, usz initial_capacity = 16)
 	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.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap()) @deprecated("Use init(mem)")
-{
-	self.allocator = allocator;
-	self.size = 0;
-	self.capacity = 0;
-	self.entries = null;
-	self.reserve(initial_capacity);
-	return self;
-}

 <*
 Initialize the list using the temp allocator.

- @param initial_capacity "The initial capacity to reserve"
-*>
-fn List* List.temp_init(&self, usz initial_capacity = 16) @deprecated("Use tinit()")
-{
-	return self.init(allocator::temp(), initial_capacity) @inline;
-}
-
-<*
- Initialize the list using the temp allocator.
-
- @param initial_capacity "The initial capacity to reserve"
+ @param initial_capacity : "The initial capacity to reserve"
 *>
 fn List* List.tinit(&self, usz initial_capacity = 16)
 {
-	return self.init(allocator::temp(), initial_capacity) @inline;
+	return self.init(tmem, initial_capacity) @inline;
 }

 <*
 Initialize a new list with an array.

- @param [in] values `The values to initialize the list with.`
- @require self.size == 0 "The List must be empty"
-*>
-fn List* List.new_init_with_array(&self, Type[] values, Allocator allocator = allocator::heap()) @deprecated("Use init_with_array(mem)")
-{
-	return self.init_with_array(allocator, values);
-}
-
-<*
- Initialize a new list with an array.
-
- @param [in] values `The values to initialize the list with.`
- @require self.size == 0 "The List must be empty"
+ @param [in] values : `The values to initialize the list with.`
+ @require self.size == 0 : "The List must be empty"
 *>
 fn List* List.init_with_array(&self, Allocator allocator, Type[] values)
 {
@@ -94,21 +64,8 @@ fn List* List.init_with_array(&self, Allocator allocator, Type[] values)
 <*
 Initialize a temporary list with an array.

- @param [in] values `The values to initialize the list with.`
- @require self.size == 0 "The List must be empty"
-*>
-fn List* List.temp_init_with_array(&self, Type[] values) @deprecated("Use tinit_with_array()")
-{
-	self.tinit(values.len) @inline;
-	self.add_array(values) @inline;
-	return self;
-}
-
-<*
- Initialize a temporary list with an array.
-
- @param [in] values `The values to initialize the list with.`
- @require self.size == 0 "The List must be empty"
+ @param [in] values : `The values to initialize the list with.`
+ @require self.size == 0 : "The List must be empty"
 *>
 fn List* List.tinit_with_array(&self, Type[] values)
 {
@@ -118,9 +75,9 @@ fn List* List.tinit_with_array(&self, Type[] values)
 }

 <*
- @require self.capacity == 0 "The List must not be allocated"
+ @require !self.is_initialized() : "The List must not be allocated"
 *>
-fn void List.init_wrapping_array(&self, Type[] types, Allocator allocator = allocator::heap())
+fn void List.init_wrapping_array(&self, Allocator allocator, Type[] types)
 {
 	self.allocator = allocator;
 	self.capacity = types.len;
@@ -128,7 +85,9 @@ fn void List.init_wrapping_array(&self, Type[] types, Allocator allocator = allo
 	self.set_size(types.len);
 }

-fn usz! List.to_format(&self, Formatter* formatter) @dynamic
+fn bool List.is_initialized(&self) @inline => self.allocator != null && self.allocator != (Allocator)&dummy;
+
+fn usz? List.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.size)
 	{
@@ -148,25 +107,15 @@ fn usz! List.to_format(&self, Formatter* formatter) @dynamic
 	}
 }

-fn String List.to_new_string(&self, Allocator allocator = allocator::heap()) @dynamic
-{
-	return string::format("%s", *self, allocator: allocator);
-}
-
-fn String List.to_tstring(&self)
-{
-	return string::tformat("%s", *self);
-}
-
 fn void List.push(&self, Type element) @inline
 {
 	self.reserve(1);
 	self.entries[self.set_size(self.size + 1)] = element;
 }

-fn Type! List.pop(&self)
+fn Type? List.pop(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	defer self.set_size(self.size - 1);
 	return self.entries[self.size - 1];
 }
@@ -176,15 +125,15 @@ fn void List.clear(&self)
 	self.set_size(0);
 }

-fn Type! List.pop_first(&self)
+fn Type? List.pop_first(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	defer self.remove_at(0);
 	return self.entries[0];
 }

 <*
- @require index < self.size `Removed element out of bounds`
+ @require index < self.size : `Removed element out of bounds`
 *>
 fn void List.remove_at(&self, usz index)
 {
@@ -208,25 +157,25 @@ fn void List.add_all(&self, List* other_list)
 <*
 IMPORTANT The returned array must be freed using free_aligned.
 *>
-fn Type[] List.to_new_aligned_array(&self, Allocator allocator = allocator::heap())
+fn Type[] List.to_aligned_array(&self, Allocator allocator)
 {
-	return list_common::list_to_new_aligned_array(Type, self, allocator);
+	return list_common::list_to_aligned_array(Type, self, allocator);
 }

 <*
 @require !type_is_overaligned() : "This function is not available on overaligned types"
 *>
-macro Type[] List.to_new_array(&self, Allocator allocator = allocator::heap())
+macro Type[] List.to_array(&self, Allocator allocator)
 {
-	return list_common::list_to_new_array(Type, self, allocator);
+	return list_common::list_to_array(Type, self, allocator);
 }

 fn Type[] List.to_tarray(&self)
 {
 	$if type_is_overaligned():
-	return self.to_new_aligned_array(allocator::temp());
+	return self.to_aligned_array(tmem);
 	$else
-	return self.to_new_array(allocator::temp());
+	return self.to_array(tmem);
 	$endif;
 }

@@ -263,7 +212,7 @@ fn void List.push_front(&self, Type type) @inline
 }

 <*
- @require index <= self.size `Insert was out of bounds`
+ @require index <= self.size : `Insert was out of bounds`
 *>
 fn void List.insert_at(&self, usz index, Type type)
 {
@@ -284,27 +233,27 @@ fn void List.set_at(&self, usz index, Type type)
 	self.entries[index] = type;
 }

-fn void! List.remove_last(&self) @maydiscard
+fn void? List.remove_last(&self) @maydiscard
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	self.set_size(self.size - 1);
 }

-fn void! List.remove_first(&self) @maydiscard
+fn void? List.remove_first(&self) @maydiscard
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	self.remove_at(0);
 }

-fn Type! List.first(&self)
+fn Type? List.first(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	return self.entries[0];
 }

-fn Type! List.last(&self)
+fn Type? List.last(&self)
 {
-	if (!self.size) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!self.size) return NO_MORE_ELEMENT?;
 	return self.entries[self.size - 1];
 }

@@ -324,7 +273,7 @@ fn usz List.len(&self) @operator(len) @inline
 }

 <*
- @require index < self.size `Access out of bounds`
+ @require index < self.size : `Access out of bounds`
 *>
 fn Type List.get(&self, usz index) @inline
 {
@@ -333,7 +282,7 @@ fn Type List.get(&self, usz index) @inline

 fn void List.free(&self)
 {
-	if (!self.allocator || !self.capacity) return;
+	if (!self.allocator || self.allocator.ptr == &dummy || !self.capacity) return;

 	self.pre_free(); // Remove sanitizer annotation

@@ -348,7 +297,7 @@ fn void List.free(&self)
 }

 <*
- @require i < self.size && j < self.size `Access out of bounds`
+ @require i < self.size && j < self.size : `Access out of bounds`
 *>
 fn void List.swap(&self, usz i, usz j)
 {
@@ -356,7 +305,7 @@ fn void List.swap(&self, usz i, usz j)
 }

 <*
- @param filter "The function to determine if it should be removed or not"
+ @param filter : "The function to determine if it should be removed or not"
 @return "the number of deleted elements"
 *>
 fn usz List.remove_if(&self, ElementPredicate filter)
@@ -365,7 +314,7 @@ fn usz List.remove_if(&self, ElementPredicate filter)
 }

 <*
- @param selection "The function to determine if it should be kept or not"
+ @param selection : "The function to determine if it should be kept or not"
 @return "the number of deleted elements"
 *>
 fn usz List.retain_if(&self, ElementPredicate selection)
@@ -398,7 +347,17 @@ fn void List.ensure_capacity(&self, usz min_capacity) @local
 {
 	if (!min_capacity) return;
 	if (self.capacity >= min_capacity) return;
-	if (!self.allocator) self.allocator = allocator::heap();
+
+	// Get a proper allocator
+	switch (self.allocator.ptr)
+	{
+		case &dummy:
+			self.allocator = mem;
+		case null:
+			self.allocator = tmem;
+		default:
+			break;
+	}

 	self.pre_free(); // Remove sanitizer annotation

@@ -414,7 +373,7 @@ fn void List.ensure_capacity(&self, usz min_capacity) @local
 }

 <*
- @require index < self.size `Access out of bounds`
+ @require index < self.size : `Access out of bounds`
 *>
 macro Type List.@item_at(&self, usz index) @operator([])
 {
@@ -422,7 +381,7 @@ macro Type List.@item_at(&self, usz index) @operator([])
 }

 <*
- @require index < self.size `Access out of bounds`
+ @require index < self.size : `Access out of bounds`
 *>
 fn Type* List.get_ref(&self, usz index) @operator(&[]) @inline
 {
@@ -430,7 +389,7 @@ fn Type* List.get_ref(&self, usz index) @operator(&[]) @inline
 }

 <*
- @require index < self.size `Access out of bounds`
+ @require index < self.size : `Access out of bounds`
 *>
 fn void List.set(&self, usz index, Type value) @operator([]=)
 {
@@ -451,10 +410,13 @@ fn void List.reserve(&self, usz added)
 fn void List._update_size_change(&self,usz old_size, usz new_size)
 {
 	if (old_size == new_size) return;
-	sanitizer::annotate_contiguous_container(self.entries,
+	$if env::ADDRESS_SANITIZER:
+		if (self.allocator.ptr != &allocator::LIBC_ALLOCATOR) return;
+		sanitizer::annotate_contiguous_container(self.entries,
 	                                         &self.entries[self.capacity],
 	                                         &self.entries[old_size],
 	                                         &self.entries[new_size]);
+	$endif
 }
 <*
 @require new_size == 0 || self.capacity != 0
@@ -484,22 +446,22 @@ macro void List.post_alloc(&self) @private
 // Functions for equatable types


-fn usz! List.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz? List.index_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

-fn usz! List.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
+fn usz? List.rindex_of(&self, Type type) @if(ELEMENT_IS_EQUATABLE)
 {
 	foreach_r (i, v : self)
 	{
 		if (equals(v, type)) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 fn bool List.equals(&self, List other_list) @if(ELEMENT_IS_EQUATABLE)
@@ -515,8 +477,8 @@ fn bool List.equals(&self, List other_list) @if(ELEMENT_IS_EQUATABLE)
 <*
 Check for presence of a value in a list.

- @param [&in] self "the list to find elements in"
- @param value "The value to search for"
+ @param [&in] self : "the list to find elements in"
+ @param value : "The value to search for"
 @return "True if the value is found, false otherwise"
 *>
 fn bool List.contains(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -529,8 +491,8 @@ 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"
+ @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_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -539,8 +501,8 @@ fn bool List.remove_last_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
 }

 <*
- @param [&inout] self "The list to remove elements from"
- @param value "The value to remove"
+ @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_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -548,8 +510,8 @@ fn bool List.remove_first_item(&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"
+ @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_item(&self, Type value) @if(ELEMENT_IS_EQUATABLE)
@@ -593,35 +555,4 @@ fn usz List.compact(&self) @if(ELEMENT_IS_POINTER)
 	return list_common::list_compact(self);
 }

-// --> Deprecated
-
-<*
- @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) @deprecated
-{
-	return self.remove_last_item(value) @inline;
-}
-
-<*
- @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) @deprecated
-{
-	return self.remove_first_item(value) @inline;
-}
-
-
-<*
- @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_all_matches(&self, Type value) @if(ELEMENT_IS_EQUATABLE) @deprecated
-{
-	return self.remove_item(value) @inline;
-}
+int dummy @local;
--- a/lib/std/collections/list_common.c3
+++ b/lib/std/collections/list_common.c3
@@ -3,7 +3,7 @@ module std::collections::list_common;
 <*
 IMPORTANT The returned array must be freed using free_aligned.
 *>
-macro list_to_new_aligned_array($Type, self, Allocator allocator)
+macro list_to_aligned_array($Type, self, Allocator allocator)
 {
 	if (!self.size) return ($Type[]){};
 	$Type[] result = allocator::alloc_array_aligned(allocator, $Type, self.size);
@@ -11,7 +11,7 @@ macro list_to_new_aligned_array($Type, self, Allocator allocator)
 	return result;
 }

-macro list_to_new_array($Type, self, Allocator allocator)
+macro list_to_array($Type, self, Allocator allocator)
 {
 	if (!self.size) return ($Type[]){};
 	$Type[] result = allocator::alloc_array(allocator, $Type, self.size);
--- a/lib/std/collections/map.c3
+++ b/lib/std/collections/map.c3
@@ -1,508 +0,0 @@
-// Copyright (c) 2023 Christoffer Lerno. All rights reserved.
-// Use of this source code is governed by the MIT license
-// a copy of which can be found in the LICENSE_STDLIB file.
-module std::collections::map(<Key, Value>);
-import std::math;
-
-const uint DEFAULT_INITIAL_CAPACITY = 16;
-const uint MAXIMUM_CAPACITY = 1u << 31;
-const float DEFAULT_LOAD_FACTOR = 0.75;
-const VALUE_IS_EQUATABLE = Value.is_eq;
-const bool COPY_KEYS = types::implements_copy(Key);
-
-distinct Map = void*;
-
-struct MapImpl
-{
-	Entry*[] table;
-	Allocator allocator;
-	uint count; // Number of elements
-	uint threshold; // Resize limit
-	float load_factor;
-}
-
-<*
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn Map new(uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
-{
-	MapImpl* map = allocator::alloc(allocator, MapImpl);
-	_init(map, capacity, load_factor, allocator);
-	return (Map)map;
-}
-
-<*
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn Map temp(uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	MapImpl* map = mem::temp_alloc(MapImpl);
-	_init(map, capacity, load_factor, allocator::temp());
-	return (Map)map;
-}
-
-<*
- @param [&inout] allocator "The allocator to use"
- @require $vacount % 2 == 0 "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-macro Map new_init_with_key_values(..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
-{
-	Map map = new(capacity, load_factor, allocator);
-	$for (var $i = 0; $i < $vacount; $i += 2)
-		map.set($vaarg[$i], $vaarg[$i+1]);
-	$endfor
-	return map;
-}
-
-<*
- @param [in] keys "Array of keys for the Map entries"
- @param [in] values "Array of values for the Map entries"
- @param [&inout] allocator "The allocator to use"
- @require keys.len == values.len "Both keys and values arrays must be the same length"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn Map new_init_from_keys_and_values(Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
-{
-	assert(keys.len == values.len);
-	Map map = new(capacity, load_factor, allocator);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		map.set(keys[i], values[i]);
-	}
-	return map;
-}
-
-<*
- @require $vacount % 2 == 0 "There must be an even number of arguments provided for keys and values"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-macro Map temp_new_with_key_values(..., uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR)
-{
-	Map map = temp(capacity, load_factor);
-	$for (var $i = 0; $i < $vacount; $i += 2)
-		map.set($vaarg[$i], $vaarg[$i+1]);
-	$endfor
-	return map;
-}
-
-<*
- @param [in] keys "The keys for the HashMap entries"
- @param [in] values "The values for the HashMap entries"
- @param [&inout] allocator "The allocator to use"
- @require keys.len == values.len "Both keys and values arrays must be the same length"
- @require capacity > 0 "The capacity must be 1 or higher"
- @require load_factor > 0.0 "The load factor must be higher than 0"
- @require capacity < MAXIMUM_CAPACITY "Capacity cannot exceed maximum"
-*>
-fn Map temp_init_from_keys_and_values(Key[] keys, Value[] values, uint capacity = DEFAULT_INITIAL_CAPACITY, float load_factor = DEFAULT_LOAD_FACTOR, Allocator allocator = allocator::heap())
-{
-	assert(keys.len == values.len);
-	Map map = temp(capacity, load_factor);
-	for (usz i = 0; i < keys.len; i++)
-	{
-		map.set(keys[i], values[i]);
-	}
-	return map;
-}
-
-<*
- @param [&in] other_map "The map to copy from."
-*>
-fn Map new_from_map(Map other_map, Allocator allocator = null)
-{
-	MapImpl* other_map_impl = (MapImpl*)other_map;
-	if (!other_map_impl)
-	{
-		if (allocator) return new(allocator: allocator);
-		return null;
-	}
-	MapImpl* map = (MapImpl*)new(other_map_impl.table.len, other_map_impl.load_factor, allocator ?: allocator::heap());
-	if (!other_map_impl.count) return (Map)map;
-	foreach (Entry *e : other_map_impl.table)
-	{
-		while (e)
-		{
-			map._put_for_create(e.key, e.value);
-			e = e.next;
-		}
-	}
-	return (Map)map;
-}
-
-<*
- @param [&in] other_map "The map to copy from."
-*>
-fn Map temp_from_map(Map other_map)
-{
-	return new_from_map(other_map, allocator::temp());
-}
-
-fn bool Map.is_empty(map) @inline
-{
-	return !map || !((MapImpl*)map).count;
-}
-
-fn usz Map.len(map) @inline
-{
-	return map ? ((MapImpl*)map).count : 0;
-}
-
-fn Value*! Map.get_ref(self, Key key)
-{
-	MapImpl *map = (MapImpl*)self;
-	if (!map || !map.count) return SearchResult.MISSING?;
-	uint hash = rehash(key.hash());
-	for (Entry *e = map.table[index_for(hash, map.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return &e.value;
-	}
-	return SearchResult.MISSING?;
-}
-
-fn Entry*! Map.get_entry(map, Key key)
-{
-	MapImpl *map_impl = (MapImpl*)map;
-	if (!map_impl || !map_impl.count) return SearchResult.MISSING?;
-	uint hash = rehash(key.hash());
-	for (Entry *e = map_impl.table[index_for(hash, map_impl.table.len)]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return e;
-	}
-	return SearchResult.MISSING?;
-}
-
-<*
- Get the value or update and
- @require $assignable(#expr, Value)
-*>
-macro Value Map.@get_or_set(&self, Key key, Value #expr)
-{
-	MapImpl *map = (MapImpl*)*self;
-	if (!map || !map.count)
-	{
-		Value val = #expr;
-		map.set(key, val);
-		return val;
-	}
-	uint hash = rehash(key.hash());
-	uint index = index_for(hash, map.table.len);
-	for (Entry *e = map.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key)) return e.value;
-	}
-	Value val = #expr;
-	map.add_entry(hash, key, val, index);
-	return val;
-}
-
-fn Value! Map.get(map, Key key) @operator([])
-{
-	return *map.get_ref(key) @inline;
-}
-
-fn bool Map.has_key(map, Key key)
-{
-	return @ok(map.get_ref(key));
-}
-
-macro Value Map.set_value_return(&map, Key key, Value value) @operator([]=)
-{
-	map.set(key, value);
-	return value;
-}
-
-fn bool Map.set(&self, Key key, Value value)
-{
-	// If the map isn't initialized, use the defaults to initialize it.
-	if (!*self) *self = new();
-	MapImpl* map = (MapImpl*)*self;
-	uint hash = rehash(key.hash());
-	uint index = index_for(hash, map.table.len);
-	for (Entry *e = map.table[index]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key))
-		{
-			e.value = value;
-			return true;
-		}
-	}
-	map._add_entry(hash, key, value, index);
-	return false;
-}
-
-fn void! Map.remove(map, Key key) @maydiscard
-{
-	if (!map || !((MapImpl*)map)._remove_entry_for_key(key)) return SearchResult.MISSING?;
-}
-
-fn void Map.clear(self)
-{
-	MapImpl* map = (MapImpl*)self;
-	if (!map || !map.count) return;
-	foreach (Entry** &entry_ref : map.table)
-	{
-		Entry* entry = *entry_ref;
-		if (!entry) continue;
-		Entry *next = entry.next;
-		while (next)
-		{
-			Entry *to_delete = next;
-			next = next.next;
-			map._free_entry(to_delete);
-		}
-		map._free_entry(entry);
-		*entry_ref = null;
-	}
-	map.count = 0;
-}
-
-fn void Map.free(self)
-{
-	if (!self) return;
-	MapImpl* map = (MapImpl*)self;
-	self.clear();
-	map._free_internal(map.table.ptr);
-	map.table = {};
-	allocator::free(map.allocator, map);
-}
-
-fn Key[] Map.temp_keys_list(map)
-{
-	return map.new_keys_list(allocator::temp()) @inline;
-}
-
-fn Key[] Map.new_keys_list(self, Allocator allocator = allocator::heap())
-{
-	MapImpl* map = (MapImpl*)self;
-	if (!map || !map.count) return {};
-
-	Key[] list = allocator::alloc_array(allocator, Key, map.count);
-	usz index = 0;
-	foreach (Entry* entry : map.table)
-	{
-		while (entry)
-		{
-			list[index++] = entry.key;
-			entry = entry.next;
-		}
-	}
-	return list;
-}
-
-macro Map.@each(map; @body(key, value))
-{
-	map.@each_entry(; Entry* entry) {
-		@body(entry.key, entry.value);
-	};
-}
-
-macro Map.@each_entry(self; @body(entry))
-{
-	MapImpl *map = (MapImpl*)self;
-	if (!map || !map.count) return;
-	foreach (Entry* entry : map.table)
-	{
-		while (entry)
-		{
-			@body(entry);
-			entry = entry.next;
-		}
-	}
-}
-
-fn Value[] Map.temp_values_list(map)
-{
-	return map.new_values_list(allocator::temp()) @inline;
-}
-
-fn Value[] Map.new_values_list(self, Allocator allocator = allocator::heap())
-{
-	MapImpl* map = (MapImpl*)self;
-	if (!map || !map.count) return {};
-	Value[] list = allocator::alloc_array(allocator, Value, map.count);
-	usz index = 0;
-	foreach (Entry* entry : map.table)
-	{
-		while (entry)
-		{
-			list[index++] = entry.value;
-			entry = entry.next;
-		}
-	}
-	return list;
-}
-
-fn bool Map.has_value(self, Value v) @if(VALUE_IS_EQUATABLE)
-{
-	MapImpl* map = (MapImpl*)self;
-	if (!map || !map.count) return false;
-	foreach (Entry* entry : map.table)
-	{
-		while (entry)
-		{
-			if (equals(v, entry.value)) return true;
-			entry = entry.next;
-		}
-	}
-	return false;
-}
-
-// --- private methods
-
-fn void MapImpl._add_entry(&map, uint hash, Key key, Value value, uint bucket_index) @private
-{
-	$if COPY_KEYS:
-	key = key.copy(map.allocator);
-	$endif
-	Entry* entry = allocator::new(map.allocator, Entry, { .hash = hash, .key = key, .value = value, .next = map.table[bucket_index] });
-	map.table[bucket_index] = entry;
-	if (map.count++ >= map.threshold)
-	{
-		map._resize(map.table.len * 2);
-	}
-}
-
-fn void MapImpl._resize(&map, uint new_capacity) @private
-{
-	Entry*[] old_table = map.table;
-	uint old_capacity = old_table.len;
-	if (old_capacity == MAXIMUM_CAPACITY)
-	{
-		map.threshold = uint.max;
-		return;
-	}
-	Entry*[] new_table = allocator::new_array(map.allocator, Entry*, new_capacity);
-	map._transfer(new_table);
-	map.table = new_table;
-	map._free_internal(old_table.ptr);
-	map.threshold = (uint)(new_capacity * map.load_factor);
-}
-
-fn uint rehash(uint hash) @inline @private
-{
-	hash ^= (hash >> 20) ^ (hash >> 12);
-	return hash ^ ((hash >> 7) ^ (hash >> 4));
-}
-
-macro uint index_for(uint hash, uint capacity) @private
-{
-	return hash & (capacity - 1);
-}
-
-fn void MapImpl._transfer(&map, Entry*[] new_table) @private
-{
-	Entry*[] src = map.table;
-	uint new_capacity = new_table.len;
-	foreach (uint j, Entry *e : src)
-	{
-		if (!e) continue;
-		do
-		{
-			Entry* next = e.next;
-			uint i = index_for(e.hash, new_capacity);
-			e.next = new_table[i];
-			new_table[i] = e;
-			e = next;
-		}
-		while (e);
-	}
-}
-
-fn void _init(MapImpl* impl, uint capacity, float load_factor, Allocator allocator) @private
-{
-	capacity = math::next_power_of_2(capacity);
-	*impl = {
-		.allocator = allocator,
-		.load_factor = load_factor,
-		.threshold = (uint)(capacity * load_factor),
-		.table = allocator::new_array(allocator, Entry*, capacity)
-	};
-}
-
-fn void MapImpl._put_for_create(&map, Key key, Value value) @private
-{
-	uint hash = rehash(key.hash());
-	uint i = index_for(hash, map.table.len);
-	for (Entry *e = map.table[i]; e != null; e = e.next)
-	{
-		if (e.hash == hash && equals(key, e.key))
-		{
-			e.value = value;
-			return;
-		}
-	}
-	map._create_entry(hash, key, value, i);
-}
-
-fn void MapImpl._free_internal(&map, void* ptr) @inline @private
-{
-	allocator::free(map.allocator, ptr);
-}
-
-fn bool MapImpl._remove_entry_for_key(&map, Key key) @private
-{
-	if (!map.count) return false;
-	uint hash = rehash(key.hash());
-	uint i = index_for(hash, map.table.len);
-	Entry* prev = map.table[i];
-	Entry* e = prev;
-	while (e)
-	{
-		Entry *next = e.next;
-		if (e.hash == hash && equals(key, e.key))
-		{
-			map.count--;
-			if (prev == e)
-			{
-				map.table[i] = next;
-			}
-			else
-			{
-				prev.next = next;
-			}
-			map._free_entry(e);
-			return true;
-		}
-		prev = e;
-		e = next;
-	}
-	return false;
-}
-
-fn void MapImpl._create_entry(&map, uint hash, Key key, Value value, int bucket_index) @private
-{
-	Entry *e = map.table[bucket_index];
-	$if COPY_KEYS:
-	key = key.copy(map.allocator);
-	$endif
-	Entry* entry = allocator::new(map.allocator, Entry, { .hash = hash, .key = key, .value = value, .next = map.table[bucket_index] });
-	map.table[bucket_index] = entry;
-	map.count++;
-}
-
-fn void MapImpl._free_entry(&self, Entry *entry) @local
-{
-	$if COPY_KEYS:
-	allocator::free(self.allocator, entry.key);
-	$endif
-	self._free_internal(entry);
-}
-
-struct Entry
-{
-	uint hash;
-	Key key;
-	Value value;
-	Entry* next;
-}
--- a/lib/std/collections/maybe.c3
+++ b/lib/std/collections/maybe.c3
@@ -1,4 +1,4 @@
-module std::collections::maybe(<Type>);
+module std::collections::maybe{Type};
 import std::io;

 struct Maybe (Printable)
@@ -7,7 +7,7 @@ struct Maybe (Printable)
 	bool has_value;
 }

-fn usz! Maybe.to_format(&self, Formatter* f) @dynamic
+fn usz? Maybe.to_format(&self, Formatter* f) @dynamic
 {
 	if (self.has_value) return f.printf("[%s]", self.value);
 	return f.printf("[EMPTY]");
@@ -28,19 +28,18 @@ fn Maybe value(Type val)
 	return { .value = val, .has_value = true };
 }

-fn Maybe Maybe.with_value(Type val) @deprecated("Use maybe::value instead.") @operator(construct)
-{
-	return { .value = val, .has_value = true };
-}
-
-fn Maybe Maybe.empty() @deprecated("Use maybe::EMPTY instead.") @operator(construct)
-{
-	return { };
-}
-
 const Maybe EMPTY = { };

-macro Type! Maybe.get(self)
+macro Type? Maybe.get(self)
 {
-	return self.has_value ? self.value : SearchResult.MISSING?;
+	return self.has_value ? self.value : NOT_FOUND?;
+}
+
+fn bool Maybe.equals(self, Maybe other) @operator(==) @if(types::is_equatable_type(Type))
+{
+	if (self.has_value)
+	{
+		return other.has_value && equals(self.value, other.value);
+	}
+	return !other.has_value;
 }
--- a/lib/std/collections/object.c3
+++ b/lib/std/collections/object.c3
@@ -25,7 +25,7 @@ struct Object (Printable)
 }


-fn usz! Object.to_format(&self, Formatter* formatter) @dynamic
+fn usz? Object.to_format(&self, Formatter* formatter) @dynamic
 {
 	switch (self.type)
 	{
@@ -50,7 +50,7 @@ fn usz! Object.to_format(&self, Formatter* formatter) @dynamic
 			usz n = formatter.printf("{")!;
 			@stack_mem(1024; Allocator mem)
 			{
-				foreach (i, key : self.map.copy_keys(mem))
+				foreach (i, key : self.map.keys(mem))
 				{
 					if (i > 0) n += formatter.printf(",")!;
 					n += formatter.printf(`"%s":`, key)!;
@@ -178,7 +178,7 @@ fn void Object.init_array_if_needed(&self) @private
 fn void Object.set_object(&self, String key, Object* new_object) @private
 {
 	self.init_map_if_needed();
-	ObjectInternalMapEntry*! entry = self.map.get_entry(key);
+	ObjectInternalMapEntry*? entry = self.map.get_entry(key);
 	defer
 	{
 		(void)entry.value.free();
@@ -186,10 +186,14 @@ fn void Object.set_object(&self, String key, Object* new_object) @private
 	self.map.set(key, new_object);
 }

+<*
+ @require self.allocator != null : "This object is not properly initialized, was it really created using 'new'"
+ @require !@typeis(value, void*) ||| value == null : "void pointers cannot be stored in an object"
+*>
 macro Object* Object.object_from_value(&self, value) @private
 {
 	var $Type = $typeof(value);
-	$switch
+	$switch:
 		$case types::is_int($Type):
 			return new_int(value, self.allocator);
 		$case types::is_float($Type):
@@ -201,7 +205,6 @@ macro Object* Object.object_from_value(&self, value) @private
 		$case $Type.typeid == Object*.typeid:
 			return value;
 		$case $Type.typeid == void*.typeid:
-			if (value != null) return CastResult.TYPE_MISMATCH?;
 			return &NULL_OBJECT;
 		$case $assignable(value, String):
 			return new_string(value, self.allocator);
@@ -242,7 +245,7 @@ macro Object* Object.push(&self, value)
 <*
 @require self.is_keyable()
 *>
-fn Object*! Object.get(&self, String key) => self.is_empty() ? SearchResult.MISSING? : self.map.get(key);
+fn Object*? Object.get(&self, String key) => self.is_empty() ? NOT_FOUND? : self.map.get(key);


 fn bool Object.has_key(&self, String key) => self.is_map() && self.map.has_key(key);
@@ -292,7 +295,7 @@ fn void Object.set_object_at(&self, usz index, Object* to_set)
 }

 <*
- @require $Type.kindof.is_int() "Expected an integer type."
+ @require $Type.kindof.is_int() : "Expected an integer type."
 *>
 macro get_integer_value(Object* value, $Type)
 {
@@ -308,7 +311,7 @@ macro get_integer_value(Object* value, $Type)
 			return ($Type)value.s.to_uint128();
 		$endif
 	}
-	if (!value.is_int()) return NumberConversion.MALFORMED_INTEGER?;
+	if (!value.is_int()) return string::MALFORMED_INTEGER?;
 	return ($Type)value.i;
 }

@@ -331,77 +334,77 @@ macro Object.get_integer(&self, $Type, String key) @private
 	return get_integer_value(self.get(key), $Type);
 }

-fn ichar! Object.get_ichar(&self, String key) => self.get_integer(ichar, key);
-fn short! Object.get_short(&self, String key) => self.get_integer(short, key);
-fn int! Object.get_int(&self, String key) => self.get_integer(int, key);
-fn long! Object.get_long(&self, String key) => self.get_integer(long, key);
-fn int128! Object.get_int128(&self, String key) => self.get_integer(int128, key);
+fn ichar? Object.get_ichar(&self, String key) => self.get_integer(ichar, key);
+fn short? Object.get_short(&self, String key) => self.get_integer(short, key);
+fn int? Object.get_int(&self, String key) => self.get_integer(int, key);
+fn long? Object.get_long(&self, String key) => self.get_integer(long, key);
+fn int128? Object.get_int128(&self, String key) => self.get_integer(int128, key);

-fn ichar! Object.get_ichar_at(&self, usz index) => self.get_integer_at(ichar, index);
-fn short! Object.get_short_at(&self, usz index) => self.get_integer_at(short, index);
-fn int! Object.get_int_at(&self, usz index) => self.get_integer_at(int, index);
-fn long! Object.get_long_at(&self, usz index) => self.get_integer_at(long, index);
-fn int128! Object.get_int128_at(&self, usz index) => self.get_integer_at(int128, index);
+fn ichar? Object.get_ichar_at(&self, usz index) => self.get_integer_at(ichar, index);
+fn short? Object.get_short_at(&self, usz index) => self.get_integer_at(short, index);
+fn int? Object.get_int_at(&self, usz index) => self.get_integer_at(int, index);
+fn long? Object.get_long_at(&self, usz index) => self.get_integer_at(long, index);
+fn int128? Object.get_int128_at(&self, usz index) => self.get_integer_at(int128, index);

-fn char! Object.get_char(&self, String key) => self.get_integer(ichar, key);
-fn short! Object.get_ushort(&self, String key) => self.get_integer(ushort, key);
-fn uint! Object.get_uint(&self, String key) => self.get_integer(uint, key);
-fn ulong! Object.get_ulong(&self, String key) => self.get_integer(ulong, key);
-fn uint128! Object.get_uint128(&self, String key) => self.get_integer(uint128, key);
+fn char? Object.get_char(&self, String key) => self.get_integer(ichar, key);
+fn short? Object.get_ushort(&self, String key) => self.get_integer(ushort, key);
+fn uint? Object.get_uint(&self, String key) => self.get_integer(uint, key);
+fn ulong? Object.get_ulong(&self, String key) => self.get_integer(ulong, key);
+fn uint128? Object.get_uint128(&self, String key) => self.get_integer(uint128, key);

-fn char! Object.get_char_at(&self, usz index) => self.get_integer_at(char, index);
-fn ushort! Object.get_ushort_at(&self, usz index) => self.get_integer_at(ushort, index);
-fn uint! Object.get_uint_at(&self, usz index) => self.get_integer_at(uint, index);
-fn ulong! Object.get_ulong_at(&self, usz index) => self.get_integer_at(ulong, index);
-fn uint128! Object.get_uint128_at(&self, usz index) => self.get_integer_at(uint128, index);
+fn char? Object.get_char_at(&self, usz index) => self.get_integer_at(char, index);
+fn ushort? Object.get_ushort_at(&self, usz index) => self.get_integer_at(ushort, index);
+fn uint? Object.get_uint_at(&self, usz index) => self.get_integer_at(uint, index);
+fn ulong? Object.get_ulong_at(&self, usz index) => self.get_integer_at(ulong, index);
+fn uint128? Object.get_uint128_at(&self, usz index) => self.get_integer_at(uint128, index);

 <*
 @require self.is_keyable()
 *>
-fn String! Object.get_string(&self, String key)
+fn String? Object.get_string(&self, String key)
 {
 	Object* value = self.get(key)!;
-	if (!value.is_string()) return CastResult.TYPE_MISMATCH?;
+	if (!value.is_string()) return TYPE_MISMATCH?;
 	return value.s;
 }

 <*
 @require self.is_indexable()
 *>
-fn String! Object.get_string_at(&self, usz index)
+fn String? Object.get_string_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
-	if (!value.is_string()) return CastResult.TYPE_MISMATCH?;
+	if (!value.is_string()) return TYPE_MISMATCH?;
 	return value.s;
 }

 <*
 @require self.is_keyable()
 *>
-macro String! Object.get_enum(&self, $EnumType, String key)
+macro String? Object.get_enum(&self, $EnumType, String key)
 {
 	Object value = self.get(key)!;
-	if ($EnumType.typeid != value.type) return CastResult.TYPE_MISMATCH?;
+	if ($EnumType.typeid != value.type) return TYPE_MISMATCH?;
 	return ($EnumType)value.i;
 }

 <*
 @require self.is_indexable()
 *>
-macro String! Object.get_enum_at(&self, $EnumType, usz index)
+macro String? Object.get_enum_at(&self, $EnumType, usz index)
 {
 	Object value = self.get_at(index);
-	if ($EnumType.typeid != value.type) return CastResult.TYPE_MISMATCH?;
+	if ($EnumType.typeid != value.type) return TYPE_MISMATCH?;
 	return ($EnumType)value.i;
 }

 <*
 @require self.is_keyable()
 *>
-fn bool! Object.get_bool(&self, String key)
+fn bool? Object.get_bool(&self, String key)
 {
 	Object* value = self.get(key)!;
-	if (!value.is_bool()) return CastResult.TYPE_MISMATCH?;
+	if (!value.is_bool()) return TYPE_MISMATCH?;
 	return value.b;
 }

@@ -409,17 +412,17 @@ fn bool! Object.get_bool(&self, String key)
 <*
 @require self.is_indexable()
 *>
-fn bool! Object.get_bool_at(&self, usz index)
+fn bool? Object.get_bool_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
-	if (!value.is_bool()) return CastResult.TYPE_MISMATCH?;
+	if (!value.is_bool()) return TYPE_MISMATCH?;
 	return value.b;
 }

 <*
 @require self.is_keyable()
 *>
-fn double! Object.get_float(&self, String key)
+fn double? Object.get_float(&self, String key)
 {
 	Object* value = self.get(key)!;
 	switch (value.type.kindof)
@@ -431,14 +434,14 @@ fn double! Object.get_float(&self, String key)
 		case FLOAT:
 			return value.f;
 		default:
-			return CastResult.TYPE_MISMATCH?;
+			return TYPE_MISMATCH?;
 	}
 }

 <*
 @require self.is_indexable()
 *>
-fn double! Object.get_float_at(&self, usz index)
+fn double? Object.get_float_at(&self, usz index)
 {
 	Object* value = self.get_at(index);
 	switch (value.type.kindof)
@@ -450,7 +453,7 @@ fn double! Object.get_float_at(&self, usz index)
 		case FLOAT:
 			return value.f;
 		default:
-			return CastResult.TYPE_MISMATCH?;
+			return TYPE_MISMATCH?;
 	}
 }

@@ -462,7 +465,7 @@ fn Object* Object.get_or_create_obj(&self, String key)
 	return container;
 }

-def ObjectInternalMap = HashMap(<String, Object*>) @private;
-def ObjectInternalList = List(<Object*>) @private;
-def ObjectInternalMapEntry = Entry(<String, Object*>) @private;
+alias ObjectInternalMap      @private = HashMap {String, Object*};
+alias ObjectInternalList     @private = List {Object*};
+alias ObjectInternalMapEntry @private = Entry {String, Object*};

--- a/lib/std/collections/priorityqueue.c3
+++ b/lib/std/collections/priorityqueue.c3
@@ -1,7 +1,7 @@
 //  priorityqueue.c3
 //  A priority queue using a classic binary heap for C3.
 //
-//  Copyright (c) 2022 David Kopec
+//  Copyright (c) 2022-2025 David Kopec
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -20,35 +20,30 @@
 //  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
-module std::collections::priorityqueue(<Type>);
+module std::collections::priorityqueue{Type};
 import std::collections::priorityqueue::private;

-distinct PriorityQueue = inline PrivatePriorityQueue(<Type, false>);
-distinct PriorityQueueMax = inline PrivatePriorityQueue(<Type, true>);
+typedef PriorityQueue = inline PrivatePriorityQueue{Type, false};
+typedef PriorityQueueMax = inline PrivatePriorityQueue{Type, true};

-module std::collections::priorityqueue::private(<Type, MAX>);
+module std::collections::priorityqueue::private{Type, MAX};
 import std::collections::list, std::io;

-def Heap = List(<Type>);
-
 struct PrivatePriorityQueue (Printable)
 {
-	Heap heap;
+	List{Type} heap;
 }

-fn void PrivatePriorityQueue.init(&self, Allocator allocator, usz initial_capacity = 16, ) @inline
+fn PrivatePriorityQueue* PrivatePriorityQueue.init(&self, Allocator allocator, usz initial_capacity = 16, ) @inline
 {
 	self.heap.init(allocator, initial_capacity);
+	return self;
 }

-fn void PrivatePriorityQueue.new_init(&self, usz initial_capacity = 16, Allocator allocator = allocator::heap()) @inline
+fn PrivatePriorityQueue* PrivatePriorityQueue.tinit(&self, usz initial_capacity = 16) @inline
 {
-	self.heap.init(allocator, initial_capacity);
-}
-
-fn void PrivatePriorityQueue.temp_init(&self, usz initial_capacity = 16) @inline
-{
-	self.heap.init(allocator::temp(), initial_capacity) @inline;
+	self.init(tmem, initial_capacity);
+	return self;
 }


@@ -72,6 +67,9 @@ fn void PrivatePriorityQueue.push(&self, Type element)
 	}
 }

+<*
+ @require index < self.len() : "Index out of range"
+*>
 fn void PrivatePriorityQueue.remove_at(&self, usz index)
 {
 	if (index == 0)
@@ -84,11 +82,11 @@ fn void PrivatePriorityQueue.remove_at(&self, usz index)
 <*
 @require self != null
 *>
-fn Type! PrivatePriorityQueue.pop(&self)
+fn Type? PrivatePriorityQueue.pop(&self)
 {
 	usz i = 0;
 	usz len = self.heap.len();
-	if (!len) return IteratorResult.NO_MORE_ELEMENT?;
+	if (!len) return NO_MORE_ELEMENT?;
 	usz new_count = len - 1;
 	self.heap.swap(0, new_count);
 	while OUTER: ((2 * i + 1) < new_count)
@@ -122,10 +120,9 @@ fn Type! PrivatePriorityQueue.pop(&self)
 	return self.heap.pop();
 }

-fn Type! PrivatePriorityQueue.first(&self)
+fn Type? PrivatePriorityQueue.first(&self)
 {
-	if (!self.len()) return IteratorResult.NO_MORE_ELEMENT?;
-	return self.heap.get(0);
+	return self.heap.first();
 }

 fn void PrivatePriorityQueue.free(&self)
@@ -135,12 +132,12 @@ fn void PrivatePriorityQueue.free(&self)

 fn usz PrivatePriorityQueue.len(&self) @operator(len)
 {
-	return self.heap.len();
+	return self.heap.len() @inline;
 }

 fn bool PrivatePriorityQueue.is_empty(&self)
 {
-	return self.heap.is_empty();
+	return self.heap.is_empty() @inline;
 }

 <*
@@ -151,13 +148,8 @@ fn Type PrivatePriorityQueue.get(&self, usz index) @operator([])
 	return self.heap[index];
 }

-fn usz! PrivatePriorityQueue.to_format(&self, Formatter* formatter) @dynamic
+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
-{
-	return self.heap.to_new_string(allocator);
-}
-
--- a/lib/std/collections/range.c3
+++ b/lib/std/collections/range.c3
@@ -1,7 +1,7 @@
 <*
 @require Type.is_ordered : "The type must be ordered"
 *>
-module std::collections::range(<Type>);
+module std::collections::range{Type};
 import std::io;

 struct Range (Printable)
@@ -29,22 +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 @deprecated
-{
-	return string::format("[%s..%s]", self.start, self.end, allocator: allocator);
-}
-
-fn String Range.to_string(&self, Allocator allocator) @dynamic
-{
-	return string::format("[%s..%s]", self.start, self.end, allocator: allocator);
-}
-
-fn String Range.to_tstring(&self)
-{
-	return self.to_string(allocator::temp());
-}
-
-fn usz! Range.to_format(&self, Formatter* formatter) @dynamic
+fn usz? Range.to_format(&self, Formatter* formatter) @dynamic
 {
 	return formatter.printf("[%s..%s]", self.start, self.end)!;
 }
@@ -66,26 +51,11 @@ fn bool ExclusiveRange.contains(&self, Type value) @inline
 	return value >= self.start && value < self.end;
 }

-fn usz! ExclusiveRange.to_format(&self, Formatter* formatter) @dynamic
+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 = null) @dynamic
-{
-	return self.to_string(allocator ?: allocator::heap());
-}
-
-fn String ExclusiveRange.to_string(&self, Allocator allocator) @dynamic
-{
-	return string::format("[%s..<%s]", self.start, self.end, allocator: allocator);
-}
-
-fn String ExclusiveRange.to_tstring(&self)
-{
-	return self.to_new_string(allocator::temp());
-}
-
 <*
 @require index < self.len() : "Can't index into an empty range"
 *>
--- a/lib/std/collections/ringbuffer.c3
+++ b/lib/std/collections/ringbuffer.c3
@@ -1,11 +1,14 @@
 <*
- @require values::@is_int(SIZE) &&& SIZE > 0 "The size must be positive integer"
+ @require Type.kindof == ARRAY : "Required an array type"
 *>
-module std::collections::ringbuffer(<Type, SIZE>);
+module std::collections::ringbuffer{Type};
+import std::io;

-struct RingBuffer
+alias Element = $typeof((Type){}[0]);
+
+struct RingBuffer (Printable)
 {
-	Type[SIZE] buf;
+	Type buf;
 	usz written;
 	usz head;
 }
@@ -15,9 +18,9 @@ fn void RingBuffer.init(&self) @inline
 	*self = {};
 }

-fn void RingBuffer.push(&self, Type c)
+fn void RingBuffer.push(&self, Element c)
 {
-	if (self.written < SIZE)
+	if (self.written < self.buf.len)
 	{
 		self.buf[self.written] = c;
 		self.written++;
@@ -25,14 +28,14 @@ fn void RingBuffer.push(&self, Type c)
 	else
 	{
 		self.buf[self.head] = c;
-		self.head = (self.head + 1) % SIZE;
+		self.head = (self.head + 1) % self.buf.len;
 	}
 }

-fn Type RingBuffer.get(&self, usz index) @operator([])
+fn Element RingBuffer.get(&self, usz index) @operator([])
 {
-	index %= SIZE;
-	usz avail = SIZE - self.head;
+	index %= self.buf.len;
+	usz avail = self.buf.len - self.head;
 	if (index < avail)
 	{
 		return self.buf[self.head + index];
@@ -40,25 +43,31 @@ fn Type RingBuffer.get(&self, usz index) @operator([])
 	return self.buf[index - avail];
 }

-fn Type! RingBuffer.pop(&self)
+fn Element? RingBuffer.pop(&self)
 {
 	switch
 	{
 		case self.written == 0:
-			return SearchResult.MISSING?;
-		case self.written < SIZE:
+			return NO_MORE_ELEMENT?;
+		case self.written < self.buf.len:
 			self.written--;
 			return self.buf[self.written];
 		default:
-			self.head = (self.head - 1) % SIZE;
+			self.head = (self.head - 1) % self.buf.len;
 			return self.buf[self.head];
 	}
 }

-fn usz RingBuffer.read(&self, usz index, Type[] buffer)
+fn usz? RingBuffer.to_format(&self, Formatter* format) @dynamic
 {
-	index %= SIZE;
-	if (self.written < SIZE)
+	// Improve this?
+	return format.printf("%s", self.buf);
+}
+
+fn usz RingBuffer.read(&self, usz index, Element[] buffer)
+{
+	index %= self.buf.len;
+	if (self.written < self.buf.len)
 	{
 		if (index >= self.written) return 0;
 		usz end = self.written - index;
@@ -66,7 +75,7 @@ fn usz RingBuffer.read(&self, usz index, Type[] buffer)
 		buffer[:n] = self.buf[index:n];
 		return n;
 	}
-	usz end = SIZE - self.head;
+	usz end = self.buf.len - self.head;
 	if (index >= end)
 	{
 		index -= end;
@@ -75,13 +84,13 @@ fn usz RingBuffer.read(&self, usz index, Type[] buffer)
 		buffer[:n] = self.buf[index:n];
 		return n;
 	}
-	if (buffer.len <= SIZE - index)
+	if (buffer.len <= self.buf.len - index)
 	{
 		usz n = buffer.len;
 		buffer[:n] = self.buf[self.head + index:n];
 		return n;
 	}
-	usz n1 = SIZE - index;
+	usz n1 = self.buf.len - index;
 	buffer[:n1] = self.buf[self.head + index:n1];
 	buffer = buffer[n1..];
 	index -= n1;
@@ -90,10 +99,10 @@ fn usz RingBuffer.read(&self, usz index, Type[] buffer)
 	return n1 + n2;
 }

-fn void RingBuffer.write(&self, Type[] buffer)
+fn void RingBuffer.write(&self, Element[] buffer)
 {
 	usz i;
-	while (self.written < SIZE && i < buffer.len)
+	while (self.written < self.buf.len && i < buffer.len)
 	{
 		self.buf[self.written] = buffer[i++];
 		self.written++;
@@ -101,6 +110,6 @@ fn void RingBuffer.write(&self, Type[] buffer)
 	foreach (c : buffer[i..])
 	{
 		self.buf[self.head] = c;
-		self.head = (self.head + 1) % SIZE;
+		self.head = (self.head + 1) % self.buf.len;
 	}
 }
--- a/lib/std/collections/tuple.c3
+++ b/lib/std/collections/tuple.c3
@@ -1,4 +1,4 @@
-module std::collections::tuple(<Type1, Type2>);
+module std::collections::tuple{Type1, Type2};

 struct Tuple
 {
@@ -6,7 +6,7 @@ struct Tuple
 	Type2 second;
 }

-module std::collections::triple(<Type1, Type2, Type3>);
+module std::collections::triple{Type1, Type2, Type3};

 struct Triple
 {
--- a/lib/std/compression/qoi.c3
+++ b/lib/std/compression/qoi.c3
@@ -37,19 +37,11 @@ struct QOIDesc
 	QOIChannels channels;
 	QOIColorspace colorspace;
 }
-
 <*
 QOI Errors.
 These are all the possible bad outcomes.
 *>
-fault QOIError
-{
-	INVALID_PARAMETERS,
-	FILE_OPEN_FAILED,
-	FILE_WRITE_FAILED,
-	INVALID_DATA,
-	TOO_MANY_PIXELS
-}
+faultdef INVALID_PARAMETERS, FILE_OPEN_FAILED, FILE_WRITE_FAILED, INVALID_DATA, TOO_MANY_PIXELS;


 // Let the user decide if they want to use std::io
@@ -67,25 +59,17 @@ import std::io;
 The function returns an optional, which can either be a QOIError
 or the number of bytes written on success.

- @param [in] filename `The file's name to write the image to`
- @param [in] input `The raw RGB or RGBA pixels to encode`
- @param [&in] desc `The descriptor of the image`
+ @param [in] filename : `The file's name to write the image to`
+ @param [in] input : `The raw RGB or RGBA pixels to encode`
+ @param [&in] desc : `The descriptor of the image`
 *>
-fn usz! write(String filename, char[] input, QOIDesc* desc) => @pool()
+fn usz? write(String filename, char[] input, QOIDesc* desc) => @pool()
 {
 	// encode data
-	char[] output = new_encode(input, desc, allocator: allocator::temp())!;
+	char[] output = encode(tmem, input, desc)!;

-	// open file
-	File! f = file::open(filename, "wb");
-	if (catch f) return QOIError.FILE_OPEN_FAILED?;
-
-	// write data to file and close it
-	usz! written = f.write(output);
-	if (catch written) return QOIError.FILE_WRITE_FAILED?;
-	if (catch f.close()) return QOIError.FILE_WRITE_FAILED?;
-
-	return written;
+	file::save(filename, output)!;
+	return output.len;
 }


@@ -106,33 +90,25 @@ fn usz! write(String filename, char[] input, QOIDesc* desc) => @pool()
 The returned pixel data should be free()d after use, or the decoding
 and use of the data should be wrapped in a @pool() { ... }; block.

- @param [in] filename `The file's name to read the image from`
- @param [&out] desc `The descriptor to fill with the image's info`
- @param channels `The channels to be used`
+ @param [in] filename : `The file's name to read the image from`
+ @param [&out] desc : `The descriptor to fill with the image's info`
+ @param channels : `The channels to be used`
+ @return? FILE_OPEN_FAILED, INVALID_DATA, TOO_MANY_PIXELS
 *>
-fn char[]! new_read(String filename, QOIDesc* desc, QOIChannels channels = AUTO, Allocator allocator = allocator::heap()) => @pool(allocator)
+fn char[]? read(Allocator allocator, String filename, QOIDesc* desc, QOIChannels channels = AUTO) => @pool()
 {
 	// read file
-	char[] data = file::load_temp(filename) ?? QOIError.FILE_OPEN_FAILED?!;
+	char[] data = file::load_temp(filename) ?? FILE_OPEN_FAILED?!;
 	// pass data to decode function
-	return new_decode(data, desc, channels, allocator);
+	return decode(allocator, data, desc, channels);
 }

-fn char[]! read(String filename, QOIDesc* desc, QOIChannels channels = AUTO, Allocator allocator = allocator::heap()) @deprecated("Use new_read")
-{
-	return new_read(filename, desc, channels, allocator);
-}


 // Back to basic non-stdio mode
 module std::compression::qoi;
 import std::bits;

-fn char[]! encode(char[] input, QOIDesc* desc, Allocator allocator = allocator::heap()) @deprecated("use encode_new")
-{
-	return new_encode(input, desc, allocator);
-}
-
 <*
 Encode raw RGB or RGBA pixels into a QOI image in memory.

@@ -143,20 +119,21 @@ fn char[]! encode(char[] input, QOIDesc* desc, Allocator allocator = allocator::
 and use of the data should be wrapped in a @pool() { ... }; block.
 See the write() function for an example.

- @param [in] input `The raw RGB or RGBA pixels to encode`
- @param [&in] desc `The descriptor of the image`
+ @param [in] input : `The raw RGB or RGBA pixels to encode`
+ @param [&in] desc : `The descriptor of the image`
+ @return? INVALID_PARAMETERS, TOO_MANY_PIXELS, INVALID_DATA
 *>
-fn char[]! new_encode(char[] input, QOIDesc* desc, Allocator allocator = allocator::heap()) @nodiscard
+fn char[]? encode(Allocator allocator, char[] input, QOIDesc* desc) @nodiscard
 {
 	// check info in desc
-	if (desc.width == 0 || desc.height == 0) return QOIError.INVALID_PARAMETERS?;
-	if (desc.channels == AUTO) return QOIError.INVALID_PARAMETERS?;
+	if (desc.width == 0 || desc.height == 0) return INVALID_PARAMETERS?;
+	if (desc.channels == AUTO) return INVALID_PARAMETERS?;
 	uint pixels = desc.width * desc.height;
-	if (pixels > PIXELS_MAX) return QOIError.TOO_MANY_PIXELS?;
+	if (pixels > PIXELS_MAX) return TOO_MANY_PIXELS?;
 	
 	// check input data size
 	uint image_size = pixels * desc.channels.id;
-	if (image_size != input.len) return QOIError.INVALID_DATA?;
+	if (image_size != input.len) return INVALID_DATA?;

 	// allocate memory for encoded data (output)
 	// header + chunk tag and RGB(A) data for each pixel + end of stream
@@ -271,17 +248,13 @@ fn char[]! new_encode(char[] input, QOIDesc* desc, Allocator allocator = allocat
 	}

 	// write end of stream
-	output[pos:END_OF_STREAM.len] = END_OF_STREAM;
+	output[pos:END_OF_STREAM.len] = END_OF_STREAM[..];
 	pos += END_OF_STREAM.len;
 	
 	return output[:pos];
 }


-fn char[]! decode(char[] data, QOIDesc* desc, QOIChannels channels = AUTO, Allocator allocator = allocator::heap())
-{
-	return new_decode(data, desc, channels, allocator);
-}

 <*
 Decode a QOI image from memory.
@@ -300,34 +273,35 @@ fn char[]! decode(char[] data, QOIDesc* desc, QOIChannels channels = AUTO, Alloc
 The returned pixel data should be free()d after use, or the decoding
 and use of the data should be wrapped in a @pool() { ... }; block.

- @param [in] data `The QOI image data to decode`
- @param [&out] desc `The descriptor to fill with the image's info`
- @param channels `The channels to be used`
+ @param [in] data : `The QOI image data to decode`
+ @param [&out] desc : `The descriptor to fill with the image's info`
+ @param channels : `The channels to be used`
+ @return? INVALID_DATA, TOO_MANY_PIXELS
 *>
-fn char[]! new_decode(char[] data, QOIDesc* desc, QOIChannels channels = AUTO, Allocator allocator = allocator::heap()) @nodiscard
+fn char[]? decode(Allocator allocator, char[] data, QOIDesc* desc, QOIChannels channels = AUTO) @nodiscard
 {
 	// check input data
-	if (data.len < Header.sizeof + END_OF_STREAM.len) return QOIError.INVALID_DATA?;
+	if (data.len < Header.sizeof + END_OF_STREAM.len) return INVALID_DATA?;

 	// get header
 	Header* header = (Header*)data.ptr;

 	// check magic bytes (FourCC)
-	if (bswap(header.be_magic) != 'qoif') return QOIError.INVALID_DATA?;
+	if (bswap(header.be_magic) != 'qoif') return INVALID_DATA?;

 	// copy header data to desc
 	desc.width = bswap(header.be_width);
 	desc.height = bswap(header.be_height);
 	desc.channels = @enumcast(QOIChannels, header.channels)!; 			// Rethrow if invalid
 	desc.colorspace = @enumcast(QOIColorspace, header.colorspace)!;	// Rethrow if invalid
-	if (desc.channels == AUTO) return QOIError.INVALID_DATA?; // Channels must be specified in the header
+	if (desc.channels == AUTO) return INVALID_DATA?; // Channels must be specified in the header

 	// check width and height
-	if (desc.width == 0 || desc.height == 0) return QOIError.INVALID_DATA?;
+	if (desc.width == 0 || desc.height == 0) return INVALID_DATA?;

 	// check pixel count
 	ulong pixels = (ulong)desc.width * (ulong)desc.height;
-	if (pixels > PIXELS_MAX) return QOIError.TOO_MANY_PIXELS?;
+	if (pixels > PIXELS_MAX) return TOO_MANY_PIXELS?;

 	uint pos = Header.sizeof; 	// Current position in data
 	uint loc;					// Current position in image (top-left corner)
@@ -390,7 +364,7 @@ fn char[]! new_decode(char[] data, QOIDesc* desc, QOIChannels channels = AUTO, A
 		}

 		// draw the pixel
-		if (channels == RGBA) { image[loc:4] = p.rgba; } else { image[loc:3] = p.rgb; }
+		if (channels == RGBA) { image[loc:4] = p.rgba[..]; } else { image[loc:3] = p.rgb[..]; }
 	}
 	
 	return image;
@@ -426,19 +400,23 @@ struct Header @packed
 	char colorspace;	// 0 = sRGB with linear alpha, 1 = all channels linear
 }

-const char[?] END_OF_STREAM = {0, 0, 0, 0, 0, 0, 0, 1};
+const char[*] END_OF_STREAM = {0, 0, 0, 0, 0, 0, 0, 1};

 // inefficient, but it's only run once at a time
+
+<*
+ @return? INVALID_DATA
+*>
 macro @enumcast($Type, raw)
 {
 	foreach (value : $Type.values)
 	{
 		if (value.id == raw) return value;
 	}
-	return QOIError.INVALID_DATA?;
+	return INVALID_DATA?;
 }

-distinct Pixel = inline char[<4>];
+typedef Pixel = inline char[<4>];
 macro char Pixel.hash(Pixel p)
 {
 	return (p.r * 3 + p.g * 5 + p.b * 7 + p.a * 11) % 64;
--- a/lib/std/core/allocators/arena_allocator.c3
+++ b/lib/std/core/allocators/arena_allocator.c3
@@ -1,9 +1,13 @@
-// Copyright (c) 2023 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2023-2025 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::core::mem::allocator;
 import std::math;

+// The arena allocator allocates up to its maximum data
+// and then fails to allocate more, returning out of memory.
+// It supports mark and reset to mark.
+
 struct ArenaAllocator (Allocator)
 {
 	char[] data;
@@ -12,6 +16,8 @@ struct ArenaAllocator (Allocator)

 <*
 Initialize a memory arena for use using the provided bytes.
+
+ @param [inout] data : "The memory to use for the arena."
 *>
 fn ArenaAllocator* ArenaAllocator.init(&self, char[] data)
 {
@@ -20,23 +26,44 @@ fn ArenaAllocator* ArenaAllocator.init(&self, char[] data)
 	return self;
 }

+<*
+ Reset the usage completely.
+*>
 fn void ArenaAllocator.clear(&self)
 {
 	self.used = 0;
 }

-struct ArenaAllocatorHeader @local
-{
-	usz size;
-	char[?] data;
-}
+<*
+ Given some memory, create an arena allocator on the stack for it.

+ @param [inout] bytes : `The bytes to use, may be empty.`
+
+ @return `An arena allocator using the bytes`
+*>
 macro ArenaAllocator* wrap(char[] bytes)
 {
 	return (ArenaAllocator){}.init(bytes);
 }

 <*
+ "Mark" the current state of the arena allocator by returning the use count.
+
+ @return `The value to pass to 'reset' in order to reset to the current use.`
+*>
+fn usz ArenaAllocator.mark(&self) => self.used;
+
+<*
+ Reset to a previous mark.
+
+ @param mark : `The previous mark.`
+ @require mark <= self.used : "Invalid mark - out of range"
+*>
+fn void ArenaAllocator.reset(&self, usz mark) => self.used = mark;
+
+<*
+ Implements the Allocator interface method.
+
 @require ptr != null
 *>
 fn void ArenaAllocator.release(&self, void* ptr, bool) @dynamic
@@ -50,24 +77,25 @@ fn void ArenaAllocator.release(&self, void* ptr, bool) @dynamic
 	}
 }

-fn usz ArenaAllocator.mark(&self) @dynamic => self.used;
-fn void ArenaAllocator.reset(&self, usz mark) @dynamic => self.used = mark;

 <*
+ Implements the Allocator interface method.
+
 @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 @require size > 0
+ @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 *>
-fn void*! ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @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;
-	if (size > total_len) return AllocationFailure.CHUNK_TOO_LARGE?;
+	if (size > total_len) return mem::INVALID_ALLOC_SIZE?;
 	void* start_mem = self.data.ptr;
 	void* unaligned_pointer_to_offset = start_mem + self.used + ArenaAllocatorHeader.sizeof;
 	void* mem = mem::aligned_pointer(unaligned_pointer_to_offset, alignment);
 	usz end = (usz)(mem - self.data.ptr) + size;
-	if (end > total_len) return AllocationFailure.OUT_OF_MEMORY?;
+	if (end > total_len) return mem::OUT_OF_MEMORY?;
 	self.used = end;
 	ArenaAllocatorHeader* header = mem - ArenaAllocatorHeader.sizeof;
 	header.size = size;
@@ -76,17 +104,20 @@ fn void*! ArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz a
 }

 <*
+ Implements the Allocator interface method.
+
 @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 @require old_pointer != null
 @require size > 0
+ @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 *>
-fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignment) @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.");
 	usz total_len = self.data.len;
-	if (size > total_len) return AllocationFailure.CHUNK_TOO_LARGE?;
+	if (size > total_len) return mem::INVALID_ALLOC_SIZE?;
 	ArenaAllocatorHeader* header = old_pointer - ArenaAllocatorHeader.sizeof;
 	usz old_size = header.size;
 	// Do last allocation and alignment match?
@@ -99,7 +130,7 @@ fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignmen
 		else
 		{
 			usz new_used = self.used + size - old_size;
-			if (new_used > total_len) return AllocationFailure.OUT_OF_MEMORY?;
+			if (new_used > total_len) return mem::OUT_OF_MEMORY?;
 			self.used = new_used;
 		}
 		header.size = size;
@@ -109,4 +140,12 @@ fn void*! ArenaAllocator.resize(&self, void *old_pointer, usz size, usz alignmen
 	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;
-}
+}
+
+// Internal data
+
+struct ArenaAllocatorHeader @local
+{
+	usz size;
+	char[*] data;
+}
--- a/lib/std/core/allocators/backed_arena_allocator.c3
+++ b/lib/std/core/allocators/backed_arena_allocator.c3
@@ -1,43 +1,51 @@
 module std::core::mem::allocator;
 import std::io, std::math;

-struct TempAllocatorChunk @local
-{
-	usz size;
-	char[?] data;
-}
+<*
+ The backed arena allocator provides an allocator that will allocate from a pre-allocated chunk of memory
+ provided by it's backing allocator. The allocator supports mark / reset operations, so it can be used
+ as a stack (push-pop) allocator. If the initial memory is used up, it will fall back to regular allocations,
+ that will be safely freed on `reset`.

-struct TempAllocator (Allocator)
+ While this allocator is similar to the dynamic arena, it supports multiple "save points", which the dynamic arena
+ doesn't.
+*>
+struct BackedArenaAllocator (Allocator)
 {
 	Allocator backing_allocator;
-	TempAllocatorPage* last_page;
+	ExtraPage* last_page;
 	usz used;
 	usz capacity;
-	char[?] data;
+	char[*] data;
 }

-const usz PAGE_IS_ALIGNED @private = (usz)isz.max + 1u;
-
-
-struct TempAllocatorPage
+struct AllocChunk @local
 {
-	TempAllocatorPage* prev_page;
+	usz size;
+	char[*] data;
+}
+
+const usz PAGE_IS_ALIGNED @local = (usz)isz.max + 1u;
+
+struct ExtraPage @local
+{
+	ExtraPage* prev_page;
 	void* start;
 	usz mark;
 	usz size;
 	usz ident;
-	char[?] data;
+	char[*] data;
 }

-macro usz TempAllocatorPage.pagesize(&self) => self.size & ~PAGE_IS_ALIGNED;
-macro bool TempAllocatorPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED == PAGE_IS_ALIGNED;
+macro usz ExtraPage.pagesize(&self) => self.size & ~PAGE_IS_ALIGNED;
+macro bool ExtraPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED == PAGE_IS_ALIGNED;

 <*
 @require size >= 16
 *>
-fn TempAllocator*! new_temp_allocator(usz size, Allocator allocator)
+fn BackedArenaAllocator*? new_backed_allocator(usz size, Allocator allocator)
 {
-	TempAllocator* temp = allocator::alloc_with_padding(allocator, TempAllocator, size)!;
+	BackedArenaAllocator* temp = allocator::alloc_with_padding(allocator, BackedArenaAllocator, size)!;
 	temp.last_page = null;
 	temp.backing_allocator = allocator;
 	temp.used = 0;
@@ -45,16 +53,16 @@ fn TempAllocator*! new_temp_allocator(usz size, Allocator allocator)
 	return temp;
 }

-fn void TempAllocator.destroy(&self)
+fn void BackedArenaAllocator.destroy(&self)
 {
 	self.reset(0);
 	if (self.last_page) (void)self._free_page(self.last_page);
 	allocator::free(self.backing_allocator, self);
 }

-fn usz TempAllocator.mark(&self) @dynamic => self.used;
+fn usz BackedArenaAllocator.mark(&self) => self.used;

-fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
+fn void BackedArenaAllocator.release(&self, void* old_pointer, bool) @dynamic
 {
 	usz old_size = *(usz*)(old_pointer - DEFAULT_SIZE_PREFIX);
 	if (old_pointer + old_size == &self.data[self.used])
@@ -63,13 +71,13 @@ fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
 		asan::poison_memory_region(&self.data[self.used], old_size);
 	}
 }
-fn void TempAllocator.reset(&self, usz mark) @dynamic
+fn void BackedArenaAllocator.reset(&self, usz mark)
 {
-	TempAllocatorPage *last_page = self.last_page;
+	ExtraPage *last_page = self.last_page;
 	while (last_page && last_page.mark > mark)
 	{
 		self.used = last_page.mark;
-		TempAllocatorPage *to_free = last_page;
+		ExtraPage *to_free = last_page;
 		last_page = last_page.prev_page;
 		self._free_page(to_free)!!;
 	}
@@ -90,19 +98,19 @@ fn void TempAllocator.reset(&self, usz mark) @dynamic
 	self.used = mark;
 }

-fn void! TempAllocator._free_page(&self, TempAllocatorPage* page) @inline @local
+fn void? BackedArenaAllocator._free_page(&self, ExtraPage* page) @inline @local
 {
 	void* mem = page.start;
 	return self.backing_allocator.release(mem, page.is_aligned());
 }

-fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size, usz alignment) @inline @local
+fn void*? BackedArenaAllocator._realloc_page(&self, ExtraPage* page, usz size, usz alignment) @inline @local
 {
 	// Then the actual start pointer:
 	void* real_pointer = page.start;

 	// Walk backwards to find the pointer to this page.
-	TempAllocatorPage **pointer_to_prev = &self.last_page;
+	ExtraPage **pointer_to_prev = &self.last_page;
 	// Remove the page from the list
 	while (*pointer_to_prev != page)
 	{
@@ -117,18 +125,18 @@ fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size,
 	return data;
 }

-fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
+fn void*? BackedArenaAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
 {
-	TempAllocatorChunk *chunk = pointer - TempAllocatorChunk.sizeof;
+	AllocChunk *chunk = pointer - AllocChunk.sizeof;
 	if (chunk.size == (usz)-1)
 	{
-		assert(self.last_page, "Realloc of non temp pointer");
+		assert(self.last_page, "Realloc of unrelated pointer");
 		// First grab the page
-		TempAllocatorPage *page = pointer - TempAllocatorPage.sizeof;
+		ExtraPage *page = pointer - ExtraPage.sizeof;
 		return self._realloc_page(page, size, alignment);
 	}

-	TempAllocatorChunk* data = self.acquire(size, NO_ZERO, alignment)!;
+	AllocChunk* data = self.acquire(size, NO_ZERO, alignment)!;
 	mem::copy(data, pointer, chunk.size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);

 	return data;
@@ -137,16 +145,16 @@ fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @d
 <*
 @require size > 0
 @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 *>
-fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? BackedArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	void* start_mem = &self.data;
 	void* starting_ptr = start_mem + self.used;
-	void* aligned_header_start = mem::aligned_pointer(starting_ptr, TempAllocatorChunk.alignof);
-	void* mem = aligned_header_start + TempAllocatorChunk.sizeof;
-	if (alignment > TempAllocatorChunk.alignof)
+	void* aligned_header_start = mem::aligned_pointer(starting_ptr, AllocChunk.alignof);
+	void* mem = aligned_header_start + AllocChunk.sizeof;
+	if (alignment > AllocChunk.alignof)
 	{
 		mem = mem::aligned_pointer(mem, alignment);
 	}
@@ -156,7 +164,7 @@ fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 	if (new_usage <= self.capacity)
 	{
 		asan::unpoison_memory_region(starting_ptr, new_usage - self.used);
-		TempAllocatorChunk* chunk_start = mem - TempAllocatorChunk.sizeof;
+		AllocChunk* chunk_start = mem - AllocChunk.sizeof;
 		chunk_start.size = size;
 		self.used = new_usage;
 		if (init_type == ZERO) mem::clear(mem, size, mem::DEFAULT_MEM_ALIGNMENT);
@@ -164,13 +172,13 @@ fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 	}

 	// Fallback to backing allocator
-	TempAllocatorPage* page;
+	ExtraPage* page;

 	// We have something we need to align.
 	if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
 	{
 		// This is actually simpler, since it will create the offset for us.
-		usz total_alloc_size = mem::aligned_offset(TempAllocatorPage.sizeof + size, alignment);
+		usz total_alloc_size = mem::aligned_offset(ExtraPage.sizeof + size, alignment);
 		if (init_type == ZERO)
 		{
 			mem = allocator::calloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
@@ -180,21 +188,21 @@ fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 			mem = allocator::malloc_aligned(self.backing_allocator, total_alloc_size, alignment)!;
 		}
 		void* start = mem;
-		mem += mem::aligned_offset(TempAllocatorPage.sizeof, alignment);
-		page = (TempAllocatorPage*)mem - 1;
+		mem += mem::aligned_offset(ExtraPage.sizeof, alignment);
+		page = (ExtraPage*)mem - 1;
 		page.start = start;
 		page.size = size | PAGE_IS_ALIGNED;
 	}
 	else
 	{
 		// Here we might need to pad
-		usz padded_header_size = mem::aligned_offset(TempAllocatorPage.sizeof, mem::DEFAULT_MEM_ALIGNMENT);
+		usz padded_header_size = mem::aligned_offset(ExtraPage.sizeof, mem::DEFAULT_MEM_ALIGNMENT);
 		usz total_alloc_size = padded_header_size + size;
 		void* alloc = self.backing_allocator.acquire(total_alloc_size, init_type, 0)!;

 		// Find the page.
-		page = alloc + padded_header_size - TempAllocatorPage.sizeof;
-		assert(mem::ptr_is_aligned(page, TempAllocator.alignof));
+		page = alloc + padded_header_size - ExtraPage.sizeof;
+		assert(mem::ptr_is_aligned(page, BackedArenaAllocator.alignof));
 		assert(mem::ptr_is_aligned(&page.data[0], mem::DEFAULT_MEM_ALIGNMENT));
 		page.start = alloc;
 		page.size = size;
@@ -209,22 +217,3 @@ fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al
 	self.last_page = page;
 	return &page.data[0];
 }
-
-fn void! TempAllocator.print_pages(&self, File* f)
-{
-	TempAllocatorPage *last_page = self.last_page;
-	if (!last_page)
-	{
-		io::fprintf(f, "No pages.\n")!;
-		return;
-	}
-	io::fprintf(f, "---Pages----\n")!;
-	uint index = 0;
-	while (last_page)
-	{
-		bool is_not_aligned = !(last_page.size & (1u64 << 63));
-		io::fprintf(f, "%d. Alloc: %d %d at %p%s\n", ++index,
-				last_page.size & ~(1u64 << 63), last_page.mark, &last_page.data[0], is_not_aligned ? "" : " [aligned]")!;
-		last_page = last_page.prev_page;
-	}
-}
--- a/lib/std/core/allocators/dynamic_arena.c3
+++ b/lib/std/core/allocators/dynamic_arena.c3
@@ -4,6 +4,17 @@
 module std::core::mem::allocator;
 import std::math;

+<*
+ The dynamic arena allocator is an arena allocator that can grow by adding additional arena "pages".
+ It only supports reset, at which point all pages except the first one is released to the backing
+ allocator.
+
+ If you want multiple save points, use the BackedArenaAllocator instead.
+
+ The advantage over the BackedArenaAllocator, is that when allocating beyond the first "page", it will
+ retain the characteristics of an arena allocator (allocating a large piece of memory then handing off
+ memory from that memory), wheras the BackedArenaAllocator will have heap allocator characteristics.
+*>
 struct DynamicArenaAllocator (Allocator)
 {
 	Allocator backing_allocator;
@@ -16,7 +27,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, Allocator allocator, usz page_size)
 {
 	self.page = null;
 	self.unused_page = null;
@@ -62,7 +73,7 @@ struct DynamicArenaChunk @local

 <*
 @require ptr != null
- @require self.page != null  `tried to free pointer on invalid allocator`
+ @require self.page != null  : `tried to free pointer on invalid allocator`
 *>
 fn void DynamicArenaAllocator.release(&self, void* ptr, bool) @dynamic
 {
@@ -75,11 +86,12 @@ fn void DynamicArenaAllocator.release(&self, void* ptr, bool) @dynamic
 }

 <*
- @require size > 0 `Resize doesn't support zeroing`
- @require old_pointer != null `Resize doesn't handle null pointers`
- @require self.page != null  `tried to realloc pointer on invalid allocator`
+ @require size > 0 : `Resize doesn't support zeroing`
+ @require old_pointer != null : `Resize doesn't handle null pointers`
+ @require self.page != null  : `tried to realloc pointer on invalid allocator`
+ @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 *>
-fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+fn void*? DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	DynamicArenaPage* current_page = self.page;
 	alignment = alignment_for_allocation(alignment);
@@ -109,9 +121,8 @@ fn void*! DynamicArenaAllocator.resize(&self, void* old_pointer, usz size, usz a
 	return new_mem;
 }

-fn void DynamicArenaAllocator.reset(&self, usz mark = 0) @dynamic
+fn void DynamicArenaAllocator.reset(&self)
 {
-	assert(mark == 0, "Unexpectedly reset dynamic arena allocator with mark %d", mark);
 	DynamicArenaPage* page = self.page;
 	DynamicArenaPage** unused_page_ptr = &self.unused_page;
 	while (page)
@@ -129,15 +140,16 @@ fn void DynamicArenaAllocator.reset(&self, usz mark = 0) @dynamic
 <*
 @require math::is_power_of_2(alignment)
 @require size > 0
+ @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 *>
-fn void*! DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @local
+fn void*? DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @local
 {
 	// First, make sure that we can align it, extending the page size if needed.
 	usz page_size = max(self.page_size, mem::aligned_offset(size + DynamicArenaChunk.sizeof + alignment, alignment));
 	assert(page_size > size + DynamicArenaChunk.sizeof);
 	// Grab the page without alignment (we do it ourselves)
 	void* mem = allocator::malloc_try(self.backing_allocator, page_size)!;
-	DynamicArenaPage*! page = allocator::new_try(self.backing_allocator, DynamicArenaPage);
+	DynamicArenaPage*? page = allocator::new_try(self.backing_allocator, DynamicArenaPage);
 	if (catch err = page)
 	{
 		allocator::free(self.backing_allocator, mem);
@@ -157,10 +169,11 @@ fn void*! DynamicArenaAllocator._alloc_new(&self, usz size, usz alignment) @loca
 }

 <*
- @require size > 0 `acquire expects size > 0`
+ @require size > 0 : `acquire expects size > 0`
 @require !alignment || math::is_power_of_2(alignment)
+ @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 *>
-fn void*! DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? DynamicArenaAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	DynamicArenaPage* page = self.page;
--- a/lib/std/core/allocators/heap_allocator.c3
+++ b/lib/std/core/allocators/heap_allocator.c3
@@ -1,10 +1,17 @@
-// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.

 module std::core::mem::allocator;
 import std::math;

+<*
+ The SimpleHeapAllocator implements a simple heap allocator on top of an allocator function.
+
+ It uses the given allocator function to allocate memory from some source, but never frees it.
+ This allocator is intended to be used in environments where there isn't any native libc malloc,
+ and it has to be emulated from a memory region, or wrapping linear memory as is the case for plain WASM.
+*>
 struct SimpleHeapAllocator (Allocator)
 {
 	MemoryAllocFn alloc_fn;
@@ -12,8 +19,8 @@ struct SimpleHeapAllocator (Allocator)
 }

 <*
- @require allocator != null  "An underlying memory provider must be given"
- @require !self.free_list "The allocator may not be already initialized"
+ @require allocator != null  : "An underlying memory provider must be given"
+ @require !self.free_list : "The allocator may not be already initialized"
 *>
 fn void SimpleHeapAllocator.init(&self, MemoryAllocFn allocator)
 {
@@ -21,7 +28,7 @@ fn void SimpleHeapAllocator.init(&self, MemoryAllocFn allocator)
 	self.free_list = null;
 }

-fn void*! SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
@@ -30,7 +37,7 @@ fn void*! SimpleHeapAllocator.acquire(&self, usz size, AllocInitType init_type,
 	return alignment > 0 ? @aligned_alloc(self._alloc, size, alignment) : self._alloc(size);
 }

-fn void*! SimpleHeapAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @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)
@@ -52,7 +59,7 @@ fn void SimpleHeapAllocator.release(&self, void* old_pointer, bool aligned) @dyn
 <*
 @require old_pointer && bytes > 0
 *>
-fn void*! SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @local
+fn void*? SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @local
 {
 	// Find the block header.
 	Header* block = (Header*)old_pointer - 1;
@@ -64,14 +71,14 @@ fn void*! SimpleHeapAllocator._realloc(&self, void* old_pointer, usz bytes) @loc
 	return new;
 }

-fn void*! SimpleHeapAllocator._calloc(&self, usz bytes) @local
+fn void*? SimpleHeapAllocator._calloc(&self, usz bytes) @local
 {
 	void* data = self._alloc(bytes)!;
 	mem::clear(data, bytes, mem::DEFAULT_MEM_ALIGNMENT);
 	return data;
 }

-fn void*! SimpleHeapAllocator._alloc(&self, usz bytes) @local
+fn void*? SimpleHeapAllocator._alloc(&self, usz bytes) @local
 {
 	usz aligned_bytes = mem::aligned_offset(bytes, mem::DEFAULT_MEM_ALIGNMENT);
 	if (!self.free_list)
@@ -120,7 +127,7 @@ fn void*! SimpleHeapAllocator._alloc(&self, usz bytes) @local
 	return self._alloc(aligned_bytes);
 }

-fn void! SimpleHeapAllocator.add_block(&self, usz aligned_bytes) @local
+fn void? SimpleHeapAllocator.add_block(&self, usz aligned_bytes) @local
 {
 	assert(mem::aligned_offset(aligned_bytes, mem::DEFAULT_MEM_ALIGNMENT) == aligned_bytes);
 	char[] result = self.alloc_fn(aligned_bytes + Header.sizeof)!;
--- a/lib/std/core/allocators/libc_allocator.c3
+++ b/lib/std/core/allocators/libc_allocator.c3
@@ -1,45 +1,47 @@
-// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
-
 module std::core::mem::allocator @if(env::LIBC);
 import std::io;
 import libc;

+<*
+ The LibcAllocator is a wrapper around malloc to conform to the Allocator interface.
+*>
+typedef LibcAllocator (Allocator, Printable) = uptr;
 const LibcAllocator LIBC_ALLOCATOR = {};
-distinct LibcAllocator (Allocator, Printable) = uptr;

 fn String LibcAllocator.to_string(&self, Allocator allocator) @dynamic => "Libc allocator".copy(allocator);
-fn usz! LibcAllocator.to_format(&self, Formatter *format) @dynamic => format.print("Libc allocator");
+fn usz? LibcAllocator.to_format(&self, Formatter *format) @dynamic => format.print("Libc allocator");

 module std::core::mem::allocator @if(env::POSIX);
 import std::os;
 import libc;


-fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
 		void* data @noinit;
 		if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
 		{
-			if (posix::posix_memalign(&data, alignment, bytes)) return AllocationFailure.OUT_OF_MEMORY?;
+			if (posix::posix_memalign(&data, alignment, bytes)) return mem::OUT_OF_MEMORY?;
 			mem::clear(data, bytes, mem::DEFAULT_MEM_ALIGNMENT);
 			return data;
 		}
-		return libc::calloc(1, bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+		return libc::calloc(1, bytes) ?: mem::OUT_OF_MEMORY?;
 	}
 	else
 	{
 		void* data @noinit;
 		if (alignment > mem::DEFAULT_MEM_ALIGNMENT)
 		{
-			if (posix::posix_memalign(&data, alignment, bytes)) return AllocationFailure.OUT_OF_MEMORY?;
+			if (posix::posix_memalign(&data, alignment, bytes)) return mem::OUT_OF_MEMORY?;
 		}
 		else
 		{
-			if (!(data = libc::malloc(bytes))) return AllocationFailure.OUT_OF_MEMORY?;
+			if (!(data = libc::malloc(bytes))) return mem::OUT_OF_MEMORY?;
 		}
 		$if env::TESTING:
 			for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
@@ -48,13 +50,13 @@ fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz a
 	}
 }

-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
-	if (alignment <= mem::DEFAULT_MEM_ALIGNMENT) return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+	if (alignment <= mem::DEFAULT_MEM_ALIGNMENT) return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
 	void* new_ptr;
-	if (posix::posix_memalign(&new_ptr, alignment, new_bytes)) return AllocationFailure.OUT_OF_MEMORY?;
+	if (posix::posix_memalign(&new_ptr, alignment, new_bytes)) return mem::OUT_OF_MEMORY?;

-	$switch
+	$switch:
 	$case env::DARWIN:
 		usz old_usable_size = darwin::malloc_size(old_ptr);
 	$case env::LINUX:
@@ -78,31 +80,31 @@ module std::core::mem::allocator @if(env::WIN32);
 import std::os::win32;
 import libc;

-fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	if (init_type == ZERO)
 	{
 		if (alignment > 0)
 		{
-			return win32::_aligned_recalloc(null, 1, bytes, alignment) ?: AllocationFailure.OUT_OF_MEMORY?;
+			return win32::_aligned_recalloc(null, 1, bytes, alignment) ?: mem::OUT_OF_MEMORY?;
 		}
-		return libc::calloc(1, bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+		return libc::calloc(1, bytes) ?: mem::OUT_OF_MEMORY?;
 	}
 	void* data = alignment > 0 ? win32::_aligned_malloc(bytes, alignment) : libc::malloc(bytes);
-	if (!data) return AllocationFailure.OUT_OF_MEMORY?;
+	if (!data) return mem::OUT_OF_MEMORY?;
 	$if env::TESTING:
 		for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
 	$endif
 	return data;
 }

-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
-		return win32::_aligned_realloc(old_ptr, new_bytes, alignment) ?: AllocationFailure.OUT_OF_MEMORY?;
+		return win32::_aligned_realloc(old_ptr, new_bytes, alignment) ?: mem::OUT_OF_MEMORY?;
 	}
-	return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+	return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
 }

 fn void LibcAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
@@ -118,17 +120,17 @@ fn void LibcAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
 module std::core::mem::allocator @if(!env::WIN32 && !env::POSIX && env::LIBC);
 import libc;

-fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*? LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
 	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?;
+		return data ?: mem::OUT_OF_MEMORYY?;
 	}
 	else
 	{
 		void* data = alignment ? @aligned_alloc(libc::malloc, bytes, alignment)!! : libc::malloc(bytes);
-		if (!data) return AllocationFailure.OUT_OF_MEMORY?;
+		if (!data) return mem::OUT_OF_MEMORY?;
 		$if env::TESTING:
 			for (usz i = 0; i < bytes; i++) ((char*)data)[i] = 0xAA;
 		$endif
@@ -137,14 +139,14 @@ fn void*! LibcAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz a
 }


-fn void*! LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*? LibcAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
 	if (alignment)
 	{
 		void* data = @aligned_realloc(fn void*(usz bytes) => libc::malloc(bytes), libc::free, old_ptr, new_bytes, alignment)!!;
-		return data ?: AllocationFailure.OUT_OF_MEMORY?;
+		return data ?: mem::OUT_OF_MEMORY?;
 	}
-	return libc::realloc(old_ptr, new_bytes) ?: AllocationFailure.OUT_OF_MEMORY?;
+	return libc::realloc(old_ptr, new_bytes) ?: mem::OUT_OF_MEMORY?;
 }


--- a/lib/std/core/allocators/on_stack_allocator.c3
+++ b/lib/std/core/allocators/on_stack_allocator.c3
@@ -1,5 +1,14 @@
 module std::core::mem::allocator;

+<*
+ The OnStackAllocator is similar to the ArenaAllocator: it allocates from a chunk of memory
+ given to it.
+
+ The difference is that when it runs out of memory it will go directly to its backing allocator
+ rather than failing.
+
+ It is utilized by the @stack_mem macro as an alternative to the temp allocator.
+*>
 struct OnStackAllocator (Allocator)
 {
 	Allocator backing_allocator;
@@ -8,7 +17,6 @@ struct OnStackAllocator (Allocator)
 	OnStackAllocatorExtraChunk* chunk;
 }

-
 struct OnStackAllocatorExtraChunk @local
 {
 	bool is_aligned;
@@ -52,7 +60,7 @@ fn void OnStackAllocator.free(&self)
 struct OnStackAllocatorHeader
 {
 	usz size;
-	char[?] data;
+	char[*] data;
 }

 <*
@@ -102,9 +110,9 @@ fn OnStackAllocatorExtraChunk* on_stack_allocator_find_chunk(OnStackAllocator* a
 <*
 @require size > 0
 @require old_pointer != null
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 *>
-fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+fn void*? OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	if (!allocation_in_stack_mem(self, old_pointer))
 	{
@@ -121,10 +129,10 @@ fn void*! OnStackAllocator.resize(&self, void* old_pointer, usz size, usz alignm
 }

 <*
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 @require size > 0
 *>
-fn void*! OnStackAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? OnStackAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	bool aligned = alignment > 0;
 	alignment = alignment_for_allocation(alignment);
--- a/lib/std/core/allocators/temp_allocator.c3
+++ b/lib/std/core/allocators/temp_allocator.c3
@@ -1,32 +1,61 @@
 module std::core::mem::allocator;
 import std::io, std::math;
+import std::core::sanitizer::asan;

-struct TempAllocatorChunk @local
-{
-	usz size;
-	char[?] data;
-}
+// This implements the temp allocator.
+// The temp allocator is a specialized allocator only intended for use where
+// the allocation is strictly stack-like.
+//
+// It is *not* thread-safe: you cannot safely use the
+// temp allocator on a thread and pass it to another thread.
+//
+// Fundamentally the temp allocator is a thread local arena allocator
+// but the stack-like behaviour puts additional constraints to it.
+//
+// It works great for allocating temporary data in a scope then dropping
+// that data, however you should not be storing temporary data in globals
+// or locals that have a lifetime outside of the current temp allocator scope.
+//
+// Furthermore, note that the temp allocator is bounded, with additional
+// allocations on top of that causing heap allocations. Such heap allocations
+// will be cleaned up but is undesirable from a performance standpoint.
+//
+// If you want customizable behaviour similar to the temp allocator, consider
+// the ArenaAllocator, BackedArenaAllocator or the DynamicArenaAllocator.
+//
+// Experimenting with the temp allocator to make it work outside of its
+// standard usage patterns will invariably end in tears and frustrated
+// hair pulling.
+//
+// Use one of the ArenaAllocators instead.

 struct TempAllocator (Allocator)
 {
 	Allocator backing_allocator;
 	TempAllocatorPage* last_page;
+	TempAllocator* derived;
+	bool allocated;
 	usz used;
 	usz capacity;
-	char[?] data;
+	usz original_capacity;
+	char[*] data;
+}
+
+struct TempAllocatorChunk @local
+{
+	usz size;
+	char[*] data;
 }

 const usz PAGE_IS_ALIGNED @private = (usz)isz.max + 1u;

-
 struct TempAllocatorPage
 {
 	TempAllocatorPage* prev_page;
 	void* start;
-	usz mark;
 	usz size;
 	usz ident;
-	char[?] data;
+	char[*] data;
 }

 macro usz TempAllocatorPage.pagesize(&self) => self.size & ~PAGE_IS_ALIGNED;
@@ -34,25 +63,101 @@ macro bool TempAllocatorPage.is_aligned(&self) => self.size & PAGE_IS_ALIGNED ==

 <*
 @require size >= 16
+ @require allocator.type != TempAllocator.typeid : "You may not create a temp allocator with a TempAllocator as the backing allocator."
 *>
-fn TempAllocator*! new_temp_allocator(usz size, Allocator allocator)
+fn TempAllocator*? new_temp_allocator(Allocator allocator, usz size)
 {
 	TempAllocator* temp = allocator::alloc_with_padding(allocator, TempAllocator, size)!;
 	temp.last_page = null;
 	temp.backing_allocator = allocator;
 	temp.used = 0;
-	temp.capacity = size;
+	temp.allocated = true;
+	temp.derived = null;
+	temp.original_capacity = temp.capacity = size;
 	return temp;
 }
-
-fn void TempAllocator.destroy(&self)
+<*
+ @require !self.derived
+ @require min_size > TempAllocator.sizeof + 64 : "Min size must meaningfully hold the data + some bytes"
+ @require mult > 0 : "The multiple can never be zero"
+*>
+fn TempAllocator*? TempAllocator.derive_allocator(&self, usz min_size, usz buffer, usz mult)
 {
-	self.reset(0);
-	if (self.last_page) (void)self._free_page(self.last_page);
-	allocator::free(self.backing_allocator, self);
+	usz remaining = self.capacity - self.used;
+	void* mem @noinit;
+	usz size @noinit;
+	if (min_size + buffer > remaining)
+	{
+		return self.derived = new_temp_allocator(self.backing_allocator, min_size * mult)!;
+	}
+	usz start = mem::aligned_offset(self.used + buffer, mem::DEFAULT_MEM_ALIGNMENT);
+	void* ptr = &self.data[start];
+	TempAllocator* temp = (TempAllocator*)ptr;
+	$if env::ADDRESS_SANITIZER:
+        asan::unpoison_memory_region(ptr, TempAllocator.sizeof);
+	$endif
+	temp.last_page = null;
+    temp.backing_allocator = self.backing_allocator;
+    temp.used = 0;
+    temp.allocated = false;
+    temp.derived = null;
+    temp.original_capacity = temp.capacity = self.capacity - start - TempAllocator.sizeof;
+    self.capacity = start;
+	self.derived = temp;
+    return temp;
 }

-fn usz TempAllocator.mark(&self) @dynamic => self.used;
+<*
+ Reset the entire temp allocator, which will merge all the children into it.
+*>
+fn void TempAllocator.reset(&self)
+{
+	TempAllocator* child = self.derived;
+	if (!child) return;
+	while (child)
+	{
+		TempAllocator* old = child;
+		child = old.derived;
+		old.destroy();
+	}
+	self.capacity = self.original_capacity;
+	$if env::ADDRESS_SANITIZER:
+		asan::poison_memory_region(&self.data[self.used], self.capacity - self.used);
+	$endif
+	self.derived = null;
+}
+
+<*
+ @require self.allocated : "Only a top level allocator should be freed."
+*>
+fn void TempAllocator.free(&self)
+{
+	self.reset();
+	self.destroy();
+}
+
+fn void TempAllocator.destroy(&self) @local
+{
+	TempAllocatorPage *last_page = self.last_page;
+	while (last_page)
+	{
+		TempAllocatorPage *to_free = last_page;
+		last_page = last_page.prev_page;
+		self._free_page(to_free)!!;
+	}
+	if (self.allocated)
+	{
+		allocator::free(self.backing_allocator, self);
+		return;
+	}
+	$if env::COMPILER_SAFE_MODE || env::ADDRESS_SANITIZER:
+    	$if env::COMPILER_SAFE_MODE && !env::ADDRESS_SANITIZER:
+    		self.data[0 : self.used] = 0xAA;
+		$else
+            asan::poison_memory_region(&self.data[0], self.used);
+    	$endif
+    $endif
+}

 fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
 {
@@ -63,40 +168,15 @@ fn void TempAllocator.release(&self, void* old_pointer, bool) @dynamic
 		asan::poison_memory_region(&self.data[self.used], old_size);
 	}
 }
-fn void TempAllocator.reset(&self, usz mark) @dynamic
-{
-	TempAllocatorPage *last_page = self.last_page;
-	while (last_page && last_page.mark > mark)
-	{
-		self.used = last_page.mark;
-		TempAllocatorPage *to_free = last_page;
-		last_page = last_page.prev_page;
-		self._free_page(to_free)!!;
-	}
-	self.last_page = last_page;
-	$if env::COMPILER_SAFE_MODE || env::ADDRESS_SANITIZER:
-		if (!last_page)
-		{
-			usz cleaned = self.used - mark;
-			if (cleaned > 0)
-			{
-				$if env::COMPILER_SAFE_MODE && !env::ADDRESS_SANITIZER:
-					self.data[mark : cleaned] = 0xAA;
-				$endif
-				asan::poison_memory_region(&self.data[mark], cleaned);
-			}
-		}
-	$endif
-	self.used = mark;
-}

-fn void! TempAllocator._free_page(&self, TempAllocatorPage* page) @inline @local
+
+fn void? TempAllocator._free_page(&self, TempAllocatorPage* page) @inline @local
 {
 	void* mem = page.start;
 	return self.backing_allocator.release(mem, page.is_aligned());
 }

-fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size, usz alignment) @inline @local
+fn void*? TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size, usz alignment) @inline @local
 {
 	// Then the actual start pointer:
 	void* real_pointer = page.start;
@@ -112,12 +192,13 @@ fn void*! TempAllocator._realloc_page(&self, TempAllocatorPage* page, usz size,
 	usz page_size = page.pagesize();
 	// Clear on size > original size.
 	void* data = self.acquire(size, NO_ZERO, alignment)!;
+	if (page_size > size) page_size = size;
 	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) @dynamic
+fn void*? TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @dynamic
 {
 	TempAllocatorChunk *chunk = pointer - TempAllocatorChunk.sizeof;
 	if (chunk.size == (usz)-1)
@@ -127,19 +208,47 @@ fn void*! TempAllocator.resize(&self, void* pointer, usz size, usz alignment) @d
 		TempAllocatorPage *page = pointer - TempAllocatorPage.sizeof;
 		return self._realloc_page(page, size, alignment);
 	}
-
-	TempAllocatorChunk* data = self.acquire(size, NO_ZERO, alignment)!;
-	mem::copy(data, pointer, chunk.size, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
-
+	bool is_realloc_of_last = chunk.size + pointer == &self.data[self.used];
+	if (is_realloc_of_last)
+	{
+		isz diff = size - chunk.size;
+		if (diff == 0) return pointer;
+		if (self.capacity - self.used > diff)
+		{
+			chunk.size += diff;
+			self.used += diff;
+			$if env::ADDRESS_SANITIZER:
+				if (diff < 0)
+				{
+					asan::poison_memory_region(pointer + chunk.size, -diff);
+				}
+				else
+				{
+					asan::unpoison_memory_region(pointer, chunk.size);
+				}
+			$endif
+			return pointer;
+		}
+	}
+	void* data = self.acquire(size, NO_ZERO, alignment)!;
+	usz len_to_copy = chunk.size > size ? size : chunk.size;
+	mem::copy(data, pointer, len_to_copy, mem::DEFAULT_MEM_ALIGNMENT, mem::DEFAULT_MEM_ALIGNMENT);
+	if (is_realloc_of_last)
+	{
+		self.used = (uptr)chunk - (uptr)&self.data;
+		$if env::ADDRESS_SANITIZER:
+			asan::poison_memory_region(chunk, TempAllocatorChunk.sizeof + chunk.size);
+		$endif
+	}
 	return data;
 }

 <*
 @require size > 0
 @require !alignment || math::is_power_of_2(alignment)
- @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+ @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 *>
-fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	alignment = alignment_for_allocation(alignment);
 	void* start_mem = &self.data;
@@ -202,29 +311,9 @@ fn void*! TempAllocator.acquire(&self, usz size, AllocInitType init_type, usz al

 	// Mark it as a page
 	page.ident = ~(usz)0;
-	// Store when it was created
-	page.mark = ++self.used;
 	// Hook up the page.
 	page.prev_page = self.last_page;
 	self.last_page = page;
 	return &page.data[0];
 }

-fn void! TempAllocator.print_pages(&self, File* f)
-{
-	TempAllocatorPage *last_page = self.last_page;
-	if (!last_page)
-	{
-		io::fprintf(f, "No pages.\n")!;
-		return;
-	}
-	io::fprintf(f, "---Pages----\n")!;
-	uint index = 0;
-	while (last_page)
-	{
-		bool is_not_aligned = !(last_page.size & (1u64 << 63));
-		io::fprintf(f, "%d. Alloc: %d %d at %p%s\n", ++index,
-				last_page.size & ~(1u64 << 63), last_page.mark, &last_page.data[0], is_not_aligned ? "" : " [aligned]")!;
-		last_page = last_page.prev_page;
-	}
-}
--- a/lib/std/core/allocators/tracking_allocator.c3
+++ b/lib/std/core/allocators/tracking_allocator.c3
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2024 Christoffer Lerno. All rights reserved.
+// Copyright (c) 2021-2025 Christoffer Lerno. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.

@@ -13,11 +13,15 @@ struct Allocation
 	void*[MAX_BACKTRACE] backtrace;
 }

-def AllocMap = HashMap(<uptr, Allocation>);
+alias AllocMap = HashMap { uptr, Allocation };

 // A simple tracking allocator.
 // It tracks allocations using a hash map but
 // is not compatible with allocators that uses mark()
+//
+// It is also embarassingly single-threaded, so
+// do not use it to track allocations that cross threads.
+
 struct TrackingAllocator (Allocator)
 {
 	Allocator inner_allocator;
@@ -29,7 +33,7 @@ struct TrackingAllocator (Allocator)
 <*
 Initialize a tracking allocator to wrap (and track) another allocator.

- @param [&inout] allocator "The allocator to track"
+ @param [&inout] allocator : "The allocator to track"
 *>
 fn void TrackingAllocator.init(&self, Allocator allocator)
 {
@@ -52,7 +56,7 @@ fn void TrackingAllocator.free(&self)
 fn usz TrackingAllocator.allocated(&self) => @pool()
 {
 	usz allocated = 0;
-	foreach (&allocation : self.map.value_tlist()) allocated += allocation.size;
+	foreach (&allocation : self.map.tvalues()) allocated += allocation.size;
 	return allocated;
 }

@@ -68,7 +72,7 @@ fn usz TrackingAllocator.total_allocation_count(&self) => self.allocs_total;

 fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator allocator)
 {
-	return self.map.value_tlist();
+	return self.map.tvalues();
 }

 <*
@@ -76,7 +80,7 @@ fn Allocation[] TrackingAllocator.allocations_tlist(&self, Allocator allocator)
 *>
 fn usz TrackingAllocator.allocation_count(&self) => self.map.count;

-fn void*! TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
+fn void*? TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, usz alignment) @dynamic
 {
 	void* data = self.inner_allocator.acquire(size, init_type, alignment)!;
 	self.allocs_total++;
@@ -87,7 +91,7 @@ fn void*! TrackingAllocator.acquire(&self, usz size, AllocInitType init_type, us
 	return data;
 }

-fn void*! TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
+fn void*? TrackingAllocator.resize(&self, void* old_pointer, usz size, usz alignment) @dynamic
 {
 	void* data = self.inner_allocator.resize(old_pointer, size, alignment)!;
 	self.map.remove((uptr)old_pointer);
@@ -121,13 +125,13 @@ fn bool TrackingAllocator.has_leaks(&self)
 fn void TrackingAllocator.print_report(&self) => self.fprint_report(io::stdout())!!;


-fn void! TrackingAllocator.fprint_report(&self, OutStream out) => @pool()
+fn void? TrackingAllocator.fprint_report(&self, OutStream out) => @pool()
 {
 	usz total = 0;
 	usz entries = 0;
 	bool leaks = false;

-	Allocation[] allocs = self.map.value_tlist();
+	Allocation[] allocs = self.map.tvalues();
 	if (allocs.len)
 	{
 		if (!allocs[0].backtrace[0])
@@ -155,7 +159,7 @@ fn void! TrackingAllocator.fprint_report(&self, OutStream out) => @pool()
 				Backtrace trace = backtrace::BACKTRACE_UNKNOWN;
 				if (allocation.backtrace[3])
 				{
-					trace = backtrace::symbolize_backtrace(allocation.backtrace[3:1], allocator::temp()).get(0) ?? backtrace::BACKTRACE_UNKNOWN;
+					trace = backtrace::symbolize_backtrace(tmem, allocation.backtrace[3:1]).get(0) ?? backtrace::BACKTRACE_UNKNOWN;
 				}
 				if (trace.function.len)	leaks = true;
 				io::fprintfn(out, "%13s   %p   %s:%d", allocation.size,
@@ -194,7 +198,7 @@ fn void! TrackingAllocator.fprint_report(&self, OutStream out) => @pool()
 					break;
 				}
 			}
-			BacktraceList list = backtrace::symbolize_backtrace(allocation.backtrace[3..(end - 1)], allocator::temp())!;
+			BacktraceList list = backtrace::symbolize_backtrace(tmem, allocation.backtrace[3..(end - 1)])!;
 			io::fprintfn(out, "Allocation %d (%d bytes): ", i + 1, allocation.size)!;
 			foreach (trace : list)
 			{
--- a/lib/std/core/array.c3
+++ b/lib/std/core/array.c3
@@ -2,10 +2,29 @@ module std::core::array;
 import std::core::array::slice;

 <*
+ Returns true if the array contains at least one element, else false
+ 
+ @param [in] array
+ @param [in] element
+ @require @typekind(array) == SLICE || @typekind(array) == ARRAY
+ @require @typeis(array[0], $typeof(element)) : "array and element must have the same type"
+*>
+macro bool contains(array, element)
+{
+	foreach (&item : array)
+	{
+		if (*item == element) return true;
+	}
+	return false;	
+}
+
+<*
+ Return the first index of element found in the array, searching from the start.
+ 
 @param [in] array
 @param [in] element
 @return "the first index of the element"
- @return! SearchResult.MISSING
+ @return? NOT_FOUND
 *>
 macro index_of(array, element)
 {
@@ -13,10 +32,18 @@ macro index_of(array, element)
 	{
 		if (*e == element) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 <*
+ Slice a 2d array and create a Slice2d from it.
+
+ @param array_ptr : "the pointer to create a slice from"
+ @param x : "The starting position of the slice x, optional"
+ @param y : "The starting position of the slice y, optional"
+ @param xlen : "The length of the slice in x, defaults to the length of the array"
+ @param ylen : "The length of the slice in y, defaults to the length of the array"
+ @return "A Slice2d from the array"
 @require @typekind(array_ptr) == POINTER
 @require @typekind(*array_ptr) == VECTOR || @typekind(*array_ptr) == ARRAY
 @require @typekind((*array_ptr)[0]) == VECTOR || @typekind((*array_ptr)[0]) == ARRAY
@@ -26,15 +53,17 @@ macro slice2d(array_ptr, x = 0, xlen = 0, y = 0, ylen = 0)
 	if (xlen < 1) xlen = $typeof((*array_ptr)[0]).len + xlen;
 	if (ylen < 1) ylen = $typeof((*array_ptr)).len + ylen;
 	var $ElementType = $typeof((*array_ptr)[0][0]);
-	return Slice2d(<$ElementType>) { ($ElementType*)array_ptr, $typeof((*array_ptr)[0]).len, y, ylen, x, xlen };
+	return (Slice2d{$ElementType}) { ($ElementType*)array_ptr, $typeof((*array_ptr)[0]).len, y, ylen, x, xlen };
 }


 <*
+ Return the first index of element found in the array, searching in reverse from the end.
+ 
 @param [in] array
 @param [in] element
 @return "the last index of the element"
- @return! SearchResult.MISSING
+ @return? NOT_FOUND
 *>
 macro rindex_of(array, element)
 {
@@ -42,7 +71,7 @@ macro rindex_of(array, element)
 	{
 		if (*e == element) return i;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 <*
@@ -50,13 +79,13 @@ macro rindex_of(array, element)

 @param [in] arr1
 @param [in] arr2
- @param [&inout] allocator "The allocator to use, default is the heap allocator"
+ @param [&inout] allocator : "The allocator to use, default is the heap allocator"
 @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"
+ @require @typeis(arr1[0], $typeof(arr2[0])) : "Arrays must have the same type"
 @ensure result.len == arr1.len + arr2.len
 *>
-macro concat(arr1, arr2, Allocator allocator) @nodiscard
+macro concat(Allocator allocator, arr1, arr2) @nodiscard
 {
 	var $Type = $typeof(arr1[0]);
 	$Type[] result = allocator::alloc_array(allocator, $Type, arr1.len + arr2.len);
@@ -70,22 +99,6 @@ macro concat(arr1, arr2, Allocator allocator) @nodiscard
 	}
 	return result;
 }
-<*
- 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) == 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 return.len == arr1.len + arr2.len
-*>
-macro concat_new(arr1, arr2, Allocator allocator = allocator::heap()) @nodiscard
-{
-	return concat(arr1, arr2, allocator);
-}
-
 <*
 Concatenate two arrays or slices, returning a slice containing the concatenation of them,
 allocated using the temp allocator.
@@ -94,100 +107,7 @@ macro concat_new(arr1, arr2, Allocator allocator = allocator::heap()) @nodiscard
 @param [in] arr2
 @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"
+ @require @typeis(arr1[0], $typeof(arr2[0])) : "Arrays must have the same type"
 @ensure return.len == arr1.len + arr2.len
 *>
-macro tconcat(arr1, arr2) @nodiscard => concat(arr1, arr2, allocator::temp());
-
-module std::core::array::slice(<Type>);
-
-struct Slice2d
-{
-	Type* ptr;
-	usz inner_len;
-	usz ystart;
-	usz ylen;
-	usz xstart;
-	usz xlen;
-}
-
-fn usz Slice2d.len(&self) @operator(len)
-{
-	return self.ylen;
-}
-
-fn usz Slice2d.count(&self)
-{
-	return self.ylen * self.xlen;
-}
-
-macro void Slice2d.@each(&self; @body(usz[<2>], Type))
-{
-	foreach (y, line : *self)
-	{
-		foreach (x, val : line)
-		{
-			@body({ x, y }, val);
-		}
-	}
-}
-
-macro void Slice2d.@each_ref(&self; @body(usz[<2>], Type*))
-{
-	foreach (y, line : *self)
-	{
-		foreach (x, &val : line)
-		{
-			@body({ x, y }, val);
-		}
-	}
-}
-
-<*
- @require idy >= 0 && idy < self.ylen
-*>
-macro Type[] Slice2d.get_row(self, usz idy) @operator([])
-{
-	return (self.ptr + self.inner_len * (idy + self.ystart))[self.xstart:self.xlen];
-}
-
-macro Type Slice2d.get_coord(self, usz[<2>] coord)
-{
-	return *self.get_coord_ref(coord);
-}
-
-macro Type Slice2d.get_xy(self, x, y)
-{
-	return *self.get_xy_ref(x, y);
-}
-
-macro Type* Slice2d.get_xy_ref(self, x, y)
-{
-	return self.ptr + self.inner_len * (y + self.ystart) + self.xstart + x;
-}
-
-macro Type* Slice2d.get_coord_ref(self, usz[<2>] coord)
-{
-	return self.get_xy_ref(coord.x, coord.y);
-}
-
-macro void Slice2d.set_coord(self, usz[<2>] coord, Type value)
-{
-	*self.get_coord_ref(coord) = value;
-}
-
-macro void Slice2d.set_xy(self, x, y, Type value)
-{
-	*self.get_xy_ref(x, y) = value;
-}
-
-<*
- @require y >= 0 && y < self.ylen
- @require x >= 0 && x < self.xlen
-*>
-fn Slice2d Slice2d.slice(&self, isz x = 0, isz xlen = 0, isz y = 0, isz ylen = 0)
-{
-	if (xlen < 1) xlen = self.xlen + xlen;
-	if (ylen < 1) ylen = self.ylen + ylen;
-	return { self.ptr, self.inner_len, y + self.ystart, ylen, x + self.xstart, xlen };
-}
+macro tconcat(arr1, arr2) @nodiscard => concat(tmem, arr1, arr2);
--- a/lib/std/core/ascii.c3
+++ b/lib/std/core/ascii.c3
@@ -0,0 +1,114 @@
+<*
+ This module contains utils for handling ASCII characters. They only operate on
+ characters corresponding to 0-127.
+*>
+module std::core::ascii;
+
+macro bool @is_lower(c)  => ASCII_LOOKUP[c].lower;      // Is a-z
+macro bool @is_upper(c)  => ASCII_LOOKUP[c].upper;      // Is A-Z
+macro bool @is_digit(c)  => ASCII_LOOKUP[c].digit;      // Is 0-9
+macro bool @is_bdigit(c) => ASCII_LOOKUP[c].bin_digit;  // Is 0-1
+macro bool @is_odigit(c) => ASCII_LOOKUP[c].oct_digit;  // Is 0-7
+macro bool @is_xdigit(c) => ASCII_LOOKUP[c].hex_digit;  // Is 0-9 or a-f or A-F
+macro bool @is_alpha(c)  => ASCII_LOOKUP[c].alpha;      // Is a-z or A-Z
+macro bool @is_print(c)  => ASCII_LOOKUP[c].printable;  // Is a printable character (space or higher and < 127
+macro bool @is_graph(c)  => ASCII_LOOKUP[c].graph;      // Does it show any graphics (printable but not space)
+macro bool @is_space(c)  => ASCII_LOOKUP[c].space;      // Is it a space character: space, tab, linefeed etc
+macro bool @is_alnum(c)  => ASCII_LOOKUP[c].alphanum;   // Is it alpha or digit
+macro bool @is_punct(c)  => ASCII_LOOKUP[c].punct;      // Is it "graph" but not digit or letter
+macro bool @is_blank(c)  => ASCII_LOOKUP[c].blank;      // Is it a blank space: space or tab
+macro bool @is_cntrl(c)  => ASCII_LOOKUP[c].control;    // Is it a control character: before space or 127
+macro char @to_lower(c)  => c + TO_LOWER[c];            // Convert A-Z to a-z if found
+macro char @to_upper(c)  => c - TO_UPPER[c];            // Convert a-z to A-Z if found
+
+fn bool is_lower(char c)  => @is_lower(c);  // Is a-z
+fn bool is_upper(char c)  => @is_upper(c);  // Is A-Z
+fn bool is_digit(char c)  => @is_digit(c);  // Is 0-9
+fn bool is_bdigit(char c) => @is_bdigit(c); // Is 0-1
+fn bool is_odigit(char c) => @is_odigit(c); // Is 0-7
+fn bool is_xdigit(char c) => @is_xdigit(c); // Is 0-9 or a-f or A-F
+fn bool is_alpha(char c)  => @is_alpha(c);  // Is a-z or A-Z
+fn bool is_print(char c)  => @is_print(c);  // Is a printable character (space or higher and < 127
+fn bool is_graph(char c)  => @is_graph(c);  // Does it show any graphics (printable but not space)
+fn bool is_space(char c)  => @is_space(c);  // Is it a space character: space, tab, linefeed etc
+fn bool is_alnum(char c)  => @is_alnum(c);  // Is it alpha or digit
+fn bool is_punct(char c)  => @is_punct(c);  // Is it "graph" but not digit or letter
+fn bool is_blank(char c)  => @is_blank(c);  // Is it a blank space: space or tab
+fn bool is_cntrl(char c)  => @is_cntrl(c);  // Is it a control character: before space or 127
+fn char to_lower(char c)  => @to_lower(c);  // Convert A-Z to a-z if found
+fn char to_upper(char c)  => @to_upper(c);  // Convert a-z to A-Z if found
+
+// The following methods are macro methods for the same functions
+macro bool char.is_lower(char c)  => @is_lower(c);
+macro bool char.is_upper(char c)  => @is_upper(c);
+macro bool char.is_digit(char c)  => @is_digit(c);
+macro bool char.is_bdigit(char c) => @is_bdigit(c);
+macro bool char.is_odigit(char c) => @is_odigit(c);
+macro bool char.is_xdigit(char c) => @is_xdigit(c);
+macro bool char.is_alpha(char c)  => @is_alpha(c);
+macro bool char.is_print(char c)  => @is_print(c);
+macro bool char.is_graph(char c)  => @is_graph(c);
+macro bool char.is_space(char c)  => @is_space(c);
+macro bool char.is_alnum(char c)  => @is_alnum(c);
+macro bool char.is_punct(char c)  => @is_punct(c);
+macro bool char.is_blank(char c)  => @is_blank(c);
+macro bool char.is_cntrl(char c)  => @is_cntrl(c);
+macro char char.to_lower(char c)  => @to_lower(c);
+macro char char.to_upper(char c)  => @to_upper(c);
+
+<*
+ Convert a-f/A-F/0-9 to the appropriate hex value.
+
+ @require c.is_xdigit()
+ @ensure return >= 0 && return <= 15
+*>
+macro char char.from_hex(char c) => HEX_VALUE[c];
+
+<*
+ Bitstruct containing the different properties of a character
+*>
+bitstruct CharType : ushort @private
+{
+	bool lower;
+	bool upper;
+	bool digit;
+	bool bin_digit;
+	bool hex_digit;
+	bool oct_digit;
+	bool alpha;
+	bool alphanum;
+	bool space;
+	bool printable;
+	bool blank;
+	bool punct;
+	bool control;
+	bool graph;
+}
+
+const CharType[256] ASCII_LOOKUP @private = {
+	[0..31]    = { .control },
+	[9..13]    = { .control, .space },
+	['\t']     = { .control, .space, .blank },
+	[' ']      = { .space, .printable, .blank },
+	[33..126]  = { .printable, .graph, .punct },
+	['0'..'9'] = { .printable, .graph, .alphanum, .hex_digit, .digit },
+	['2'..'7'] = { .printable, .graph, .alphanum, .hex_digit, .digit, .oct_digit },
+	['0'..'1'] = { .printable, .graph, .alphanum, .hex_digit, .digit, .oct_digit, .bin_digit },
+	['A'..'Z'] = { .printable, .graph, .alphanum, .alpha, .upper },
+	['A'..'F'] = { .printable, .graph, .alphanum, .alpha, .upper, .hex_digit },
+	['a'..'z'] = { .printable, .graph, .alphanum, .alpha, .lower },
+	['a'..'f'] = { .printable, .graph, .alphanum, .alpha, .lower, .hex_digit },
+	[127]      = { .control },
+};
+
+const char[256] HEX_VALUE = {
+	['0'] =  0, ['1'] =  1, ['2'] =  2, ['3'] =  3, ['4'] =  4,
+	['5'] =  5, ['6'] =  6, ['7'] =  7, ['8'] =  8, ['9'] =  9,
+	['A'] = 10, ['B'] = 11, ['C'] = 12, ['D'] = 13, ['E'] = 14,
+	['F'] = 15, ['a'] = 10, ['b'] = 11, ['c'] = 12, ['d'] = 13,
+	['e'] = 14, ['f'] = 15
+};
+
+const char[256] TO_UPPER @private = { ['a'..'z'] = 'a' - 'A' };
+const char[256] TO_LOWER @private  = { ['A'..'Z'] = 'a' - 'A' };
+
--- a/lib/std/core/bitorder.c3
+++ b/lib/std/core/bitorder.c3
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Christoffer Lerno and contributors. All rights reserved.
+// Copyright (c) 2023-2025 Christoffer Lerno and contributors. All rights reserved.
 // Use of this source code is governed by the MIT license
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::core::bitorder;
@@ -88,13 +88,13 @@ bitstruct UInt128LE : uint128 @littleendian
 }

 <*
- @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"
+ @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)
 {
 	char[] s;
-	$switch (@typekind(bytes))
+	$switch @typekind(bytes):
 	$case POINTER:
 		s = (*bytes)[:$Type.sizeof];
 	$default:
@@ -104,13 +104,13 @@ macro read(bytes, $Type)
 }

 <*
- @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"
+ @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)
 {
 	char[] s;
-	$switch (@typekind(bytes))
+	$switch @typekind(bytes):
 	$case POINTER:
 		s = (*bytes)[:$Type.sizeof];
 	$default:
@@ -121,7 +121,7 @@ macro write(x, bytes, $Type)

 macro is_bitorder($Type)
 {
-	$switch ($Type)
+	$switch $Type:
 	$case UShortLE:
 	$case ShortLE:
 	$case UIntLE:
@@ -146,7 +146,7 @@ macro is_bitorder($Type)

 macro bool is_array_or_slice_of_char(bytes)
 {
-	$switch (@typekind(bytes))
+	$switch @typekind(bytes):
 	$case POINTER:
 		var $Inner = $typefrom($typeof(bytes).inner);
 		$if $Inner.kindof == ARRAY:
@@ -164,7 +164,7 @@ macro bool is_array_or_slice_of_char(bytes)

 macro bool is_arrayptr_or_slice_of_char(bytes)
 {
-	$switch (@typekind(bytes))
+	$switch @typekind(bytes):
 	$case POINTER:
 		var $Inner = $typefrom($typeof(bytes).inner);
 		$if $Inner.kindof == ARRAY:
--- a/lib/std/core/builtin.c3
+++ b/lib/std/core/builtin.c3
@@ -4,29 +4,63 @@
 module std::core::builtin;
 import libc, std::hash, std::io, std::os::backtrace;

+
+<*
+ EMPTY_MACRO_SLOT is a value used for implementing optional arguments for macros in an efficient
+ way. It relies on the fact that distinct types are not implicitly convertable.
+
+ You can use `@is_empty_macro_slot()` and `@is_valid_macro_slot()` to figure out whether
+ the argument has been used or not.
+
+ An example:
+
+```c3
+macro foo(a, #b = EMPTY_MACRO_SLOT)
+{
+	$if @is_valid_macro_slot(#b):
+        return invoke_foo2(a, #b);
+    $else
+        return invoke_foo1(a);
+    $endif
+}
+*>
+const EmptySlot EMPTY_MACRO_SLOT @builtin = null;
+
+typedef EmptySlot = void*;
+macro @is_empty_macro_slot(#arg) @const @builtin => @typeis(#arg, EmptySlot);
+macro @is_valid_macro_slot(#arg) @const @builtin => !@typeis(#arg, EmptySlot);
+
+<*
+ Returns a random value at compile time.
+
+ @ensure return >= 0.0 && return < 1.0
+ @return "A compile time random"
+*>
+macro @rnd() @const @builtin => $$rnd();
+
 /*
 Use `IteratorResult` when reading the end of an iterator, or accessing a result out of bounds.
 */
-fault IteratorResult { NO_MORE_ELEMENT }
+faultdef NO_MORE_ELEMENT @builtin;

 /*
 Use `SearchResult` when trying to return a value from some collection but the element is missing.
 */
-fault SearchResult { MISSING }
+faultdef NOT_FOUND @builtin;

 /*
 Use `CastResult` when an attempt at conversion fails.
 */
-fault CastResult { TYPE_MISMATCH }
+faultdef TYPE_MISMATCH @builtin;


-def VoidFn = fn void();
+alias VoidFn = fn void();

 <*
 Stores a variable on the stack, then restores it at the end of the
 macro scope.

- @param #variable `the variable to store and restore`
+ @param #variable : `the variable to store and restore`
 @require values::@is_lvalue(#variable)
 *>
 macro void @scope(#variable; @body) @builtin
@@ -38,7 +72,7 @@ macro void @scope(#variable; @body) @builtin

 <*
 Swap two variables
- @require $defined(#a = #b, #b = #a) `The values must be mutually assignable`
+ @require $defined(#a = #b, #b = #a) : `The values must be mutually assignable`
 *>
 macro void @swap(#a, #b) @builtin
 {
@@ -50,24 +84,32 @@ macro void @swap(#a, #b) @builtin
 <*
 Convert an `any` type to a type, returning an failure if there is a type mismatch.

- @param v `the any to convert to the given type.`
- @param $Type `the type to convert to`
+ @param v : `the any to convert to the given type.`
+ @param $Type : `the type to convert to`
 @return `The any.ptr converted to its type.`
 @ensure @typeis(return, $Type*)
- @return! CastResult.TYPE_MISMATCH
+ @return? TYPE_MISMATCH
 *>
 macro anycast(any v, $Type) @builtin
 {
-	if (v.type != $Type.typeid) return CastResult.TYPE_MISMATCH?;
+	if (v.type != $Type.typeid) return TYPE_MISMATCH?;
 	return ($Type*)v.ptr;
 }

-fn bool print_backtrace(String message, int backtraces_to_ignore) @if(env::NATIVE_STACKTRACE) => @pool()
+fn bool print_backtrace(String message, int backtraces_to_ignore) @if(env::NATIVE_STACKTRACE) => @stack_mem(0x1100; Allocator smem)
 {
+	Allocator t = allocator::current_temp;
+	TempAllocator* new_t = allocator::new_temp_allocator(smem, 0x1000)!!;
+	allocator::current_temp = new_t;
+	defer
+	{
+		allocator::current_temp = t;
+		new_t.free();
+	}
 	void*[256] buffer;
 	void*[] backtraces = backtrace::capture_current(&buffer);
 	backtraces_to_ignore++;
-	BacktraceList! backtrace = backtrace::symbolize_backtrace(backtraces, allocator::temp());
+	BacktraceList? backtrace = backtrace::symbolize_backtrace(tmem, backtraces);
 	if (catch backtrace) return false;
 	if (backtrace.len() <= backtraces_to_ignore) return false;
 	io::eprint("\nERROR: '");
@@ -130,7 +172,7 @@ fn void default_panic(String message, String file, String function, uint line) @
 	$$trap();
 }

-def PanicFn = fn void(String message, String file, String function, uint line);
+alias PanicFn = fn void(String message, String file, String function, uint line);

 PanicFn panic = &default_panic;

@@ -156,7 +198,7 @@ fn void panicf(String fmt, String file, String function, uint line, args...)
 <*
 Marks the path as unreachable. This will panic in safe mode, and in fast will simply be assumed
 never happens.
- @param [in] string "The panic message or format string"
+ @param [in] string : "The panic message or format string"
 *>
 macro void unreachable(String string = "Unreachable statement reached.", ...) @builtin @noreturn
 {
@@ -168,7 +210,7 @@ macro void unreachable(String string = "Unreachable statement reached.", ...) @b

 <*
 Marks the path as unsupported, this is similar to unreachable.
- @param [in] string "The error message"
+ @param [in] string : "The error message"
 *>
 macro void unsupported(String string = "Unsupported function invoked") @builtin @noreturn
 {
@@ -200,10 +242,10 @@ macro any.as_inner(&self)
 }

 <*
- @param expr "the expression to cast"
- @param $Type "the type to cast to"
+ @param expr : "the expression to cast"
+ @param $Type : "the type to cast to"

- @require $sizeof(expr) == $Type.sizeof  "Cannot bitcast between types of different size."
+ @require $sizeof(expr) == $Type.sizeof  : "Cannot bitcast between types of different size."
 @ensure @typeis(return, $Type)
 *>
 macro bitcast(expr, $Type) @builtin
@@ -218,11 +260,11 @@ macro bitcast(expr, $Type) @builtin
 }

 <*
- @param $Type `The type of the enum`
- @param [in] enum_name `The name of the enum to search for`
- @require $Type.kindof == ENUM `Only enums may be used`
+ @param $Type : `The type of the enum`
+ @param [in] enum_name : `The name of the enum to search for`
+ @require $Type.kindof == ENUM : `Only enums may be used`
 @ensure @typeis(return, $Type)
- @return! SearchResult.MISSING
+ @return? NOT_FOUND
 *>
 macro enum_by_name($Type, String enum_name) @builtin
 {
@@ -231,37 +273,36 @@ macro enum_by_name($Type, String enum_name) @builtin
 	{
 		if (name == enum_name) return $Type.from_ordinal(i);
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 <*
- @param $Type `The type of the enum`
- @require $Type.kindof == ENUM `Only enums may be used`
- @require $defined($Type.#value) `Expected '#value' to match an enum associated value`
- @require $assignable(value, $typeof(($Type){}.#value)) `Expected the value to match the type of the associated value`
+ @param $Type : `The type of the enum`
+ @require $Type.kindof == ENUM : `Only enums may be used`
+ @require $defined($Type.#value) : `Expected '#value' to match an enum associated value`
+ @require $assignable(value, $typeof(($Type){}.#value)) : `Expected the value to match the type of the associated value`
 @ensure @typeis(return, $Type)
- @return! SearchResult.MISSING
+ @return? NOT_FOUND
 *>
 macro @enum_from_value($Type, #value, value) @builtin
 {
-	usz elements = $Type.elements;
 	foreach (e : $Type.values)
 	{
 		if (e.#value == value) return e;
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

 <*
 Mark an expression as likely to be true

- @param #value "expression to be marked likely"
- @param $probability "in the range 0 - 1"
+ @param #value : "expression to be marked likely"
+ @param $probability : "in the range 0 - 1"
 @require $probability >= 0 && $probability <= 1.0
 *>
 macro bool @likely(bool #value, $probability = 1.0) @builtin
 {
-	$switch
+	$switch:
 	$case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value;
 	$case $probability == 1.0:
@@ -274,13 +315,13 @@ macro bool @likely(bool #value, $probability = 1.0) @builtin
 <*
 Mark an expression as unlikely to be true

- @param #value "expression to be marked unlikely"
- @param $probability "in the range 0 - 1"
+ @param #value : "expression to be marked unlikely"
+ @param $probability : "in the range 0 - 1"
 @require $probability >= 0 && $probability <= 1.0
 *>
 macro bool @unlikely(bool #value, $probability = 1.0) @builtin
 {
-	$switch
+	$switch:
 	$case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value;
 	$case $probability == 1.0:
@@ -297,7 +338,7 @@ macro bool @unlikely(bool #value, $probability = 1.0) @builtin
 *>
 macro @expect(#value, expected, $probability = 1.0) @builtin
 {
-	$switch
+	$switch:
 	$case env::BUILTIN_EXPECT_IS_DISABLED:
 	return #value == expected;
 	$case $probability == 1.0:
@@ -322,9 +363,9 @@ enum PrefetchLocality
 <*
 Prefetch a pointer.

- @param [in] ptr `Pointer to prefetch`
- @param $locality `Locality ranging from none to extremely local`
- @param $write `Prefetch for write, otherwise prefetch for read.`
+ @param [in] ptr : `Pointer to prefetch`
+ @param $locality : `Locality ranging from none to extremely local`
+ @param $write : `Prefetch for write, otherwise prefetch for read.`
 *>
 macro @prefetch(void* ptr, PrefetchLocality $locality = VERY_NEAR, bool $write = false) @builtin
 {
@@ -348,7 +389,7 @@ macro swizzle2(v, v2, ...) @builtin

 @require @typekind(#expr) == OPTIONAL : `@catch expects an Optional value`
 *>
-macro anyfault @catch(#expr) @builtin
+macro fault @catch(#expr) @builtin
 {
 	if (catch f = #expr) return f;
 	return {};
@@ -367,7 +408,7 @@ macro bool @ok(#expr) @builtin
 }

 <*
- @require $defined(&#value, (char*)&#value) "This must be a value that can be viewed as a char array"
+ @require $defined(&#value, (char*)&#value) : "This must be a value that can be viewed as a char array"
 *>
 macro char[] @as_char_view(#value) @builtin
 {
@@ -390,33 +431,70 @@ macro @generic_hash_core(h, value)
 macro @generic_hash(value)
 {
 	uint h = @generic_hash_core((uint)0x3efd4391, value);
-	$for (var $cnt = 4; $cnt < $sizeof(value); $cnt += 4)
+	$for var $cnt = 4; $cnt < $sizeof(value); $cnt += 4:
 		value >>= 32; // reduce value
 		h = @generic_hash_core(h, value);
 	$endfor
 	return h;
 }

-macro uint int.hash(int i) => @generic_hash(i);
-macro uint uint.hash(uint i) => @generic_hash(i);
-macro uint short.hash(short s) => @generic_hash(s);
-macro uint ushort.hash(ushort s) => @generic_hash(s);
-macro uint char.hash(char c) => @generic_hash(c);
-macro uint ichar.hash(ichar c) => @generic_hash(c);
-macro uint long.hash(long i) => @generic_hash(i);
-macro uint ulong.hash(ulong i) => @generic_hash(i);
-macro uint int128.hash(int128 i) => @generic_hash(i);
-macro uint uint128.hash(uint128 i) => @generic_hash(i);
-macro uint bool.hash(bool b) => @generic_hash(b);
+
+macro uint int128.hash(self)       => @generic_hash(self);
+macro uint uint128.hash(self)      => @generic_hash(self);
+macro uint long.hash(self)         => @generic_hash(self);
+macro uint ulong.hash(self)        => @generic_hash(self);
+macro uint int.hash(self)          => @generic_hash(self);
+macro uint uint.hash(self)         => @generic_hash(self);
+macro uint short.hash(self)        => @generic_hash(self);
+macro uint ushort.hash(self)       => @generic_hash(self);
+macro uint ichar.hash(self)        => @generic_hash(self);
+macro uint char.hash(self)         => @generic_hash(self);
+macro uint bool.hash(self)         => @generic_hash(self);
+
+macro uint int128[*].hash(&self)   => hash_array(self);
+macro uint uint128[*].hash(&self)  => hash_array(self);
+macro uint long[*].hash(&self)     => hash_array(self);
+macro uint ulong[*].hash(&self)    => hash_array(self);
+macro uint int[*].hash(&self)      => hash_array(self);
+macro uint uint[*].hash(&self)     => hash_array(self);
+macro uint short[*].hash(&self)    => hash_array(self);
+macro uint ushort[*].hash(&self)   => hash_array(self);
+macro uint char[*].hash(&self)     => hash_array(self);
+macro uint ichar[*].hash(&self)    => hash_array(self);
+macro uint bool[*].hash(&self)     => hash_array(self);
+
+macro uint int128[<*>].hash(self)  => hash_vec(self);
+macro uint uint128[<*>].hash(self) => hash_vec(self);
+macro uint long[<*>].hash(self)    => hash_vec(self);
+macro uint ulong[<*>].hash(self)   => hash_vec(self);
+macro uint int[<*>].hash(self)     => hash_vec(self);
+macro uint uint[<*>].hash(self)    => hash_vec(self);
+macro uint short[<*>].hash(self)   => hash_vec(self);
+macro uint ushort[<*>].hash(self)  => hash_vec(self);
+macro uint char[<*>].hash(self)    => hash_vec(self);
+macro uint ichar[<*>].hash(self)   => hash_vec(self);
+macro uint bool[<*>].hash(self)    => hash_vec(self);
+
 macro uint typeid.hash(typeid t) => @generic_hash(((ulong)(uptr)t));
-macro uint String.hash(String c) => (uint)fnv32a::encode(c);
-macro uint char[].hash(char[] c) => (uint)fnv32a::encode(c);
+macro uint String.hash(String c) => (uint)fnv32a::hash(c);
+macro uint char[].hash(char[] c) => (uint)fnv32a::hash(c);
 macro uint void*.hash(void* ptr) => @generic_hash(((ulong)(uptr)ptr));

-distinct EmptySlot = void*;
-const EmptySlot EMPTY_MACRO_SLOT @builtin = null;
-macro @is_empty_macro_slot(#arg) @builtin => @typeis(#arg, EmptySlot);
-macro @is_valid_macro_slot(#arg) @builtin => !@typeis(#arg, EmptySlot);
+<*
+ @require @typekind(array_ptr) == POINTER &&& @typekind(*array_ptr) == ARRAY
+*>
+macro uint hash_array(array_ptr) @local
+{
+	return (uint)fnv32a::hash(((char*)array_ptr)[:$sizeof(*array_ptr)]);
+}
+
+<*
+ @require @typekind(vec) == VECTOR
+*>
+macro uint hash_vec(vec) @local
+{
+	return (uint)fnv32a::hash(((char*)&&vec)[:$sizeof(vec.len * $typeof(vec).inner.sizeof)]);
+}

 const MAX_FRAMEADDRESS = 128;
 <*
@@ -701,7 +779,7 @@ macro void* get_returnaddress(int n)
 	}
 }

-module std::core::builtin @if((env::LINUX || env::DARWIN) && env::COMPILER_SAFE_MODE && env::DEBUG_SYMBOLS);
+module std::core::builtin @if((env::LINUX || env::ANDROID || env::DARWIN) && env::COMPILER_SAFE_MODE && env::DEBUG_SYMBOLS);
 import libc, std::io;

 fn void sig_panic(String message)
--- a/lib/std/core/builtin_comparison.c3
+++ b/lib/std/core/builtin_comparison.c3
@@ -8,7 +8,7 @@ module std::core::builtin;
 *>
 macro less(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.less):
 		return a.less(b);
 	$case $defined(a.compare_to):
@@ -23,7 +23,7 @@ macro less(a, b) @builtin
 *>
 macro less_eq(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.less):
 		return !b.less(a);
 	$case $defined(a.compare_to):
@@ -38,7 +38,7 @@ macro less_eq(a, b) @builtin
 *>
 macro greater(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.less):
 		return b.less(a);
 	$case $defined(a.compare_to):
@@ -53,7 +53,7 @@ macro greater(a, b) @builtin
 *>
 macro int compare_to(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.compare_to):
 		return a.compare_to(b);
 	$case $defined(a.less):
@@ -67,7 +67,7 @@ macro int compare_to(a, b) @builtin
 *>
 macro greater_eq(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.less):
 		return !a.less(b);
 	$case $defined(a.compare_to):
@@ -78,11 +78,11 @@ macro greater_eq(a, b) @builtin
 }

 <*
- @require types::@equatable_value(a) && types::@equatable_value(b) `values must be equatable`
+ @require types::@equatable_value(a) && types::@equatable_value(b) : `values must be equatable`
 *>
 macro bool equals(a, b) @builtin
 {
-	$switch
+	$switch:
 	$case $defined(a.equals, a.equals(b)):
 		return a.equals(b);
 	$case $defined(a.compare_to, a.compare_to(b)):
@@ -100,7 +100,7 @@ macro min(x, ...) @builtin
 		return less(x, $vaarg[0]) ? x : $vaarg[0];
 	$else
 		var result = x;
-		$for (var $i = 0; $i < $vacount; $i++)
+		$for var $i = 0; $i < $vacount; $i++:
 			if (less($vaarg[$i], result))
 			{
 				 result = $vaarg[$i];
@@ -116,7 +116,7 @@ macro max(x, ...) @builtin
 		return greater(x, $vaarg[0]) ? x : $vaarg[0];
 	$else
 		var result = x;
-		$for (var $i = 0; $i < $vacount; $i++)
+		$for var $i = 0; $i < $vacount; $i++:
 			if (greater($vaarg[$i], result))
 			{
 				 result = $vaarg[$i];
--- a/lib/std/core/cinterop.c3
+++ b/lib/std/core/cinterop.c3
@@ -16,18 +16,18 @@ $assert C_SHORT_SIZE <= C_INT_SIZE;
 $assert C_INT_SIZE <= C_LONG_SIZE;
 $assert C_LONG_SIZE <= C_LONG_LONG_SIZE;

-def CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE));
-def CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE));
-def CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE));
-def CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE));
-def CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE));
-def CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE));
-def CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE));
-def CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE));
-def CSChar = ichar;
-def CUChar = char;
+alias CShort = $typefrom(signed_int_from_bitsize($$C_SHORT_SIZE));
+alias CUShort = $typefrom(unsigned_int_from_bitsize($$C_SHORT_SIZE));
+alias CInt = $typefrom(signed_int_from_bitsize($$C_INT_SIZE));
+alias CUInt = $typefrom(unsigned_int_from_bitsize($$C_INT_SIZE));
+alias CLong = $typefrom(signed_int_from_bitsize($$C_LONG_SIZE));
+alias CULong = $typefrom(unsigned_int_from_bitsize($$C_LONG_SIZE));
+alias CLongLong = $typefrom(signed_int_from_bitsize($$C_LONG_LONG_SIZE));
+alias CULongLong = $typefrom(unsigned_int_from_bitsize($$C_LONG_LONG_SIZE));
+alias CSChar = ichar;
+alias CUChar = char;

-def CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid);
+alias CChar = $typefrom($$C_CHAR_IS_SIGNED ? ichar.typeid : char.typeid);

 enum CBool : char
 {
@@ -38,7 +38,7 @@ enum CBool : char
 // Helper macros
 macro typeid signed_int_from_bitsize(usz $bitsize) @private
 {
-	$switch ($bitsize)
+	$switch $bitsize:
 		$case 128: return int128.typeid;
 		$case 64: return long.typeid;
 		$case 32: return int.typeid;
@@ -50,7 +50,7 @@ macro typeid signed_int_from_bitsize(usz $bitsize) @private

 macro typeid unsigned_int_from_bitsize(usz $bitsize) @private
 {
-	$switch ($bitsize)
+	$switch $bitsize:
 		$case 128: return uint128.typeid;
 		$case 64: return ulong.typeid;
 		$case 32: return uint.typeid;
--- a/lib/std/core/conv.c3
+++ b/lib/std/core/conv.c3
@@ -10,30 +10,31 @@ const uint UTF16_SURROGATE_LOW_VALUE @private = 0xDC00;
 const uint UTF16_SURROGATE_HIGH_VALUE @private = 0xD800;

 <*
- @param c `The utf32 codepoint to convert`
- @param [out] output `the resulting buffer`
+ @param c : `The utf32 codepoint to convert`
+ @param [out] output : `the resulting buffer`
+ @return? string::CONVERSION_FAILED
 *>
-fn usz! char32_to_utf8(Char32 c, char[] output)
+fn usz? char32_to_utf8(Char32 c, char[] output)
 {
-	if (!output.len) return UnicodeResult.CONVERSION_FAILED?;
+	if (!output.len) return string::CONVERSION_FAILED?;
 	switch (true)
 	{
 		case c <= 0x7f:
 			output[0] = (char)c;
 			return 1;
 		case c <= 0x7ff:
-			if (output.len < 2) return UnicodeResult.CONVERSION_FAILED?;
+			if (output.len < 2) return string::CONVERSION_FAILED?;
 			output[0] = (char)(0xC0 | c >> 6);
 			output[1] = (char)(0x80 | (c & 0x3F));
 			return 2;
 		case c <= 0xffff:
-			if (output.len < 3) return UnicodeResult.CONVERSION_FAILED?;
+			if (output.len < 3) return string::CONVERSION_FAILED?;
 			output[0] = (char)(0xE0 | c >> 12);
 			output[1] = (char)(0x80 | (c >> 6 & 0x3F));
 			output[2] = (char)(0x80 | (c & 0x3F));
 			return 3;
 		case c <= 0x10ffff:
-			if (output.len < 4) return UnicodeResult.CONVERSION_FAILED?;
+			if (output.len < 4) return string::CONVERSION_FAILED?;
 			output[0] = (char)(0xF0 | c >> 18);
 			output[1] = (char)(0x80 | (c >> 12 & 0x3F));
 			output[2] = (char)(0x80 | (c >> 6 & 0x3F));
@@ -41,15 +42,15 @@ fn usz! char32_to_utf8(Char32 c, char[] output)
 			return 4;
 		default:
 			// 0x10FFFF and above is not defined.
-			return UnicodeResult.CONVERSION_FAILED?;
+			return string::CONVERSION_FAILED?;
 	}
 }

 <*
 Convert a code pointer into 1-2 UTF16 characters.

- @param c `The character to convert.`
- @param [inout] output `the resulting UTF16 buffer to write to.`
+ @param c : `The character to convert.`
+ @param [inout] output : `the resulting UTF16 buffer to write to.`
 *>
 fn void char32_to_utf16_unsafe(Char32 c, Char16** output)
 {
@@ -69,11 +70,11 @@ fn void char32_to_utf16_unsafe(Char32 c, Char16** output)
 <*
 Convert 1-2 UTF16 data points into UTF8.

- @param [in] ptr `The UTF16 data to convert.`
- @param [inout] available `amount of UTF16 data available.`
- @param [inout] output `the resulting utf8 buffer to write to.`
+ @param [in] ptr : `The UTF16 data to convert.`
+ @param [inout] available : `amount of UTF16 data available.`
+ @param [inout] output : `the resulting utf8 buffer to write to.`
 *>
-fn void! char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
+fn void? char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 {
 	Char16 high = *ptr;
 	if (high & UTF16_SURROGATE_GENERIC_MASK != UTF16_SURROGATE_GENERIC_VALUE)
@@ -83,15 +84,15 @@ fn void! char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 		return;
 	}
 	// Low surrogate first is an error
-	if (high & UTF16_SURROGATE_MASK != UTF16_SURROGATE_HIGH_VALUE) return UnicodeResult.INVALID_UTF16?;
+	if (high & UTF16_SURROGATE_MASK != UTF16_SURROGATE_HIGH_VALUE) return string::INVALID_UTF16?;

 	// Unmatched high surrogate is an error
-	if (*available == 1) return UnicodeResult.INVALID_UTF16?;
+	if (*available == 1) return string::INVALID_UTF16?;

 	Char16 low = ptr[1];

 	// Unmatched high surrogate, invalid
-	if (low & UTF16_SURROGATE_MASK != UTF16_SURROGATE_LOW_VALUE) return UnicodeResult.INVALID_UTF16?;
+	if (low & UTF16_SURROGATE_MASK != UTF16_SURROGATE_LOW_VALUE) return string::INVALID_UTF16?;

 	// The high bits of the codepoint are the value bits of the high surrogate
 	// The low bits of the codepoint are the value bits of the low surrogate
@@ -101,8 +102,8 @@ fn void! char16_to_utf8_unsafe(Char16 *ptr, usz *available, char** output)
 	*available = 2;
 }
 <*
- @param c `The utf32 codepoint to convert`
- @param [inout] output `the resulting buffer`
+ @param c : `The utf32 codepoint to convert`
+ @param [inout] output : `the resulting buffer`
 *>
 fn usz char32_to_utf8_unsafe(Char32 c, char** output)
 {
@@ -130,14 +131,14 @@ fn usz char32_to_utf8_unsafe(Char32 c, char** output)
 }

 <*
- @param [in] ptr `pointer to the first character to parse`
- @param [inout] size `Set to max characters to read, set to characters read`
+ @param [in] ptr : `pointer to the first character to parse`
+ @param [inout] size : `Set to max characters to read, set to characters read`
 @return `the parsed 32 bit codepoint`
 *>
-fn Char32! utf8_to_char32(char* ptr, usz* size)
+fn Char32? utf8_to_char32(char* ptr, usz* size)
 {
 	usz max_size = *size;
-	if (max_size < 1) return UnicodeResult.INVALID_UTF8?;
+	if (max_size < 1) return string::INVALID_UTF8?;
 	char c = (ptr++)[0];

 	if ((c & 0x80) == 0)
@@ -147,45 +148,45 @@ fn Char32! utf8_to_char32(char* ptr, usz* size)
 	}
 	if ((c & 0xE0) == 0xC0)
 	{
-		if (max_size < 2) return UnicodeResult.INVALID_UTF8?;
+		if (max_size < 2) return string::INVALID_UTF8?;
 		*size = 2;
 		Char32 uc = (c & 0x1F) << 6;
 		c = *ptr;
 		// Overlong sequence or invalid second.
-		if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+		if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 		return uc + c & 0x3F;
 	}
 	if ((c & 0xF0) == 0xE0)
 	{
-		if (max_size < 3) return UnicodeResult.INVALID_UTF8?;
+		if (max_size < 3) return string::INVALID_UTF8?;
 		*size = 3;
 		Char32 uc = (c & 0x0F) << 12;
 		c = ptr++[0];
-		if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+		if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 		uc += (c & 0x3F) << 6;
 		c = ptr++[0];
 		// Overlong sequence or invalid last
-		if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+		if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 		return uc + c & 0x3F;
 	}
-	if (max_size < 4) return UnicodeResult.INVALID_UTF8?;
-	if ((c & 0xF8) != 0xF0) return UnicodeResult.INVALID_UTF8?;
+	if (max_size < 4) return string::INVALID_UTF8?;
+	if ((c & 0xF8) != 0xF0) return string::INVALID_UTF8?;
 	*size = 4;
 	Char32 uc = (c & 0x07) << 18;
 	c = ptr++[0];
-	if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+	if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 	uc += (c & 0x3F) << 12;
 	c = ptr++[0];
-	if (c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+	if (c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 	uc += (c & 0x3F) << 6;
 	c = ptr++[0];
 	// Overlong sequence or invalid last
-	if (!uc || c & 0xC0 != 0x80) return UnicodeResult.INVALID_UTF8?;
+	if (!uc || c & 0xC0 != 0x80) return string::INVALID_UTF8?;
 	return uc + c & 0x3F;
 }

 <*
- @param utf8 `An UTF-8 encoded slice of bytes`
+ @param utf8 : `An UTF-8 encoded slice of bytes`
 @return `the number of encoded code points`
 *>
 fn usz utf8_codepoints(String utf8)
@@ -200,7 +201,7 @@ fn usz utf8_codepoints(String utf8)

 <*
 Calculate the UTF8 length required to encode an UTF32 array.
- @param [in] utf32 `the utf32 data to calculate from`
+ @param [in] utf32 : `the utf32 data to calculate from`
 @return `the length of the resulting UTF8 array`
 *>
 fn usz utf8len_for_utf32(Char32[] utf32)
@@ -225,7 +226,7 @@ fn usz utf8len_for_utf32(Char32[] utf32)

 <*
 Calculate the UTF8 length required to encode an UTF16 array.
- @param [in] utf16 `the utf16 data to calculate from`
+ @param [in] utf16 : `the utf16 data to calculate from`
 @return `the length of the resulting UTF8 array`
 *>
 fn usz utf8len_for_utf16(Char16[] utf16)
@@ -257,7 +258,7 @@ fn usz utf8len_for_utf16(Char16[] utf16)

 <*
 Calculate the UTF16 length required to encode a UTF8 array.
- @param utf8 `the utf8 data to calculate from`
+ @param utf8 : `the utf8 data to calculate from`
 @return `the length of the resulting UTF16 array`
 *>
 fn usz utf16len_for_utf8(String utf8)
@@ -280,7 +281,7 @@ fn usz utf16len_for_utf8(String utf8)
 }

 <*
- @param [in] utf32 `the UTF32 array to check the length for`
+ @param [in] utf32 : `the UTF32 array to check the length for`
 @return `the required length of an UTF16 array to hold the UTF32 data.`
 *>
 fn usz utf16len_for_utf32(Char32[] utf32)
@@ -300,7 +301,7 @@ fn usz utf16len_for_utf32(Char32[] utf32)
 @param [out] utf8_buffer
 @return `the number of bytes written.`
 *>
-fn usz! utf32to8(Char32[] utf32, char[] utf8_buffer)
+fn usz? utf32to8(Char32[] utf32, char[] utf8_buffer)
 {
 	char[] buffer = utf8_buffer;
 	foreach (uc : utf32)
@@ -320,7 +321,7 @@ fn usz! utf32to8(Char32[] utf32, char[] utf8_buffer)
 @param [out] utf32_buffer
 @return `the number of Char32s written.`
 *>
-fn usz! utf8to32(String utf8, Char32[] utf32_buffer)
+fn usz? utf8to32(String utf8, Char32[] utf32_buffer)
 {
 	usz len = utf8.len;
 	Char32* ptr = utf32_buffer.ptr;
@@ -328,7 +329,7 @@ fn usz! utf8to32(String utf8, Char32[] utf32_buffer)
 	usz buf_len = utf32_buffer.len;
 	for (usz i = 0; i < len;)
 	{
-		if (len32 == buf_len) return UnicodeResult.CONVERSION_FAILED?;
+		if (len32 == buf_len) return string::CONVERSION_FAILED?;
 		usz width = len - i;
 		Char32 uc = utf8_to_char32(&utf8[i], &width) @inline!;
 		i += width;
@@ -344,10 +345,10 @@ fn usz! utf8to32(String utf8, Char32[] utf32_buffer)
 checking. This will assume the buffer is sufficiently large to hold
 the converted data.

- @param [in] utf16 `The UTF16 array containing the data to convert.`
- @param [out] utf8_buffer `the (sufficiently large) buffer to hold the UTF16 data.`
+ @param [in] utf16 : `The UTF16 array containing the data to convert.`
+ @param [out] utf8_buffer : `the (sufficiently large) buffer to hold the UTF16 data.`
 *>
-fn void! utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
+fn void? utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
 {
 	usz len16 = utf16.len;
 	for (usz i = 0; i < len16;)
@@ -363,10 +364,10 @@ fn void! utf16to8_unsafe(Char16[] utf16, char* utf8_buffer)
 checking. This will assume the buffer is sufficiently large to hold
 the converted data.

- @param [in] utf8 `The UTF8 buffer containing the data to convert.`
- @param [out] utf32_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ @param [in] utf8 : `The UTF8 buffer containing the data to convert.`
+ @param [out] utf32_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
 *>
-fn void! utf8to32_unsafe(String utf8, Char32* utf32_buffer)
+fn void? utf8to32_unsafe(String utf8, Char32* utf32_buffer)
 {
 	usz len = utf8.len;
 	for (usz i = 0; i < len;)
@@ -383,10 +384,10 @@ fn void! utf8to32_unsafe(String utf8, Char32* utf32_buffer)
 checking. This will assume the buffer is sufficiently large to hold
 the converted data.

- @param [in] utf8 `The UTF8 buffer containing the data to convert.`
- @param [out] utf16_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ @param [in] utf8 : `The UTF8 buffer containing the data to convert.`
+ @param [out] utf16_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
 *>
-fn void! utf8to16_unsafe(String utf8, Char16* utf16_buffer)
+fn void? utf8to16_unsafe(String utf8, Char16* utf16_buffer)
 {
 	usz len = utf8.len;
 	for (usz i = 0; i < len;)
@@ -403,8 +404,8 @@ fn void! utf8to16_unsafe(String utf8, Char16* utf16_buffer)
 checking. This will assume the buffer is sufficiently large to hold
 the converted data.

- @param [in] utf32 `The UTF32 buffer containing the data to convert.`
- @param [out] utf8_buffer `the (sufficiently large) buffer to hold the UTF8 data.`
+ @param [in] utf32 : `The UTF32 buffer containing the data to convert.`
+ @param [out] utf8_buffer : `the (sufficiently large) buffer to hold the UTF8 data.`
 *>
 fn void utf32to8_unsafe(Char32[] utf32, char* utf8_buffer)
 {
--- a/lib/std/core/dstring.c3
+++ b/lib/std/core/dstring.c3
@@ -1,26 +1,21 @@
 module std::core::dstring;
 import std::io;

-distinct DString (OutStream) = DStringOpaque*;
-distinct DStringOpaque = void;
+<*
+ The DString offers a dynamic string builder.
+*>
+typedef DString (OutStream) = DStringOpaque*;
+typedef DStringOpaque = void;

 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()) @deprecated("Use init(mem)")
-{
-	if (capacity < MIN_CAPACITY) capacity = MIN_CAPACITY;
-	StringData* data = allocator::alloc_with_padding(allocator, StringData, capacity)!!;
-	data.allocator = allocator;
-	data.len = 0;
-	data.capacity = capacity;
-	return *self = (DString)data;
-}
+ Initialize the DString with a particular allocator.

-<*
- @require !self.data() "String already initialized"
+ @param [&inout] allocator : "The allocator to use"
+ @param capacity : "Starting capacity, defaults to MIN_CAPACITY and cannot be smaller"
+ @return "Return the DString itself"
+ @require !self.data() : "String already initialized"
 *>
 fn DString DString.init(&self, Allocator allocator, usz capacity = MIN_CAPACITY)
 {
@@ -33,34 +28,29 @@ fn DString DString.init(&self, Allocator allocator, usz capacity = MIN_CAPACITY)
 }

 <*
- @require !self.data() "String already initialized"
-*>
-fn DString DString.temp_init(&self, usz capacity = MIN_CAPACITY) @deprecated("Use tinit()")
-{
-	self.init(allocator::temp(), capacity) @inline;
-	return *self;
-}
+ Initialize the DString with the temp allocator. Note that if the dstring is never
+ initialized, this is the allocator it will default to.

-<*
- @require !self.data() "String already initialized"
+ @param capacity : "Starting capacity, defaults to MIN_CAPACITY and cannot be smaller"
+ @return "Return the DString itself"
+ @require !self.data() : "String already initialized"
 *>
 fn DString DString.tinit(&self, usz capacity = MIN_CAPACITY)
 {
-	self.init(allocator::temp(), capacity) @inline;
-	return *self;
+	return self.init(tmem, capacity) @inline;
 }

-fn DString new_with_capacity(usz capacity, Allocator allocator = allocator::heap())
+fn DString new_with_capacity(Allocator allocator, usz capacity)
 {
 	return (DString){}.init(allocator, capacity);
 }

-fn DString temp_with_capacity(usz capacity) => new_with_capacity(capacity, allocator::temp()) @inline;
+fn DString temp_with_capacity(usz capacity) => new_with_capacity(tmem, capacity) @inline;

-fn DString new(String c = "", Allocator allocator = allocator::heap())
+fn DString new(Allocator allocator, String c = "")
 {
 	usz len = c.len;
-	StringData* data = (StringData*)new_with_capacity(len, allocator);
+	StringData* data = (StringData*)new_with_capacity(allocator, len);
 	if (len)
 	{
 		data.len = len;
@@ -69,7 +59,7 @@ fn DString new(String c = "", Allocator allocator = allocator::heap())
 	return (DString)data;
 }

-fn DString temp_new(String s = "") => new(s, allocator::temp()) @inline;
+fn DString temp(String s = "") => new(tmem, s) @inline;


 fn void DString.replace_char(self, char ch, char replacement)
@@ -92,7 +82,8 @@ fn void DString.replace(&self, String needle, String replacement)
 		self.replace_char(needle[0], replacement[0]);
 		return;
 	}
-	@pool(data.allocator) {
+	@pool()
+	{
 		String str = self.tcopy_str();
 		self.clear();
 		usz len = str.len;
@@ -121,7 +112,7 @@ fn void DString.replace(&self, String needle, String replacement)
 	};
 }

-fn DString DString.new_concat(self, DString b, Allocator allocator = allocator::heap()) @deprecated("Use concat(mem)")
+fn DString DString.concat(self, Allocator allocator, DString b) @nodiscard
 {
 	DString string;
 	string.init(allocator, self.len() + b.len());
@@ -130,16 +121,7 @@ fn DString DString.new_concat(self, DString b, Allocator allocator = allocator::
 	return string;
 }

-fn DString DString.concat(self, Allocator allocator, DString b)
-{
-	DString string;
-	string.init(allocator, self.len() + b.len());
-	string.append(self);
-	string.append(b);
-	return string;
-}
-
-fn DString DString.temp_concat(self, DString b) => self.concat(allocator::temp(), b);
+fn DString DString.tconcat(self, DString b) => self.concat(tmem, b);

 fn ZString DString.zstr_view(&self)
 {
@@ -188,7 +170,7 @@ fn String DString.str_view(self)

 <*
 @require index < self.len()
- @require self.data() != null "Empty string"
+ @require self.data() != null : "Empty string"
 *>
 fn char DString.char_at(self, usz index) @operator([])
 {
@@ -197,7 +179,7 @@ fn char DString.char_at(self, usz index) @operator([])

 <*
 @require index < self.len()
- @require self.data() != null  "Empty string"
+ @require self.data() != null  : "Empty string"
 *>
 fn char* DString.char_ref(&self, usz index) @operator(&[])
 {
@@ -249,23 +231,18 @@ fn usz DString.append_char32(&self, Char32 c)
 	return n;
 }

-fn DString DString.tcopy(&self) => self.copy(allocator::temp());
+fn DString DString.tcopy(&self) => self.copy(tmem);

-fn DString DString.copy(self, Allocator allocator = null)
+fn DString DString.copy(self, Allocator allocator) @nodiscard
 {
-	if (!self)
-	{
-		if (allocator) return new_with_capacity(0, allocator);
-		return (DString)null;
-	}
+	if (!self) return new(allocator);
 	StringData* data = self.data();
-	if (!allocator) allocator = allocator::heap();
-	DString new_string = new_with_capacity(data.capacity, allocator);
+	DString new_string = new_with_capacity(allocator, data.capacity);
 	mem::copy((char*)new_string.data(), (char*)data, StringData.sizeof + data.len);
 	return new_string;
 }

-fn ZString DString.copy_zstr(self, Allocator allocator = allocator::heap())
+fn ZString DString.copy_zstr(self, Allocator allocator) @nodiscard
 {
 	usz str_len = self.len();
 	if (!str_len)
@@ -279,12 +256,12 @@ 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) @nodiscard
 {
 	return (String)self.copy_zstr(allocator)[:self.len()];
 }

-fn String DString.tcopy_str(self) => self.copy_str(allocator::temp()) @inline;
+fn String DString.tcopy_str(self) @nodiscard => self.copy_str(tmem) @inline;

 fn bool DString.equals(self, DString other_string)
 {
@@ -334,7 +311,7 @@ fn void DString.append_chars(&self, String str)
 	if (!other_len) return;
 	if (!*self)
 	{
-		*self = new(str);
+		*self = temp(str);
 		return;
 	}
 	self.reserve(other_len);
@@ -343,7 +320,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)
 {
 	return self.str_view().to_utf32(allocator) @inline!!;
 }
@@ -361,13 +338,13 @@ fn void DString.clear(self)
 	self.data().len = 0;
 }

-fn usz! DString.write(&self, char[] buffer) @dynamic
+fn usz? DString.write(&self, char[] buffer) @dynamic
 {
 	self.append_chars((String)buffer);
 	return buffer.len;
 }

-fn void! DString.write_byte(&self, char c) @dynamic
+fn void? DString.write_byte(&self, char c) @dynamic
 {
 	self.append_char(c);
 }
@@ -376,7 +353,7 @@ fn void DString.append_char(&self, char c)
 {
 	if (!*self)
 	{
-		*self = new_with_capacity(MIN_CAPACITY);
+		*self = temp_with_capacity(MIN_CAPACITY);
 	}
 	self.reserve(1);
 	StringData* data = self.data();
@@ -386,7 +363,7 @@ fn void DString.append_char(&self, char c)
 <*
 @require start < self.len()
 @require end < self.len()
- @require end >= start "End must be same or equal to the start"
+ @require end >= start : "End must be same or equal to the start"
 *>
 fn void DString.delete_range(&self, usz start, usz end)
 {
@@ -418,7 +395,7 @@ fn void DString.delete(&self, usz start, usz len = 1)
 macro void DString.append(&self, value)
 {
 	var $Type = $typeof(value);
-	$switch ($Type)
+	$switch $Type:
 		$case char:
 		$case ichar:
 			self.append_char(value);
@@ -429,7 +406,7 @@ macro void DString.append(&self, value)
 		$case Char32:
 			self.append_char32(value);
 		$default:
-			$switch
+			$switch:
 				$case $defined((Char32)value):
 					self.append_char32((Char32)value);
 				$case $defined((String)value):
@@ -550,7 +527,7 @@ fn usz DString.insert_utf32_at(&self, usz index, Char32[] chars)
 macro void DString.insert_at(&self, usz index, value)
 {
 	var $Type = $typeof(value);
-	$switch ($Type)
+	$switch $Type:
 		$case char:
 		$case ichar:
 			self.insert_char_at(index, value);
@@ -561,7 +538,7 @@ macro void DString.insert_at(&self, usz index, value)
 		$case Char32:
 			self.insert_char32_at(index, value);
 		$default:
-			$switch
+			$switch:
 				$case $defined((Char32)value):
 					self.insert_char32_at(index, (Char32)value);
 				$case $defined((String)value):
@@ -572,21 +549,19 @@ macro void DString.insert_at(&self, usz index, value)
 	$endswitch
 }

-fn usz! DString.appendf(&self, String format, args...) @maydiscard
+import libc;
+fn usz? DString.appendf(&self, String format, args...) @maydiscard
 {
-	if (!self.data()) self.init(mem, format.len + 20);
-	@pool(self.data().allocator)
-	{
-		Formatter formatter;
-		formatter.init(&out_string_append_fn, self);
-		return formatter.vprintf(format, args);
-	};
+	if (!self.data()) self.tinit(format.len + 20);
+	Formatter formatter;
+	formatter.init(&out_string_append_fn, self);
+	return formatter.vprintf(format, args);
 }

-fn usz! DString.appendfn(&self, String format, args...) @maydiscard
+fn usz? DString.appendfn(&self, String format, args...) @maydiscard
 {
-	if (!self.data()) self.init(mem, format.len + 20);
-	@pool(self.data().allocator)
+	if (!self.data()) self.tinit(format.len + 20);
+	@pool()
 	{
 		Formatter formatter;
 		formatter.init(&out_string_append_fn, self);
@@ -596,25 +571,25 @@ fn usz! DString.appendfn(&self, String format, args...) @maydiscard
 	};
 }

-fn DString new_join(String[] s, String joiner, Allocator allocator = allocator::heap())
+fn DString join(Allocator allocator, String[] s, String joiner) @nodiscard
 {
-	if (!s.len) return (DString)null;
+	if (!s.len) return new(allocator);
 	usz total_size = joiner.len * s.len;
 	foreach (String* &str : s)
 	{
 		total_size += str.len;
 	}
-	DString res = new_with_capacity(total_size, allocator);
+	DString res = new_with_capacity(allocator, total_size);
 	res.append(s[0]);
-	foreach (String* &str : s[1..])
+	foreach (String str : s[1..])
 	{
 		res.append(joiner);
-		res.append(*str);
+		res.append(str);
 	}
 	return res;
 }

-fn void! out_string_append_fn(void* data, char c) @private
+fn void? out_string_append_fn(void* data, char c) @private
 {
 	DString* s = data;
 	s.append_char(c);
@@ -644,7 +619,7 @@ fn void DString.reserve(&self, usz addition)
 	StringData* data = self.data();
 	if (!data)
 	{
-		*self = dstring::new_with_capacity(addition);
+		*self = dstring::temp_with_capacity(addition);
 		return;
 	}
 	usz len = data.len + addition;
@@ -656,7 +631,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)
 	{
@@ -691,5 +666,5 @@ struct StringData @private
 	Allocator allocator;
 	usz len;
 	usz capacity;
-	char[?] chars;
+	char[*] chars;
 }
--- a/lib/std/core/env.c3
+++ b/lib/std/core/env.c3
@@ -57,6 +57,7 @@ enum OsType
 	HURD,
 	WASI,
 	EMSCRIPTEN,
+	ANDROID,
 }

 enum ArchType
@@ -119,6 +120,7 @@ const String COMPILER_BUILD_HASH = $$BUILD_HASH;
 const String COMPILER_BUILD_DATE = $$BUILD_DATE;
 const OsType OS_TYPE = OsType.from_ordinal($$OS_TYPE);
 const ArchType ARCH_TYPE = ArchType.from_ordinal($$ARCH_TYPE);
+const usz MAX_VECTOR_SIZE = $$MAX_VECTOR_SIZE;
 const bool ARCH_32_BIT = $$REGISTER_SIZE == 32;
 const bool ARCH_64_BIT = $$REGISTER_SIZE == 64;
 const bool LIBC = $$COMPILER_LIBC_AVAILABLE;
@@ -150,15 +152,17 @@ const bool FREEBSD = LIBC && OS_TYPE == FREEBSD;
 const bool NETBSD = LIBC && OS_TYPE == NETBSD;
 const bool BSD_FAMILY = env::FREEBSD || env::OPENBSD || env::NETBSD;
 const bool WASI = LIBC && OS_TYPE == WASI;
+const bool ANDROID = LIBC && OS_TYPE == ANDROID;
 const bool WASM_NOLIBC @builtin = !LIBC && ARCH_TYPE == ArchType.WASM32 || ARCH_TYPE == ArchType.WASM64;
 const bool ADDRESS_SANITIZER = $$ADDRESS_SANITIZER;
 const bool MEMORY_SANITIZER = $$MEMORY_SANITIZER;
 const bool THREAD_SANITIZER = $$THREAD_SANITIZER;
 const bool ANY_SANITIZER = ADDRESS_SANITIZER || MEMORY_SANITIZER || THREAD_SANITIZER;
+const int LANGUAGE_DEV_VERSION = $$LANGUAGE_DEV_VERSION;

 macro bool os_is_darwin() @const
 {
-	$switch (OS_TYPE)
+	$switch OS_TYPE:
 	$case IOS:
 	$case MACOS:
 	$case TVOS:
@@ -171,7 +175,7 @@ macro bool os_is_darwin() @const

 macro bool os_is_posix() @const
 {
-	$switch (OS_TYPE)
+	$switch OS_TYPE:
 	$case IOS:
 	$case MACOS:
 	$case NETBSD:
@@ -182,6 +186,7 @@ macro bool os_is_posix() @const
 	$case SOLARIS:
 	$case TVOS:
 	$case WATCHOS:
+	$case ANDROID:
 		return true;
 	$case WIN32:
 	$case WASI:
--- a/lib/std/core/mem.c3
+++ b/lib/std/core/mem.c3
@@ -8,6 +8,8 @@ import std::math;
 const MAX_MEMORY_ALIGNMENT = 0x1000_0000;
 const DEFAULT_MEM_ALIGNMENT = (void*.alignof) * 2;

+faultdef OUT_OF_MEMORY, INVALID_ALLOC_SIZE;
+
 macro bool @constant_is_power_of_2($x) @const @private
 {
 	return $x != 0 && ($x & ($x - 1)) == 0;
@@ -16,16 +18,16 @@ macro bool @constant_is_power_of_2($x) @const @private
 <*
 Load a vector from memory according to a mask assuming default alignment.

- @param ptr "The pointer address to load from."
- @param mask "The mask for the load"
- @param passthru "The value to use for non masked values"
+ @param ptr : "The pointer address to load from."
+ @param mask : "The mask for the load"
+ @param passthru : "The value to use for non masked values"
 @require $assignable(&&passthru, $typeof(ptr)) : "Pointer and passthru must match"
 @require @typekind(passthru) == VECTOR : "Expected passthru to be a vector"
 @require passthru.len == mask.len : "Mask and passthru must have the same length"

 @return "A vector with the loaded values where the mask is true, passthru where the mask is false"
 *>
-macro masked_load(ptr, bool[<?>] mask, passthru)
+macro masked_load(ptr, bool[<*>] mask, passthru)
 {
 	return $$masked_load(ptr, mask, passthru, 0);
 }
@@ -33,10 +35,10 @@ macro masked_load(ptr, bool[<?>] mask, passthru)
 <*
 Load a vector from memory according to a mask.

- @param ptr "The pointer address to load from."
- @param mask "The mask for the load"
- @param passthru "The value to use for non masked values"
- @param $alignment "The alignment to assume for the pointer"
+ @param ptr : "The pointer address to load from."
+ @param mask : "The mask for the load"
+ @param passthru : "The value to use for non masked values"
+ @param $alignment : "The alignment to assume for the pointer"

 @require $assignable(&&passthru, $typeof(ptr)) : "Pointer and passthru must match"
 @require @typekind(passthru) == VECTOR : "Expected passthru to be a vector"
@@ -45,7 +47,7 @@ macro masked_load(ptr, bool[<?>] mask, passthru)

 @return "A vector with the loaded values where the mask is true, passthru where the mask is false"
 *>
-macro @masked_load_aligned(ptr, bool[<?>] mask, passthru, usz $alignment)
+macro @masked_load_aligned(ptr, bool[<*>] mask, passthru, usz $alignment)
 {
 	return $$masked_load(ptr, mask, passthru, $alignment);
 }
@@ -53,9 +55,9 @@ macro @masked_load_aligned(ptr, bool[<?>] mask, passthru, usz $alignment)
 <*
 Load values from a pointer vector, assuming default alignment.

- @param ptrvec "The vector of pointers to load from."
- @param mask "The mask for the load"
- @param passthru "The value to use for non masked values"
+ @param ptrvec : "The vector of pointers to load from."
+ @param mask : "The mask for the load"
+ @param passthru : "The value to use for non masked values"

 @require @typekind(ptrvec) == VECTOR : "Expected ptrvec to be a vector"
 @require @typekind(passthru) == VECTOR : "Expected passthru to be a vector"
@@ -65,7 +67,7 @@ macro @masked_load_aligned(ptr, bool[<?>] mask, passthru, usz $alignment)

 @return "A vector with the loaded values where the mask is true, passthru where the mask is false"
 *>
-macro gather(ptrvec, bool[<?>] mask, passthru)
+macro gather(ptrvec, bool[<*>] mask, passthru)
 {
 	return $$gather(ptrvec, mask, passthru, 0);
 }
@@ -74,10 +76,10 @@ macro gather(ptrvec, bool[<?>] mask, passthru)
 <*
 Load values from a pointer vector.

- @param ptrvec "The vector of pointers to load from."
- @param mask "The mask for the load"
- @param passthru "The value to use for non masked values"
- @param $alignment "The alignment to assume for the pointers"
+ @param ptrvec : "The vector of pointers to load from."
+ @param mask : "The mask for the load"
+ @param passthru : "The value to use for non masked values"
+ @param $alignment : "The alignment to assume for the pointers"

 @require @typekind(ptrvec) == VECTOR : "Expected ptrvec to be a vector"
 @require @typekind(passthru) == VECTOR : "Expected passthru to be a vector"
@@ -88,7 +90,7 @@ macro gather(ptrvec, bool[<?>] mask, passthru)

 @return "A vector with the loaded values where the mask is true, passthru where the mask is false"
 *>
-macro @gather_aligned(ptrvec, bool[<?>] mask, passthru, usz $alignment)
+macro @gather_aligned(ptrvec, bool[<*>] mask, passthru, usz $alignment)
 {
 	return $$gather(ptrvec, mask, passthru, $alignment);
 }
@@ -97,24 +99,24 @@ macro @gather_aligned(ptrvec, bool[<?>] mask, passthru, usz $alignment)
 <*
 Store parts of a vector according to the mask, assuming default alignment.

- @param ptr "The pointer address to store to."
- @param value "The value to store masked"
- @param mask "The mask for the store"
+ @param ptr : "The pointer address to store to."
+ @param value : "The value to store masked"
+ @param mask : "The mask for the store"

 @require $assignable(&&value, $typeof(ptr)) : "Pointer and value must match"
 @require @typekind(value) == VECTOR : "Expected value to be a vector"
 @require value.len == mask.len : "Mask and value must have the same length"
 *>
-macro masked_store(ptr, value, bool[<?>] mask)
+macro masked_store(ptr, value, bool[<*>] mask)
 {
 	return $$masked_store(ptr, value, mask, 0);
 }

 <*
- @param ptr "The pointer address to store to."
- @param value "The value to store masked"
- @param mask "The mask for the store"
- @param $alignment "The alignment of the pointer"
+ @param ptr : "The pointer address to store to."
+ @param value : "The value to store masked"
+ @param mask : "The mask for the store"
+ @param $alignment : "The alignment of the pointer"

 @require $assignable(&&value, $typeof(ptr)) : "Pointer and value must match"
 @require @typekind(value) == VECTOR : "Expected value to be a vector"
@@ -122,15 +124,15 @@ macro masked_store(ptr, value, bool[<?>] mask)
 @require @constant_is_power_of_2($alignment) : "The alignment must be a power of two"

 *>
-macro @masked_store_aligned(ptr, value, bool[<?>] mask, usz $alignment)
+macro @masked_store_aligned(ptr, value, bool[<*>] mask, usz $alignment)
 {
 	return $$masked_store(ptr, value, mask, $alignment);
 }

 <*
- @param ptrvec "The vector pointer containing the addresses to store to."
- @param value "The value to store masked"
- @param mask "The mask for the store"
+ @param ptrvec : "The vector pointer containing the addresses to store to."
+ @param value : "The value to store masked"
+ @param mask : "The mask for the store"
 @require @typekind(ptrvec) == VECTOR : "Expected ptrvec to be a vector"
 @require @typekind(value) == VECTOR : "Expected value to be a vector"
 @require $assignable(&&value[0], $typeof(ptrvec[0])) : "Pointer and value must match"
@@ -138,16 +140,16 @@ macro @masked_store_aligned(ptr, value, bool[<?>] mask, usz $alignment)
 @require mask.len == ptrvec.len : "Mask and ptrvec must have the same length"

 *>
-macro scatter(ptrvec, value, bool[<?>] mask)
+macro scatter(ptrvec, value, bool[<*>] mask)
 {
 	return $$scatter(ptrvec, value, mask, 0);
 }

 <*
- @param ptrvec "The vector pointer containing the addresses to store to."
- @param value "The value to store masked"
- @param mask "The mask for the store"
- @param $alignment "The alignment of the load"
+ @param ptrvec : "The vector pointer containing the addresses to store to."
+ @param value : "The value to store masked"
+ @param mask : "The mask for the store"
+ @param $alignment : "The alignment of the load"

 @require @typekind(ptrvec) == VECTOR : "Expected ptrvec to be a vector"
 @require @typekind(value) == VECTOR : "Expected value to be a vector"
@@ -156,14 +158,14 @@ macro scatter(ptrvec, value, bool[<?>] mask)
 @require mask.len == ptrvec.len : "Mask and ptrvec must have the same length"
 @require @constant_is_power_of_2($alignment) : "The alignment must be a power of two"
 *>
-macro @scatter_aligned(ptrvec, value, bool[<?>] mask, usz $alignment)
+macro @scatter_aligned(ptrvec, value, bool[<*>] mask, usz $alignment)
 {
 	return $$scatter(ptrvec, value, mask, $alignment);
 }

 <*
- @param #x "The variable or dereferenced pointer to load."
- @param $alignment "The alignment to assume for the load"
+ @param #x : "The variable or dereferenced pointer to load."
+ @param $alignment : "The alignment to assume for the load"
 @return "The value of the variable"

 @require @constant_is_power_of_2($alignment) : "The alignment must be a power of two"
@@ -175,9 +177,9 @@ macro @unaligned_load(#x, usz $alignment) @builtin
 }

 <*
- @param #x "The variable or dereferenced pointer to store to."
- @param value "The value to store."
- @param $alignment "The alignment to assume for the store"
+ @param #x : "The variable or dereferenced pointer to store to."
+ @param value : "The value to store."
+ @param $alignment : "The alignment to assume for the store"
 @return "The value stored"

 @require $defined(&#x) : "This must be a variable or dereferenced pointer"
@@ -190,7 +192,7 @@ macro @unaligned_store(#x, value, usz $alignment) @builtin
 }

 <*
- @param #x "The variable or dereferenced pointer to load."
+ @param #x : "The variable or dereferenced pointer to load."
 @return "The value of the variable"

 @require $defined(&#x) : "This must be a variable or dereferenced pointer"
@@ -201,8 +203,8 @@ macro @volatile_load(#x) @builtin
 }

 <*
- @param #x "The variable or dereferenced pointer to store to."
- @param value "The value to store."
+ @param #x : "The variable or dereferenced pointer to store to."
+ @param value : "The value to store."
 @return "The value stored"

 @require $defined(&#x) : "This must be a variable or dereferenced pointer"
@@ -225,15 +227,15 @@ enum AtomicOrdering : int
 }

 <*
- @param #x "the variable or dereferenced pointer to load."
- @param $ordering "atomic ordering of the load, defaults to SEQ_CONSISTENT"
- @param $volatile "whether the load should be volatile, defaults to 'false'"
+ @param #x : "the variable or dereferenced pointer to load."
+ @param $ordering : "atomic ordering of the load, defaults to SEQ_CONSISTENT"
+ @param $volatile : "whether the load should be volatile, defaults to 'false'"
 @return "returns the value of x"

 @require $defined(&#x) : "This must be a variable or dereferenced pointer"
- @require $ordering != AtomicOrdering.RELEASE "Release ordering is not valid for load."
- @require $ordering != AtomicOrdering.ACQUIRE_RELEASE "Acquire release is not valid for load."
- @require types::may_load_atomic($typeof(#x)) "Only integer, float and pointers may be used."
+ @require $ordering != AtomicOrdering.RELEASE : "Release ordering is not valid for load."
+ @require $ordering != AtomicOrdering.ACQUIRE_RELEASE : "Acquire release is not valid for load."
+ @require types::may_load_atomic($typeof(#x)) : "Only integer, float and pointers may be used."
 *>
 macro @atomic_load(#x, AtomicOrdering $ordering = SEQ_CONSISTENT, $volatile = false) @builtin
 {
@@ -241,14 +243,14 @@ macro @atomic_load(#x, AtomicOrdering $ordering = SEQ_CONSISTENT, $volatile = fa
 }

 <*
- @param #x "the variable or dereferenced pointer to store to."
- @param value "the value to store."
- @param $ordering "the atomic ordering of the store, defaults to SEQ_CONSISTENT"
- @param $volatile "whether the store should be volatile, defaults to 'false'"
+ @param #x : "the variable or dereferenced pointer to store to."
+ @param value : "the value to store."
+ @param $ordering : "the atomic ordering of the store, defaults to SEQ_CONSISTENT"
+ @param $volatile : "whether the store should be volatile, defaults to 'false'"

- @require $ordering != AtomicOrdering.ACQUIRE "Acquire ordering is not valid for store."
- @require $ordering != AtomicOrdering.ACQUIRE_RELEASE "Acquire release is not valid for store."
- @require types::may_load_atomic($typeof(#x)) "Only integer, float and pointers may be used."
+ @require $ordering != AtomicOrdering.ACQUIRE : "Acquire ordering is not valid for store."
+ @require $ordering != AtomicOrdering.ACQUIRE_RELEASE : "Acquire release is not valid for store."
+ @require types::may_load_atomic($typeof(#x)) : "Only integer, float and pointers may be used."
 @require $defined(&#x) : "This must be a variable or dereferenced pointer"
 @require $defined(#x = value) : "The value doesn't match the variable"
 *>
@@ -258,8 +260,8 @@ macro void @atomic_store(#x, value, AtomicOrdering $ordering = SEQ_CONSISTENT, $
 }

 <*
- @require $success != AtomicOrdering.NOT_ATOMIC && $success != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
- @require $failure != AtomicOrdering.RELEASE && $failure != AtomicOrdering.ACQUIRE_RELEASE "Acquire release is not valid."
+ @require $success != AtomicOrdering.NOT_ATOMIC && $success != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
+ @require $failure != AtomicOrdering.RELEASE && $failure != AtomicOrdering.ACQUIRE_RELEASE : "Acquire release is not valid."
 *>
 macro compare_exchange(ptr, compare, value, AtomicOrdering $success = SEQ_CONSISTENT, AtomicOrdering $failure = SEQ_CONSISTENT, bool $volatile = true, bool $weak = false, usz $alignment = 0)
 {
@@ -267,8 +269,8 @@ macro compare_exchange(ptr, compare, value, AtomicOrdering $success = SEQ_CONSIS
 }

 <*
- @require $success != AtomicOrdering.NOT_ATOMIC && $success != AtomicOrdering.UNORDERED "Acquire ordering is not valid."
- @require $failure != AtomicOrdering.RELEASE && $failure != AtomicOrdering.ACQUIRE_RELEASE "Acquire release is not valid."
+ @require $success != AtomicOrdering.NOT_ATOMIC && $success != AtomicOrdering.UNORDERED : "Acquire ordering is not valid."
+ @require $failure != AtomicOrdering.RELEASE && $failure != AtomicOrdering.ACQUIRE_RELEASE : "Acquire release is not valid."
 *>
 macro compare_exchange_volatile(ptr, compare, value, AtomicOrdering $success = SEQ_CONSISTENT, AtomicOrdering $failure = SEQ_CONSISTENT)
 {
@@ -314,13 +316,14 @@ macro void clear_inline(void* dst, usz $len, usz $dst_align = 0, bool $is_volati
 <*
 Copy memory from src to dst efficiently, assuming the memory ranges do not overlap.

- @param [&out] dst "The destination to copy to"
- @param [&in] src "The source to copy from"
- @param len "The number of bytes to copy"
- @param $dst_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $src_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $is_volatile "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+ @param [&out] dst : "The destination to copy to"
+ @param [in] src : "The source to copy from"
+ @param len : "The number of bytes to copy"
+ @param $dst_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $src_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $is_volatile : "True if this copy should be treated as volatile, i.e. it can't be optimized away."

+ @require src != null || len == 0 : "Copying a null with non-zero length is invalid"
 @require len == 0 || dst + len <= src || src + len <= dst : "Ranges may not overlap"
 *>
 macro void copy(void* dst, void* src, usz len, usz $dst_align = 0, usz $src_align = 0, bool $is_volatile = false)
@@ -332,13 +335,14 @@ macro void copy(void* dst, void* src, usz len, usz $dst_align = 0, usz $src_alig
 Copy memory from src to dst efficiently, assuming the memory ranges do not overlap, it
 will always be inlined and never call memcopy

- @param [&out] dst "The destination to copy to"
- @param [&in] src "The source to copy from"
- @param $len "The number of bytes to copy"
- @param $dst_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $src_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $is_volatile "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+ @param [&out] dst : "The destination to copy to"
+ @param [in] src : "The source to copy from"
+ @param $len : "The number of bytes to copy"
+ @param $dst_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $src_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $is_volatile : "True if this copy should be treated as volatile, i.e. it can't be optimized away."

+ @require src != null || $len == 0 : "Copying a null with non-zero length is invalid"
 @require $len == 0 || dst + $len <= src || src + $len <= dst : "Ranges may not overlap"
 *>
 macro void copy_inline(void* dst, void* src, usz $len, usz $dst_align = 0, usz $src_align = 0, bool $is_volatile = false)
@@ -349,12 +353,14 @@ macro void copy_inline(void* dst, void* src, usz $len, usz $dst_align = 0, usz $
 <*
 Copy memory from src to dst but correctly handle the possibility of overlapping ranges.

- @param [&out] dst "The destination to copy to"
- @param [&in] src "The source to copy from"
- @param len "The number of bytes to copy"
- @param $dst_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $src_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $is_volatile "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+ @param [&out] dst : "The destination to copy to"
+ @param [in] src : "The source to copy from"
+ @param len : "The number of bytes to copy"
+ @param $dst_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $src_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $is_volatile : "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+
+ @require src != null || len == 0 : "Moving a null with non-zero length is invalid"
 *>
 macro void move(void* dst, void* src, usz len, usz $dst_align = 0, usz $src_align = 0, bool $is_volatile = false)
 {
@@ -364,11 +370,11 @@ macro void move(void* dst, void* src, usz len, usz $dst_align = 0, usz $src_alig
 <*
 Sets all memory in a region to that of the provided byte.

- @param [&out] dst "The destination to copy to"
- @param val "The value to copy into memory"
- @param len "The number of bytes to copy"
- @param $dst_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $is_volatile "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+ @param [&out] dst : "The destination to copy to"
+ @param val : "The value to copy into memory"
+ @param len : "The number of bytes to copy"
+ @param $dst_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $is_volatile : "True if this copy should be treated as volatile, i.e. it can't be optimized away."

 @ensure !len || (dst[0] == val && dst[len - 1] == val)
 *>
@@ -380,11 +386,11 @@ macro void set(void* dst, char val, usz len, usz $dst_align = 0, bool $is_volati
 <*
 Sets all memory in a region to that of the provided byte. Never calls OS memset.

- @param [&out] dst "The destination to copy to"
- @param val "The value to copy into memory"
- @param $len "The number of bytes to copy"
- @param $dst_align "the alignment of the destination if different from the default, 0 assumes the default"
- @param $is_volatile "True if this copy should be treated as volatile, i.e. it can't be optimized away."
+ @param [&out] dst : "The destination to copy to"
+ @param val : "The value to copy into memory"
+ @param $len : "The number of bytes to copy"
+ @param $dst_align : "the alignment of the destination if different from the default, 0 assumes the default"
+ @param $is_volatile : "True if this copy should be treated as volatile, i.e. it can't be optimized away."

 @ensure !$len || (dst[0] == val && dst[$len - 1] == val)
 *>
@@ -421,7 +427,7 @@ macro bool equals(a, b, isz len = -1, usz $align = 0)

 	if (!len) return true;
 	var $Type;
-	$switch ($align)
+	$switch $align:
 		$case 1:
 			$Type = char;
 		$case 2:
@@ -471,7 +477,7 @@ macro void @scoped(Allocator allocator; @body())
 Run the tracking allocator in the scope, then
 print out stats.

- @param $enabled "Set to false to disable tracking"
+ @param $enabled : "Set to false to disable tracking"
 *>
 macro void @report_heap_allocs_in_scope($enabled = true; @body())
 {
@@ -493,14 +499,14 @@ macro void @report_heap_allocs_in_scope($enabled = true; @body())
 <*
 Assert on memory leak in the scope of the macro body.

- @param $report "Set to false to disable memory report"
+ @param $report : "Set to false to disable memory report"
 *>
 macro void @assert_leak($report = true; @body()) @builtin
 {
 	$if env::DEBUG_SYMBOLS || $feature(MEMORY_ASSERTS):
 		TrackingAllocator tracker;
-		tracker.init(allocator::thread_allocator);
-		Allocator old_allocator = allocator::thread_allocator;
+		tracker.init(mem);
+		Allocator old_allocator = mem;
 		allocator::thread_allocator = &tracker;
 		defer
 		{
@@ -509,7 +515,8 @@ macro void @assert_leak($report = true; @body()) @builtin
 			usz allocated = tracker.allocated();
 			if (allocated)
 			{
-				DString report = dstring::new();
+				DString report;
+				report.init(old_allocator);
 				defer report.free();
 				$if $report:
 					report.append_char('\n');
@@ -530,13 +537,13 @@ macro void @assert_leak($report = true; @body()) @builtin

 Release everything on scope exit.

- @param $size `the size of the buffer`
+ @param $size : `the size of the buffer`
 *>
 macro void @stack_mem(usz $size; @body(Allocator mem)) @builtin
 {
 	char[$size] buffer;
 	OnStackAllocator allocator;
-	allocator.init(&buffer, allocator::heap());
+	allocator.init(&buffer, mem);
 	defer allocator.free();
 	@body(&allocator);
 }
@@ -545,7 +552,7 @@ macro void @stack_pool(usz $size; @body) @builtin
 {
 	char[$size] buffer;
 	OnStackAllocator allocator;
-	allocator.init(&buffer, allocator::heap());
+	allocator.init(&buffer, mem);
 	defer allocator.free();
 	mem::@scoped(&allocator)
 	{
@@ -553,60 +560,44 @@ macro void @stack_pool(usz $size; @body) @builtin
 	};
 }

-struct TempState
-{
-	TempAllocator* old;
-	TempAllocator* current;
-	usz mark;
-}
 <*
 Push the current temp allocator. A push must always be balanced with a pop using the current state.
 *>
-fn TempState temp_push(TempAllocator* other = null)
+fn PoolState temp_push()
 {
-	TempAllocator* current = allocator::temp();
-	TempAllocator* old = current;
-	if (other == current)
-	{
-		current = allocator::temp_allocator_next();
-	}
-	return { old, current, current.used };
+	return allocator::push_pool() @inline;
 }

 <*
 Pop the current temp allocator. A pop must always be balanced with a push.
 *>
-fn void temp_pop(TempState old_state)
+fn void temp_pop(PoolState old_state)
 {
-	assert(allocator::thread_temp_allocator == old_state.current, "Tried to pop temp allocators out of order.");
-	assert(old_state.current.used >= old_state.mark, "Tried to pop temp allocators out of order.");
-	old_state.current.reset(old_state.mark);
-	allocator::thread_temp_allocator = old_state.old;
+	allocator::pop_pool(old_state) @inline;
 }

-<*
- @require @is_empty_macro_slot(#other_temp) ||| $assignable(#other_temp, Allocator) "Must be an allocator"
- *>
-macro void @pool(#other_temp = EMPTY_MACRO_SLOT; @body) @builtin
+macro void @pool_init(Allocator allocator, usz pool_size, usz buffer_size; @body) @builtin
 {
-	TempAllocator* current = allocator::temp();
-	$if @is_valid_macro_slot(#other_temp):
-		TempAllocator* original = current;
-		if (current == #other_temp.ptr) current = allocator::temp_allocator_next();
-	$endif
-	usz mark = current.used;
+	Allocator current = allocator::current_temp;
+	TempAllocator* top = allocator::top_temp;
+	allocator::create_temp_allocator(allocator, pool_size, buffer_size);
 	defer
 	{
-		current.reset(mark);
-		$if @is_valid_macro_slot(#other_temp):
-			allocator::thread_temp_allocator = original;
-		$endif;
+		allocator::destroy_temp_allocators();
+		allocator::top_temp = top;
+		allocator::current_temp = current;
+	}
+	@body();
+}
+macro void @pool(;@body) @builtin
+{
+	PoolState state = allocator::push_pool() @inline;
+	defer
+	{
+		allocator::pop_pool(state) @inline;
 	}
 	@body();
 }
-
-import libc;
-

 module std::core::mem @if(WASM_NOLIBC);
 import std::core::mem::allocator @public;
@@ -622,7 +613,6 @@ fn void initialize_wasm_mem() @init(1024) @private
 	wasm_allocator.init(fn (x) => allocator::wasm_memory.allocate_block(x));
 	allocator::thread_allocator = &wasm_allocator;
 	allocator::temp_base_allocator = &wasm_allocator;
-	allocator::init_default_temp_allocators();
 }

 module std::core::mem;
@@ -631,25 +621,47 @@ module std::core::mem;
 macro TrackingEnv* get_tracking_env()
 {
 	$if env::TRACK_MEMORY:
-		return &&TrackingEnv { $$FILE, $$FUNC, $$LINE };
+		return &&(TrackingEnv){ $$FILE, $$FUNC, $$LINE };
 	$else
 		return null;
 	$endif
 }

+<*
+ @param value : "The value to clone"
+ @return "A pointer to the cloned value"
+ @require $alignof(value) <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'clone_aligned' instead"
+*>
 macro @clone(value) @builtin @nodiscard
 {
-	return allocator::clone(allocator::heap(), value);
+	return allocator::clone(mem, value);
 }

+<*
+ @param value : "The value to clone"
+ @return "A pointer to the cloned value, which must be released using free_aligned"
+*>
+macro @clone_aligned(value) @builtin @nodiscard
+{
+	return allocator::clone_aligned(mem, value);
+}
+
+<*
+ @param value : "The value to clone"
+ @return "A pointer to the cloned value"
+*>
 macro @tclone(value) @builtin @nodiscard
 {
-	return temp_new($typeof(value), value);
+	$if $alignof(value) <= mem::DEFAULT_MEM_ALIGNMENT:
+		return tnew($typeof(value), value);
+	$else
+		return allocator::clone_aligned(tmem, value);
+	$endif
 }

 fn void* malloc(usz size) @builtin @inline @nodiscard
 {
-	return allocator::malloc(allocator::heap(), size);
+	return allocator::malloc(mem, size);
 }

 <*
@@ -658,13 +670,13 @@ fn void* malloc(usz size) @builtin @inline @nodiscard
 *>
 fn void* malloc_aligned(usz size, usz alignment) @builtin @inline @nodiscard
 {
-	return allocator::malloc_aligned(allocator::heap(), size, alignment)!!;
+	return allocator::malloc_aligned(mem, size, alignment)!!;
 }

 fn void* tmalloc(usz size, usz alignment = 0) @builtin @inline @nodiscard
 {
 	if (!size) return null;
-	return allocator::temp().acquire(size, NO_ZERO, alignment)!!;
+	return tmem.acquire(size, NO_ZERO, alignment)!!;
 }

 <*
@@ -745,12 +757,12 @@ macro alloc_aligned($Type) @nodiscard
 @require $vacount < 2 : "Too many arguments."
 @require $vacount == 0 ||| $assignable($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
 *>
-macro temp_new($Type, ...) @nodiscard
+macro tnew($Type, ...) @nodiscard
 {
 	$if $vacount == 0:
-		return ($Type*)tcalloc($Type.sizeof) @inline;
+		return ($Type*)tcalloc($Type.sizeof, $Type.alignof) @inline;
 	$else
-		$Type* val = tmalloc($Type.sizeof) @inline;
+		$Type* val = tmalloc($Type.sizeof, $Type.alignof) @inline;
 		*val = $vaexpr[0];
 		return val;
 	$endif
@@ -760,25 +772,25 @@ macro temp_new($Type, ...) @nodiscard
 @require $vacount < 2 : "Too many arguments."
 @require $vacount == 0 ||| $assignable($vaexpr[0], $Type) : "The second argument must be an initializer for the type"
 *>
-macro temp_new_with_padding($Type, usz padding, ...) @nodiscard
+macro temp_with_padding($Type, usz padding, ...) @nodiscard
 {
 	$if $vacount == 0:
-		return ($Type*)tcalloc($Type.sizeof + padding) @inline;
+		return ($Type*)tcalloc($Type.sizeof + padding, $Type.alignof) @inline;
 	$else
-		$Type* val = tmalloc($Type.sizeof + padding) @inline;
+		$Type* val = tmalloc($Type.sizeof + padding, $Type.alignof) @inline;
 		*val = $vaexpr[0];
 		return val;
 	$endif
 }

-macro temp_alloc($Type) @nodiscard
+macro talloc($Type) @nodiscard
 {
-	return tmalloc($Type.sizeof);
+	return tmalloc($Type.sizeof, $Type.alignof);
 }

-macro temp_alloc_with_padding($Type, usz padding) @nodiscard
+macro talloc_with_padding($Type, usz padding) @nodiscard
 {
-	return tmalloc($Type.sizeof + padding);
+	return tmalloc($Type.sizeof + padding, $Type.alignof);
 }

 <*
@@ -786,7 +798,7 @@ macro temp_alloc_with_padding($Type, usz padding) @nodiscard
 *>
 macro new_array($Type, usz elements) @nodiscard
 {
-	return allocator::new_array(allocator::heap(), $Type, elements);
+	return allocator::new_array(mem, $Type, elements);
 }

 <*
@@ -795,7 +807,7 @@ macro new_array($Type, usz elements) @nodiscard
 *>
 macro new_array_aligned($Type, usz elements) @nodiscard
 {
-	return allocator::new_array_aligned(allocator::heap(), $Type, elements);
+	return allocator::new_array_aligned(mem, $Type, elements);
 }

 <*
@@ -803,7 +815,7 @@ macro new_array_aligned($Type, usz elements) @nodiscard
 *>
 macro alloc_array($Type, usz elements) @nodiscard
 {
-	return allocator::alloc_array(allocator::heap(), $Type, elements);
+	return allocator::alloc_array(mem, $Type, elements);
 }

 <*
@@ -812,22 +824,22 @@ macro alloc_array($Type, usz elements) @nodiscard
 *>
 macro alloc_array_aligned($Type, usz elements) @nodiscard
 {
-	return allocator::alloc_array_aligned(allocator::heap(), $Type, elements);
+	return allocator::alloc_array_aligned(mem, $Type, elements);
 }

-macro temp_alloc_array($Type, usz elements) @nodiscard
+macro talloc_array($Type, usz elements) @nodiscard
 {
 	return (($Type*)tmalloc($Type.sizeof * elements, $Type.alignof))[:elements];
 }

-macro temp_new_array($Type, usz elements) @nodiscard
+macro temp_array($Type, usz elements) @nodiscard
 {
 	return (($Type*)tcalloc($Type.sizeof * elements, $Type.alignof))[:elements];
 }

 fn void* calloc(usz size) @builtin @inline @nodiscard
 {
-	return allocator::calloc(allocator::heap(), size);
+	return allocator::calloc(mem, size);
 }

 <*
@@ -836,40 +848,40 @@ fn void* calloc(usz size) @builtin @inline @nodiscard
 *>
 fn void* calloc_aligned(usz size, usz alignment) @builtin @inline @nodiscard
 {
-	return allocator::calloc_aligned(allocator::heap(), size, alignment)!!;
+	return allocator::calloc_aligned(mem, size, alignment)!!;
 }

 fn void* tcalloc(usz size, usz alignment = 0) @builtin @inline @nodiscard
 {
 	if (!size) return null;
-	return allocator::temp().acquire(size, ZERO, alignment)!!;
+	return tmem.acquire(size, ZERO, alignment)!!;
 }

 fn void* realloc(void *ptr, usz new_size) @builtin @inline @nodiscard
 {
-	return allocator::realloc(allocator::heap(), ptr, new_size);
+	return allocator::realloc(mem, ptr, new_size);
 }

 fn void* realloc_aligned(void *ptr, usz new_size, usz alignment) @builtin @inline @nodiscard
 {
-	return allocator::realloc_aligned(allocator::heap(), ptr, new_size, alignment)!!;
+	return allocator::realloc_aligned(mem, ptr, new_size, alignment)!!;
 }

 fn void free(void* ptr) @builtin @inline
 {
-	return allocator::free(allocator::heap(), ptr);
+	return allocator::free(mem, ptr);
 }

 fn void free_aligned(void* ptr) @builtin @inline
 {
-	return allocator::free_aligned(allocator::heap(), ptr);
+	return allocator::free_aligned(mem, ptr);
 }

 fn void* trealloc(void* ptr, usz size, usz alignment = mem::DEFAULT_MEM_ALIGNMENT) @builtin @inline @nodiscard
 {
 	if (!size) return null;
 	if (!ptr) return tmalloc(size, alignment);
-	return allocator::temp().resize(ptr, size, alignment)!!;
+	return tmem.resize(ptr, size, alignment)!!;
 }

 module std::core::mem @if(env::NO_LIBC);
--- a/lib/std/core/mem_allocator.c3
+++ b/lib/std/core/mem_allocator.c3
@@ -1,4 +1,17 @@
 module std::core::mem::allocator;
+import std::math;
+
+// C3 has multiple different allocators available:
+//
+// Name                     Arena  Uses buffer  OOM Fallback?     Mark?   Reset?
+// ArenaAllocator             Yes          Yes             No       Yes      Yes
+// BackedArenaAllocator       Yes           No            Yes       Yes      Yes
+// DynamicArenaAllocator      Yes           No            Yes        No      Yes
+// HeapAllocator               No           No             No        No       No   *Note: Not for normal use
+// LibcAllocator               No           No             No        No       No   *Note: Wraps malloc
+// OnStackAllocator           Yes          Yes            Yes        No       No   *Note: Used by @stack_mem
+// TempAllocator              Yes           No            Yes        No*      No*  *Note: Mark/reset using @pool
+// TrackingAllocator           No           No            N/A        No       No   *Note: Wraps other heap allocator

 const DEFAULT_SIZE_PREFIX = usz.sizeof;
 const DEFAULT_SIZE_PREFIX_ALIGNMENT = usz.alignof;
@@ -18,34 +31,38 @@ enum AllocInitType

 interface Allocator
 {
-	fn void reset(usz mark) @optional;
-	fn usz mark() @optional;
 	<*
+	 Acquire memory from the allocator, with the given alignment and initialization type.
+
 	 @require !alignment || math::is_power_of_2(alignment)
-	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
-	 @require size > 0
+	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
+	 @require size > 0 : "The size must be 1 or more"
+	 @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 	*>
-	fn void*! acquire(usz size, AllocInitType init_type, usz alignment = 0);
+	fn void*? acquire(usz size, AllocInitType init_type, usz alignment = 0);
+
 	<*
+	 Resize acquired memory from the allocator, with the given new size and alignment.
+
 	 @require !alignment || math::is_power_of_2(alignment)
-	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT `alignment too big`
+	 @require alignment <= mem::MAX_MEMORY_ALIGNMENT : `alignment too big`
 	 @require ptr != null
 	 @require new_size > 0
+	 @return? mem::INVALID_ALLOC_SIZE, mem::OUT_OF_MEMORY
 	*>
-	fn void*! resize(void* ptr, usz new_size, usz alignment = 0);
+	fn void*? resize(void* ptr, usz new_size, usz alignment = 0);
+
 	<*
-	 @require ptr != null
+	 Release memory acquired using `acquire` or `resize`.
+
+	 @require ptr != null : "Empty pointers should never be released"
 	*>
 	fn void release(void* ptr, bool aligned);
 }

-def MemoryAllocFn = fn char[]!(usz);
+alias MemoryAllocFn = fn char[]?(usz);
+

-fault AllocationFailure
-{
-	OUT_OF_MEMORY,
-	CHUNK_TOO_LARGE,
-}

 fn usz alignment_for_allocation(usz alignment) @inline @private
 {
@@ -57,7 +74,7 @@ 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:
@@ -74,7 +91,7 @@ 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, ZERO);
@@ -85,7 +102,7 @@ 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)
 	{
@@ -105,7 +122,7 @@ macro void free(Allocator allocator, void* ptr)
 	allocator.release(ptr, false);
 }

-macro void*! malloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
+macro void*? malloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
 	$if env::TESTING:
@@ -117,13 +134,13 @@ macro void*! malloc_aligned(Allocator allocator, usz size, usz alignment) @nodis
 	$endif
 }

-macro void*! calloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
+macro void*? calloc_aligned(Allocator allocator, usz size, usz alignment) @nodiscard
 {
 	if (!size) return null;
 	return allocator.acquire(size, ZERO, alignment);
 }

-macro void*! realloc_aligned(Allocator allocator, void* ptr, usz new_size, usz alignment) @nodiscard
+macro void*? realloc_aligned(Allocator allocator, void* ptr, usz new_size, usz alignment) @nodiscard
 {
 	if (!new_size)
 	{
@@ -286,11 +303,31 @@ macro alloc_array_try(Allocator allocator, $Type, usz elements) @nodiscard
 	return (($Type*)malloc_try(allocator, $Type.sizeof * elements))[:elements];
 }

+<*
+ Clone a value.
+
+ @param [&inout] allocator : "The allocator to use to clone"
+ @param value : "The value to clone"
+ @return "A pointer to the cloned value"
+ @require $alignof(value) <= mem::DEFAULT_MEM_ALIGNMENT : "Types with alignment exceeding the default must use 'clone_aligned' instead"
+*>
 macro clone(Allocator allocator, value) @nodiscard
 {
 	return new(allocator, $typeof(value), value);
 }

+<*
+ Clone overaligned values. Must be released using free_aligned.
+
+ @param [&inout] allocator : "The allocator to use to clone"
+ @param value : "The value to clone"
+ @return "A pointer to the cloned value"
+*>
+macro clone_aligned(Allocator allocator, value) @nodiscard
+{
+	return new_aligned(allocator, $typeof(value), value)!!;
+}
+
 fn any clone_any(Allocator allocator, any value) @nodiscard
 {
 	usz size = value.type.sizeof;
@@ -305,7 +342,7 @@ fn any clone_any(Allocator allocator, any value) @nodiscard
 @require alignment > 0
 @require bytes <= isz.max
 *>
-macro void*! @aligned_alloc(#alloc_fn, usz bytes, usz alignment)
+macro void*? @aligned_alloc(#alloc_fn, usz bytes, usz alignment)
 {
 	if (alignment < void*.alignof) alignment = void*.alignof;
 	usz header = AlignedBlock.sizeof + alignment;
@@ -328,7 +365,7 @@ struct AlignedBlock
 	void* start;
 }

-macro void! @aligned_free(#free_fn, void* old_pointer)
+macro void? @aligned_free(#free_fn, void* old_pointer)
 {
 	AlignedBlock* desc = (AlignedBlock*)old_pointer - 1;
 	$if @typekind(#free_fn(desc.start)) == OPTIONAL:
@@ -342,7 +379,7 @@ macro void! @aligned_free(#free_fn, void* old_pointer)
 @require bytes > 0
 @require alignment > 0
 *>
-macro void*! @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes, usz alignment)
+macro void*? @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes, usz alignment)
 {
 	AlignedBlock* desc = (AlignedBlock*)old_pointer - 1;
 	void* data_start = desc.start;
@@ -358,14 +395,34 @@ macro void*! @aligned_realloc(#calloc_fn, #free_fn, void* old_pointer, usz bytes


 // All allocators
-
-
-def mem = thread_allocator @builtin;
+alias mem @builtin = thread_allocator ;
 tlocal Allocator thread_allocator @private = base_allocator();
 Allocator temp_base_allocator @private = base_allocator();

-tlocal TempAllocator* thread_temp_allocator @private = null;
-tlocal TempAllocator*[2] temp_allocator_pair @private;
+typedef PoolState = TempAllocator*;
+
+const LazyTempAllocator LAZY_TEMP @private = {};
+tlocal Allocator current_temp = &LAZY_TEMP;
+tlocal TempAllocator* top_temp;
+tlocal bool auto_create_temp = false;
+
+usz temp_allocator_min_size = temp_allocator_default_min_size();
+usz temp_allocator_buffer_size = temp_allocator_default_buffer_size();
+usz temp_allocator_new_mult = 4;
+
+fn PoolState push_pool()
+{
+	Allocator old = top_temp ? current_temp : create_temp_allocator_on_demand();
+	current_temp = ((TempAllocator*)old).derive_allocator(temp_allocator_min_size, temp_allocator_buffer_size, temp_allocator_new_mult)!!;
+	return (PoolState)old.ptr;
+}
+
+fn void pop_pool(PoolState old)
+{
+	TempAllocator* temp = (TempAllocator*)old;
+	current_temp = temp;
+	temp.reset();
+}

 macro Allocator base_allocator() @private
 {
@@ -376,36 +433,68 @@ macro Allocator base_allocator() @private
 	$endif
 }

-macro TempAllocator* create_default_sized_temp_allocator(Allocator allocator) @local
+macro usz temp_allocator_size() @local
 {
-	$switch (env::MEMORY_ENV)
-	$case NORMAL:
-		return new_temp_allocator(1024 * 256, allocator)!!;
-	$case SMALL:
-		return new_temp_allocator(1024 * 16, allocator)!!;
-	$case TINY:
-		return new_temp_allocator(1024 * 2, allocator)!!;
-	$case NONE:
-		unreachable("Temp allocator must explicitly created when memory-env is set to 'none'.");
+	$switch env::MEMORY_ENV:
+		$case NORMAL: return 256 * 1024;
+		$case SMALL: return 1024 * 32;
+		$case TINY: return 1024 * 4;
+		$case NONE: return 0;
+	$endswitch
+}
+
+macro usz temp_allocator_default_min_size() @local
+{
+	$switch env::MEMORY_ENV:
+		$case NORMAL: return 16 * 1024;
+		$case SMALL: return 1024 * 2;
+		$case TINY: return 256;
+		$case NONE: return 256;
+	$endswitch
+}
+
+macro usz temp_allocator_default_buffer_size() @local
+{
+	$switch env::MEMORY_ENV:
+		$case NORMAL: return 1024;
+		$case SMALL: return 128;
+		$case TINY: return 64;
+		$case NONE: return 64;
 	$endswitch
 }

 macro Allocator heap() => thread_allocator;

-macro TempAllocator* temp()
+<*
+ @require !top_temp : "This should never be called when temp already exists"
+*>
+fn Allocator create_temp_allocator_on_demand() @private
 {
-	if (!thread_temp_allocator)
+	if (!auto_create_temp)
 	{
-		init_default_temp_allocators();
+	    auto_create_temp = true;
+	    abort("Use '@pool_init()' to enable the temp allocator on a new thread. A temp allocator is only implicitly created on the main thread.");
 	}
-	return thread_temp_allocator;
+	return create_temp_allocator(temp_base_allocator, temp_allocator_size());
+}
+<*
+ @require !top_temp : "This should never be called when temp already exists"
+*>
+fn Allocator create_temp_allocator(Allocator allocator, usz size, usz buffer = temp_allocator_default_buffer_size()) @private
+{
+	return current_temp = top_temp = allocator::new_temp_allocator(allocator, size)!!;
 }

-fn void init_default_temp_allocators() @private
+macro Allocator temp()
 {
-	temp_allocator_pair[0] = create_default_sized_temp_allocator(temp_base_allocator);
-	temp_allocator_pair[1] = create_default_sized_temp_allocator(temp_base_allocator);
-	thread_temp_allocator = temp_allocator_pair[0];
+	return current_temp;
+}
+
+alias tmem @builtin = current_temp;
+
+fn void allow_implicit_temp_allocator_on_load_thread() @init(1) @local @if(env::LIBC || env::WASM_NOLIBC)
+{
+	auto_create_temp = true;
 }

 fn void destroy_temp_allocators_after_exit() @finalizer(65535) @local @if(env::LIBC)
@@ -418,35 +507,42 @@ fn void destroy_temp_allocators_after_exit() @finalizer(65535) @local @if(env::L
 *>
 fn void destroy_temp_allocators()
 {
-	if (!thread_temp_allocator) return;
-	temp_allocator_pair[0].destroy();
-	temp_allocator_pair[1].destroy();
-	temp_allocator_pair[..] = null;
-	thread_temp_allocator = null;
+	if (!top_temp) return;
+	top_temp.free();
+	top_temp = null;
+	current_temp = &LAZY_TEMP;
 }

-fn TempAllocator* temp_allocator_next() @private
+import libc;
+typedef LazyTempAllocator (Allocator) @private = uptr;
+
+fn void*? LazyTempAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+{
+	if (!top_temp) create_temp_allocator_on_demand();
+	return top_temp.acquire(bytes, init_type, alignment);
+}
+
+fn void*? LazyTempAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+{
+	if (!top_temp) create_temp_allocator_on_demand();
+	return top_temp.resize(old_ptr, new_bytes, alignment);
+}
+
+fn void LazyTempAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
 {
-	if (!thread_temp_allocator)
-	{
-		init_default_temp_allocators();
-		return thread_temp_allocator;
-	}
-	usz index = thread_temp_allocator == temp_allocator_pair[0] ? 1 : 0;
-	return thread_temp_allocator = temp_allocator_pair[index];
 }

 const NullAllocator NULL_ALLOCATOR = {};
-distinct NullAllocator (Allocator) = uptr;
+typedef NullAllocator (Allocator) = uptr;

-fn void*! NullAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
+fn void*? NullAllocator.acquire(&self, usz bytes, AllocInitType init_type, usz alignment) @dynamic
 {
-	return AllocationFailure.OUT_OF_MEMORY?;
+	return mem::OUT_OF_MEMORY?;
 }

-fn void*! NullAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
+fn void*? NullAllocator.resize(&self, void* old_ptr, usz new_bytes, usz alignment) @dynamic
 {
-	return AllocationFailure.OUT_OF_MEMORY?;
+	return mem::OUT_OF_MEMORY?;
 }

 fn void NullAllocator.release(&self, void* old_ptr, bool aligned) @dynamic
--- a/lib/std/core/os/wasm/wasm_memory.c3
+++ b/lib/std/core/os/wasm/wasm_memory.c3
@@ -11,7 +11,7 @@ struct WasmMemory
 	uptr use;
 }

-fn char[]! WasmMemory.allocate_block(&self, usz bytes)
+fn char[]? WasmMemory.allocate_block(&self, usz bytes)
 {
 	if (!self.allocation)
 	{
@@ -25,7 +25,7 @@ fn char[]! WasmMemory.allocate_block(&self, usz bytes)
 	}

 	usz blocks_required = (bytes_required + WASM_BLOCK_SIZE + 1) / WASM_BLOCK_SIZE;
-	if ($$wasm_memory_grow(0, blocks_required) == -1) return AllocationFailure.OUT_OF_MEMORY?;
+	if ($$wasm_memory_grow(0, blocks_required) == -1) return mem::OUT_OF_MEMORY?;
 	self.allocation = $$wasm_memory_size(0) * WASM_BLOCK_SIZE;
 	defer self.use += bytes;
 	return ((char*)self.use)[:bytes];
--- a/lib/std/core/private/cpu_detect.c3
+++ b/lib/std/core/private/cpu_detect.c3
@@ -143,7 +143,7 @@ uint128 x86_features;

 fn void add_feature_if_bit(X86Feature feature, uint register, int bit)
 {
-	if (register & 1U << bit) x86_features |= 1u128 << feature.ordinal;
+	if (register & 1U << bit) x86_features |= 1ULL << feature.ordinal;
 }

 fn void x86_initialize_cpu_features()
--- a/lib/std/core/private/macho_runtime.c3
+++ b/lib/std/core/private/macho_runtime.c3
@@ -56,10 +56,7 @@ struct MachHeader64

 const LC_SEGMENT_64 = 0x19;

-fault MachoSearch
-{
-	NOT_FOUND
-}
+
 fn bool name_cmp(char* a, char[16]* b)
 {
 	for (usz i = 0; i < 16; i++)
@@ -70,7 +67,7 @@ fn bool name_cmp(char* a, char[16]* b)
 	return false;
 }

-fn SegmentCommand64*! find_segment(MachHeader* header, char* segname)
+fn SegmentCommand64*? find_segment(MachHeader* header, char* segname)
 {
 	LoadCommand* command = (void*)header + MachHeader64.sizeof;
 	for (uint i = 0; i < header.ncmds; i++)
@@ -82,9 +79,9 @@ fn SegmentCommand64*! find_segment(MachHeader* header, char* segname)
 		}
 		command = (void*)command + command.cmdsize;
 	}
-	return MachoSearch.NOT_FOUND?;
+	return NOT_FOUND?;
 }
-fn Section64*! find_section(SegmentCommand64* command, char* sectname)
+fn Section64*? find_section(SegmentCommand64* command, char* sectname)
 {
 	Section64* section = (void*)command + SegmentCommand64.sizeof;
 	for (uint i = 0; i < command.nsects; i++)
@@ -92,13 +89,13 @@ fn Section64*! find_section(SegmentCommand64* command, char* sectname)
 		if (name_cmp(sectname, &section.sectname)) return section;
 		section++;
 	}
-	return MachoSearch.NOT_FOUND?;
+	return NOT_FOUND?;
 }

 macro find_segment_section_body(MachHeader* header, char* segname, char* sectname, $Type)
 {

-	Section64*! section = find_section(find_segment(header, segname), sectname);
+	Section64*? section = find_section(find_segment(header, segname), sectname);
 	if (catch section)
 	{
 		return ($Type[]){};
@@ -107,7 +104,7 @@ macro find_segment_section_body(MachHeader* header, char* segname, char* sectnam
 	return ptr[:section.size / $Type.sizeof];
 }

-def DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide);
+alias DyldCallback = fn void (MachHeader* mh, isz vmaddr_slide);

 extern fn void _dyld_register_func_for_add_image(DyldCallback);

@@ -126,7 +123,7 @@ extern fn void* realloc(void* ptr, usz size);
 extern fn void* malloc(usz size);
 extern fn void free(void* ptr);

-def CallbackFn = fn void();
+alias CallbackFn = fn void();
 struct Callback
 {
 	uint priority;
@@ -214,7 +211,7 @@ struct TypeId
 	usz sizeof;
 	TypeId* inner;
 	usz len;
-	typeid[?] additional;
+	typeid[*] additional;
 }

 fn void dl_reg_callback(MachHeader* mh, isz vmaddr_slide)
--- a/lib/std/core/private/main_stub.c3
+++ b/lib/std/core/private/main_stub.c3
@@ -80,7 +80,7 @@ macro String[] wargs_strings(int argc, Char16** argv) @private
 	{
 		Char16* arg = argv[i];
 		Char16[] argstring = arg[:_strlen(arg)];
-		list[i] = string::new_from_utf16(argstring) ?? "?".copy();
+		list[i] = string::from_utf16(mem, argstring) ?? "?".copy(mem);
 	}
 	return list[:argc];
 }
--- a/lib/std/core/runtime.c3
+++ b/lib/std/core/runtime.c3
@@ -22,6 +22,14 @@ struct SliceRaw
 	usz len;
 }

+macro @enum_lookup($Type, #value, value)
+{
+	$foreach $val : $Type.values:
+		if ($val.#value == value) return $val;
+	$endforeach
+	return NOT_FOUND?;
+}
+

 module std::core::runtime @if(WASM_NOLIBC);

--- a/lib/std/core/runtime_benchmark.c3
+++ b/lib/std/core/runtime_benchmark.c3
@@ -1,8 +1,7 @@
 module std::core::runtime;
 import libc, std::time, std::io, std::sort;

-def BenchmarkFn = fn void!() @if($$OLD_TEST);
-def BenchmarkFn = fn void() @if(!$$OLD_TEST);
+alias BenchmarkFn = fn void();

 struct BenchmarkUnit
 {
@@ -10,7 +9,7 @@ struct BenchmarkUnit
 	BenchmarkFn func;
 }

-fn BenchmarkUnit[] benchmark_collection_create(Allocator allocator = allocator::heap())
+fn BenchmarkUnit[] benchmark_collection_create(Allocator allocator)
 {
 	BenchmarkFn[] fns = $$BENCHMARK_FNS;
 	String[] names = $$BENCHMARK_NAMES;
@@ -39,80 +38,7 @@ fn void set_benchmark_max_iterations(uint value) @builtin
    benchmark_max_iterations = value;
 }

-fn bool run_benchmarks(BenchmarkUnit[] benchmarks) @if($$OLD_TEST)
-{
-	int benchmarks_passed = 0;
-	int benchmark_count = benchmarks.len;
-	usz max_name;
-
-	foreach (&unit : benchmarks)
-	{
-		if (max_name < unit.name.len) max_name = unit.name.len;
-	}
-
-	usz len = max_name + 9;
-
-	DString name = dstring::temp_with_capacity(64);
-	name.append_repeat('-', len / 2);
-	name.append(" BENCHMARKS ");
-	name.append_repeat('-', len - len / 2);
-
-	io::printn(name);
-
-	name.clear();
-
-	long sys_clock_started;
-	long sys_clock_finished;
-	long sys_clocks;
-	Clock clock;
-	anyfault err;
-
-	foreach(unit : benchmarks)
-	{
-		defer name.clear();
-		name.appendf("Benchmarking %s ", unit.name);
-		name.append_repeat('.', max_name - unit.name.len + 2);
-		io::printf("%s ", name.str_view());
-
-		for (uint i = 0; i < benchmark_warmup_iterations; i++)
-		{
-			err = @catch(unit.func()) @inline;
-			@volatile_load(err);
-		}
-
-		clock = std::time::clock::now();
-		sys_clock_started = $$sysclock();
-
-		for (uint i = 0; i < benchmark_max_iterations; i++)
-		{
-			err = @catch(unit.func()) @inline;
-			@volatile_load(err);
-		}
-
-		sys_clock_finished = $$sysclock();
-		NanoDuration nano_seconds = clock.mark();
-		sys_clocks = sys_clock_finished - sys_clock_started;
-
-		if (err)
-		{
-			io::printfn("[failed] Failed due to: %s", err);
-			continue;
-		}
-
-		io::printfn("[ok] %.2f ns, %.2f CPU's clocks", (float)nano_seconds / benchmark_max_iterations, (float)sys_clocks / benchmark_max_iterations);
-		benchmarks_passed++;
-	}
-
-	io::printfn("\n%d benchmark%s run.\n", benchmark_count, benchmark_count > 1 ? "s" : "");
-	io::printfn("Benchmarks Result: %s. %d passed, %d failed.",
-		benchmarks_passed < benchmark_count ? "FAILED" : "ok",
-		benchmarks_passed,
-		benchmark_count - benchmarks_passed);
-
-	return benchmark_count == benchmarks_passed;
-}
-
-fn bool run_benchmarks(BenchmarkUnit[] benchmarks) @if(!$$OLD_TEST)
+fn bool run_benchmarks(BenchmarkUnit[] benchmarks)
 {
 	usz max_name;

@@ -170,5 +96,5 @@ fn bool run_benchmarks(BenchmarkUnit[] benchmarks) @if(!$$OLD_TEST)

 fn bool default_benchmark_runner(String[] args) => @pool()
 {
-	return run_benchmarks(benchmark_collection_create(allocator::temp()));
+	return run_benchmarks(benchmark_collection_create(tmem));
 }
--- a/lib/std/core/runtime_test.c3
+++ b/lib/std/core/runtime_test.c3
@@ -7,8 +7,7 @@ import std::core::mem::allocator @public;
 import libc, std::time, std::io, std::sort;
 import std::os::env;

-def TestFn = fn void!() @if($$OLD_TEST);
-def TestFn = fn void() @if(!$$OLD_TEST);
+alias TestFn = fn void();

 TestContext* test_context @private;

@@ -47,7 +46,7 @@ struct TestUnit
 	TestFn func;
 }

-fn TestUnit[] test_collection_create(Allocator allocator = allocator::heap())
+fn TestUnit[] test_collection_create(Allocator allocator)
 {
 	TestFn[] fns = $$TEST_FNS;
 	String[] names = $$TEST_NAMES;
@@ -75,7 +74,8 @@ fn int cmp_test_unit(TestUnit a, TestUnit b)

 fn bool terminal_has_ansi_codes() @local => @pool()
 {
-	if (try v = env::get_var_temp("TERM"))
+
+	if (try v = env::tget_var("TERM"))
 	{
 		if (v.contains("xterm") || v.contains("vt100") || v.contains("screen")) return true;
 	}
@@ -181,7 +181,7 @@ fn bool run_tests(String[] args, TestUnit[] tests) @private
 		.breakpoint_on_assert = false,
 		.test_filter = "",
 		.has_ansi_codes = terminal_has_ansi_codes(),
-		.stored.allocator = allocator::heap(),
+		.stored.allocator = mem,
 		.stored.stderr = *io::stderr(),
 		.stored.stdout = *io::stdout(),
 	};
@@ -244,7 +244,7 @@ fn bool run_tests(String[] args, TestUnit[] tests) @private
 	name.append_repeat('-', len - len / 2);
 	if (!context.is_quiet_mode) io::printn(name);
 	name.clear();
-	TempState temp_state = mem::temp_push();
+	PoolState temp_state = mem::temp_push();
 	defer mem::temp_pop(temp_state);
 	foreach(unit : tests)
 	{
@@ -278,15 +278,7 @@ fn bool run_tests(String[] args, TestUnit[] tests) @private
 			mute_output();
 			mem.clear();
 			if (check_leaks) allocator::thread_allocator = &mem;
-			$if(!$$OLD_TEST):
-				unit.func();
-			$else
-				if (catch err = unit.func())
-				{
-					io::printf("[FAIL] Failed due to: %s", err);
-					continue;
-				}
-			$endif
+			unit.func();
 			// track cleanup that may take place in teardown_fn
 			if (context.teardown_fn)
 			{
@@ -297,7 +289,7 @@ fn bool run_tests(String[] args, TestUnit[] tests) @private
 			unmute_output(false); // all good, discard output
 			if (mem.has_leaks())
 			{
-				if(context.is_quiet_mode) io::printf("\n%s ", context.current_test_name);
+				if (context.is_quiet_mode) io::printf("\n%s ", context.current_test_name);
 				io::print(context.has_ansi_codes ? "[\e[0;31mFAIL\e[0m]" : "[FAIL]");
 				io::printn(" LEAKS DETECTED!");
 				mem.print_report();
@@ -337,6 +329,6 @@ fn bool run_tests(String[] args, TestUnit[] tests) @private
 fn bool default_test_runner(String[] args) => @pool()
 {
 	assert(test_context == null, "test suite is already running");
-	return run_tests(args, test_collection_create(allocator::temp()));
+	return run_tests(args, test_collection_create(tmem));
 }

--- a/lib/std/core/sanitizer/asan.c3
+++ b/lib/std/core/sanitizer/asan.c3
@@ -12,7 +12,7 @@

 module std::core::sanitizer::asan;

-def ErrorCallback = fn void (ZString);
+alias ErrorCallback = fn void (ZString);

 <*
 Marks a memory region ([addr, addr+size)) as unaddressable.
@@ -26,8 +26,8 @@ def ErrorCallback = fn void (ZString);
 NOTE This function is not thread-safe because no two threads can poison or
 unpoison memory in the same memory region simultaneously.

- @param addr "Start of memory region."
- @param size "Size of memory region."
+ @param addr : "Start of memory region."
+ @param size : "Size of memory region."
 *>
 macro poison_memory_region(void* addr, usz size)
 {
@@ -47,8 +47,8 @@ macro poison_memory_region(void* addr, usz size)
 NOTE This function is not thread-safe because no two threads can
 poison or unpoison memory in the same memory region simultaneously.

- @param addr "Start of memory region."
- @param size "Size of memory region."
+ @param addr : "Start of memory region."
+ @param size : "Size of memory region."
 *>
 macro unpoison_memory_region(void* addr, usz size)
 {
@@ -60,7 +60,7 @@ macro unpoison_memory_region(void* addr, usz size)
 <*
 Checks if an address is poisoned.
 @return "True if 'addr' is poisoned (that is, 1-byte read/write access to this address would result in an error report from ASan). Otherwise returns false."
- @param addr "Address to check."
+ @param addr : "Address to check."
 *>
 macro bool address_is_poisoned(void* addr)
 {
@@ -77,8 +77,8 @@ macro bool address_is_poisoned(void* addr)
 If at least one byte in [beg, beg+size) is poisoned, returns the
 address of the first such byte. Otherwise returns 0.

- @param beg "Start of memory region."
- @param size "Start of memory region."
+ @param beg : "Start of memory region."
+ @param size : "Start of memory region."
 @return "Address of first poisoned byte."
 *>
 macro void* region_is_poisoned(void* beg, usz size)
--- a/lib/std/core/sanitizer/tsan.c3
+++ b/lib/std/core/sanitizer/tsan.c3
@@ -1,6 +1,6 @@
 module std::core::sanitizer::tsan;

-distinct MutexFlags = inline CUInt;
+typedef MutexFlags = inline CUInt;

 const MutexFlags MUTEX_LINKER_INIT      = 1 << 0;
 const MutexFlags MUTEX_WRITE_REENTRANT  = 1 << 1;
--- a/lib/std/core/slice2d.c3
+++ b/lib/std/core/slice2d.c3
@@ -0,0 +1,169 @@
+module std::core::array::slice {Type};
+
+<*
+ A slice2d allows slicing an array like int[10][10] into an arbitrary "int[][]"-like counterpart
+ Typically you'd use array::slice2d(...) to create one.
+*>
+struct Slice2d
+{
+	Type* ptr;
+	usz inner_len;
+	usz ystart;
+	usz ylen;
+	usz xstart;
+	usz xlen;
+}
+
+<*
+ @return `The length of the "outer" slice`
+*>
+fn usz Slice2d.len(&self) @operator(len)
+{
+	return self.ylen;
+}
+
+<*
+ @return `The total number of elements.`
+*>
+fn usz Slice2d.count(&self)
+{
+	return self.ylen * self.xlen;
+}
+
+<*
+ Step through each element of the slice.
+*>
+macro void Slice2d.@each(&self; @body(usz[<2>], Type))
+{
+	foreach (y, line : *self)
+	{
+		foreach (x, val : line)
+		{
+			@body({ x, y }, val);
+		}
+	}
+}
+
+<*
+ Step through each element of the slice *by reference*
+*>
+macro void Slice2d.@each_ref(&self; @body(usz[<2>], Type*))
+{
+	foreach (y, line : *self)
+	{
+		foreach (x, &val : line)
+		{
+			@body({ x, y }, val);
+		}
+	}
+}
+
+<*
+ Return a row as a slice.
+
+ @param idy : "The row to return"
+ @return "The slice for the particular row"
+ @require idy >= 0 && idy < self.ylen
+*>
+macro Type[] Slice2d.get_row(self, usz idy) @operator([])
+{
+	return (self.ptr + self.inner_len * (idy + self.ystart))[self.xstart:self.xlen];
+}
+
+<*
+ Get the value at a particular x/y position in the slice.
+
+ @param coord : "The xy coordinate"
+ @return "The value at that coordinate"
+ @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
+ @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
+*>
+macro Type Slice2d.get_coord(self, usz[<2>] coord)
+{
+	return *self.get_coord_ref(coord);
+}
+
+<*
+ Get a pointer to the value at a particular x/y position in the slice.
+
+ @param coord : "The xy coordinate"
+ @return "A pointer to the value at that coordinate"
+ @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
+ @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
+*>
+macro Type* Slice2d.get_coord_ref(self, usz[<2>] coord)
+{
+	return self.get_xy_ref(coord.x, coord.y);
+}
+
+<*
+ Get the value at a particular x/y position in the slice.
+
+ @param x : "The x coordinate"
+ @param y : "The x coordinate"
+ @return "The value at that coordinate"
+ @require y >= 0 && y < self.ylen : "y value out of range"
+ @require x >= 0 && x < self.xlen : "x value out of range"
+*>
+macro Type Slice2d.get_xy(self, x, y)
+{
+	return *self.get_xy_ref(x, y);
+}
+
+<*
+ Get the value at a particular x/y position in the slice by reference.
+
+ @param x : "The x coordinate"
+ @param y : "The y coordinate"
+ @return "A pointer to the value at that coordinate"
+ @require y >= 0 && y < self.ylen : "y value out of range"
+ @require x >= 0 && x < self.xlen : "x value out of range"
+*>
+macro Type* Slice2d.get_xy_ref(self, x, y)
+{
+	return self.ptr + self.inner_len * (y + self.ystart) + self.xstart + x;
+}
+
+<*
+ Set the ´value at a particular x/y position in the slice.
+
+ @param coord : "The xy coordinate"
+ @param value : "The new value"
+ @require coord.y >= 0 && coord.y < self.ylen : "y value out of range"
+ @require coord.x >= 0 && coord.x < self.xlen : "x value out of range"
+*>
+macro void Slice2d.set_coord(self, usz[<2>] coord, Type value)
+{
+	*self.get_coord_ref(coord) = value;
+}
+
+<*
+ Set the value at a particular x/y position in the slice.
+
+ @param x : "The x coordinate"
+ @param y : "The y coordinate"
+ @param value : "The new value"
+ @require y >= 0 && y < self.ylen : "y value out of range"
+ @require x >= 0 && x < self.xlen : "x value out of range"
+*>
+macro void Slice2d.set_xy(self, x, y, Type value)
+{
+	*self.get_xy_ref(x, y) = value;
+}
+
+<*
+ Reslice a slice2d returning a new slice.
+
+ @param x : "The starting x"
+ @param xlen : "The length along x"
+ @param y : "The starting y"
+ @param ylen : "The length along y"
+ @require y >= 0 && y < self.ylen
+ @require x >= 0 && x < self.xlen
+*>
+fn Slice2d Slice2d.slice(&self, isz x = 0, isz xlen = 0, isz y = 0, isz ylen = 0)
+{
+	if (xlen < 1) xlen = self.xlen + xlen;
+	if (ylen < 1) ylen = self.ylen + ylen;
+	return { self.ptr, self.inner_len, y + self.ystart, ylen, x + self.xstart, xlen };
+}
--- a/lib/std/core/string.c3
+++ b/lib/std/core/string.c3
--- a/lib/std/core/string_iterator.c3
+++ b/lib/std/core/string_iterator.c3
@@ -11,22 +11,22 @@ fn void StringIterator.reset(&self)
 	self.current = 0;
 }

-fn Char32! StringIterator.next(&self)
+fn Char32? StringIterator.next(&self)
 {
    usz len = self.utf8.len;
    usz current = self.current;
-    if (current >= len) return IteratorResult.NO_MORE_ELEMENT?;
+    if (current >= len) return NO_MORE_ELEMENT?;
    usz read = (len - current < 4 ? len - current : 4);
    Char32 res = conv::utf8_to_char32(&self.utf8[current], &read)!;
    self.current += read;
    return res;
 }

-fn Char32! StringIterator.peek(&self)
+fn Char32? StringIterator.peek(&self)
 {
    usz len = self.utf8.len;
    usz current = self.current;
-    if (current >= len) return IteratorResult.NO_MORE_ELEMENT?;
+    if (current >= len) return NO_MORE_ELEMENT?;
    usz read = (len - current < 4 ? len - current : 4);
    Char32 res = conv::utf8_to_char32(&self.utf8[current], &read)!;
    return res;
@@ -37,13 +37,13 @@ fn bool StringIterator.has_next(&self)
    return self.current < self.utf8.len;
 }

-fn Char32! StringIterator.get(&self)
+fn Char32? StringIterator.get(&self)
 {
    usz len = self.utf8.len;
    usz current = self.current;
    usz read = (len - current < 4 ? len - current : 4);
    usz index = current > read ? current - read : 0;
-    if (index >= len) return IteratorResult.NO_MORE_ELEMENT?;
+    if (index >= len) return NO_MORE_ELEMENT?;
    Char32 res = conv::utf8_to_char32(&self.utf8[index], &read)!;
    return res;
 }
--- a/lib/std/core/string_to_real.c3
+++ b/lib/std/core/string_to_real.c3
@@ -34,13 +34,13 @@ const uint[2] B1B_MAX = { 9007199, 254740991 };
 <*
 @require chars.len > 0
 *>
-macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
+macro double? decfloat(char[] chars, int $bits, int $emin, int sign)
 {
 	uint[KMAX] x;
 	const uint[2] TH = B1B_MAX;
 	int emax = - $emin - $bits + 3;

-	const int[?] P10S = { 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };
+	const int[*] P10S = { 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };
 	usz index;
 	bool got_digit = chars[0] == '0';
 	bool got_rad;
@@ -64,7 +64,7 @@ macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
 		got_rad = true;
 		if (index == last_char)
 		{
-			if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
+			if (!got_digit) return MALFORMED_FLOAT?;
 			return sign * 0.0;
 		}
 		if (index != last_char && (c = chars[++index]) == '0')
@@ -83,7 +83,7 @@ macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
 		switch
 		{
 			case c == '.':
-				if (got_rad) return NumberConversion.MALFORMED_FLOAT?;
+				if (got_rad) return MALFORMED_FLOAT?;
 				got_rad = true;
 				lrp = dc;
 			case k < KMAX - 3:
@@ -113,24 +113,24 @@ macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
 		c = chars[++index];
 	}
 	if (!got_rad) lrp = dc;
-	if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
+	if (!got_digit) return MALFORMED_FLOAT?;
 	if ((c | 32) == 'e')
 	{
-		if (last_char == index) return NumberConversion.MALFORMED_FLOAT?;
-		long e10 = String.to_long((String)chars[index + 1..]) ?? NumberConversion.MALFORMED_FLOAT?!;
+		if (last_char == index) return MALFORMED_FLOAT?;
+		long e10 = String.to_long((String)chars[index + 1..]) ?? MALFORMED_FLOAT?!;
 		lrp += e10;
 	}
 	else if (index != last_char)
 	{
-		return NumberConversion.MALFORMED_FLOAT?;
+		return MALFORMED_FLOAT?;
 	}
 	// Handle zero specially to avoid nasty special cases later
 	if (!x[0]) return sign * 0.0;

 	// Optimize small integers (w/no exponent) and over/under-flow
 	if (lrp == dc && dc < 10 && ($bits > 30 || (ulong)x[0] >> $bits == 0)) return sign * (double)x[0];
-	if (lrp > - $emin / 2) return NumberConversion.FLOAT_OUT_OF_RANGE?;
-	if (lrp < $emin - 2 * math::DOUBLE_MANT_DIG) return NumberConversion.FLOAT_OUT_OF_RANGE?;
+	if (lrp > - $emin / 2) return FLOAT_OUT_OF_RANGE?;
+	if (lrp < $emin - 2 * math::DOUBLE_MANT_DIG) return FLOAT_OUT_OF_RANGE?;

 	// Align incomplete final B1B digit
 	if (j)
@@ -320,12 +320,12 @@ macro double! decfloat(char[] chars, int $bits, int $emin, int sign)
 			y *= 0.5;
 			e2++;
 		}
-		if (e2 + math::DOUBLE_MANT_DIG > emax || (denormal && frac)) return NumberConversion.MALFORMED_FLOAT?;
+		if (e2 + math::DOUBLE_MANT_DIG > emax || (denormal && frac)) return MALFORMED_FLOAT?;
 	}
 	return math::scalbn(y, e2);
 }

-macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
+macro double? hexfloat(char[] chars, int $bits, int $emin, int sign)
 {
 	double scale = 1;
 	uint x;
@@ -351,7 +351,7 @@ macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 		got_rad = true;
 		if (index == last_char)
 		{
-			if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
+			if (!got_digit) return MALFORMED_FLOAT?;
 			return sign * 0.0;
 		}
 		if (index != last_char && (c = chars[++index]) == '0')
@@ -369,7 +369,7 @@ macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 	{
 		if (c == '.')
 		{
-			if (got_rad) return NumberConversion.MALFORMED_FLOAT?;
+			if (got_rad) return MALFORMED_FLOAT?;
 			got_rad = true;
 			rp = dc;
 		}
@@ -393,20 +393,20 @@ macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 		if (index == last_char) break;
 		c = chars[++index];
 	}
-	if (!got_digit) return NumberConversion.MALFORMED_FLOAT?;
+	if (!got_digit) return MALFORMED_FLOAT?;
 	if (!got_rad) rp = dc;
 	for (; dc < 8; dc++) x *= 16;

 	long e2;
 	if ((c | 32) == 'p')
 	{
-		long e2val = String.to_long((String)chars[index + 1..]) ?? (NumberConversion.MALFORMED_FLOAT?)!;
+		long e2val = String.to_long((String)chars[index + 1..]) ?? (MALFORMED_FLOAT?)!;
 		e2 = e2val;
 	}
 	e2 += 4 * rp - 32;
 	if (!x) return sign * 0.0;
-	if (e2 > -$emin) return NumberConversion.FLOAT_OUT_OF_RANGE?;
-	if (e2 < $emin - 2 * math::DOUBLE_MANT_DIG) return NumberConversion.FLOAT_OUT_OF_RANGE?;
+	if (e2 > -$emin) return FLOAT_OUT_OF_RANGE?;
+	if (e2 < $emin - 2 * math::DOUBLE_MANT_DIG) return FLOAT_OUT_OF_RANGE?;

 	while (x < 0x80000000)
 	{
@@ -441,7 +441,7 @@ macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 	}
 	y = bias + sign * (double)x + sign * y;
 	y -= bias;
-	if (!y) return NumberConversion.FLOAT_OUT_OF_RANGE?;
+	if (!y) return FLOAT_OUT_OF_RANGE?;

 	return math::scalbn(y, (int)e2);
 }
@@ -449,7 +449,7 @@ macro double! hexfloat(char[] chars, int $bits, int $emin, int sign)
 macro String.to_real(chars, $Type) @private
 {
 	int sign = 1;
-	$switch ($Type)
+	$switch $Type:
 	$case float:
 		const int BITS = math::FLOAT_MANT_DIG;
 		const int EMIN = math::FLOAT_MIN_EXP - BITS;
@@ -463,14 +463,18 @@ macro String.to_real(chars, $Type) @private
 	$endswitch

 	while (chars.len && chars[0] == ' ') chars = chars[1..];
-	if (!chars.len) return NumberConversion.MALFORMED_FLOAT?;
-	switch (chars[0])
+	if (!chars.len) return MALFORMED_FLOAT?;
+
+	if (chars.len != 1)
 	{
-		case '-':
-			sign = -1;
-			nextcase;
-		case '+':
-			chars = chars[1..];
+		switch (chars[0])
+		{
+			case '-':
+				sign = -1;
+				nextcase;
+			case '+':
+				chars = chars[1..];
+		}
 	}
 	if (chars == "infinity" || chars == "INFINITY") return sign * $Type.inf;
 	if (chars == "NAN" || chars == "nan") return $Type.nan;
--- a/lib/std/core/test.c3
+++ b/lib/std/core/test.c3
@@ -8,18 +8,15 @@ Example:
 module sample::m;
 import std::io;

-fault MathError
-{
-	DIVISION_BY_ZERO
-}
+faultdef DIVISION_BY_ZERO;

-fn double! divide(int a, int b)
+fn double? divide(int a, int b)
 {
 	if (b == 0) return MathError.DIVISION_BY_ZERO?;
 	return (double)(a) / (double)(b);
 }

-fn void! test_div() @test
+fn void? test_div() @test
 {
 	test::eq(2, divide(6, 3)!);
 	test::ne(1, 2);
@@ -44,11 +41,11 @@ import std::math, std::io, libc;
 <*
 Initializes test case context.

- @param setup_fn `initializer function for test case`
- @param teardown_fn `cleanup function for test context (may be null)`
+ @param setup_fn : `initializer function for test case`
+ @param teardown_fn : `cleanup function for test context (may be null)`

- @require runtime::test_context != null "Only allowed in @test functions"
- @require setup_fn != null "setup_fn must always be set"
+ @require runtime::test_context != null : "Only allowed in @test functions"
+ @require setup_fn != null : "setup_fn must always be set"
 *>
 macro @setup(TestFn setup_fn, TestFn teardown_fn = null)
 {
@@ -60,10 +57,10 @@ macro @setup(TestFn setup_fn, TestFn teardown_fn = null)
 <*
 Checks condition and fails assertion if not true

- @param #condition `any boolean condition, will be expanded by text`
- @param format `printf compatible format`
- @param args `vargs for format`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param #condition : `any boolean condition, will be expanded by text`
+ @param format : `printf compatible format`
+ @param args : `vargs for format`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro @check(#condition, String format = "", args...)
 {
@@ -83,11 +80,11 @@ macro @check(#condition, String format = "", args...)
 <*
 Check if function returns specific error

- @param #funcresult `result of function execution`
- @param error_expected `expected error of function execution`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param #funcresult : `result of function execution`
+ @param error_expected : `expected error of function execution`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
-macro @error(#funcresult, anyfault error_expected)
+macro @error(#funcresult, fault error_expected)
 {
 	if (catch err = #funcresult)
 	{
@@ -104,9 +101,9 @@ macro @error(#funcresult, anyfault error_expected)
 <*
 Check if left == right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro eq(left, right)
 {
@@ -119,13 +116,13 @@ macro eq(left, right)
 <*
 Check left floating point value is approximately equals to right value

- @param places `number of decimal places to compare (default: 7)`
- @param delta `minimal allowed difference (overrides places parameter)`
- @param equal_nan `allows comparing nan values, if left and right both nans result is ok`
+ @param places : `number of decimal places to compare (default: 7)`
+ @param delta : `minimal allowed difference (overrides places parameter)`
+ @param equal_nan : `allows comparing nan values, if left and right both nans result is ok`

- @require places > 0, places <= 20 "too many decimal places"
- @require delta >= 0, delta <= 1 "delta must be a small number"
- @require runtime::test_context != null "Only allowed in @test functions"
+ @require places > 0, places <= 20 : "too many decimal places"
+ @require delta >= 0, delta <= 1 : "delta must be a small number"
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro void eq_approx(double left, double right, uint places = 7, double delta = 0, bool equal_nan = true)
 {
@@ -143,9 +140,9 @@ macro void eq_approx(double left, double right, uint places = 7, double delta =
 <*
 Check if left != right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro void ne(left, right)
 {
@@ -158,9 +155,9 @@ macro void ne(left, right)
 <*
 Check if left > right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro gt(left, right)
 {
@@ -173,9 +170,9 @@ macro gt(left, right)
 <*
 Check if left >= right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro ge(left, right)
 {
@@ -188,9 +185,9 @@ macro ge(left, right)
 <*
 Check if left < right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro lt(left, right)
 {
@@ -203,9 +200,9 @@ macro lt(left, right)
 <*
 Check if left <= right

- @param left `left argument of any comparable type`
- @param right `right argument of any comparable type`
- @require runtime::test_context != null "Only allowed in @test functions"
+ @param left : `left argument of any comparable type`
+ @param right : `right argument of any comparable type`
+ @require runtime::test_context != null : "Only allowed in @test functions"
 *>
 macro le(left, right)
 {
--- a/lib/std/core/types.c3
+++ b/lib/std/core/types.c3
@@ -3,15 +3,11 @@ module std::core::types;
 import libc;


-fault ConversionResult
-{
-	VALUE_OUT_OF_RANGE,
-	VALUE_OUT_OF_UNSIGNED_RANGE,
-}
+faultdef VALUE_OUT_OF_RANGE, VALUE_OUT_OF_UNSIGNED_RANGE;

 <*
- @require $Type.kindof.is_int() "Type was not an integer"
- @require v.type.kindof == ENUM "Value was not an enum"
+ @require $Type.kindof.is_int() : "Type was not an integer"
+ @require v.type.kindof == ENUM : "Value was not an enum"
 *>
 macro any_to_enum_ordinal(any v, $Type)
 {
@@ -19,8 +15,8 @@ macro any_to_enum_ordinal(any v, $Type)
 }

 <*
- @require $Type.kindof.is_int() "Type was not an integer"
- @require v.type.kindof.is_int() "Value was not an integer"
+ @require $Type.kindof.is_int() : "Type was not an integer"
+ @require v.type.kindof.is_int() : "Value was not an integer"
 *>
 macro any_to_int(any v, $Type)
 {
@@ -33,47 +29,47 @@ macro any_to_int(any v, $Type)
 	{
 		case ichar:
 			ichar c = *(char*)v.ptr;
-			if (is_mixed_signed && c < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (is_mixed_signed && c < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
 			return ($Type)c;
 		case short:
 			short s = *(short*)v.ptr;
-			if (is_mixed_signed && s < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (s > max || s < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && s < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (s > max || s < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)s;
 		case int:
 			int i = *(int*)v.ptr;
-			if (is_mixed_signed && i < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && i < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case long:
 			long l = *(long*)v.ptr;
-			if (is_mixed_signed && l < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (l > max || l < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && l < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (l > max || l < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)l;
 		case int128:
 			int128 i = *(int128*)v.ptr;
-			if (is_mixed_signed && i < 0) return ConversionResult.VALUE_OUT_OF_UNSIGNED_RANGE?;
-			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (is_mixed_signed && i < 0) return VALUE_OUT_OF_UNSIGNED_RANGE?;
+			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case char:
 			char c = *(char*)v.ptr;
-			if (c > max) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (c > max) return VALUE_OUT_OF_RANGE?;
 			return ($Type)c;
 		case ushort:
 			ushort s = *(ushort*)v.ptr;
-			if (s > max || s < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (s > max || s < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)s;
 		case uint:
 			uint i = *(uint*)v.ptr;
-			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		case ulong:
 			ulong l = *(ulong*)v.ptr;
-			if (l > max || l < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (l > max || l < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)l;
 		case uint128:
 			uint128 i = *(uint128*)v.ptr;
-			if (i > max || i < min) return ConversionResult.VALUE_OUT_OF_RANGE?;
+			if (i > max || i < min) return VALUE_OUT_OF_RANGE?;
 			return ($Type)i;
 		default:
 			unreachable();
@@ -93,7 +89,7 @@ fn bool typeid.is_subtype_of(self, typeid other)
 macro bool is_subtype_of($Type, $OtherType)
 {
 	var $typeid = $Type.typeid;
-	$switch ($Type)
+	$switch $Type:
 		$case $OtherType: return true;
 		$default: return false;
 	$endswitch
@@ -116,7 +112,7 @@ fn bool TypeKind.is_int(kind) @inline

 macro bool is_slice_convertable($Type)
 {
-	$switch ($Type.kindof)
+	$switch $Type.kindof:
 		$case SLICE:
 			return true;
 		$case POINTER:
@@ -130,11 +126,11 @@ macro bool is_bool($Type) @const => $Type.kindof == TypeKind.BOOL;
 macro bool is_int($Type) @const  => $Type.kindof == TypeKind.SIGNED_INT || $Type.kindof == TypeKind.UNSIGNED_INT;

 <*
- @require is_numerical($Type) "Expected a numerical type"
+ @require is_numerical($Type) : "Expected a numerical type"
 *>
 macro bool is_signed($Type) @const
 {
-	$switch (inner_kind($Type))
+	$switch inner_kind($Type):
 		$case SIGNED_INT:
 		$case FLOAT:
 			return true;
@@ -146,11 +142,11 @@ macro bool is_signed($Type) @const
 }

 <*
- @require is_numerical($Type) "Expected a numerical type"
+ @require is_numerical($Type) : "Expected a numerical type"
 *>
 macro bool is_unsigned($Type) @const
 {
-	$switch (inner_kind($Type))
+	$switch inner_kind($Type):
 		$case UNSIGNED_INT:
 			return true;
 		$case VECTOR:
@@ -160,6 +156,24 @@ macro bool is_unsigned($Type) @const
 	$endswitch
 }

+macro typeid flat_type($Type) @const
+{
+	$if $Type.kindof == DISTINCT:
+		return flat_type($typefrom($Type.inner));
+	$else
+		return $Type.typeid;
+	$endif
+}
+
+macro TypeKind flat_kind($Type) @const
+{
+	$if $Type.kindof == DISTINCT:
+		return flat_type($typefrom($Type.inner));
+	$else
+		return $Type.kindof;
+	$endif
+}
+
 macro bool is_indexable($Type) @const
 {
 	return $defined(($Type){}[0]);
@@ -172,7 +186,7 @@ macro bool is_ref_indexable($Type) @const

 macro bool is_intlike($Type) @const
 {
-	$switch ($Type.kindof)
+	$switch $Type.kindof:
 		$case SIGNED_INT:
 		$case UNSIGNED_INT:
 			return true;
@@ -185,7 +199,7 @@ macro bool is_intlike($Type) @const

 macro bool is_underlying_int($Type) @const
 {
-	$switch ($Type.kindof)
+	$switch $Type.kindof:
 		$case SIGNED_INT:
 		$case UNSIGNED_INT:
 			return true;
@@ -200,7 +214,7 @@ macro bool is_float($Type) @const  => $Type.kindof == TypeKind.FLOAT;

 macro bool is_floatlike($Type) @const
 {
-	$switch ($Type.kindof)
+	$switch $Type.kindof:
 		$case FLOAT:
 			return true;
 		$case VECTOR:
@@ -240,7 +254,7 @@ macro bool @has_same(#a, #b, ...) @const
 	$if $type_a != @typeid(#b):
 		return false;
 	$endif
-	$for (var $i = 0; $i < $vacount; $i++)
+	$for var $i = 0; $i < $vacount; $i++:
 		$if @typeid($vaexpr[$i]) != $type_a:
 			return false;
 		$endif
@@ -250,7 +264,7 @@ macro bool @has_same(#a, #b, ...) @const

 macro bool may_load_atomic($Type) @const
 {
-	$switch ($Type.kindof)
+	$switch $Type.kindof:
 	$case BOOL:
 	$case SIGNED_INT:
 	$case UNSIGNED_INT:
@@ -266,15 +280,16 @@ macro bool may_load_atomic($Type) @const

 macro lower_to_atomic_compatible_type($Type) @const
 {
-	$switch ($Type.kindof)
-	$case SIGNED_INT:
-	  $case UNSIGNED_INT:
-	  return $Type.typeid;
+	$switch $Type.kindof:
+		$case BOOL:
+		$case SIGNED_INT:
+		$case UNSIGNED_INT:
+	        return $Type.typeid;
 		$case DISTINCT:
 			return lower_to_atomic_compatible_type($Type.inner);
 		$case FLOAT:
-			$switch ($Type)
-				$case float16: 
+			$switch $Type:
+				$case float16:
 					return ushort.typeid;
 				$case float: 
 					return uint.typeid;
@@ -319,11 +334,6 @@ macro bool implements_copy($Type) @const
 	return $defined($Type.copy) && $defined($Type.free);
 }

-macro bool is_equatable_value(value) @deprecated
-{
-	return is_equatable_type($typeof(value));
-}
-
 macro bool @equatable_value(#value) @const
 {
 	return is_equatable_type($typeof(#value));
@@ -338,15 +348,6 @@ macro bool @comparable_value(#value) @const
 	$endif
 }

-macro bool is_comparable_value(value) @deprecated
-{
-	$if $defined(value.less) || $defined(value.compare_to):
-		return true;
-	$else
-		return $typeof(value).is_ordered;
-	$endif
-}
-
 enum TypeKind : char
 {
 	VOID,
@@ -355,10 +356,9 @@ enum TypeKind : char
 	UNSIGNED_INT,
 	FLOAT,
 	TYPEID,
-	ANYFAULT,
+	FAULT,
 	ANY,
 	ENUM,
-	FAULT,
 	STRUCT,
 	UNION,
 	BITSTRUCT,
--- a/lib/std/core/values.c3
+++ b/lib/std/core/values.c3
@@ -33,7 +33,7 @@ macro promote_int(x)

 This acts like `$bool ? #value_1 : #value_2` but at compile time.

- @param $bool `true for picking the first value, false for the other`
+ @param $bool : `true for picking the first value, false for the other`
 @param #value_1
 @param #value_2
 @returns `The selected value.`
@@ -49,7 +49,7 @@ macro @select(bool $bool, #value_1, #value_2) @builtin
 macro promote_int_same(x, y)
 {
 	$if @is_int(x):
-		$switch
+		$switch:
 		$case @is_vector(y) &&& $typeof(y).inner == float.typeid:
 			return (float)x;
 		$case $typeof(y).typeid == float.typeid:
--- a/lib/std/crypto/rc4.c3
+++ b/lib/std/crypto/rc4.c3
@@ -12,8 +12,8 @@ struct Rc4
 <*
 Initialize the RC4 state.

- @param [in] key "The key to use"
- @require key.len > 0 "The key must be at least 1 byte long"
+ @param [in] key : "The key to use"
+ @require key.len > 0 : "The key must be at least 1 byte long"
 *>
 fn void Rc4.init(&self, char[] key)
 {
@@ -43,9 +43,9 @@ fn void crypt(char[] key, char[] data)
 <*
 Encrypt or decrypt a sequence of bytes.

- @param [in] in "The input"
- @param [out] out "The output"
- @require in.len <= out.len "Output would overflow"
+ @param [in] in : "The input"
+ @param [out] out : "The output"
+ @require in.len <= out.len : "Output would overflow"
 *>
 fn void Rc4.crypt(&self, char[] in, char[] out)
 {
@@ -67,7 +67,7 @@ fn void Rc4.crypt(&self, char[] in, char[] out)
 <*
 Clear the rc4 state.

- @param [&out] self "The RC4 State"
+ @param [&out] self : "The RC4 State"
 *>
 fn void Rc4.destroy(&self)
 {
--- a/lib/std/encoding/base32.c3
+++ b/lib/std/encoding/base32.c3
@@ -14,13 +14,13 @@ const char DEFAULT_PAD = '=';

 <*
 Encode the content of src into a newly allocated string
- @param [in] src "The input to be encoded."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require padding < 0xFF "Invalid padding character"
+ @param [in] src : "The input to be encoded."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The encoded string."
 *>
-fn String! encode(char[] src, Allocator allocator, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
+fn String? encode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
 {
 	char[] dst = allocator::alloc_array(allocator, char, encode_len(src.len, padding));
 	return encode_buffer(src, dst, padding, alphabet);
@@ -28,28 +28,26 @@ fn String! encode(char[] src, Allocator allocator, char padding = DEFAULT_PAD, B

 <*
 Decode the content of src into a newly allocated char array.
- @param [in] src "The input to be encoded."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require padding < 0xFF "Invalid padding character"
+ @param [in] src : "The input to be encoded."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The decoded data."
 *>
-fn char[]! decode(char[] src, Allocator allocator, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
+fn char[]? decode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
 {
 	char[] dst = allocator::alloc_array(allocator, char, decode_len(src.len, padding));
 	return decode_buffer(src, dst, padding, alphabet);
 }

-fn String! encode_new(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => encode(code, allocator::heap(), padding, alphabet);
-fn String! encode_temp(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => encode(code, allocator::temp(), padding, alphabet);
-fn char[]! decode_new(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => decode(code, allocator::heap(), padding, alphabet);
-fn char[]! decode_temp(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => decode(code, allocator::temp(), padding, alphabet);
+fn String? tencode(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => encode(tmem, code, padding, alphabet);
+fn char[]? tdecode(char[] code, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD) @inline => decode(tmem, code, padding, alphabet);

 <*
 Calculate the length in bytes of the decoded data.
- @param n "Length in bytes of input."
- @param padding "The padding character or 0 if none"
- @require padding < 0xFF "Invalid padding character"
+ @param n : "Length in bytes of input."
+ @param padding : "The padding character or 0 if none"
+ @require padding < 0xFF : "Invalid padding character"
 @return "Length in bytes of the decoded data."
 *>
 fn usz decode_len(usz n, char padding)
@@ -62,9 +60,9 @@ fn usz decode_len(usz n, char padding)

 <*
 Calculate the length in bytes of the encoded data.
- @param n "Length in bytes on input."
- @param padding "The padding character or 0 if none"
- @require padding < 0xFF "Invalid padding character"
+ @param n : "Length in bytes on input."
+ @param padding : "The padding character or 0 if none"
+ @require padding < 0xFF : "Invalid padding character"
 @return "Length in bytes of the encoded data."
 *>
 fn usz encode_len(usz n, char padding)
@@ -79,16 +77,16 @@ fn usz encode_len(usz n, char padding)

 <*
 Decode the content of src into dst, which must be properly sized.
- @param src "The input to be decoded."
- @param dst "The decoded input."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require padding < 0xFF "Invalid padding character"
- @require dst.len >= decode_len(src.len, padding) "Destination buffer too small"
+ @param src : "The input to be decoded."
+ @param dst : "The decoded input."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require padding < 0xFF : "Invalid padding character"
+ @require dst.len >= decode_len(src.len, padding) : "Destination buffer too small"
 @return "The resulting dst buffer"
- @return! DecodingFailure
+ @return? encoding::INVALID_PADDING, encoding::INVALID_CHARACTER
 *>
-fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
+fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
 {
 	if (src.len == 0) return dst[:0];
 	char* dst_ptr = dst;
@@ -103,12 +101,12 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 		{
 			if (src.len == 0)
 			{
-				if (padding > 0) return DecodingFailure.INVALID_PADDING?;
+				if (padding > 0) return encoding::INVALID_PADDING?;
 				break;
 			}
 			if (src[0] == padding) break;
 			buf[i] = alphabet.reverse[src[0]];
-			if (buf[i] == INVALID) return DecodingFailure.INVALID_CHARACTER?;
+			if (buf[i] == INVALID) return encoding::INVALID_CHARACTER?;
 			src = src[1..];
 		}

@@ -152,7 +150,7 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 				dst[0] = buf[1] >> 2 | buf[0] << 3;
 				n++;
 			default:
-				return DecodingFailure.INVALID_CHARACTER?;
+				return encoding::INVALID_CHARACTER?;
 		}
 		if (dst.len < 5) break;
 		dst = dst[5..];
@@ -162,12 +160,12 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas

 <*
 Encode the content of src into dst, which must be properly sized.
- @param [in] src "The input to be encoded."
- @param [inout] dst "The encoded input."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require padding < 0xFF "Invalid padding character"
- @require dst.len >= encode_len(src.len, padding) "Destination buffer too small"
+ @param [in] src : "The input to be encoded."
+ @param [inout] dst : "The encoded input."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require padding < 0xFF : "Invalid padding character"
+ @require dst.len >= encode_len(src.len, padding) : "Destination buffer too small"
 @return "The encoded size."
 *>
 fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base32Alphabet* alphabet = &STANDARD)
@@ -244,138 +242,7 @@ const char INVALID @private = 0xff;
 const int STD_PADDING = '=';
 const int NO_PADDING = -1;

-fault Base32Error
-{
-	DUPLICATE_IN_ALPHABET,
-	PADDING_IN_ALPHABET,
-	INVALID_CHARACTER_IN_ALPHABET,
-	DESTINATION_TOO_SMALL,
-	INVALID_PADDING,
-	CORRUPT_INPUT
-}
-
-struct Base32Encoder @deprecated
-{
-	Base32Alphabet alphabet;
-	char padding;
-}
-
-<*
- @param encoder "The 32-character alphabet for encoding."
- @param padding "Set to a negative value to disable padding."
- @require padding < 256
-*>
-fn void! Base32Encoder.init(&self, Alphabet encoder = STD_ALPHABET, int padding = STD_PADDING)
-{
-	encoder.validate(padding)!;
-	*self = { .alphabet = { .encoding = (char[32])encoder }, .padding = padding < 0 ? (char)0 : (char)padding};
-}
-
-<*
- Calculate the length in bytes of the encoded data.
- @param n "Length in bytes on input."
- @return "Length in bytes of the encoded data."
-*>
-fn usz Base32Encoder.encode_len(&self, usz n)
-{
-	return encode_len(n, self.padding);
-}
-
-<*
- Encode the content of src into dst, which must be properly sized.
- @param [in] src "The input to be encoded."
- @param [inout] dst "The encoded input."
- @return "The encoded size."
- @return! Base32Error.DESTINATION_TOO_SMALL
-*>
-fn usz! Base32Encoder.encode(&self, char[] src, char[] dst)
-{
-	usz dn = self.encode_len(src.len);
-	if (dst.len < dn) return Base32Error.DESTINATION_TOO_SMALL?;
-	return encode_buffer(src, dst, self.padding, &self.alphabet).len;
-}
-
-struct Base32Decoder @deprecated
-{
-	Base32Alphabet alphabet;
-	char padding;
-}
-
-<*
- @param decoder "The alphabet used for decoding."
- @param padding "Set to a negative value to disable padding."
- @require padding < 256
-*>
-fn void! Base32Decoder.init(&self, Alphabet decoder = STD_ALPHABET, int padding = STD_PADDING)
-{
-	decoder.validate(padding)!;
-	*self = { .alphabet = { .encoding = (char[32])decoder }, .padding = padding < 0 ? (char)0 : (char)padding };
-
-	self.alphabet.reverse[..] = INVALID;
-	foreach (char i, c : decoder)
-	{
-		self.alphabet.reverse[c] = i;
-	}
-}
-
-<*
- Calculate the length in bytes of the decoded data.
- @param n "Length in bytes of input."
- @return "Length in bytes of the decoded data."
-*>
-fn usz Base32Decoder.decode_len(&self, usz n)
-{
-	return decode_len(n, self.padding);
-}
-
-<*
- Decode the content of src into dst, which must be properly sized.
- @param src "The input to be decoded."
- @param dst "The decoded input."
- @return "The decoded size."
- @return! Base32Error.DESTINATION_TOO_SMALL, Base32Error.CORRUPT_INPUT
-*>
-fn usz! Base32Decoder.decode(&self, char[] src, char[] dst)
-{
-	if (src.len == 0) return 0;
-	usz dn = self.decode_len(src.len);
-	if (dst.len < dn) return Base32Error.DESTINATION_TOO_SMALL?;
-	return decode_buffer(src, dst, self.padding, &self.alphabet).len;
-}
-
-
-// Validate the 32-character alphabet to make sure that no character occurs
-// twice and that the padding is not present in the alphabet.
-fn void! Alphabet.validate(&self, int padding)
-{
-	bool[256] checked;
-	foreach (c : self)
-	{
-		if (checked[c])
-		{
-			return Base32Error.DUPLICATE_IN_ALPHABET?;
-		}
-		checked[c] = true;
-		if (c == '\r' || c == '\n')
-		{
-			return Base32Error.INVALID_CHARACTER_IN_ALPHABET?;
-		}
-	}
-	if (padding >= 0)
-	{
-		char pad = (char)padding;
-		if (pad == '\r' || pad == '\n')
-		{
-			return Base32Error.INVALID_PADDING?;
-		}
-		if (checked[pad])
-		{
-			return Base32Error.PADDING_IN_ALPHABET?;
-		}
-	}
-}
-
-distinct Alphabet = char[32];
+typedef Alphabet = char[32];
 // Standard base32 Alphabet
 const Alphabet STD_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 // Extended Hex Alphabet
--- a/lib/std/encoding/base64.c3
+++ b/lib/std/encoding/base64.c3
@@ -43,29 +43,27 @@ const Base64Alphabet URL = {
 const STD_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 const URL_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";

-fn String encode(char[] src, Allocator allocator, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+fn String encode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
 {
 	char[] dst = allocator::alloc_array(allocator, char, encode_len(src.len, padding));
 	return encode_buffer(src, dst, padding, alphabet);
 }

-fn char[]! decode(char[] src, Allocator allocator, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+fn char[]? decode(Allocator allocator, char[] src, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
 {
 	char[] dst = allocator::alloc_array(allocator, char, decode_len(src.len, padding))!;
 	return decode_buffer(src, dst, padding, alphabet);
 }

-fn String encode_new(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => encode(code, allocator::heap(), padding, alphabet);
-fn String encode_temp(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => encode(code, allocator::temp(), padding, alphabet);
-fn char[]! decode_new(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => decode(code, allocator::heap(), padding, alphabet);
-fn char[]! decode_temp(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => decode(code, allocator::temp(), padding, alphabet);
+fn String tencode(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => encode(tmem, code, padding, alphabet);
+fn char[]? tdecode(char[] code, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD) @inline => decode(tmem, code, padding, alphabet);


 <*
 Calculate the size of the encoded data.
- @param n "Size of the input to be encoded."
- @param padding "The padding character or 0 if none"
- @require padding < 0xFF "Invalid padding character"
+ @param n : "Size of the input to be encoded."
+ @param padding : "The padding character or 0 if none"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The size of the input once encoded."
 *>
 fn usz encode_len(usz n, char padding)
@@ -77,35 +75,34 @@ fn usz encode_len(usz n, char padding)

 <*
 Calculate the size of the decoded data.
- @param n "Size of the input to be decoded."
- @param padding "The padding character or 0 if none"
- @require padding < 0xFF "Invalid padding character"
+ @param n : "Size of the input to be decoded."
+ @param padding : "The padding character or 0 if none"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The size of the input once decoded."
- @return! DecodingFailure.INVALID_PADDING
+ @return? encoding::INVALID_PADDING
 *>
-fn usz! decode_len(usz n, char padding)
+fn usz? decode_len(usz n, char padding)
 {
 	usz dn = n / 4 * 3;
 	usz trailing = n % 4;
 	if (padding)
 	{
-		if (trailing != 0) return DecodingFailure.INVALID_PADDING?;
+		if (trailing != 0) return encoding::INVALID_PADDING?;
 		// source size is multiple of 4
 		return dn;
 	}
-	if (trailing == 1) return DecodingFailure.INVALID_PADDING?;
+	if (trailing == 1) return encoding::INVALID_PADDING?;
 	return dn + trailing * 3 / 4;
 }

 <*
 Encode the content of src into dst, which must be properly sized.
- @param src "The input to be encoded."
- @param dst "The encoded input."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require padding < 0xFF "Invalid padding character"
+ @param src : "The input to be encoded."
+ @param dst : "The encoded input."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The encoded size."
- @return! Base64Error.DESTINATION_TOO_SMALL
 *>
 fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
 {
@@ -159,16 +156,16 @@ fn String encode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base

 <*
 Decode the content of src into dst, which must be properly sized.
- @param src "The input to be decoded."
- @param dst "The decoded input."
- @param padding "The padding character or 0 if none"
- @param alphabet "The alphabet to use"
- @require (decode_len(src.len, padding) ?? 0) <= dst.len "Destination buffer too small"
- @require padding < 0xFF "Invalid padding character"
+ @param src : "The input to be decoded."
+ @param dst : "The decoded input."
+ @param padding : "The padding character or 0 if none"
+ @param alphabet : "The alphabet to use"
+ @require (decode_len(src.len, padding) ?? 0) <= dst.len : "Destination buffer too small"
+ @require padding < 0xFF : "Invalid padding character"
 @return "The decoded data."
- @return! DecodingFailure
+ @return? encoding::INVALID_CHARACTER, encoding::INVALID_PADDING
 *>
-fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
+fn char[]? decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Base64Alphabet* alphabet = &STANDARD)
 {
 	if (src.len == 0) return dst[:0];
 	usz dn = decode_len(src.len, padding)!;
@@ -199,7 +196,7 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 			case c1:
 			case c2:
 			case c3:
-				return DecodingFailure.INVALID_CHARACTER?;
+				return encoding::INVALID_CHARACTER?;
 		}
 		uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6 | (uint)c3;
 		dst[0] = (char)(group >> 16);
@@ -214,7 +211,7 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 	src = src[^trailing..];
 	char c0 = alphabet.reverse[src[0]];
 	char c1 = alphabet.reverse[src[1]];
-	if (c0 == 0xFF || c1 == 0xFF) return DecodingFailure.INVALID_PADDING?;
+	if (c0 == 0xFF || c1 == 0xFF) return encoding::INVALID_PADDING?;
 	if (!padding)
 	{
 		switch (src.len)
@@ -224,7 +221,7 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 				dst[0] = (char)(group >> 16);
 			case 3:
 				char c2 = alphabet.reverse[src[2]];
-				if (c2 == 0xFF) return DecodingFailure.INVALID_CHARACTER?;
+				if (c2 == 0xFF) return encoding::INVALID_CHARACTER?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6;
 				dst[0] = (char)(group >> 16);
 				dst[1] = (char)(group >> 8);
@@ -238,13 +235,13 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas
 		switch (padding)
 		{
 			case src[2]:
-				if (src[3] != padding) return DecodingFailure.INVALID_PADDING?;
+				if (src[3] != padding) return encoding::INVALID_PADDING?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12;
 				dst[0] = (char)(group >> 16);
 				dn -= 2;
 			case src[3]:
 				char c2 = alphabet.reverse[src[2]];
-				if (c2 == 0xFF) return DecodingFailure.INVALID_CHARACTER?;
+				if (c2 == 0xFF) return encoding::INVALID_CHARACTER?;
 				uint group = (uint)c0 << 18 | (uint)c1 << 12 | (uint)c2 << 6;
 				dst[0] = (char)(group >> 16);
 				dst[1] = (char)(group >> 8);
@@ -256,146 +253,3 @@ fn char[]! decode_buffer(char[] src, char[] dst, char padding = DEFAULT_PAD, Bas

 const MASK @private = 0b111111;

-struct Base64Encoder @deprecated
-{
-	char padding;
-	String alphabet;
-}
-
-fault Base64Error
-{
-	DUPLICATE_IN_ALPHABET,
-	PADDING_IN_ALPHABET,
-	DESTINATION_TOO_SMALL,
-	INVALID_PADDING,
-	INVALID_CHARACTER,
-}
-
-<*
- @param alphabet "The alphabet used for encoding."
- @param padding "Set to a negative value to disable padding."
- @require alphabet.len == 64
- @require padding < 256
- @return! Base64Error.DUPLICATE_IN_ALPHABET, Base64Error.PADDING_IN_ALPHABET
-*>
-fn Base64Encoder*! Base64Encoder.init(&self, String alphabet, int padding = '=')
-{
-	check_alphabet(alphabet, padding)!;
-	*self = { .padding = padding < 0 ? 0 : (char)padding, .alphabet = alphabet };
-	return self;
-}
-
-<*
- Calculate the size of the encoded data.
- @param n "Size of the input to be encoded."
- @return "The size of the input once encoded."
-*>
-fn usz Base64Encoder.encode_len(&self, usz n)
-{
-	return encode_len(n, self.padding);
-}
-
-<*
- Encode the content of src into dst, which must be properly sized.
- @param src "The input to be encoded."
- @param dst "The encoded input."
- @return "The encoded size."
- @return! Base64Error.DESTINATION_TOO_SMALL
-*>
-fn usz! Base64Encoder.encode(&self, char[] src, char[] dst)
-{
-	if (src.len == 0) return 0;
-	usz dn = self.encode_len(src.len);
-	if (dst.len < dn) return Base64Error.DESTINATION_TOO_SMALL?;
-	Base64Alphabet a = { .encoding = self.alphabet[:64] };
-	return encode_buffer(src, dst, self.padding, &a).len;
-}
-
-struct Base64Decoder @deprecated
-{
-	char padding;
-	Base64Alphabet encoding;
-	bool init_done;
-}
-
-import std;
-<*
- @param alphabet "The alphabet used for encoding."
- @param padding "Set to a negative value to disable padding."
- @require alphabet.len == 64
- @require padding < 256
- @return! Base64Error.DUPLICATE_IN_ALPHABET, Base64Error.PADDING_IN_ALPHABET
-*>
-fn void! Base64Decoder.init(&self, String alphabet, int padding = '=')
-{
-	self.init_done = true;
-	check_alphabet(alphabet, padding)!;
-	*self = { .padding = padding < 0 ? 0 : (char)padding, .encoding.encoding = alphabet[:64] };
-
-	self.encoding.reverse[..] = 0xFF;
-
-	foreach (i, c : alphabet)
-	{
-		self.encoding.reverse[c] = (char)i;
-	}
-}
-
-<*
- Calculate the size of the decoded data.
- @param n "Size of the input to be decoded."
- @return "The size of the input once decoded."
- @return! Base64Error.INVALID_PADDING
-*>
-fn usz! Base64Decoder.decode_len(&self, usz n)
-{
-	return decode_len(n, self.padding) ?? Base64Error.INVALID_PADDING?;
-}
-
-<*
- Decode the content of src into dst, which must be properly sized.
- @param src "The input to be decoded."
- @param dst "The decoded input."
- @return "The decoded size."
- @return! Base64Error.DESTINATION_TOO_SMALL, Base64Error.INVALID_PADDING, Base64Error.INVALID_CHARACTER
-*>
-fn usz! Base64Decoder.decode(&self, char[] src, char[] dst)
-{
-	if (src.len == 0) return 0;
-	usz dn = self.decode_len(src.len)!;
-	if (dst.len < dn) return Base64Error.DESTINATION_TOO_SMALL?;
-	char[]! decoded = decode_buffer(src, dst, self.padding, &self.encoding);
-	if (catch err = decoded)
-	{
-		case DecodingFailure.INVALID_PADDING:
-			return Base64Error.INVALID_PADDING?;
-		case DecodingFailure.INVALID_CHARACTER:
-			return Base64Error.INVALID_CHARACTER?;
-		default:
-			return err?;
-	}
-	return decoded.len;
-}
-
-// Make sure that all bytes in the alphabet are unique and
-// the padding is not present in the alphabet.
-fn void! check_alphabet(String alphabet, int padding) @local
-{
-	bool[256] checked;
-	if (padding < 0)
-	{
-		foreach (c : alphabet)
-		{
-			if (checked[c]) return Base64Error.DUPLICATE_IN_ALPHABET?;
-			checked[c] = true;
-		}
-		return;
-	}
-	char pad = (char)padding;
-	foreach (c : alphabet)
-	{
-		if (c == pad) return Base64Error.PADDING_IN_ALPHABET?;
-		if (checked[c]) return Base64Error.DUPLICATE_IN_ALPHABET?;
-		checked[c] = true;
-	}
-}
-
--- a/lib/std/encoding/csv.c3
+++ b/lib/std/encoding/csv.c3
@@ -15,7 +15,7 @@ struct CsvRow (Printable)
 	Allocator allocator;
 }

-fn usz! CsvRow.to_format(&self, Formatter* f) @dynamic
+fn usz? CsvRow.to_format(&self, Formatter* f) @dynamic
 {
 	return f.printf("%s", self.list);
 }
@@ -38,30 +38,24 @@ fn void CsvReader.init(&self, InStream stream, String separator = ",")
 	self.stream = stream;
 	self.separator = separator;
 }
-
-fn CsvRow! CsvReader.read_new_row(self)
-{
-	return self.read_row(allocator::heap()) @inline;
-}
-
 <*
 @param [&inout] allocator
 *>
-fn CsvRow! CsvReader.read_row(self, Allocator allocator)
+fn CsvRow? CsvReader.read_row(self, Allocator allocator)
 {
-	String row = io::readline(self.stream, allocator: allocator)!;
+	String row = io::readline(allocator, self.stream)!;
 	defer catch allocator::free(allocator, row);
-	String[] list = row.split(self.separator, allocator: allocator);
+	String[] list = row.split(allocator, self.separator);
 	return { list, row, allocator };
 }

-fn CsvRow! CsvReader.read_temp_row(self)
+fn CsvRow? CsvReader.tread_row(self)
 {
-	return self.read_row(allocator::temp()) @inline;
+	return self.read_row(tmem) @inline;
 }

 <*
- @require self.allocator != null  `Row already freed`
+ @require self.allocator != null  : `Row already freed`
 *>
 fn void CsvRow.free(&self)
 {
@@ -70,26 +64,32 @@ fn void CsvRow.free(&self)
 	self.allocator = null;
 }

-fn void! CsvReader.skip_row(self) @maydiscard => @pool()
+fn void? CsvReader.skip_row(self) @maydiscard => @pool()
 {
 	(void)io::treadline(self.stream);
 }

-macro void! CsvReader.@each_row(self, int rows = int.max; @body(String[] row)) @maydiscard
+macro void? @each_row(InStream stream, String separator = ",", int max_rows = int.max; @body(String[] row)) @maydiscard
 {
-	InStream stream = self.stream;
-	String sep = self.separator;
-	while (rows--)
+	while (max_rows--)
 	{
-		@stack_mem(512; Allocator mem)
+		@stack_mem(512; mem)
 		{
-			String! s = io::readline(stream, mem);
+			String? s = io::readline(mem, stream);
 			if (catch err = s)
 			{
-				if (err == IoError.EOF) return;
+				if (err == io::EOF) return;
 				return err?;
 			}
-			@body(s.split(sep, allocator: mem));
+			@body(s.split(mem, separator));
 		};
 	}
+}
+
+macro void? CsvReader.@each_row(self, int rows = int.max; @body(String[] row)) @maydiscard
+{
+	return @each_row(self.stream, self.separator, rows; row)
+	{
+		@body(row);
+	};
 }
--- a/lib/std/encoding/encoding.c3
+++ b/lib/std/encoding/encoding.c3
@@ -1,7 +1,3 @@
 module std::encoding;

-fault DecodingFailure
-{
-	INVALID_CHARACTER,
-	INVALID_PADDING,
-}
+faultdef INVALID_CHARACTER, INVALID_PADDING;
--- a/lib/std/encoding/hex.c3
+++ b/lib/std/encoding/hex.c3
@@ -8,41 +8,40 @@ fn String encode_buffer(char[] code, char[] buffer)
 	return (String)buffer[:encode_bytes(code, buffer)];
 }

-fn char[]! decode_buffer(char[] code, char[] buffer)
+fn char[]? decode_buffer(char[] code, char[] buffer)
 {
 	return buffer[:decode_bytes(code, buffer)!];
 }

-fn String encode(char[] code, Allocator allocator)
+fn String encode(Allocator allocator, char[] code)
 {
 	char[] data = allocator::alloc_array(allocator, char, encode_len(code.len));
 	return (String)data[:encode_bytes(code, data)];
 }

-fn char[]! decode(char[] code, Allocator allocator)
+fn char[]? decode(Allocator allocator, char[] code)
 {
 	char[] data = allocator::alloc_array(allocator, char, decode_len(code.len));
 	return data[:decode_bytes(code, data)!];
 }

-fn String encode_new(char[] code) @inline => encode(code, allocator::heap());
-fn String encode_temp(char[] code) @inline => encode(code, allocator::temp());
-fn char[]! decode_new(char[] code) @inline => decode(code, allocator::heap());
-fn char[]! decode_temp(char[] code) @inline => decode(code, allocator::temp());
+fn String tencode(char[] code) @inline => encode(tmem, code);
+fn char[]? tdecode(char[] code) @inline => decode(tmem, code);
+

 <*
 Calculate the size of the encoded data.
- @param n "Size of the input to be encoded."
+ @param n : "Size of the input to be encoded."
 @return "The size of the input once encoded."
 *>
 fn usz encode_len(usz n) => n * 2;

 <*
 Encode the content of src into dst, which must be properly sized.
- @param src "The input to be encoded."
- @param dst "The encoded input."
+ @param src : "The input to be encoded."
+ @param dst : "The encoded input."
 @return "The encoded size."
- @require dst.len >= encode_len(src.len) "Destination array is not large enough"
+ @require dst.len >= encode_len(src.len) : "Destination array is not large enough"
 *>
 fn usz encode_bytes(char[] src, char[] dst)
 {
@@ -58,7 +57,7 @@ fn usz encode_bytes(char[] src, char[] dst)

 <*
 Calculate the size of the decoded data.
- @param n "Size of the input to be decoded."
+ @param n : "Size of the input to be decoded."
 @return "The size of the input once decoded."
 *>
 macro usz decode_len(usz n) => n / 2;
@@ -69,28 +68,28 @@ macro usz decode_len(usz n) => n / 2;
 Expects that src only contains hexadecimal characters and that src has even
 length.

- @param src "The input to be decoded."
- @param dst "The decoded input."
- @require src.len % 2 == 0 "src is not of even length"
- @require dst.len >= decode_len(src.len) "Destination array is not large enough"
- @return! DecodingFailure.INVALID_CHARACTER
+ @param src : "The input to be decoded."
+ @param dst : "The decoded input."
+ @require src.len % 2 == 0 : "src is not of even length"
+ @require dst.len >= decode_len(src.len) : "Destination array is not large enough"
+ @return? encoding::INVALID_CHARACTER
 *>
-fn usz! decode_bytes(char[] src, char[] dst)
+fn usz? decode_bytes(char[] src, char[] dst)
 {
 	usz i;
 	for (usz j = 1; j < src.len; j += 2)
 	{
 		char a = HEXREVERSE[src[j - 1]];
 		char b = HEXREVERSE[src[j]];
-		if (a > 0x0f || b > 0x0f) return DecodingFailure.INVALID_CHARACTER?;
+		if (a > 0x0f || b > 0x0f) return encoding::INVALID_CHARACTER?;
 		dst[i] = (a << 4) | b;
 		i++;
 	}
 	return i;
 }

-const char[?] HEXALPHABET @private = "0123456789abcdef";
-const char[?] HEXREVERSE @private =
+const char[*] HEXALPHABET @private = "0123456789abcdef";
+const char[*] HEXREVERSE @private =
 x`ffffffffffffffffffffffffffffffff
  ffffffffffffffffffffffffffffffff
  ffffffffffffffffffffffffffffffff
--- a/lib/std/encoding/json.c3
+++ b/lib/std/encoding/json.c3
@@ -3,43 +3,35 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::encoding::json;
 import std::io;
-import std::ascii;
 import std::collections::object;

-fault JsonParsingError
+faultdef UNEXPECTED_CHARACTER, INVALID_ESCAPE_SEQUENCE, DUPLICATE_MEMBERS, INVALID_NUMBER;
+
+fn Object*? parse_string(Allocator allocator, String s)
 {
-	EOF,
-	UNEXPECTED_CHARACTER,
-	INVALID_ESCAPE_SEQUENCE,
-	DUPLICATE_MEMBERS,
-	INVALID_NUMBER,
+	return parse(allocator, (ByteReader){}.init(s));
 }

-fn Object*! parse_string(String s, Allocator allocator = allocator::heap())
+fn Object*? tparse_string(String s)
 {
-	return parse((ByteReader){}.init(s), allocator);
+	return parse(tmem, (ByteReader){}.init(s));
 }

-fn Object*! temp_parse_string(String s)
+fn Object*? parse(Allocator allocator, InStream s)
 {
-	return parse((ByteReader){}.init(s), allocator::temp());
-}
-
-fn Object*! parse(InStream s, Allocator allocator = allocator::heap())
-{
-	@stack_mem(512; Allocator mem)
+	@stack_mem(512; Allocator smem)
 	{
-		JsonContext context = { .last_string = dstring::new_with_capacity(64, mem), .stream = s, .allocator = allocator };
-		@pool(allocator)
+		JsonContext context = { .last_string = dstring::new_with_capacity(smem, 64), .stream = s, .allocator = allocator };
+		@pool()
 		{
 			return parse_any(&context);
 		};
 	};
 }

-fn Object*! temp_parse(InStream s)
+fn Object*? tparse(InStream s)
 {
-	return parse(s, allocator::temp());
+	return parse(tmem, s);
 }

 // -- Implementation follows --
@@ -78,7 +70,7 @@ struct JsonContext @local
 }


-fn Object*! parse_from_token(JsonContext* context, JsonTokenType token) @local
+fn Object*? parse_from_token(JsonContext* context, JsonTokenType token) @local
 {
 	switch (token)
 	{
@@ -88,25 +80,25 @@ fn Object*! parse_from_token(JsonContext* context, JsonTokenType token) @local
 		case COMMA:
 		case RBRACE:
 		case RBRACKET:
-		case COLON: return JsonParsingError.UNEXPECTED_CHARACTER?;
+		case COLON: return UNEXPECTED_CHARACTER?;
 		case STRING: return object::new_string(context.last_string.str_view(), context.allocator);
 		case NUMBER: return object::new_float(context.last_number, context.allocator);
 		case TRUE: return object::new_bool(true);
 		case FALSE: return object::new_bool(false);
 		case NULL: return object::new_null();
-		case EOF: return JsonParsingError.EOF?;
+		case EOF: return io::EOF?;
 	}
 }
-fn Object*! parse_any(JsonContext* context) @local
+fn Object*? parse_any(JsonContext* context) @local
 {
 	return parse_from_token(context, advance(context));
 }

-fn JsonTokenType! lex_number(JsonContext *context, char c) @local
+fn JsonTokenType? lex_number(JsonContext *context, char c) @local
 {
 	@stack_mem(256; Allocator mem)
 	{
-		DString t = dstring::new_with_capacity(32, allocator: mem);
+		DString t = dstring::new_with_capacity(mem, 32);
 		bool negate = c == '-';
 		if (negate)
 		{
@@ -137,7 +129,7 @@ fn JsonTokenType! lex_number(JsonContext *context, char c) @local
 					t.append(c);
 					c = read_next(context)!;
 			}
-			if (!c.is_digit()) return JsonParsingError.INVALID_NUMBER?;
+			if (!c.is_digit()) return INVALID_NUMBER?;
 			while (c.is_digit())
 			{
 				t.append(c);
@@ -145,13 +137,13 @@ fn JsonTokenType! lex_number(JsonContext *context, char c) @local
 			}
 		}
 		pushback(context, c);
-		double! d = t.str_view().to_double() ?? JsonParsingError.INVALID_NUMBER?;
+		double? d = t.str_view().to_double() ?? INVALID_NUMBER?;
 		context.last_number = d!;
 		return NUMBER;
 	};
 }

-fn Object*! parse_map(JsonContext* context) @local
+fn Object*? parse_map(JsonContext* context) @local
 {
 	Object* map = object::new_obj(context.allocator);
 	defer catch map.free();
@@ -159,12 +151,12 @@ fn Object*! parse_map(JsonContext* context) @local

 	@stack_mem(256; Allocator mem)
 	{
-		DString temp_key = dstring::new_with_capacity(32, mem);
+		DString temp_key = dstring::new_with_capacity(mem, 32);
 		while (token != JsonTokenType.RBRACE)
 		{
-			if (token != JsonTokenType.STRING) return JsonParsingError.UNEXPECTED_CHARACTER?;
+			if (token != JsonTokenType.STRING) return UNEXPECTED_CHARACTER?;
 			DString string = context.last_string;
-			if (map.has_key(string.str_view())) return JsonParsingError.DUPLICATE_MEMBERS?;
+			if (map.has_key(string.str_view())) return DUPLICATE_MEMBERS?;
 			// Copy the key to our temp holder, since our
 			// last_string may be used in parse_any
 			temp_key.clear();
@@ -178,13 +170,13 @@ fn Object*! parse_map(JsonContext* context) @local
 				token = advance(context)!;
 				continue;
 			}
-			if (token != JsonTokenType.RBRACE) return JsonParsingError.UNEXPECTED_CHARACTER?;
+			if (token != JsonTokenType.RBRACE) return UNEXPECTED_CHARACTER?;
 		}
 		return map;
 	};
 }

-fn Object*! parse_array(JsonContext* context) @local
+fn Object*? parse_array(JsonContext* context) @local
 {
 	Object* list = object::new_obj(context.allocator);
 	defer catch list.free();
@@ -199,7 +191,7 @@ fn Object*! parse_array(JsonContext* context) @local
 			token = advance(context)!;
 			continue;
 		}
-		if (token != JsonTokenType.RBRACKET) return JsonParsingError.UNEXPECTED_CHARACTER?;
+		if (token != JsonTokenType.RBRACKET) return UNEXPECTED_CHARACTER?;
 	}
 	return list;
 }
@@ -214,7 +206,7 @@ fn void pushback(JsonContext* context, char c) @local
 	}
 }

-fn char! read_next(JsonContext* context) @local
+fn char? read_next(JsonContext* context) @local
 {
 	if (context.reached_end) return '\0';
 	if (context.pushed_back)
@@ -222,14 +214,15 @@ fn char! read_next(JsonContext* context) @local
 		context.pushed_back = false;
 		return context.current;
 	}
-	char! c = context.stream.read_byte();
+	char? c = context.stream.read_byte();
 	if (catch err = c)
 	{
-		case IoError.EOF:
+		if (err == io::EOF)
+		{
 			context.reached_end = true;
 			return '\0';
-		default:
-			return err?;
+		}
+		return err?;
 	}
 	if (c == 0)
 	{
@@ -238,7 +231,7 @@ fn char! read_next(JsonContext* context) @local
 	return c;
 }

-fn JsonTokenType! advance(JsonContext* context) @local
+fn JsonTokenType? advance(JsonContext* context) @local
 {
 	char c;
 	// Skip whitespace
@@ -286,7 +279,7 @@ fn JsonTokenType! advance(JsonContext* context) @local
 	switch (c)
 	{
 		case '\0':
-			return IoError.EOF?;
+			return io::EOF?;
 		case '{':
 			return LBRACE;
 		case '}':
@@ -314,25 +307,25 @@ fn JsonTokenType! advance(JsonContext* context) @local
 			match(context, "ull")!;
 			return NULL;
 		default:
-			return JsonParsingError.UNEXPECTED_CHARACTER?;
+			return UNEXPECTED_CHARACTER?;
 	}
 }

-fn void! match(JsonContext* context, String str) @local
+fn void? match(JsonContext* context, String str) @local
 {
 	foreach (c : str)
 	{
 		char l = read_next(context)!;
-		if (l != c) return JsonParsingError.UNEXPECTED_CHARACTER?;
+		if (l != c) return UNEXPECTED_CHARACTER?;
 	}
 }

-fn void! parse_expected(JsonContext* context, JsonTokenType token) @local
+fn void? parse_expected(JsonContext* context, JsonTokenType token) @local
 {
-	if (advance(context)! != token) return JsonParsingError.UNEXPECTED_CHARACTER?;
+	if (advance(context)! != token) return UNEXPECTED_CHARACTER?;
 }

-fn JsonTokenType! lex_string(JsonContext* context)
+fn JsonTokenType? lex_string(JsonContext* context)
 {
 	context.last_string.clear();
 	while LOOP: (true)
@@ -341,9 +334,9 @@ fn JsonTokenType! lex_string(JsonContext* context)
 		switch (c)
 		{
 			case '\0':
-				return JsonParsingError.EOF?;
+				return io::EOF?;
 			case 1..31:
-				return JsonParsingError.UNEXPECTED_CHARACTER?;
+				return UNEXPECTED_CHARACTER?;
 			case '"':
 				break LOOP;
 			case '\\':
@@ -356,9 +349,9 @@ fn JsonTokenType! lex_string(JsonContext* context)
 		switch (c)
 		{
 			case '\0':
-				return JsonParsingError.EOF?;
+				return io::EOF?;
 			case 1..31:
-				return JsonParsingError.UNEXPECTED_CHARACTER?;
+				return UNEXPECTED_CHARACTER?;
 			case '"':
 			case '\\':
 			case '/':
@@ -378,13 +371,13 @@ fn JsonTokenType! lex_string(JsonContext* context)
 				for (int i = 0; i < 4; i++)
 				{
 					c = read_next(context)!;
-					if (!c.is_xdigit()) return JsonParsingError.INVALID_ESCAPE_SEQUENCE?;
+					if (!c.is_xdigit()) return INVALID_ESCAPE_SEQUENCE?;
 					val = val << 4 + (c > '9' ? (c | 32) - 'a' + 10 : c - '0');
 				}
 				context.last_string.append_char32(val);
 				continue;
 			default:
-				 return JsonParsingError.INVALID_ESCAPE_SEQUENCE?;
+				 return INVALID_ESCAPE_SEQUENCE?;
 		}
 		context.last_string.append(c);
 	}
--- a/lib/std/experimental/FrameScheduler.c3
+++ b/lib/std/experimental/FrameScheduler.c3
@@ -1,4 +1,4 @@
-module std::experimental::scheduler(<Event>);
+module std::experimental::scheduler{Event};
 import std::collections, std::thread, std::time;

 struct DelayedSchedulerEvent @local
@@ -19,9 +19,9 @@ fn int DelayedSchedulerEvent.compare_to(self, DelayedSchedulerEvent other) @loca

 struct FrameScheduler
 {
-	PriorityQueue(<DelayedSchedulerEvent>) delayed_events;
-	List(<Event>) events;
-	List(<Event>) pending_events;
+	PriorityQueue{DelayedSchedulerEvent} delayed_events;
+	List{Event} events;
+	List{Event} pending_events;
 	bool pending;
 	Mutex mtx;
 }
@@ -71,12 +71,12 @@ fn void FrameScheduler.queue_event(&self, Event event)
 		@atomic_store(self.pending, true);
 	};
 }
-fn Event! FrameScheduler.pop_event(&self)
+fn Event? FrameScheduler.pop_event(&self)
 {
 	while (true)
 	{
 		if (try event = self.events.pop()) return event;
-    	if (!@atomic_load(self.pending)) return IteratorResult.NO_MORE_ELEMENT?;
+    	if (!@atomic_load(self.pending)) return NO_MORE_ELEMENT?;
        self.mtx.@in_lock()
        {
            self.events.add_all(&self.pending_events);
@@ -88,7 +88,7 @@ fn Event! FrameScheduler.pop_event(&self)
                self.events.push(self.delayed_events.pop()!!);
            }
            @atomic_store(self.pending, self.delayed_events.len() > 0);
-            if (!self.events.len()) return IteratorResult.NO_MORE_ELEMENT?;
+            if (!self.events.len()) return NO_MORE_ELEMENT?;
        };
 	}
 }
--- a/lib/std/hash/adler32.c3
+++ b/lib/std/hash/adler32.c3
@@ -40,7 +40,7 @@ fn uint Adler32.final(&self)
 	return (self.b << 16) | self.a;
 }

-fn uint encode(char[] data)
+fn uint hash(char[] data)
 {
 	uint a = 1;
 	uint b = 0;
--- a/lib/std/hash/crc32.c3
+++ b/lib/std/hash/crc32.c3
@@ -33,7 +33,7 @@ fn uint Crc32.final(&self)
 	return ~self.result;
 }

-fn uint encode(char[] data)
+fn uint hash(char[] data)
 {
 	uint result = ~(uint)(0);
 	foreach (char x : data)
--- a/lib/std/hash/crc64.c3
+++ b/lib/std/hash/crc64.c3
@@ -33,7 +33,7 @@ fn ulong Crc64.final(&self)
 	return self.result;
 }

-fn ulong encode(char[] data)
+fn ulong hash(char[] data)
 {
 	ulong result = (ulong)(0);
 	foreach (char x : data)
--- a/lib/std/hash/fnv32a.c3
+++ b/lib/std/hash/fnv32a.c3
@@ -3,7 +3,7 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::hash::fnv32a;

-distinct Fnv32a = uint;
+typedef Fnv32a = uint;

 const FNV32A_START @private = 0x811c9dc5;
 const FNV32A_MUL @private = 0x01000193;
@@ -30,7 +30,7 @@ macro void Fnv32a.update_char(&self, char c)
 	update(self, c);
 }

-fn uint encode(char[] data)
+fn uint hash(char[] data)
 {
 	uint h = FNV32A_START;
 	foreach (char x : data)
--- a/lib/std/hash/fnv64a.c3
+++ b/lib/std/hash/fnv64a.c3
@@ -3,7 +3,7 @@
 // a copy of which can be found in the LICENSE_STDLIB file.
 module std::hash::fnv64a;

-distinct Fnv64a = ulong;
+typedef Fnv64a = ulong;

 const FNV64A_START @private = 0xcbf29ce484222325;
 const FNV64A_MUL @private = 0x00000100000001b3;
@@ -30,7 +30,7 @@ macro void Fnv64a.update_char(&self, char c)
 	update(self, c);
 }

-fn ulong encode(char[] data)
+fn ulong hash(char[] data)
 {
 	ulong h = FNV64A_START;
 	foreach (char x : data)
--- a/lib/std/hash/hmac.c3
+++ b/lib/std/hash/hmac.c3
@@ -1,4 +1,4 @@
-module std::hash::hmac(<HashAlg, HASH_BYTES, BLOCK_BYTES>);
+module std::hash::hmac{HashAlg, HASH_BYTES, BLOCK_BYTES};
 import std::crypto;

 struct Hmac
@@ -15,8 +15,8 @@ fn char[HASH_BYTES] hash(char[] key, char[] message)
 }

 <*
- @require output.len > 0 "Output must be greater than zero"
- @require output.len < int.max / HASH_BYTES "Output is too large"
+ @require output.len > 0 : "Output must be greater than zero"
+ @require output.len < int.max / HASH_BYTES : "Output is too large"
 *>
 fn void pbkdf2(char[] pw, char[] salt, uint iterations, char[] output)
 {
@@ -93,7 +93,7 @@ macro @derive(Hmac *hmac_start, char[] salt, uint iterations, usz index, char[]
 	UIntBE be = { (uint)index };
 	hmac.update(&&bitcast(be, char[4]));
 	tmp = hmac.final();
-	out[..] = tmp;
+	out[..] = tmp[..];
 	for (int it = 1; it < iterations; it++)
 	{
 		hmac = *hmac_start;
--- a/lib/std/hash/md5.c3
+++ b/lib/std/hash/md5.c3
@@ -13,9 +13,9 @@ struct Md5
 	uint[16] block;
 }

-def HmacMd5 = Hmac(<Md5, HASH_BYTES, BLOCK_BYTES>);
-def hmac = hmac::hash(<Md5, HASH_BYTES, BLOCK_BYTES>);
-def pbkdf2 = hmac::pbkdf2(<Md5, HASH_BYTES, BLOCK_BYTES>);
+alias HmacMd5 = Hmac{Md5, HASH_BYTES, BLOCK_BYTES};
+alias hmac = hmac::hash{Md5, HASH_BYTES, BLOCK_BYTES};
+alias pbkdf2 = hmac::pbkdf2{Md5, HASH_BYTES, BLOCK_BYTES};

 fn char[HASH_BYTES] hash(char[] data)
 {
@@ -89,10 +89,10 @@ fn char[HASH_BYTES] Md5.final(&ctx)
 	body(ctx, &ctx.buffer, 64);

 	char[16] res @noinit;
-	res[0:4] = bitcast(ctx.a, char[4]);
-	res[4:4] = bitcast(ctx.b, char[4]);
-	res[8:4] = bitcast(ctx.c, char[4]);
-	res[12:4] = bitcast(ctx.d, char[4]);
+	res[0:4] = bitcast(ctx.a, char[4])[..];
+	res[4:4] = bitcast(ctx.b, char[4])[..];
+	res[8:4] = bitcast(ctx.c, char[4])[..];
+	res[12:4] = bitcast(ctx.d, char[4])[..];
 	*ctx = {};
 	return res;
 }
--- a/lib/std/hash/sha1.c3
+++ b/lib/std/hash/sha1.c3
@@ -18,9 +18,9 @@ struct Sha1
 	char[BLOCK_BYTES] buffer;
 }

-def HmacSha1 = Hmac(<Sha1, HASH_BYTES, BLOCK_BYTES>);
-def hmac = hmac::hash(<Sha1, HASH_BYTES, BLOCK_BYTES>);
-def pbkdf2 = hmac::pbkdf2(<Sha1, HASH_BYTES, BLOCK_BYTES>);
+alias HmacSha1 = Hmac{Sha1, HASH_BYTES, BLOCK_BYTES};
+alias hmac = hmac::hash{Sha1, HASH_BYTES, BLOCK_BYTES};
+alias pbkdf2 = hmac::pbkdf2{Sha1, HASH_BYTES, BLOCK_BYTES};

 fn char[HASH_BYTES] hash(char[] data)
 {
--- a/lib/std/hash/sha256.c3
+++ b/lib/std/hash/sha256.c3
@@ -34,9 +34,9 @@ struct Sha256
    char[BLOCK_SIZE] buffer;
 }

-def HmacSha256 = Hmac(<Sha256, HASH_SIZE, BLOCK_SIZE>);
-def hmac = hmac::hash(<Sha256, HASH_SIZE, BLOCK_SIZE>);
-def pbkdf2 = hmac::pbkdf2(<Sha256, HASH_SIZE, BLOCK_SIZE>);
+alias HmacSha256 = Hmac{Sha256, HASH_SIZE, BLOCK_SIZE};
+alias hmac = hmac::hash{Sha256, HASH_SIZE, BLOCK_SIZE};
+alias pbkdf2 = hmac::pbkdf2{Sha256, HASH_SIZE, BLOCK_SIZE};

 fn char[HASH_SIZE] hash(char[] data)
 {
--- a/lib/std/io/bits.c3
+++ b/lib/std/io/bits.c3
@@ -21,7 +21,7 @@ fn void BitReader.clear(&self) @inline
 @require nbits <= 8
 @require self.len + nbits <= uint.sizeof * 8
 *>
-fn char! BitReader.read_bits(&self, uint nbits)
+fn char? BitReader.read_bits(&self, uint nbits)
 {
 	uint bits = self.bits;
 	if (self.len < nbits)
@@ -54,7 +54,7 @@ fn void BitWriter.init(&self, OutStream byte_writer)
 	*self = { .writer = byte_writer };
 }

-fn void! BitWriter.flush(&self)
+fn void? BitWriter.flush(&self)
 {
 	if (self.len == 0) return;

@@ -70,7 +70,7 @@ fn void! BitWriter.flush(&self)
 <*
 @require nbits <= 32
 *>
-fn void! BitWriter.write_bits(&self, uint bits, uint nbits)
+fn void? BitWriter.write_bits(&self, uint bits, uint nbits)
 {
 	if (nbits == 0) return;
 	while (self.len + nbits > WRITER_BITS)
--- a/lib/std/io/file.c3
+++ b/lib/std/io/file.c3
@@ -9,19 +9,19 @@ struct File (InStream, OutStream)
 module std::io::file;
 import libc, std::io::path, std::io::os;

-fn File! open(String filename, String mode)
+fn File? open(String filename, String mode)
 {
 	return from_handle(os::native_fopen(filename, mode));
 }

-fn File! open_path(Path path, String mode)
+fn File? open_path(Path path, String mode)
 {
 	return from_handle(os::native_fopen(path.str_view(), mode));
 }

 fn bool exists(String file) => @pool()
 {
-	return path::exists(path::temp_new(file)) ?? false;
+	return os::native_file_or_dir_exists(file);
 }

 fn File from_handle(CFile file)
@@ -34,18 +34,26 @@ fn bool is_file(String path)
 	return os::native_is_file(path);
 }

-fn usz! get_size(String path)
+fn bool is_dir(String path)
+{
+	return os::native_is_dir(path);
+}
+
+fn usz? get_size(String path)
 {
 	return os::native_file_size(path);
 }

-fn void! delete(String filename) => os::native_remove(filename) @inline;
+fn void? delete(String filename)
+{
+	return os::native_remove(filename) @inline;
+}


 <*
 @require self.file != null
 *>
-fn void! File.reopen(&self, String filename, String mode)
+fn void? File.reopen(&self, String filename, String mode)
 {
 	self.file = os::native_freopen(self.file, filename, mode)!;
 }
@@ -53,7 +61,7 @@ fn void! File.reopen(&self, String filename, String mode)
 <*
 @require self.file != null
 *>
-fn usz! File.seek(&self, isz offset, Seek seek_mode = Seek.SET) @dynamic
+fn usz? File.seek(&self, isz offset, Seek seek_mode = Seek.SET) @dynamic
 {
 	os::native_fseek(self.file, offset, seek_mode)!;
 	return os::native_ftell(self.file);
@@ -65,11 +73,11 @@ Implement later
 <*
 @require self.file == null
 *>
-fn void! File.memopen(File* file, char[] data, String mode)
+fn void? File.memopen(File* file, char[] data, String mode)
 {
 	@pool()
 	{
-		file.file = libc::memopen(data.ptr, data.len, mode.zstr_tcopy(), file.file);
+		file.file = libc::memopen(data.ptr, data.len, mode.to_temp_zstr(), file.file);
 		// TODO errors
 	};
 }
@@ -79,7 +87,7 @@ fn void! File.memopen(File* file, char[] data, String mode)
 <*
 @require self.file != null
 *>
-fn void! File.write_byte(&self, char c) @dynamic
+fn void? File.write_byte(&self, char c) @dynamic
 {
 	return os::native_fputc(c, self.file);
 }
@@ -87,15 +95,15 @@ fn void! File.write_byte(&self, char c) @dynamic
 <*
 @param [&inout] self
 *>
-fn void! File.close(&self) @inline @dynamic
+fn void? File.close(&self) @inline @dynamic
 {
 	if (self.file && libc::fclose(self.file))
 	{
 		switch (libc::errno())
 		{
 			case errno::ECONNRESET:
-			case errno::EBADF: return IoError.FILE_NOT_VALID?;
-			case errno::EINTR: return IoError.INTERRUPTED?;
+			case errno::EBADF: return io::FILE_NOT_VALID?;
+			case errno::EINTR: return io::INTERRUPTED?;
 			case errno::EDQUOT:
 			case errno::EFAULT:
 			case errno::EAGAIN:
@@ -103,8 +111,8 @@ fn void! File.close(&self) @inline @dynamic
 			case errno::ENETDOWN:
 			case errno::ENETUNREACH:
 			case errno::ENOSPC:
-			case errno::EIO: return IoError.INCOMPLETE_WRITE?;
-			default: return IoError.UNKNOWN_ERROR?;
+			case errno::EIO: return io::INCOMPLETE_WRITE?;
+			default: return io::UNKNOWN_ERROR?;
 		}
 	}
 	self.file = null;
@@ -121,16 +129,16 @@ fn bool File.eof(&self) @inline
 <*
 @param [in] buffer
 *>
-fn usz! File.read(&self, char[] buffer) @dynamic
+fn usz? File.read(&self, char[] buffer) @dynamic
 {
 	return os::native_fread(self.file, buffer);
 }

 <*
 @param [out] buffer
- @require self.file != null `File must be initialized`
+ @require self.file != null : `File must be initialized`
 *>
-fn usz! File.write(&self, char[] buffer) @dynamic
+fn usz? File.write(&self, char[] buffer) @dynamic
 {
 	return os::native_fwrite(self.file, buffer);
 }
@@ -145,26 +153,26 @@ fn bool File.isatty(self) @if(env::LIBC)
 	return libc::isatty(self.fd()) > 0;
 }

-fn char! File.read_byte(&self) @dynamic
+fn char? File.read_byte(&self) @dynamic
 {
 	int c = libc::fgetc(self.file);
-	if (c == -1) return IoError.EOF?;
+	if (c == -1) return io::EOF?;
 	return (char)c;
 }

 <*
- Load up to buffer.len characters. Returns IoError.OVERFLOW if the file is longer
+ Load up to buffer.len characters. Returns io::OVERFLOW if the file is longer
 than the buffer.

- @param filename "The path to the file to read"
- @param [in] buffer "The buffer to read to"
+ @param filename : "The path to the file to read"
+ @param [in] buffer : "The buffer to read to"
 *>
-fn char[]! load_buffer(String filename, char[] buffer)
+fn char[]? load_buffer(String filename, char[] buffer)
 {
 	File file = open(filename, "rb")!;
 	defer (void)file.close();
 	usz len = file.seek(0, END)!;
-	if (len > buffer.len) return IoError.OVERFLOW?;
+	if (len > buffer.len) return io::OVERFLOW?;
 	file.seek(0, SET)!;
 	usz read = 0;
 	while (read < len)
@@ -175,9 +183,7 @@ fn char[]! load_buffer(String filename, char[] buffer)

 }

-fn char[]! load(Allocator allocator, String filename) => load_new(filename, allocator);
-
-fn char[]! load_new(String filename, Allocator allocator = allocator::heap())
+fn char[]? load(Allocator allocator, String filename)
 {
 	File file = open(filename, "rb")!;
 	defer (void)file.close();
@@ -193,16 +199,13 @@ fn char[]! load_new(String filename, Allocator allocator = allocator::heap())
 	return data[:len];
 }

-fn char[]! load_path_new(Path path, Allocator allocator = allocator::heap()) => load_new(path.str_view(), allocator);
+fn char[]? load_path(Allocator allocator, Path path) => load(allocator, path.str_view());

-fn char[]! load_temp(String filename)
-{
-	return load_new(filename, allocator::temp());
-}
+fn char[]? load_temp(String filename) => load(tmem, filename);

-fn char[]! load_path_temp(Path path) => load_temp(path.str_view());
+fn char[]? load_path_temp(Path path) => load_temp(path.str_view());

-fn void! save(String filename, char[] data)
+fn void? save(String filename, char[] data)
 {
 	File file = open(filename, "wb")!;
 	defer (void)file.close();
@@ -214,9 +217,9 @@ fn void! save(String filename, char[] data)
 }

 <*
- @require self.file != null `File must be initialized`
+ @require self.file != null : `File must be initialized`
 *>
-fn void! File.flush(&self) @dynamic
+fn void? File.flush(&self) @dynamic
 {
 	libc::fflush(self.file);
 }
--- a/lib/std/io/formatter.c3
+++ b/lib/std/io/formatter.c3
@@ -6,42 +6,34 @@ const int PRINTF_NTOA_BUFFER_SIZE = 256;

 interface Printable
 {
-	fn String to_string(Allocator allocator) @optional;
-	fn String to_new_string(Allocator allocator) @optional @deprecated("Use to_string");
-	fn usz! to_format(Formatter* formatter) @optional;
+	fn String to_constant_string() @optional;
+	fn usz? to_format(Formatter* formatter) @optional;
 }

-fault PrintFault
-{
-	BUFFER_EXCEEDED,
-	INTERNAL_BUFFER_EXCEEDED,
-	INVALID_FORMAT,
-	NOT_ENOUGH_ARGUMENTS,
-	INVALID_ARGUMENT,
-}
+faultdef BUFFER_EXCEEDED, INTERNAL_BUFFER_EXCEEDED, INVALID_FORMAT,
+         NOT_ENOUGH_ARGUMENTS, INVALID_ARGUMENT;

-def OutputFn = fn void!(void* buffer, char c);
-def FloatType = double;
+alias OutputFn = fn void?(void* buffer, char c);
+alias FloatType = double;


 macro bool is_struct_with_default_print($Type)
 {
 	return $Type.kindof == STRUCT
 		&&& !$defined($Type.to_format)
-		&&& !$defined($Type.to_new_string)
-		&&& !$defined($Type.to_string);
+		&&& !$defined($Type.to_constant_string);
 }

 <*
 Introspect a struct and print it to a formatter

- @require @typekind(value) == STRUCT `This macro is only valid on macros`
+ @require @typekind(value) == STRUCT : `This macro is only valid on macros`
 *>
-macro usz! struct_to_format(value, Formatter* f, bool $force_dump)
+macro usz? struct_to_format(value, Formatter* f, bool $force_dump)
 {
    var $Type = $typeof(value);
    usz total = f.print("{ ")!;
-    $foreach ($i, $member : $Type.membersof)
+    $foreach $i, $member : $Type.membersof:
        $if $i > 0:
            total += f.print(", ")!;
        $endif
@@ -58,12 +50,12 @@ macro usz! struct_to_format(value, Formatter* f, bool $force_dump)
 	return total + f.print(" }");
 }

-fn usz! ReflectedParam.to_format(&self, Formatter* f) @dynamic
+fn usz? ReflectedParam.to_format(&self, Formatter* f) @dynamic
 {
 	return f.printf("[Parameter '%s']", self.name);
 }

-fn usz! Formatter.printf(&self, String format, args...)
+fn usz? Formatter.printf(&self, String format, args...)
 {
 	return self.vprintf(format, args) @inline;
 }
@@ -78,7 +70,7 @@ struct Formatter
 		uint width;
 		uint prec;
 		usz idx;
-		anyfault first_fault;
+		fault first_fault;
 	}
 }

@@ -98,7 +90,7 @@ fn void Formatter.init(&self, OutputFn out_fn, void* data = null)
 	*self = { .data = data, .out_fn = out_fn};
 }

-fn usz! Formatter.out(&self, char c) @private
+fn usz? Formatter.out(&self, char c) @private
 {
 	if (catch err = self.out_fn(self.data, c))
 	{
@@ -109,7 +101,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)
 	{
@@ -125,7 +117,7 @@ fn usz! Formatter.print_with_function(&self, Printable arg)
 		if (!arg) return self.out_substr("(null)");
 		return arg.to_format(self);
 	}
-	if (&arg.to_string)
+	if (&arg.to_constant_string)
 	{
 		PrintFlags old = self.flags;
 		uint old_width = self.width;
@@ -137,19 +129,16 @@ fn usz! Formatter.print_with_function(&self, Printable arg)
 			self.prec = old_prec;
 		}
 		if (!arg) return self.out_substr("(null)");
-		@stack_mem(1024; Allocator mem)
-		{
-			return self.out_substr(arg.to_string(mem));
-		};
+		return self.out_substr(arg.to_constant_string());
 	}
-	return SearchResult.MISSING?;
+	return NOT_FOUND?;
 }

-fn usz! Formatter.out_unknown(&self, String category, any arg) @private
+fn usz? Formatter.out_unknown(&self, String category, any arg) @private
 {
-	return self.out_substr("[") + self.out_substr(category) + self.out_substr(" type:") + self.ntoa((iptr)arg.type, false, 16) + self.out_substr(", addr:") + self.ntoa((iptr)arg.ptr, false, 16) + self.out_substr("]");
+	return self.out_substr("<") + self.out_substr(category) + self.out_substr(" type:") + self.ntoa((iptr)arg.type, false, 16) + self.out_substr(", addr:") + self.ntoa((iptr)arg.ptr, false, 16) + self.out_substr(">");
 }
-fn usz! Formatter.out_str(&self, any arg) @private
+fn usz? Formatter.out_str(&self, any arg) @private
 {
 	switch (arg.type.kindof)
 	{
@@ -157,9 +146,8 @@ fn usz! Formatter.out_str(&self, any arg) @private
 			return self.out_substr("typeid");
 		case VOID:
 			return self.out_substr("void");
-		case ANYFAULT:
 		case FAULT:
-			return self.out_substr((*(anyfault*)arg.ptr).nameof);
+			return self.out_substr((*(fault*)arg.ptr).nameof);
 		case INTERFACE:
 		case ANY:
 			return self.out_str(*(any*)arg);
@@ -192,9 +180,9 @@ 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 (try n) return n;
-	if (@catch(n) != SearchResult.MISSING) n!;
+	if (@catch(n) != NOT_FOUND) n!;
 	switch (arg.type.kindof)
 	{
 		case ENUM:
@@ -208,7 +196,15 @@ fn usz! Formatter.out_str(&self, any arg) @private
 		case BITSTRUCT:
 			return self.out_unknown("bitstruct", arg);
 		case FUNC:
-			return self.out_unknown("function", arg);
+			PrintFlags flags = self.flags;
+			uint width = self.width;
+			defer
+			{
+				self.flags = flags;
+				self.width = width;
+			}
+			self.width = 0;
+			return self.out_substr("0x")! + self.ntoa_any(arg, 16);
 		case DISTINCT:
 			if (arg.type == String.typeid)
 			{
@@ -231,7 +227,7 @@ fn usz! Formatter.out_str(&self, any arg) @private
 				any deref = any_make(*pointer, inner);
 				n = self.print_with_function((Printable)deref);
 				if (try n) return n;
-				if (@catch(n) != SearchResult.MISSING) n!;
+				if (@catch(n) != NOT_FOUND) n!;
 			}
 			PrintFlags flags = self.flags;
 			uint width = self.width;
@@ -243,7 +239,7 @@ fn usz! Formatter.out_str(&self, any arg) @private
 			self.width = 0;
 			return self.out_substr("0x")! + self.ntoa_any(arg, 16);
 		case ARRAY:
-			// this is SomeType[?] so grab the "SomeType"
+			// this is SomeType[*] so grab the "SomeType"
 			PrintFlags flags = self.flags;
 			uint width = self.width;
 			defer
@@ -277,7 +273,7 @@ fn usz! Formatter.out_str(&self, any arg) @private
 			}
 			self.flags = {};
 			self.width = 0;
-			// this is SomeType[?] so grab the "SomeType"
+			// this is SomeType[*] so grab the "SomeType"
 			typeid inner = arg.type.inner;
 			usz size = inner.sizeof;
 			usz vlen = arg.type.len;
@@ -330,33 +326,36 @@ fn usz! Formatter.out_str(&self, any arg) @private



-fn void! out_null_fn(void* data @unused, char c @unused) @private
+fn void? out_null_fn(void* data @unused, char c @unused) @private
 {
 }

-macro usz! @report_fault(Formatter* f, $fault)
+macro usz? @report_fault(Formatter* f, $fault)
 {
 	(void)f.out_substr($fault);
-	return PrintFault.INVALID_FORMAT?;
+	return INVALID_FORMAT?;
 }

-macro usz! @wrap_bad(Formatter* f, #action)
+macro usz? @wrap_bad(Formatter* f, #action)
 {
-	usz! len = #action;
+	usz? len = #action;
 	if (catch err = len)
 	{
-		case PrintFault.BUFFER_EXCEEDED:
-		case PrintFault.INTERNAL_BUFFER_EXCEEDED:
-			return f.first_err(err)?;
-		default:
-			err = f.first_err(PrintFault.INVALID_ARGUMENT);
-			f.out_substr("<INVALID>")!;
-			return err?;
+		switch (err)
+		{
+			case BUFFER_EXCEEDED:
+        	case INTERNAL_BUFFER_EXCEEDED:
+        		return f.first_err(err)?;
+        	default:
+				err = f.first_err(INVALID_ARGUMENT);
+        		f.out_substr("<INVALID>")!;
+        		return err?;
+		}
 	}
 	return len;
 }

-fn usz! Formatter.vprintf(&self, String format, any[] anys)
+fn usz? Formatter.vprintf(&self, String format, any[] anys)
 {
 	self.first_fault = {};
 	if (!self.out_fn)
@@ -402,7 +401,7 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 			c = format[i];
 		}
 		// evaluate width field
-		int! w = printf_parse_format_field(anys.ptr, anys.len, &variant_index, format.ptr, format.len, &i);
+		int? w = printf_parse_format_field(anys.ptr, anys.len, &variant_index, format.ptr, format.len, &i);
 		if (catch w) return @report_fault(self, "%ERR");
 		c = format[i];
 		if (w < 0)
@@ -417,7 +416,7 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 		{
 			self.flags.precision = true;
 			if (++i >= format_len) return @report_fault(self, "<BAD FORMAT>");
-			int! prec = printf_parse_format_field(anys.ptr, anys.len, &variant_index, format.ptr, format.len, &i);
+			int? prec = printf_parse_format_field(anys.ptr, anys.len, &variant_index, format.ptr, format.len, &i);
 			if (catch prec) return @report_fault(self, "<BAD FORMAT>");
 			self.prec = prec < 0 ? 0 : prec;
 			c = format[i];
@@ -427,7 +426,7 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 		uint base = 0;
 		if (variant_index >= anys.len)
 		{
-			self.first_err(PrintFault.NOT_ENOUGH_ARGUMENTS);
+			self.first_err(NOT_ENOUGH_ARGUMENTS);
 			total_len += self.out_substr("<MISSING>")!;
 			continue;
 		}
@@ -484,10 +483,9 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 				nextcase;
 			case 'h':
            	char[] out @noinit;
-				switch (current)
+				switch (current.type)
 				{
 					case char[]:
-						out = *current;
 					case ichar[]:
 						out = *(char[]*)current;
 					default:
@@ -535,7 +533,7 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 				self.flags.hash = true;
 				base = 16;
 			default:
-				self.first_err(PrintFault.INVALID_FORMAT);
+				self.first_err(INVALID_FORMAT);
 				total_len += self.out_substr("<BAD FORMAT>")!;
 				continue;
 		}
@@ -559,7 +557,7 @@ fn usz! Formatter.vprintf(&self, String format, any[] anys)
 }


-fn usz! Formatter.print(&self, String str)
+fn usz? Formatter.print(&self, String str)
 {
 	if (!self.out_fn)
 	{
--- a/lib/std/io/formatter_private.c3
+++ b/lib/std/io/formatter_private.c3
@@ -4,12 +4,9 @@ import std::math;
 const char[16] XDIGITS_H = "0123456789ABCDEF";
 const char[16] XDIGITS_L = "0123456789abcdef";

-fault FormattingFault
-{
-	BAD_FORMAT
-}
+faultdef BAD_FORMAT;

-fn usz! print_hex_chars(Formatter* f, char[] out, bool uppercase) @inline
+fn usz? print_hex_chars(Formatter* f, char[] out, bool uppercase) @inline
 {
 	char past_10 = (uppercase ? 'A' : 'a') - 10;
 	usz len = 0;
@@ -25,74 +22,74 @@ fn usz! print_hex_chars(Formatter* f, char[] out, bool uppercase) @inline
 	return len;
 }

-macro Formatter.first_err(&self, anyfault f)
+macro Formatter.first_err(&self, fault f)
 {
 	if (self.first_fault) return self.first_fault;
 	self.first_fault = f;
 	return f;
 }

-fn usz! Formatter.adjust(&self, usz len) @local
+fn usz? Formatter.adjust(&self, usz len) @local
 {
 	if (!self.flags.left) return 0;
 	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)
 	{
-		case TypeKind.POINTER:
+		case FUNC:
+		case POINTER:
 			*is_neg = false;
 			return (uint128)(uptr)*(void**)arg.ptr;
-		case TypeKind.DISTINCT:
-		case TypeKind.ENUM:
+		case DISTINCT:
 			return int_from_any(arg.as_inner(), is_neg);
 		default:
 			break;
 	}
 	*is_neg = false;
-	switch (arg)
+	switch (arg.type)
 	{
 		case bool:
-			return (uint128)*arg;
+			return (uint128)*(bool*)arg;
 		case ichar:
-			int val = *arg;
+			int val = *(ichar*)arg;
 			return (*is_neg = val < 0) ? (~(uint128)val) + 1 : (uint128)val;
 		case short:
-			int val = *arg;
+			int val = *(short*)arg;
 			return (*is_neg = val < 0) ? (~(uint128)val) + 1 : (uint128)val;
 		case int:
-			int val = *arg;
+			int val = *(int*)arg;
 			return (*is_neg = val < 0) ? (~(uint128)val) + 1 : (uint128)val;
 		case long:
-			long val = *arg;
+			long val = *(long*)arg;
 			return (*is_neg = val < 0) ? (~(uint128)val) + 1 : (uint128)val;
 		case int128:
-			int128 val = *arg;
+			int128 val = *(int128*)arg;
 			return (*is_neg = val < 0) ? (~(uint128)val) + 1 : (uint128)val;
 		case char:
-			return *arg;
+			return *(char*)arg;
 		case ushort:
-			return *arg;
+			return *(ushort*)arg;
 		case uint:
-			return *arg;
+			return *(uint*)arg;
 		case ulong:
-			return *arg;
+			return *(ulong*)arg;
 		case uint128:
-			return *arg;
+			return *(uint128*)arg;
 		case float:
-			float f = *arg;
+			float f = *(float*)arg;
 			return (uint128)((*is_neg = f < 0) ? -f : f);
 		case double:
-			double d = *arg;
+			double d = *(double*)arg;
 			return (uint128)((*is_neg = d < 0) ? -d : d);
 		default:
-			return FormattingFault.BAD_FORMAT?;
+			return BAD_FORMAT?;
 	}
 }

-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);
@@ -101,36 +98,36 @@ fn FloatType! float_from_any(any arg) @private
 	{
 		return float_from_any(arg.as_inner());
 	}
-	switch (arg)
+	switch (arg.type)
 	{
 		case bool:
-			return (FloatType)*arg;
+			return (FloatType)*(bool*)arg;
 		case ichar:
-			return *arg;
+			return *(ichar*)arg;
 		case short:
-			return *arg;
+			return *(short*)arg;
 		case int:
-			return *arg;
+			return *(int*)arg;
 		case long:
-			return *arg;
+			return *(long*)arg;
 		case int128:
-			return *arg;
+			return *(int128*)arg;
 		case char:
-			return *arg;
+			return *(char*)arg;
 		case ushort:
-			return *arg;
+			return *(ushort*)arg;
 		case uint:
-			return *arg;
+			return *(uint*)arg;
 		case ulong:
-			return *arg;
+			return *(ulong*)arg;
 		case uint128:
-			return *arg;
+			return *(uint128*)arg;
 		case float:
-			return (FloatType)*arg;
+			return (FloatType)*(float*)arg;
 		case double:
-			return (FloatType)*arg;
+			return (FloatType)*(double*)arg;
 		default:
-			return FormattingFault.BAD_FORMAT?;
+			return BAD_FORMAT?;
 	}
 }

@@ -138,9 +135,9 @@ fn FloatType! float_from_any(any arg) @private
 <*
 Read a simple integer value, typically for formatting.

- @param [inout] len_ptr "the length remaining."
- @param [in] buf "the buf to read from."
- @param maxlen "the maximum len that can be read."
+ @param [inout] len_ptr : "the length remaining."
+ @param [in] buf : "the buf to read from."
+ @param maxlen : "the maximum len that can be read."
 @return "The result of the atoi."
 *>
 fn uint simple_atoi(char* buf, usz maxlen, usz* len_ptr) @inline @private
@@ -158,7 +155,7 @@ fn uint simple_atoi(char* buf, usz maxlen, usz* len_ptr) @inline @private
 	return i;
 }

-fn usz! Formatter.out_substr(&self, String str) @private
+fn usz? Formatter.out_substr(&self, String str) @private
 {
 	usz l = conv::utf8_codepoints(str);
 	uint prec = self.prec;
@@ -177,7 +174,7 @@ fn usz! Formatter.out_substr(&self, String str) @private
 	return index;
 }

-fn usz! Formatter.pad(&self, char c, isz width, isz len) @inline
+fn usz? Formatter.pad(&self, char c, isz width, isz len) @inline
 {
 	isz delta = width - len;
 	for (isz i = 0; i < delta; i++) self.out(c)!;
@@ -191,7 +188,7 @@ fn char* fmt_u(uint128 x, char* s)
 	return s;
 }

-fn usz! Formatter.out_chars(&self, char[] s)
+fn usz? Formatter.out_chars(&self, char[] s)
 {
 	foreach (c : s) self.out(c)!;
 	return s.len;
@@ -205,12 +202,12 @@ enum FloatFormatting
 	HEX
 }

-fn usz! Formatter.etoa(&self, double y) => self.floatformat(EXPONENTIAL, y);
-fn usz! Formatter.ftoa(&self, double y) => self.floatformat(FLOAT, y);
-fn usz! Formatter.gtoa(&self, double y) => self.floatformat(ADAPTIVE, y);
-fn usz! Formatter.atoa(&self, double y) => self.floatformat(HEX, y);
+fn usz? Formatter.etoa(&self, double y) => self.floatformat(EXPONENTIAL, y);
+fn usz? Formatter.ftoa(&self, double y) => self.floatformat(FLOAT, y);
+fn usz? Formatter.gtoa(&self, double y) => self.floatformat(ADAPTIVE, y);
+fn usz? Formatter.atoa(&self, double y) => self.floatformat(HEX, y);

-fn usz! Formatter.floatformat(&self, FloatFormatting formatting, double y) @private
+fn usz? Formatter.floatformat(&self, FloatFormatting formatting, double y) @private
 {
 	// This code is heavily based on musl's printf code
 	const BUF_SIZE = (math::DOUBLE_MANT_DIG + 28) / 29 + 1
@@ -285,7 +282,7 @@ fn usz! Formatter.floatformat(&self, FloatFormatting formatting, double y) @priv
 		} while (y);
 		isz outlen = s - buf;
 		isz explen = ebuf - estr;
-		if (p > int.max - 2 - explen - pl) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+		if (p > int.max - 2 - explen - pl) return INTERNAL_BUFFER_EXCEEDED?;
 		usz len;
 		usz l = p && outlen - 2 < p
 				? p + 2 + explen
@@ -453,12 +450,12 @@ fn usz! Formatter.floatformat(&self, FloatFormatting formatting, double y) @priv
 			}
 		}
 	}
-	if (p > int.max - 1 - (isz)(p || self.flags.hash)) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+	if (p > int.max - 1 - (isz)(p || self.flags.hash)) return INTERNAL_BUFFER_EXCEEDED?;
 	int l = (int)(1 + p + (isz)(p || self.flags.hash));
 	char* estr @noinit;
 	if (formatting == FLOAT)
 	{
-		if (e > int.max - l) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+		if (e > int.max - l) return INTERNAL_BUFFER_EXCEEDED?;
 		if (e > 0) l += e;
 	}
 	else
@@ -467,10 +464,10 @@ fn usz! Formatter.floatformat(&self, FloatFormatting formatting, double y) @priv
 		while (ebuf - estr < 2) (--estr)[0] = '0';
 		*--estr = (e < 0 ? '-' : '+');
 		*--estr = self.flags.uppercase ? 'E' : 'e';
-		if (ebuf - estr > (isz)int.max - l) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+		if (ebuf - estr > (isz)int.max - l) return INTERNAL_BUFFER_EXCEEDED?;
 		l += (int)(ebuf - estr);
 	}
-	if (l > int.max - pl) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+	if (l > int.max - pl) return INTERNAL_BUFFER_EXCEEDED?;
 	usz len;
 	if (!self.flags.left && !self.flags.zeropad) len += self.pad(' ', self.width, pl + l)!;
 	if (is_neg || self.flags.plus) len += self.out(is_neg ? '-' : '+')!;
@@ -528,7 +525,7 @@ fn usz! Formatter.floatformat(&self, FloatFormatting formatting, double y) @priv
 	return len;
 }

-fn usz! Formatter.ntoa(&self, uint128 value, bool negative, uint base) @private
+fn usz? Formatter.ntoa(&self, uint128 value, bool negative, uint base) @private
 {
 	char[PRINTF_NTOA_BUFFER_SIZE] buf @noinit;
 	usz len;
@@ -542,7 +539,7 @@ fn usz! Formatter.ntoa(&self, uint128 value, bool negative, uint base) @private
 		char past_10 = (self.flags.uppercase ? 'A' : 'a') - 10;
 		do
 		{
-			if (len >= PRINTF_NTOA_BUFFER_SIZE) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= PRINTF_NTOA_BUFFER_SIZE) return INTERNAL_BUFFER_EXCEEDED?;
 			char digit = (char)(value % base);
 			buf[len++] = digit + (digit < 10 ? '0' : past_10);
 			value /= base;
@@ -552,7 +549,7 @@ fn usz! Formatter.ntoa(&self, uint128 value, bool negative, uint base) @private
 	return self.ntoa_format((String)buf[:PRINTF_NTOA_BUFFER_SIZE], len, negative, base);
 }

-fn usz! Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint base) @private
+fn usz? Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint base) @private
 {
 	// pad leading zeros
 	if (!self.flags.left)
@@ -560,12 +557,12 @@ fn usz! Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint ba
 		if (self.width && self.flags.zeropad && (negative || self.flags.plus || self.flags.space)) self.width--;
 		while (len < self.prec)
 		{
-			if (len >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			buf[len++] = '0';
 		}
 		while (self.flags.zeropad && len < self.width)
 		{
-			if (len >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			buf[len++] = '0';
 		}
 	}
@@ -580,7 +577,7 @@ fn usz! Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint ba
 		}
 		if (base != 10)
 		{
-			if (len + 1 >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len + 1 >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			switch (base)
 			{
 				case 16:
@@ -599,13 +596,13 @@ fn usz! Formatter.ntoa_format(&self, String buf, usz len, bool negative, uint ba
 	switch (true)
 	{
 		case negative:
-			if (len >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			buf[len++] = '-';
 		case self.flags.plus:
-			if (len >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			buf[len++] = '+';
 		case self.flags.space:
-			if (len >= buf.len) return PrintFault.INTERNAL_BUFFER_EXCEEDED?;
+			if (len >= buf.len) return INTERNAL_BUFFER_EXCEEDED?;
 			buf[len++] = ' ';
 	}
 	if (len) self.out_reverse(buf[:len])!;
@@ -613,13 +610,13 @@ 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;
 	return self.ntoa(int_from_any(arg, &is_neg)!!, is_neg, base) @inline;
 }

-fn usz! Formatter.out_char(&self, any arg) @private
+fn usz? Formatter.out_char(&self, any arg) @private
 {
 	if (!arg.type.kindof.is_int())
 	{
@@ -653,7 +650,7 @@ fn usz! Formatter.out_char(&self, any arg) @private
 }


-fn usz! Formatter.out_reverse(&self, char[] buf) @private
+fn usz? Formatter.out_reverse(&self, char[] buf) @private
 {
 	usz n;
 	usz buffer_start_idx = self.idx;
@@ -672,7 +669,7 @@ fn usz! Formatter.out_reverse(&self, char[] buf) @private
 }


-fn int! printf_parse_format_field(
+fn int? printf_parse_format_field(
 	any* args_ptr, usz args_len, usz* args_index_ptr,
 	char* format_ptr, usz format_len, usz* index_ptr) @inline @private
 {
@@ -680,10 +677,10 @@ fn int! printf_parse_format_field(
 	if (c.is_digit()) return simple_atoi(format_ptr, format_len, index_ptr);
 	if (c != '*') return 0;
 	usz len = ++(*index_ptr);
-	if (len >= format_len) return FormattingFault.BAD_FORMAT?;
-	if (*args_index_ptr >= args_len) return FormattingFault.BAD_FORMAT?;
+	if (len >= format_len) return BAD_FORMAT?;
+	if (*args_index_ptr >= args_len) return BAD_FORMAT?;
 	any val = args_ptr[(*args_index_ptr)++];
-	if (!val.type.kindof.is_int()) return FormattingFault.BAD_FORMAT?;
-	uint! intval = types::any_to_int(val, int);
-	return intval ?? FormattingFault.BAD_FORMAT?;
+	if (!val.type.kindof.is_int()) return BAD_FORMAT?;
+	uint? intval = types::any_to_int(val, int);
+	return intval ?? BAD_FORMAT?;
 }
--- a/lib/std/io/io.c3
+++ b/lib/std/io/io.c3
@@ -11,8 +11,7 @@ enum Seek
 	END
 }

-fault IoError
-{
+faultdef
 	ALREADY_EXISTS,
 	BUSY,
 	CANNOT_READ_DIR,
@@ -41,8 +40,7 @@ fault IoError
 	UNEXPECTED_EOF,
 	UNKNOWN_ERROR,
 	UNSUPPORTED_OPERATION,
-	WOULD_BLOCK,
-}
+	WOULD_BLOCK;


 <*
@@ -50,12 +48,12 @@ fault IoError
 or to the end of the stream, whatever comes first.
 "\r" will be filtered from the String.

- @param stream `The stream to read from.`
- @require @is_instream(stream) `The stream must implement InStream.`
- @param [inout] allocator `the allocator to use.`
+ @param stream : `The stream to read from.`
+ @require @is_instream(stream) : `The stream must implement InStream.`
+ @param [inout] allocator : `the allocator to use.`
 @return `The string containing the data read.`
 *>
-macro String! readline(stream = io::stdin(), Allocator allocator = allocator::heap())
+macro String? readline(Allocator allocator, stream = io::stdin())
 {
 	bool $is_stream = @typeis(stream, InStream);
 	$if $is_stream:
@@ -66,20 +64,20 @@ macro String! readline(stream = io::stdin(), Allocator allocator = allocator::he
 	$endif

 	if (val == '\n') return "";
-	@pool(allocator)
+	@pool()
 	{
 		DString str = dstring::temp_with_capacity(256);
 		if (val != '\r') str.append(val);
 		while (1)
 		{
 			$if $is_stream:
-				char! c = func((void*)stream);
+				char? c = func((void*)stream);
 			$else
-				char! c = stream.read_byte();
+				char? c = stream.read_byte();
 			$endif
 			if (catch err = c)
 			{
-				if (err == IoError.EOF) break;
+				if (err == io::EOF) break;
 				return err?;
 			}
 			if (c == '\r') continue;
@@ -94,27 +92,27 @@ macro String! readline(stream = io::stdin(), Allocator allocator = allocator::he
 Reads a string, see `readline`, except the it is allocated
 on the temporary allocator and does not need to be freed.

- @param stream `The stream to read from.`
- @require @is_instream(stream) `The stream must implement InStream.`
+ @param stream : `The stream to read from.`
+ @require @is_instream(stream) : `The stream must implement InStream.`
 @return `The temporary string containing the data read.`
 *>
-macro String! treadline(stream = io::stdin())
+macro String? treadline(stream = io::stdin())
 {
-	return readline(stream, allocator::temp()) @inline;
+	return readline(tmem, stream) @inline;
 }

 <*
 Print a value to a stream.

- @param out `the stream to print to`
- @param x `the value to print`
- @require @is_outstream(out) `The output must implement OutStream.`
+ @param out : `the stream to print to`
+ @param x : `the value to print`
+ @require @is_outstream(out) : `The output must implement OutStream.`
 @return `the number of bytes printed.`
 *>
-macro usz! fprint(out, x)
+macro usz? fprint(out, x)
 {
 	var $Type = $typeof(x);
-	$switch ($Type)
+	$switch $Type:
 		$case String: return out.write(x);
 		$case ZString: return out.write(x.str_view());
 		$case DString: return out.write(x.str_view());
@@ -137,11 +135,11 @@ macro usz! fprint(out, x)
 Prints using a 'printf'-style formatting string.
 See `printf` for details on formatting.

- @param [inout] out `The OutStream to print to`
- @param [in] format `The printf-style format string`
+ @param [inout] out : `The OutStream to print to`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! fprintf(OutStream out, String format, args...)
+fn usz? fprintf(OutStream out, String format, args...) @format(1)
 {
 	Formatter formatter;
 	formatter.init(&out_putstream_fn, &out);
@@ -152,11 +150,11 @@ fn usz! fprintf(OutStream out, String format, args...)
 Prints using a 'printf'-style formatting string,
 appending '\n' at the end. See `printf`.

- @param [inout] out `The OutStream to print to`
- @param [in] format `The printf-style format string`
+ @param [inout] out : `The OutStream to print to`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! fprintfn(OutStream out, String format, args...) @maydiscard
+fn usz? fprintfn(OutStream out, String format, args...) @format(1) @maydiscard
 {
 	Formatter formatter;
 	formatter.init(&out_putstream_fn, &out);
@@ -167,13 +165,13 @@ fn usz! fprintfn(OutStream out, String format, args...) @maydiscard
 }

 <*
- @require @is_outstream(out) "The output must implement OutStream"
+ @require @is_outstream(out) : "The output must implement OutStream"
 *>
-macro usz! fprintn(out, x = "")
+macro usz? fprintn(out, x = "")
 {
 	usz len = fprint(out, x)!;
 	out.write_byte('\n')!;
-	$switch
+	$switch:
 		$case @typeid(out) == OutStream.typeid:
 			if (&out.flush) out.flush()!;
 		$case $defined(out.flush):
@@ -193,7 +191,7 @@ macro void print(x)
 <*
 Print any value to stdout, appending an '\n’ after.

- @param x "The value to print"
+ @param x : "The value to print"
 *>
 macro void printn(x = "")
 {
@@ -211,7 +209,7 @@ macro void eprint(x)
 <*
 Print any value to stderr, appending an '\n’ after.

- @param x "The value to print"
+ @param x : "The value to print"
 *>
 macro void eprintn(x)
 {
@@ -219,13 +217,13 @@ macro void eprintn(x)
 }


-fn void! out_putstream_fn(void* data, char c) @private
+fn void? out_putstream_fn(void* data, char c) @private
 {
 	OutStream* stream = data;
 	return (*stream).write_byte(c);
 }

-fn void! out_putchar_fn(void* data @unused, char c) @private
+fn void? out_putchar_fn(void* data @unused, char c) @private
 {
 	$if env::TESTING:
 		// HACK: this is used for the purpose of unit test output hijacking
@@ -248,10 +246,10 @@ fn void! out_putchar_fn(void* data @unused, char c) @private
 To create a custom output for a type, implement
 the Printable interface.

- @param [in] format `The printf-style format string`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! printf(String format, args...) @maydiscard
+fn usz? printf(String format, args...) @format(0) @maydiscard
 {
 	Formatter formatter;
 	formatter.init(&out_putchar_fn);
@@ -262,14 +260,14 @@ fn usz! printf(String format, args...) @maydiscard
 Prints using a 'printf'-style formatting string,
 appending '\n' at the end. See `printf`.

- @param [in] format `The printf-style format string`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! printfn(String format, args...) @maydiscard
+fn usz? printfn(String format, args...) @format(0) @maydiscard
 {
 	Formatter formatter;
 	formatter.init(&out_putchar_fn);
-	usz! len = formatter.vprintf(format, args);
+	usz? len = formatter.vprintf(format, args);
 	out_putchar_fn(null, '\n')!;
 	io::stdout().flush()!;
 	return len + 1;
@@ -279,10 +277,10 @@ fn usz! printfn(String format, args...) @maydiscard
 Prints using a 'printf'-style formatting string
 to stderr.

- @param [in] format `The printf-style format string`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! eprintf(String format, args...) @maydiscard
+fn usz? eprintf(String format, args...) @maydiscard
 {
 	Formatter formatter;
 	OutStream stream = stderr();
@@ -295,15 +293,15 @@ fn usz! eprintf(String format, args...) @maydiscard
 Prints using a 'printf'-style formatting string,
 to stderr appending '\n' at the end. See `printf`.

- @param [in] format `The printf-style format string`
+ @param [in] format : `The printf-style format string`
 @return `the number of characters printed`
 *>
-fn usz! eprintfn(String format, args...) @maydiscard
+fn usz? eprintfn(String format, args...) @maydiscard
 {
 	Formatter formatter;
 	OutStream stream = stderr();
 	formatter.init(&out_putstream_fn, &stream);
-	usz! len = formatter.vprintf(format, args);
+	usz? len = formatter.vprintf(format, args);
 	stderr().write_byte('\n')!;
 	stderr().flush()!;
 	return len + 1;
@@ -313,11 +311,11 @@ fn usz! eprintfn(String format, args...) @maydiscard
 Prints using a 'printf'-style formatting string,
 to a string buffer. See `printf`.

- @param [inout] buffer `The buffer to print to`
- @param [in] format `The printf-style format string`
+ @param [inout] buffer : `The buffer to print to`
+ @param [in] format : `The printf-style format string`
 @return `a slice formed from the "buffer" with the resulting length.`
 *>
-fn char[]! bprintf(char[] buffer, String format, args...) @maydiscard
+fn char[]? bprintf(char[] buffer, String format, args...) @maydiscard
 {
 	Formatter formatter;
 	BufferData data = { .buffer = buffer };
@@ -327,10 +325,10 @@ fn char[]! bprintf(char[] buffer, String format, args...) @maydiscard
 }

 // Used to print to a buffer.
-fn void! out_buffer_fn(void *data, char c) @private
+fn void? out_buffer_fn(void *data, char c) @private
 {
 	BufferData *buffer_data = data;
-	if (buffer_data.written >= buffer_data.buffer.len) return PrintFault.BUFFER_EXCEEDED?;
+	if (buffer_data.written >= buffer_data.buffer.len) return BUFFER_EXCEEDED?;
 	buffer_data.buffer[buffer_data.written++] = c;
 }

--- a/lib/std/io/os/chdir.c3
+++ b/lib/std/io/os/chdir.c3
@@ -1,20 +1,20 @@
 module std::io::os;
 import std::io::path, libc, std::os;

-macro void! native_chdir(Path path)
+macro void? native_chdir(Path path)
 {
-	$switch
+	$switch:
 		$case env::POSIX:
 			if (posix::chdir(path.as_zstr()))
 			{
 				switch (libc::errno())
 				{
-					case errno::EACCES: return IoError.NO_PERMISSION?;
-					case errno::ENAMETOOLONG: return IoError.NAME_TOO_LONG?;
-					case errno::ENOTDIR: return IoError.FILE_NOT_DIR?;
-					case errno::ENOENT: return IoError.FILE_NOT_FOUND?;
-					case errno::ELOOP: return IoError.SYMLINK_FAILED?;
-					default: return IoError.GENERAL_ERROR?;
+					case errno::EACCES: return io::NO_PERMISSION?;
+					case errno::ENAMETOOLONG: return io::NAME_TOO_LONG?;
+					case errno::ENOTDIR: return io::FILE_NOT_DIR?;
+					case errno::ENOENT: return io::FILE_NOT_FOUND?;
+					case errno::ELOOP: return io::SYMLINK_FAILED?;
+					default: return io::GENERAL_ERROR?;
 				}
 			}
 		$case env::WIN32:
@@ -23,8 +23,8 @@ macro void! native_chdir(Path path)
 				// TODO improve with better error handling.
 				if (win32::setCurrentDirectoryW(path.str_view().to_temp_utf16()!!)) return;
 			};
-			return IoError.GENERAL_ERROR?;
+			return io::GENERAL_ERROR?;
 		$default:
-			return IoError.UNSUPPORTED_OPERATION?;
+			return io::UNSUPPORTED_OPERATION?;
 	$endswitch
 }
--- a/lib/std/io/os/file_libc.c3
+++ b/lib/std/io/os/file_libc.c3
@@ -5,7 +5,7 @@ import libc;
 @require mode.len > 0
 @require filename.len > 0
 *>
-fn void*! native_fopen(String filename, String mode) @inline => @pool()
+fn void*? native_fopen(String filename, String mode) @inline => @pool()
 {
 	$if env::WIN32:
 		void* file = libc::_wfopen(filename.to_temp_wstring(), mode.to_temp_wstring())!;
@@ -15,7 +15,7 @@ fn void*! native_fopen(String filename, String mode) @inline => @pool()
 		return file ?: file_open_errno()?;
 }

-fn void! native_remove(String filename) => @pool()
+fn void? native_remove(String filename) => @pool()
 {
 	$if env::WIN32:
 		CInt result = libc::_wremove(filename.to_temp_wstring())!;
@@ -27,10 +27,10 @@ fn void! native_remove(String filename) => @pool()
 		switch (libc::errno())
 		{
 			case errno::ENOENT:
-				return IoError.FILE_NOT_FOUND?;
+				return io::FILE_NOT_FOUND?;
 			case errno::EACCES:
 			default:
-				return IoError.FILE_CANNOT_DELETE?;
+				return io::FILE_CANNOT_DELETE?;
 		}
 	}
 }
@@ -39,7 +39,7 @@ fn void! native_remove(String filename) => @pool()
 @require mode.len > 0
 @require filename.len > 0
 *>
-fn void*! native_freopen(void* file, String filename, String mode) @inline => @pool()
+fn void*? native_freopen(void* file, String filename, String mode) @inline => @pool()
 {
 	$if env::WIN32:
 		file = libc::_wfreopen(filename.to_temp_wstring(), mode.to_temp_wstring(), file)!;
@@ -49,77 +49,77 @@ fn void*! native_freopen(void* file, String filename, String mode) @inline => @p
 		return file ?: file_open_errno()?;
 }

-fn void! native_fseek(void* file, isz offset, Seek seek_mode) @inline
+fn void? native_fseek(void* file, isz offset, Seek seek_mode) @inline
 {
 	if (libc::fseek(file, (SeekIndex)offset, seek_mode.ordinal)) return file_seek_errno()?;
 }


-fn usz! native_ftell(CFile file) @inline
+fn usz? native_ftell(CFile file) @inline
 {
 	long index = libc::ftell(file);
 	return index >= 0 ? (usz)index : file_seek_errno()?;
 }

-fn usz! native_fwrite(CFile file, char[] buffer) @inline
+fn usz? native_fwrite(CFile file, char[] buffer) @inline
 {
 	return libc::fwrite(buffer.ptr, 1, buffer.len, file);
 }

-fn void! native_fputc(CInt c, CFile stream) @inline
+fn void? native_fputc(CInt c, CFile stream) @inline
 {
-	if (libc::fputc(c, stream) == libc::EOF) return IoError.EOF?;
+	if (libc::fputc(c, stream) == libc::EOF) return io::EOF?;
 }

-fn usz! native_fread(CFile file, char[] buffer) @inline
+fn usz? native_fread(CFile file, char[] buffer) @inline
 {
 	return libc::fread(buffer.ptr, 1, buffer.len, file);
 }

-macro anyfault file_open_errno() @local
+macro fault file_open_errno() @local
 {
 	switch (libc::errno())
 	{
-		case errno::EACCES: return IoError.NO_PERMISSION;
-		case errno::EDQUOT: return IoError.OUT_OF_SPACE;
-		case errno::EBADF: return IoError.FILE_NOT_VALID;
-		case errno::EEXIST: return IoError.ALREADY_EXISTS;
-		case errno::EINTR: return IoError.INTERRUPTED;
-		case errno::EFAULT: return IoError.GENERAL_ERROR;
-		case errno::EISDIR: return IoError.FILE_IS_DIR;
-		case errno::ELOOP: return IoError.SYMLINK_FAILED;
-		case errno::EMFILE: return IoError.TOO_MANY_DESCRIPTORS;
-		case errno::ENAMETOOLONG: return IoError.NAME_TOO_LONG;
-		case errno::ENFILE: return IoError.OUT_OF_SPACE;
-		case errno::ENOTDIR: return IoError.FILE_NOT_DIR;
-		case errno::ENOENT: return IoError.FILE_NOT_FOUND;
-		case errno::ENOSPC: return IoError.OUT_OF_SPACE;
-		case errno::ENXIO: return IoError.FILE_NOT_FOUND;
-		case errno::EOVERFLOW: return IoError.OVERFLOW;
-		case errno::EROFS: return IoError.READ_ONLY;
-		case errno::EOPNOTSUPP: return IoError.UNSUPPORTED_OPERATION;
-		case errno::EIO: return IoError.INCOMPLETE_WRITE;
-		case errno::EWOULDBLOCK: return IoError.WOULD_BLOCK;
-		default: return IoError.UNKNOWN_ERROR;
+		case errno::EACCES: return io::NO_PERMISSION;
+		case errno::EDQUOT: return io::OUT_OF_SPACE;
+		case errno::EBADF: return io::FILE_NOT_VALID;
+		case errno::EEXIST: return io::ALREADY_EXISTS;
+		case errno::EINTR: return io::INTERRUPTED;
+		case errno::EFAULT: return io::GENERAL_ERROR;
+		case errno::EISDIR: return io::FILE_IS_DIR;
+		case errno::ELOOP: return io::SYMLINK_FAILED;
+		case errno::EMFILE: return io::TOO_MANY_DESCRIPTORS;
+		case errno::ENAMETOOLONG: return io::NAME_TOO_LONG;
+		case errno::ENFILE: return io::OUT_OF_SPACE;
+		case errno::ENOTDIR: return io::FILE_NOT_DIR;
+		case errno::ENOENT: return io::FILE_NOT_FOUND;
+		case errno::ENOSPC: return io::OUT_OF_SPACE;
+		case errno::ENXIO: return io::FILE_NOT_FOUND;
+		case errno::EOVERFLOW: return io::OVERFLOW;
+		case errno::EROFS: return io::READ_ONLY;
+		case errno::EOPNOTSUPP: return io::UNSUPPORTED_OPERATION;
+		case errno::EIO: return io::INCOMPLETE_WRITE;
+		case errno::EWOULDBLOCK: return io::WOULD_BLOCK;
+		default: return io::UNKNOWN_ERROR;
 	}
 }

-macro anyfault file_seek_errno() @local
+macro fault file_seek_errno() @local
 {
 	switch (libc::errno())
 	{
-		case errno::ESPIPE: return IoError.FILE_IS_PIPE;
-		case errno::EPIPE: return IoError.FILE_IS_PIPE;
-		case errno::EOVERFLOW: return IoError.OVERFLOW;
-		case errno::ENXIO: return IoError.FILE_NOT_FOUND;
-		case errno::ENOSPC: return IoError.OUT_OF_SPACE;
-		case errno::EIO: return IoError.INCOMPLETE_WRITE;
-		case errno::EINVAL: return IoError.INVALID_POSITION;
-		case errno::EINTR: return IoError.INTERRUPTED;
-		case errno::EFBIG: return IoError.OUT_OF_SPACE;
-		case errno::EBADF: return IoError.FILE_NOT_VALID;
-		case errno::EAGAIN: return IoError.WOULD_BLOCK;
-		default: return IoError.UNKNOWN_ERROR;
+		case errno::ESPIPE: return io::FILE_IS_PIPE;
+		case errno::EPIPE: return io::FILE_IS_PIPE;
+		case errno::EOVERFLOW: return io::OVERFLOW;
+		case errno::ENXIO: return io::FILE_NOT_FOUND;
+		case errno::ENOSPC: return io::OUT_OF_SPACE;
+		case errno::EIO: return io::INCOMPLETE_WRITE;
+		case errno::EINVAL: return io::INVALID_POSITION;
+		case errno::EINTR: return io::INTERRUPTED;
+		case errno::EFBIG: return io::OUT_OF_SPACE;
+		case errno::EBADF: return io::FILE_NOT_VALID;
+		case errno::EAGAIN: return io::WOULD_BLOCK;
+		default: return io::UNKNOWN_ERROR;
 	}
 }

--- a/lib/std/io/os/file_nolibc.c3
+++ b/lib/std/io/os/file_nolibc.c3
@@ -1,15 +1,15 @@
 module std::io::os @if(env::NO_LIBC);
 import libc;

-def FopenFn = fn void*!(String, String);
-def FreopenFn = fn void*!(void*, String, String);
-def FcloseFn = fn void!(void*);
-def FseekFn = fn void!(void*, isz, Seek);
-def FtellFn = fn usz!(void*);
-def FwriteFn = fn usz!(void*, char[] buffer);
-def FreadFn = fn usz!(void*, char[] buffer);
-def RemoveFn = fn void!(String);
-def FputcFn = fn void!(int, void*);
+alias FopenFn = fn void*?(String, String);
+alias FreopenFn = fn void*?(void*, String, String);
+alias FcloseFn = fn void?(void*);
+alias FseekFn = fn void?(void*, isz, Seek);
+alias FtellFn = fn usz?(void*);
+alias FwriteFn = fn usz?(void*, char[] buffer);
+alias FreadFn = fn usz?(void*, char[] buffer);
+alias RemoveFn = fn void?(String);
+alias FputcFn = fn void?(int, void*);

 FopenFn native_fopen_fn @weak @if(!$defined(native_fopen_fn));
 FcloseFn native_fclose_fn @weak @if(!$defined(native_fclose_fn));
@@ -25,10 +25,10 @@ FputcFn native_fputc_fn @weak @if(!$defined(native_fputc_fn));
 @require mode.len > 0
 @require filename.len > 0
 *>
-fn void*! native_fopen(String filename, String mode) @inline
+fn void*? native_fopen(String filename, String mode) @inline
 {
 	if (native_fopen_fn) return native_fopen_fn(filename, mode);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

 <*
@@ -36,48 +36,48 @@ fn void*! native_fopen(String filename, String mode) @inline

 @require filename.len > 0
 *>
-fn void! native_remove(String filename) @inline
+fn void? native_remove(String filename) @inline
 {
 	if (native_remove_fn) return native_remove_fn(filename);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

 <*
 @require mode.len > 0
 @require filename.len > 0
 *>
-fn void*! native_freopen(void* file, String filename, String mode) @inline
+fn void*? native_freopen(void* file, String filename, String mode) @inline
 {
 	if (native_freopen_fn) return native_freopen_fn(file, filename, mode);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

-fn void! native_fseek(void* file, isz offset, Seek seek_mode) @inline
+fn void? native_fseek(void* file, isz offset, Seek seek_mode) @inline
 {
 	if (native_fseek_fn) return native_fseek_fn(file, offset, seek_mode);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

-fn usz! native_ftell(CFile file) @inline
+fn usz? native_ftell(CFile file) @inline
 {
 	if (native_ftell_fn) return native_ftell_fn(file);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

-fn usz! native_fwrite(CFile file, char[] buffer) @inline
+fn usz? native_fwrite(CFile file, char[] buffer) @inline
 {
 	if (native_fwrite_fn) return native_fwrite_fn(file, buffer);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

-fn usz! native_fread(CFile file, char[] buffer) @inline
+fn usz? native_fread(CFile file, char[] buffer) @inline
 {
 	if (native_fread_fn) return native_fread_fn(file, buffer);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }

-fn void! native_fputc(CInt c, CFile stream) @inline
+fn void? native_fputc(CInt c, CFile stream) @inline
 {
 	if (native_fputc_fn) return native_fputc_fn(c, stream);
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }
--- a/lib/std/io/os/fileinfo.c3
+++ b/lib/std/io/os/fileinfo.c3
@@ -1,9 +1,9 @@
 module std::io::os;
 import libc, std::os, std::io;

-fn void! native_stat(Stat* stat, String path) @if(env::DARWIN || env::LINUX || env::BSD_FAMILY) => @pool()
+fn void? native_stat(Stat* stat, String path) @if(env::DARWIN || env::LINUX || env::ANDROID || env::BSD_FAMILY) => @pool()
 {
-	$if env::DARWIN || env::LINUX || env::BSD_FAMILY:
+	$if env::DARWIN || env::LINUX || env::ANDROID || env::BSD_FAMILY:
 		int res = libc::stat(path.zstr_tcopy(), stat);
 	$else
 		unreachable("Stat unimplemented");
@@ -14,30 +14,30 @@ fn void! native_stat(Stat* stat, String path) @if(env::DARWIN || env::LINUX || e
 		switch (libc::errno())
 		{
 			case errno::EBADF:
-				return IoError.FILE_NOT_VALID?;
+				return io::FILE_NOT_VALID?;
 			case errno::EFAULT:
 				unreachable("Invalid stat");
 			case errno::EIO:
-				return IoError.GENERAL_ERROR?;
+				return io::GENERAL_ERROR?;
 			case errno::EACCES:
-				return IoError.NO_PERMISSION?;
+				return io::NO_PERMISSION?;
 			case errno::ELOOP:
-				return IoError.NO_PERMISSION?;
+				return io::NO_PERMISSION?;
 			case errno::ENAMETOOLONG:
-				return IoError.NAME_TOO_LONG?;
+				return io::NAME_TOO_LONG?;
 			case errno::ENOENT:
-				return IoError.FILE_NOT_FOUND?;
+				return io::FILE_NOT_FOUND?;
 			case errno::ENOTDIR:
-				return IoError.FILE_NOT_DIR?;
+				return io::FILE_NOT_DIR?;
 			case errno::EOVERFLOW:
-				return IoError.GENERAL_ERROR?;
+				return io::GENERAL_ERROR?;
 			default:
-				return IoError.UNKNOWN_ERROR?;
+				return io::UNKNOWN_ERROR?;
 		}
 	}
 }

-fn usz! native_file_size(String path) @if(env::WIN32) => @pool()
+fn usz? native_file_size(String path) @if(env::WIN32) => @pool()
 {
 	Win32_FILE_ATTRIBUTE_DATA data;
 	win32::getFileAttributesExW(path.to_temp_wstring()!, Win32_GET_FILEEX_INFO_LEVELS.STANDARD, &data);
@@ -47,14 +47,14 @@ fn usz! native_file_size(String path) @if(env::WIN32) => @pool()
 	return (usz)size.quadPart;
 }

-fn usz! native_file_size(String path) @if(!env::WIN32 && !env::DARWIN)
+fn usz? native_file_size(String path) @if(!env::WIN32 && !env::DARWIN)
 {
 	File f = file::open(path, "r")!;
 	defer (void)f.close();
 	return f.seek(0, Seek.END)!;
 }

-fn usz! native_file_size(String path) @if(env::DARWIN)
+fn usz? native_file_size(String path) @if(env::DARWIN)
 {
 	Stat stat;
 	native_stat(&stat, path)!;
@@ -63,12 +63,13 @@ fn usz! native_file_size(String path) @if(env::DARWIN)

 fn bool native_file_or_dir_exists(String path)
 {
-	$switch
+	$switch:
 		$case env::DARWIN:
 		$case env::FREEBSD:
 		$case env::NETBSD:
 		$case env::OPENBSD:
 		$case env::LINUX:
+		$case env::ANDROID:
 			Stat stat;
 			return @ok(native_stat(&stat, path));
 		$case env::WIN32:
@@ -88,16 +89,17 @@ fn bool native_file_or_dir_exists(String path)

 fn bool native_is_file(String path)
 {
-	$switch
+	$switch:
 		$case env::DARWIN:
 		$case env::FREEBSD:
 		$case env::NETBSD:
 		$case env::OPENBSD:
 		$case env::LINUX:
+		$case env::ANDROID:
 			Stat stat;
 			return @ok(native_stat(&stat, path)) && libc_S_ISTYPE(stat.st_mode, libc::S_IFREG);
 		$default:
-			File! f = file::open(path, "r");
+			File? f = file::open(path, "r");
 			defer (void)f.close();
 			return @ok(f);
 	$endswitch
@@ -105,7 +107,7 @@ fn bool native_is_file(String path)

 fn bool native_is_dir(String path)
 {
-	$if env::DARWIN || env::LINUX || env::BSD_FAMILY:
+	$if env::DARWIN || env::LINUX || env::ANDROID || env::BSD_FAMILY:
 		Stat stat;
 		return @ok(native_stat(&stat, path)) && libc_S_ISTYPE(stat.st_mode, libc::S_IFDIR);
 	$else
--- a/lib/std/io/os/getcwd.c3
+++ b/lib/std/io/os/getcwd.c3
@@ -1,9 +1,9 @@
 module std::io::os;
 import libc, std::os;

-macro String! getcwd(Allocator allocator = allocator::heap())
+macro String? getcwd(Allocator allocator)
 {
-	$switch
+	$switch:
 		$case env::WIN32:
 			const DEFAULT_BUFFER = 256;
 			Char16[DEFAULT_BUFFER] buffer;
@@ -12,12 +12,12 @@ macro String! getcwd(Allocator allocator = allocator::heap())
 			defer if (free) libc::free(res);
 			if (!res)
 			{
-				if (libc::errno() != errno::ERANGE) return IoError.GENERAL_ERROR?;
+				if (libc::errno() != errno::ERANGE) return io::GENERAL_ERROR?;
 				res = win32::_wgetcwd(null, 0);
 				free = true;
 			}
 			Char16[] str16 = res[:win32::wcslen(res)];
-			return string::new_from_utf16(str16, allocator);
+			return string::from_utf16(allocator, str16);

 		$case env::POSIX:
 			const usz DEFAULT_BUFFER = 256;
@@ -27,7 +27,7 @@ macro String! getcwd(Allocator allocator = allocator::heap())
 			if (!res)
 			{
 				// Improve error
-				if (libc::errno() != errno::ERANGE) return IoError.GENERAL_ERROR?;
+				if (libc::errno() != errno::ERANGE) return io::GENERAL_ERROR?;
 				res = posix::getcwd(null, 0);
 				free = true;
 			}
@@ -35,7 +35,7 @@ macro String! getcwd(Allocator allocator = allocator::heap())
 			return res.copy(allocator);

 		$default:
-			return IoError.UNSUPPORTED_OPERATION?;
+			return io::UNSUPPORTED_OPERATION?;
 	$endswitch
 }

--- a/lib/std/io/os/ls.c3
+++ b/lib/std/io/os/ls.c3
@@ -1,13 +1,13 @@
 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.init(allocator);
 	DIRPtr directory = posix::opendir(dir.str_view() ? dir.as_zstr() : (ZString)".");
 	defer if (directory) posix::closedir(directory);
-	if (!directory) return (path::is_dir(dir) ? IoError.CANNOT_READ_DIR : IoError.FILE_NOT_DIR)?;
+	if (!directory) return (path::is_dir(dir) ? io::CANNOT_READ_DIR : io::FILE_NOT_DIR)?;
 	Posix_dirent* entry;
 	while ((entry = posix::readdir(directory)))
 	{
@@ -15,7 +15,7 @@ fn PathList! native_ls(Path dir, bool no_dirs, bool no_symlinks, String mask, Al
 		if (!name || name == "." || name == "..") continue;
 		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)!!;
+		Path path = path::new(allocator, name)!!;
 		list.push(path);
 	}
 	return list;
@@ -24,26 +24,26 @@ 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.init(allocator);

-	@pool(allocator)
+	@pool()
 	{
 		WString result = dir.str_view().tconcat(`\*`).to_temp_wstring()!!;
 		Win32_WIN32_FIND_DATAW find_data;
 		Win32_HANDLE find = win32::findFirstFileW(result, &find_data);
-		if (find == win32::INVALID_HANDLE_VALUE) return IoError.CANNOT_READ_DIR?;
+		if (find == win32::INVALID_HANDLE_VALUE) return io::CANNOT_READ_DIR?;
 		defer win32::findClose(find);
 		do
 		{
 			if (no_dirs && (find_data.dwFileAttributes & win32::FILE_ATTRIBUTE_DIRECTORY)) continue;
-			@pool(allocator)
+			@pool()
 			{
-				String filename = string::temp_from_wstring((WString)&find_data.cFileName)!;
+				String filename = string::tfrom_wstring((WString)&find_data.cFileName)!;
 				if (filename == ".." || filename == ".") continue;
-				list.push(path::new(filename, allocator)!);
+				list.push(path::new(allocator, filename)!);
 			};
 		} while (win32::findNextFileW(find, &find_data));
 		return list;
--- a/lib/std/io/os/mkdir.c3
+++ b/lib/std/io/os/mkdir.c3
@@ -5,9 +5,9 @@ import std::os::win32;
 import std::os::posix;


-macro bool! native_mkdir(Path path, MkdirPermissions permissions)
+macro bool? native_mkdir(Path path, MkdirPermissions permissions)
 {
-	$switch
+	$switch:
 		$case env::POSIX:
 			if (!posix::mkdir(path.as_zstr(), permissions == NORMAL ? 0o777 : 0o700)) return true;
 			switch (libc::errno())
@@ -15,15 +15,15 @@ macro bool! native_mkdir(Path path, MkdirPermissions permissions)
 				case errno::EACCES:
 				case errno::EPERM:
 				case errno::EROFS:
-				case errno::EFAULT: return IoError.NO_PERMISSION?;
-				case errno::ENAMETOOLONG: return IoError.NAME_TOO_LONG?;
+				case errno::EFAULT: return io::NO_PERMISSION?;
+				case errno::ENAMETOOLONG: return io::NAME_TOO_LONG?;
 				case errno::EDQUOT:
-				case errno::ENOSPC: return IoError.OUT_OF_SPACE?;
+				case errno::ENOSPC: return io::OUT_OF_SPACE?;
 				case errno::EISDIR:
 				case errno::EEXIST: return false;
-				case errno::ELOOP: return IoError.SYMLINK_FAILED?;
-				case errno::ENOTDIR: return IoError.FILE_NOT_FOUND?;
-				default: return IoError.GENERAL_ERROR?;
+				case errno::ELOOP: return io::SYMLINK_FAILED?;
+				case errno::ENOTDIR: return io::FILE_NOT_FOUND?;
+				default: return io::GENERAL_ERROR?;
 			}
 		$case env::WIN32:
 			@pool()
@@ -33,18 +33,18 @@ macro bool! native_mkdir(Path path, MkdirPermissions permissions)
 				switch (win32::getLastError())
 				{
 					case win32::ERROR_ACCESS_DENIED:
-						return IoError.NO_PERMISSION?;
+						return io::NO_PERMISSION?;
 					case win32::ERROR_DISK_FULL:
-						return IoError.OUT_OF_SPACE?;
+						return io::OUT_OF_SPACE?;
 					case win32::ERROR_ALREADY_EXISTS:
 						return false;
 					case win32::ERROR_PATH_NOT_FOUND:
-						return IoError.FILE_NOT_FOUND?;
+						return io::FILE_NOT_FOUND?;
 					default:
-						return IoError.GENERAL_ERROR?;
+						return io::GENERAL_ERROR?;
 				}
 			};
 		$default:
-			return IoError.UNSUPPORTED_OPERATION?;
+			return io::UNSUPPORTED_OPERATION?;
 	$endswitch
 }
--- a/lib/std/io/os/rmdir.c3
+++ b/lib/std/io/os/rmdir.c3
@@ -4,24 +4,24 @@ import std::io::path;
 import std::os::win32;
 import std::os::posix;

-macro bool! native_rmdir(Path path)
+macro bool? native_rmdir(Path path)
 {
-	$switch
+	$switch:
 		$case env::POSIX:
 			if (!posix::rmdir(path.as_zstr())) return true;
 			switch (libc::errno())
 			{
-				case errno::EBUSY: return IoError.BUSY?;
+				case errno::EBUSY: return io::BUSY?;
 				case errno::EACCES:
 				case errno::EPERM:
 				case errno::EROFS:
-				case errno::EFAULT: return IoError.NO_PERMISSION?;
-				case errno::ENAMETOOLONG: return IoError.NAME_TOO_LONG?;
+				case errno::EFAULT: return io::NO_PERMISSION?;
+				case errno::ENAMETOOLONG: return io::NAME_TOO_LONG?;
 				case errno::ENOTDIR:
 				case errno::ENOENT: return false;
-				case errno::ENOTEMPTY: return IoError.DIR_NOT_EMPTY?;
-				case errno::ELOOP: return IoError.SYMLINK_FAILED?;
-				default: return IoError.GENERAL_ERROR?;
+				case errno::ENOTEMPTY: return io::DIR_NOT_EMPTY?;
+				case errno::ELOOP: return io::SYMLINK_FAILED?;
+				default: return io::GENERAL_ERROR?;
 			}
 		$case env::WIN32:
 			@pool()
@@ -30,19 +30,19 @@ macro bool! native_rmdir(Path path)
 				switch (win32::getLastError())
 				{
 					case win32::ERROR_ACCESS_DENIED:
-						return IoError.NO_PERMISSION?;
+						return io::NO_PERMISSION?;
 					case win32::ERROR_CURRENT_DIRECTORY:
-						return IoError.BUSY?;
+						return io::BUSY?;
 					case win32::ERROR_DIR_NOT_EMPTY:
-						return IoError.DIR_NOT_EMPTY?;
+						return io::DIR_NOT_EMPTY?;
 					case win32::ERROR_DIRECTORY:
 					case win32::ERROR_PATH_NOT_FOUND:
 						return false;
 					default:
-						return IoError.GENERAL_ERROR?;
+						return io::GENERAL_ERROR?;
 				}
 			};
 		$default:
-			return IoError.UNSUPPORTED_OPERATION?;
+			return io::UNSUPPORTED_OPERATION?;
 	$endswitch
 }
--- a/lib/std/io/os/rmtree.c3
+++ b/lib/std/io/os/rmtree.c3
@@ -4,11 +4,11 @@ import std::io, std::os, libc;
 <*
 @require dir.str_view().len > 0
 *>
-fn void! native_rmtree(Path dir)
+fn void? native_rmtree(Path dir)
 {
 	DIRPtr directory = posix::opendir(dir.as_zstr());
 	defer if (directory) posix::closedir(directory);
-	if (!directory) return path::is_dir(dir) ? IoError.CANNOT_READ_DIR? : IoError.FILE_NOT_DIR?;
+	if (!directory) return path::is_dir(dir) ? io::CANNOT_READ_DIR? : io::FILE_NOT_DIR?;
 	Posix_dirent* entry;
 	while ((entry = posix::readdir(directory)))
 	{
@@ -16,7 +16,7 @@ fn void! native_rmtree(Path dir)
 		{
 			String name = ((ZString)&entry.name).str_view();
 			if (!name || name == "." || name == "..") continue;
-			Path new_path = dir.temp_append(name)!;
+			Path new_path = dir.tappend(name)!;
 			if (entry.d_type == posix::DT_DIR)
 			{
 				native_rmtree(new_path)!;
@@ -25,7 +25,7 @@ fn void! native_rmtree(Path dir)
 			if (libc::remove(new_path.as_zstr()))
 			{
 				// TODO improve
-				return IoError.GENERAL_ERROR?;
+				return io::GENERAL_ERROR?;
 			}
 		};
 	}
@@ -35,21 +35,21 @@ fn void! native_rmtree(Path dir)
 module std::io::os @if(env::WIN32);
 import std::io, std::time, std::os;

-fn void! native_rmtree(Path path)
+fn void? native_rmtree(Path path)
 {
 	Win32_WIN32_FIND_DATAW find_data;
 	String s = path.str_view().tconcat("\\*");
 	Win32_HANDLE find = win32::findFirstFileW(s.to_temp_utf16(), &find_data)!;

-	if (find == win32::INVALID_HANDLE_VALUE) return IoError.CANNOT_READ_DIR?;
+	if (find == win32::INVALID_HANDLE_VALUE) return io::CANNOT_READ_DIR?;
 	defer win32::findClose(find);
 	do
 	{
 		@pool()
 		{
-			String filename = string::new_from_wstring((WString)&find_data.cFileName, allocator::temp())!;
+			String filename = string::tfrom_wstring((WString)&find_data.cFileName)!;
 			if (filename == "." || filename == "..") continue;
-			Path file_path = path.temp_append(filename)!;
+			Path file_path = path.tappend(filename)!;
 			if (find_data.dwFileAttributes & win32::FILE_ATTRIBUTE_DIRECTORY)
 			{
 				native_rmtree(file_path)!;
--- a/lib/std/io/os/temp_directory.c3
+++ b/lib/std/io/os/temp_directory.c3
@@ -1,29 +1,29 @@
 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) @if(!env::WIN32)
 {
 	foreach (String env : { "TMPDIR", "TMP", "TEMP", "TEMPDIR" })
 	{
-		String tmpdir = env::get_var(env) ?? "";
-		if (tmpdir) return path::new(tmpdir, allocator);
+		String tmpdir = env::tget_var(env) ?? "";
+		if (tmpdir) return path::new(allocator, tmpdir);
 	}
-	return path::new("/tmp", allocator);
+	return path::new(allocator, "/tmp");
 }

-fn Path! native_temp_directory(Allocator allocator = allocator::heap()) @if(env::WIN32) => @pool(allocator)
+fn Path? native_temp_directory(Allocator allocator) @if(env::WIN32) => @pool()
 {
 	Win32_DWORD len = win32::getTempPathW(0, null);
-	if (!len) return IoError.GENERAL_ERROR?;
-	Char16[] buff = mem::temp_alloc_array(Char16, len + (usz)1);
-	if (!win32::getTempPathW(len, buff)) return IoError.GENERAL_ERROR?;
-	return path::new(string::temp_from_utf16(buff[:len]), allocator);
+	if (!len) return io::GENERAL_ERROR?;
+	Char16[] buff = mem::talloc_array(Char16, len + (usz)1);
+	if (!win32::getTempPathW(len, buff)) return io::GENERAL_ERROR?;
+	return path::new(allocator, string::tfrom_utf16(buff[:len]));
 }

 module std::io::os @if(env::NO_LIBC);
 import std::io::path;

-macro Path! native_temp_directory(Allocator allocator = allocator::heap())
+macro Path? native_temp_directory(Allocator allocator)
 {
-	return IoError.UNSUPPORTED_OPERATION?;
+	return io::UNSUPPORTED_OPERATION?;
 }
--- a/lib/std/io/path.c3
+++ b/lib/std/io/path.c3
@@ -2,25 +2,22 @@ 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 PathEnv DEFAULT_ENV = env::WIN32 ? PathEnv.WIN32 : PathEnv.POSIX;
 const char PREFERRED_SEPARATOR_WIN32 = '\\';
 const char PREFERRED_SEPARATOR_POSIX = '/';
 const char PREFERRED_SEPARATOR = env::WIN32 ? PREFERRED_SEPARATOR_WIN32 : PREFERRED_SEPARATOR_POSIX;

-def PathList = List(<Path>);
+alias PathList = List { Path };

-fault PathResult
-{
-	INVALID_PATH,
-	NO_PARENT,
-}
+faultdef INVALID_PATH, NO_PARENT;

-def Path = PathImp;
+alias Path = PathImp;

 struct PathImp (Printable)
 {
 	String path_string;
 	PathEnv env;
+	Allocator allocator;
 }

 enum PathEnv
@@ -29,60 +26,55 @@ enum PathEnv
 	POSIX
 }

-fn Path! new_cwd(Allocator allocator = allocator::heap()) => @pool(allocator)
+fn Path? cwd(Allocator allocator)
 {
-	return new(os::getcwd(allocator::temp()), allocator);
-}
-
-fn Path! getcwd(Allocator allocator = allocator::heap()) @deprecated("Use new_cwd()")
-{
-	@pool(allocator)
+	@pool()
 	{
-		return new(os::getcwd(allocator::temp()), allocator);
+		return new(allocator, os::getcwd(tmem));
 	};
 }

 fn bool is_dir(Path path) => os::native_is_dir(path.str_view());
 fn bool is_file(Path path) => os::native_is_file(path.str_view());
-fn usz! file_size(Path path) => os::native_file_size(path.str_view());
+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! temp_cwd() => new_cwd(allocator::temp()) @inline;
-fn Path! tgetcwd() @deprecated("Use temp_cwd()") => new_cwd(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 void! delete(Path path) => os::native_remove(path.str_view()) @inline;
+fn Path? tcwd() => cwd(tmem) @inline;

-macro bool is_separator(char c, PathEnv path_env = DEFAULT_PATH_ENV)
+<*
+ @require @is_pathlike(path) : "Expected a Path or String to chdir"
+*>
+macro void? chdir(path)
+{
+	$if @typeis(path, String):
+		@pool()
+		{
+			return os::native_chdir(temp(path));
+		};
+	$else
+		return os::native_chdir(path) @inline;
+	$endif
+}
+
+fn Path? temp_directory(Allocator allocator) => os::native_temp_directory(allocator);
+
+fn void? delete(Path path) => os::native_remove(path.str_view()) @inline;
+
+macro bool @is_pathlike(#path) => @typeis(#path, String) || @typeis(#path, Path);
+
+macro bool is_separator(char c, PathEnv path_env = DEFAULT_ENV)
 {
 	return c == '/' || (c == '\\' && path_env == PathEnv.WIN32);
 }

-macro bool is_posix_separator(char c)
-{
-	return c == '/' || c == '\\';
-}
+macro bool is_posix_separator(char c) => c == '/';
+macro bool is_win32_separator(char c) =>  c == '/' || c == '\\';

-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()) @deprecated("use new_ls")
-{
-	return new_ls(dir, no_dirs, no_symlinks, mask, allocator);
-
-}
-fn PathList! temp_ls(Path dir, bool no_dirs = false, bool no_symlinks = false, String mask = "")
-{
-	return new_ls(dir, no_dirs, no_symlinks, mask, allocator::temp()) @inline;
-}
-
-fn PathList! new_ls(Path dir, bool no_dirs = false, bool no_symlinks = false, String mask = "", Allocator allocator = allocator::heap())
+fn PathList? ls(Allocator allocator, Path dir, bool no_dirs = false, bool no_symlinks = false, String mask = "")
 {
 	$if $defined(os::native_ls):
 		return os::native_ls(dir, no_dirs, no_symlinks, mask, allocator);
 	$else
-		return IoError.UNSUPPORTED_OPERATION?;
+		return io::UNSUPPORTED_OPERATION?;
 	$endif
 }

@@ -96,84 +88,84 @@ enum MkdirPermissions
 <*
 Create a directory on a given path, optionally recursive.

- @param path `The path to create`
- @param recursive `If directories in between should be created if they're missing, defaults to false`
- @param permissions `The permissions to set on the directory`
+ @param path : `The path to create`
+ @require @is_pathlike(path) : "Expected a Path or String to chdir"
+ @param recursive : `If directories in between should be created if they're missing, defaults to false`
+ @param permissions : `The permissions to set on the directory`
 *>
-fn bool! mkdir(Path path, bool recursive = false, MkdirPermissions permissions = NORMAL)
+macro bool? mkdir(Path path, bool recursive = false, MkdirPermissions permissions = NORMAL)
 {
-	if (!path.path_string.len) return PathResult.INVALID_PATH?;
-	if (is_dir(path)) return false;
-	if (exists(path)) return IoError.FILE_NOT_DIR?;
-
-	if (recursive)
-	{
-		if (try parent = path.parent()) mkdir(parent, true, permissions)!;
-	}
-	if (!is_dir(path.parent()) ?? false) return IoError.CANNOT_READ_DIR?;
-
-	return os::native_mkdir(path, permissions);
+	$if @typeis(path, String):
+		@pool() { return _mkdir(temp(path), recursive, permissions); };
+	$else
+		return _mkdir(path, recursive, permissions);
+	$endif
 }

+
 <*
 Tries to delete directory, which must be empty.

- @param path `The path to delete`
+ @param path : `The path to delete`
+ @require @is_pathlike(path) : "Expected a Path or String to chdir"
 @return `true if there was a directory to delete, false otherwise`
- @return! PathResult.INVALID_PATH `if the path was invalid`
+ @return? INVALID_PATH : `if the path was invalid`
 *>
-fn bool! rmdir(Path path)
+macro bool? rmdir(path)
 {
-	if (!path.path_string.len) return PathResult.INVALID_PATH?;
-	return os::native_rmdir(path);
+	$if @typeis(path, String):
+		@pool() { return _rmdir(temp(path)); };
+	$else
+		return _mkdir(path);
+	$endif
 }

 <*
 Like [rmdir] but deletes a directory even if it contains items.
 *>
-fn void! rmtree(Path path)
+fn void? rmtree(Path path)
 {
-	if (!path.path_string.len) return PathResult.INVALID_PATH?;
+	if (!path.path_string.len) return INVALID_PATH?;
 	$if $defined(os::native_rmtree):
 		return os::native_rmtree(path);
 	$else
-		return IoError.UNSUPPORTED_OPERATION?;
+		return io::UNSUPPORTED_OPERATION?;
 	$endif
 }

 <*
 Creates a new path.

- @return! PathResult.INVALID_PATH `if the path was invalid`
+ @return? INVALID_PATH : `if the path was invalid`
 *>
-fn Path! new(String path, Allocator allocator = allocator::heap(), PathEnv path_env = DEFAULT_PATH_ENV)
+fn Path? new(Allocator allocator, String path, PathEnv path_env = DEFAULT_ENV)
 {
-	return { normalize(path.copy(allocator), path_env), path_env };
+	return { normalize(path.copy(allocator), path_env), path_env, allocator };
 }

 <*
 Creates a new path using the temp allocator.

- @return! PathResult.INVALID_PATH `if the path was invalid`
+ @return? INVALID_PATH : `if the path was invalid`
 *>
-fn Path! temp_new(String path, PathEnv path_env = DEFAULT_PATH_ENV)
+fn Path? temp(String path, PathEnv path_env = DEFAULT_ENV)
 {
-	return new(path, allocator::temp(), path_env);
+	return new(tmem, path, path_env);
 }

-fn Path! new_win32_wstring(WString path, Allocator allocator = allocator::heap()) => @pool(allocator)
+fn Path? from_win32_wstring(Allocator allocator, WString path) => @pool()
 {
-	return path::new(string::temp_from_wstring(path)!, allocator: allocator);
+	return path::new(allocator, string::tfrom_wstring(path)!);
 }

-fn Path! new_windows(String path, Allocator allocator = allocator::heap())
+fn Path? for_windows(Allocator allocator, String path)
 {
-	return new(path, allocator, WIN32);
+	return new(allocator, path, WIN32);
 }

-fn Path! new_posix(String path, Allocator allocator = allocator::heap())
+fn Path? for_posix(Allocator allocator, String path)
 {
-	return new(path, allocator, POSIX);
+	return new(allocator, path, POSIX);
 }

 fn bool Path.equals(self, Path p2)
@@ -181,59 +173,56 @@ fn bool Path.equals(self, Path p2)
 	return self.env == p2.env && self.path_string == p2.path_string;
 }

-fn Path! Path.append(self, String filename, Allocator allocator = allocator::heap()) @deprecated("Use path.new_append(...)")
-{
-	return self.new_append(filename, allocator) @inline;
-}
-
 <*
 Append the string to the current path.

 @param [in] filename
 *>
-fn Path! Path.new_append(self, String filename, Allocator allocator = allocator::heap())
+fn Path? Path.append(self, Allocator allocator, String filename)
 {
-	if (!self.path_string.len) return new(filename, allocator, self.env)!;
+	if (!self.path_string.len) return new(allocator, filename, self.env)!;
 	assert(!is_separator(self.path_string[^1], self.env));

-	@pool(allocator)
+	@pool()
 	{
 		DString dstr = dstring::temp_with_capacity(self.path_string.len + 1 + filename.len);
 		dstr.append(self.path_string);
 		dstr.append(PREFERRED_SEPARATOR);
 		dstr.append(filename);
-		return { normalize(dstr.copy_str(allocator), self.env), self.env };
+		return new(allocator, dstr.str_view(), self.env);
 	};
 }

-fn Path! Path.temp_append(self, String filename) => self.new_append(filename, allocator::temp());
+fn Path? Path.tappend(self, String filename) => self.append(tmem, filename);

-fn Path! Path.tappend(self, String filename) @deprecated("Use path.temp_append(...)") => self.new_append(filename, allocator::temp());
-
-fn usz Path.start_of_base_name(self) @local
+fn usz? start_of_base_name(String str, PathEnv path_env) @local
 {
-	String path_str = self.path_string;
-	if (!path_str.len) return 0;
-	if (self.env == PathEnv.WIN32)
+	if (!str.len) return 0;
+	usz? start_slash = str.rindex_of_char('/');
+	if (path_env != PathEnv.WIN32) return start_slash + 1 ?? 0;
+	if (try index = str.rindex_of_char('\\'))
 	{
-		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)!!;
+		if (try start_slash && start_slash > index) return start_slash + 1;
+		// c:\ style path, we're done!
+		if (str[0] != '\\') return index + 1;
+		// Handle \\server\foo
+		// Find the \ before "foo"
+		usz last_index = 2 + str[2..].index_of_char('\\')!;
+		// If they don't match, we're done
+		if (last_index > index) return INVALID_PATH?;
+		if (last_index != index) return index + 1;
+		// Otherwise just default to the volume length.
 	}
-	return path_str.rindex_of_char('/') + 1 ?? 0;
+	return volume_name_len(str, path_env)!!;
 }

-fn bool! Path.is_absolute(self)
+
+fn bool? String.is_absolute_path(self) => @pool()
+{
+	return temp(self).is_absolute();
+}
+
+fn bool? Path.is_absolute(self)
 {
 	String path_str = self.str_view();
 	if (!path_str.len) return false;
@@ -242,55 +231,69 @@ fn bool! Path.is_absolute(self)
 	return path_start < path_str.len && is_separator(path_str[path_start], self.env);
 }

-fn Path! Path.absolute(self, Allocator allocator = allocator::heap()) @deprecated("Use path.new_absolute()")
+
+fn Path? String.to_absolute_path(self, Allocator allocator) => @pool()
 {
-	return self.new_absolute(allocator) @inline;
+	return temp(self).absolute(allocator);
 }

 <*
- @require self.env == DEFAULT_PATH_ENV : "This method is only available on native paths"
+ @require self.env == DEFAULT_ENV : "This method is only available on native paths"
 *>
-fn Path! Path.new_absolute(self, Allocator allocator = allocator::heap())
+fn Path? Path.absolute(self, Allocator allocator)
 {
 	String path_str = self.str_view();
-	if (!path_str.len) return PathResult.INVALID_PATH?;
-	if (self.is_absolute()!) return new(path_str, allocator, self.env);
+	if (!path_str.len) return INVALID_PATH?;
+	if (self.is_absolute()!) return new(allocator, path_str, self.env);
 	if (path_str == ".")
 	{
-		@pool(allocator)
+		@pool()
 		{
-			String cwd = os::getcwd(allocator::temp())!;
-			return new(cwd, allocator, self.env);
+			String cwd = os::getcwd(tmem)!;
+			return new(allocator, cwd, self.env);
 		};
 	}
-	$if DEFAULT_PATH_ENV == WIN32:
-		@pool(allocator)
+	$if DEFAULT_ENV == WIN32:
+		@pool()
 		{
 			const usz BUFFER_LEN = 4096;
-			WString buffer = (WString)mem::temp_alloc_array(Char16, BUFFER_LEN);
+			WString buffer = (WString)mem::talloc_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 };
+			if (!buffer) return INVALID_PATH?;
+			return { string::from_wstring(allocator, buffer), WIN32, allocator };
 		};
 	$else
-		String cwd = os::getcwd(allocator::temp())!;
-		return (Path){ cwd, self.env }.new_append(path_str, allocator)!;
+		String cwd = os::getcwd(tmem)!;
+		return (Path){ cwd, self.env, tmem }.append(allocator, path_str)!;
 	$endif
 }

+fn String? String.file_basename(self, Allocator allocator) => @pool()
+{
+	return temp(self).basename().copy(allocator);
+}
+
+fn String? String.file_tbasename(self) => self.file_basename(tmem);
+
 fn String Path.basename(self)
 {
-	usz basename_start = self.start_of_base_name();
+	usz basename_start = start_of_base_name(self.path_string, self.env)!!;
 	String path_str = self.path_string;
 	if (basename_start == path_str.len) return "";
 	return path_str[basename_start..];
 }

+fn String? String.path_tdirname(self) => self.path_dirname(tmem);
+
+fn String? String.path_dirname(self, Allocator allocator) => @pool()
+{
+	return temp(self).dirname().copy(allocator);
+}

 fn String Path.dirname(self)
 {
-	usz basename_start = self.start_of_base_name();
 	String path_str = self.path_string;
+	usz basename_start = start_of_base_name(path_str, self.env)!!;
 	if (basename_start == 0) return ".";
 	usz start = volume_name_len(path_str, self.env)!!;
 	if (basename_start <= start + 1)
@@ -304,11 +307,12 @@ fn String Path.dirname(self)
 	return path_str[:basename_start - 1];
 }

+
 <*
 Test if the path has the given extension, so given the path /foo/bar.c3
 this would be true matching the extension "c3"

- @param [in] extension `The extension name (not including the leading '.')`
+ @param [in] extension : `The extension name (not including the leading '.')`
 @require extension.len > 0 : `The extension cannot be empty`
 @return `true if the extension matches`
 *>
@@ -320,13 +324,12 @@ fn bool Path.has_extension(self, String extension)
 	return basename[^extension.len..] == extension;
 }

-fn String! Path.extension(self)
+fn String? Path.extension(self)
 {
 	String basename = self.basename();
 	usz index = basename.rindex_of(".")!;
-	// Plain ".foo" does not have an
-	if (index == 0) return SearchResult.MISSING?;
-	if (index == basename.len) return "";
+	// Plain ".foo" does not have an extension
+	if (index == 0 || index == basename.len) return "";
 	return basename[index + 1..];
 }

@@ -337,7 +340,17 @@ fn String Path.volume_name(self)
 	return self.path_string[:len];
 }

-fn usz! volume_name_len(String path, PathEnv path_env) @local
+fn Path? String.to_path(self, Allocator allocator)
+{
+	return new(allocator, self);
+}
+
+fn Path? String.to_tpath(self)
+{
+	return new(tmem, self);
+}
+
+fn usz? volume_name_len(String path, PathEnv path_env) @local
 {
 	usz len = path.len;
 	if (len < 2 || path_env != PathEnv.WIN32) return 0;
@@ -361,10 +374,10 @@ fn usz! volume_name_len(String path, PathEnv path_env) @local
 					base_found = i;
 					continue;
 				}
-				if (is_reserved_win32_path_char(c)) return PathResult.INVALID_PATH?;
+				if (is_reserved_win32_path_char(c)) return INVALID_PATH?;
 			}
 			if (base_found > 0 && base_found + 1 < len) return len;
-			return PathResult.INVALID_PATH?;
+			return INVALID_PATH?;
 		case 'A'..'Z':
 		case 'a'..'z':
 			return path[1] == ':' ? 2 : 0;
@@ -378,22 +391,22 @@ fn usz! volume_name_len(String path, PathEnv path_env) @local
 of the path itself.

 @return `The parent of the path as a non-allocated path`
- @return! PathResult.NO_PARENT `if this path does not have a parent`
+ @return? NO_PARENT : `if this path does not have a parent`
 *>
-fn Path! Path.parent(self)
+fn Path? Path.parent(self)
 {
-	if (self.path_string.len == 1 && is_separator(self.path_string[0], self.env)) return PathResult.NO_PARENT?;
+	if (self.path_string.len == 1 && is_separator(self.path_string[0], self.env)) return NO_PARENT?;
 	foreach_r(i, c : self.path_string)
 	{
 		if (is_separator(c, self.env))
 		{
-			return { self.path_string[:i], self.env };
+			return { self.path_string[:i], self.env, null };
 		}
 	}
-	return PathResult.NO_PARENT?;
+	return NO_PARENT?;
 }

-fn String! normalize(String path_str, PathEnv path_env = DEFAULT_PATH_ENV)
+fn String? normalize(String path_str, PathEnv path_env = DEFAULT_ENV)
 {
 	if (!path_str.len) return path_str;
 	usz path_start = volume_name_len(path_str, path_env)!;
@@ -432,7 +445,7 @@ fn String! normalize(String path_str, PathEnv path_env = DEFAULT_PATH_ENV)

 		// The rest are names of the path elements, so check that the
 		// characters are valid.
-		if (is_reserved_path_char(c, path_env)) return PathResult.INVALID_PATH?;
+		if (is_reserved_path_char(c, path_env)) return INVALID_PATH?;

 		// If we have '.' after a separator
 		if (c == '.' && previous_was_separator)
@@ -465,7 +478,7 @@ fn String! normalize(String path_str, PathEnv path_env = DEFAULT_PATH_ENV)
 					continue;
 				case 2:
 					// This is an error: /a/../..
-					if (len == path_start && has_root) return PathResult.INVALID_PATH?;
+					if (len == path_start && has_root) return INVALID_PATH?;

 					// If this .. at the start, or after ../? If so, we just copy ..
 					if (len == path_start ||
@@ -539,24 +552,24 @@ fn String Path.root_directory(self)
 	return path_str;
 }

-def PathWalker = fn bool! (Path, bool is_dir, void*);
+alias 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"
+ @require self.env == DEFAULT_ENV : "This method is only available on native paths"
 *>
-fn bool! Path.walk(self, PathWalker w, void* data)
+fn bool? Path.walk(self, PathWalker w, void* data)
 {
 	const PATH_MAX = 512;
 	@stack_mem(PATH_MAX; Allocator allocator)
 	{
-		Path abs = self.new_absolute(allocator)!;
-		PathList files = new_ls(abs, allocator: allocator)!;
+		Path abs = self.absolute(allocator)!;
+		PathList files = ls(allocator, abs)!;
 		foreach (f : files)
 		{
 			if (f.str_view() == "." || f.str_view() == "..") continue;
-			f = abs.new_append(f.str_view(), allocator)!;
+			f = abs.append(allocator, f.str_view())!;
 			bool is_directory = is_dir(f);
 			if (w(f, is_directory, data)!) return true;
 			if (is_directory && f.walk(w, data)!) return true;
@@ -565,6 +578,35 @@ fn bool! Path.walk(self, PathWalker w, void* data)
 	return false;
 }

+alias TraverseCallback = fn bool? (Path, bool is_dir, any data);
+
+<*
+ Walk the path recursively. TraverseCallback is run for every file and
+ directory found. Return true to abort the walk.
+ @require path.env == DEFAULT_ENV : "This method is only available on native paths"
+*>
+fn bool? traverse(Path path, TraverseCallback callback, any data)
+{
+	const PATH_MAX = 512;
+	@stack_mem(PATH_MAX; Allocator allocator)
+	{
+		Path abs = path.absolute(allocator)!;
+		PathList files = ls(allocator, abs)!;
+		foreach (f : files)
+		{
+			if (f.str_view() == "." || f.str_view() == "..") continue;
+			@stack_mem(128; Allocator smem)
+			{
+				f = abs.append(smem, f.str_view())!;
+				bool is_directory = is_dir(f);
+				if (callback(f, is_directory, data)!) return true;
+				if (is_directory && traverse(f, callback, data)!) return true;
+			};
+		}
+	};
+	return false;
+}
+
 fn String Path.str_view(self) @inline
 {
 	return self.path_string;
@@ -576,26 +618,19 @@ 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);
-}
-
+<*
+ @require self.allocator != null : "This Path should never be freed"
+*>
 fn void Path.free(self)
 {
-	free(self.path_string.ptr);
+	allocator::free(self.allocator, self.path_string.ptr);
 }

-
-fn usz! Path.to_format(&self, Formatter* formatter) @dynamic
+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
-{
-	return self.str_view().copy(allocator);
-}

 const bool[256] RESERVED_PATH_CHAR_POSIX = {
 	[0] = true,
@@ -619,9 +654,29 @@ macro bool is_reserved_win32_path_char(char c)
 	return RESERVED_PATH_CHAR_WIN32[c];
 }

-macro bool is_reserved_path_char(char c, PathEnv path_env = DEFAULT_PATH_ENV)
+macro bool is_reserved_path_char(char c, PathEnv path_env = DEFAULT_ENV)
 {
 	return path_env == PathEnv.WIN32
 		? RESERVED_PATH_CHAR_WIN32[c]
 		: RESERVED_PATH_CHAR_POSIX[c];
-}
+}
+fn bool? _mkdir(Path path, bool recursive = false, MkdirPermissions permissions = NORMAL) @private
+{
+	if (!path.path_string.len) return INVALID_PATH?;
+	if (is_dir(path)) return false;
+	if (exists(path)) return io::FILE_NOT_DIR?;
+
+	if (recursive)
+	{
+		if (try parent = path.parent()) mkdir(parent, true, permissions)!;
+	}
+	if (!is_dir(path.parent()) ?? false) return io::CANNOT_READ_DIR?;
+
+	return os::native_mkdir(path, permissions);
+}
+
+fn bool? _rmdir(Path path) @private
+{
+	if (!path.path_string.len) return INVALID_PATH?;
+	return os::native_rmdir(path);
+}
--- a/lib/std/io/stream.c3
+++ b/lib/std/io/stream.c3
@@ -3,28 +3,28 @@ import std::math;

 interface InStream
 {
-	fn void! close() @optional;
-	fn usz! seek(isz offset, Seek seek) @optional;
+	fn void? close() @optional;
+	fn usz? seek(isz offset, Seek seek) @optional;
 	fn usz len() @optional;
-	fn usz! available() @optional;
-	fn usz! read(char[] buffer);
-	fn char! read_byte();
-	fn usz! write_to(OutStream out) @optional;
-	fn void! pushback_byte() @optional;
+	fn usz? available() @optional;
+	fn usz? read(char[] buffer);
+	fn char? read_byte();
+	fn usz? write_to(OutStream out) @optional;
+	fn void? pushback_byte() @optional;
 }


 interface OutStream
 {
-	fn void! destroy() @optional;
-	fn void! close() @optional;
-	fn void! flush() @optional;
-	fn usz! write(char[] bytes);
-	fn void! write_byte(char c);
-	fn usz! read_to(InStream in) @optional;
+	fn void? destroy() @optional;
+	fn void? close() @optional;
+	fn void? flush() @optional;
+	fn usz? write(char[] bytes);
+	fn void? write_byte(char c);
+	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)
@@ -51,17 +51,17 @@ macro bool @is_outstream(#expr)
 @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]);
 }

 <*
- @param [&in] ref "the object to write."
+ @param [&in] ref : "the object to write."
 @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]);
 }
@@ -69,34 +69,18 @@ macro usz! write_any(stream, any ref)
 <*
 @require @is_instream(stream)
 *>
-macro usz! read_all(stream, char[] buffer)
+macro usz? read_all(stream, char[] buffer)
 {
 	if (buffer.len == 0) return 0;
 	usz n = stream.read(buffer)!;
-	if (n != buffer.len) return IoError.UNEXPECTED_EOF?;
+	if (n != buffer.len) return UNEXPECTED_EOF?;
 	return n;
 }

 <*
 @require @is_instream(stream)
 *>
-macro char[]! read_new_fully(stream, Allocator allocator = allocator::heap()) @deprecated("Use read_fully(mem)")
-{
-	usz len = available(stream)!;
-	char* data = allocator::malloc_try(allocator, len)!;
-	defer catch allocator::free(allocator, data);
-	usz read = 0;
-	while (read < len)
-	{
-		read += stream.read(data[read:len - read])!;
-	}
-	return data[:len];
-}
-
-<*
- @require @is_instream(stream)
-*>
-macro char[]! read_fully(Allocator allocator, stream)
+macro char[]? read_fully(Allocator allocator, stream)
 {
 	usz len = available(stream)!;
 	char* data = allocator::malloc_try(allocator, len)!;
@@ -112,29 +96,24 @@ macro char[]! read_fully(Allocator allocator, stream)
 <*
 @require @is_outstream(stream)
 *>
-macro usz! write_all(stream, char[] buffer)
+macro usz? write_all(stream, char[] buffer)
 {
 	if (buffer.len == 0) return 0;
 	usz n = stream.write(buffer)!;
-	if (n != buffer.len) return IoError.INCOMPLETE_WRITE?;
+	if (n != buffer.len) return INCOMPLETE_WRITE?;
 	return n;
 }

-macro usz! @read_using_read_byte(&s, char[] buffer) @deprecated
-{
-	return read_using_read_byte(*s, buffer);
-}
-
-macro usz! read_using_read_byte(s, char[] buffer)
+macro usz? read_using_read_byte(s, char[] buffer)
 {
 	usz len = 0;
 	foreach (&cptr : buffer)
 	{
-		char! c = s.read_byte();
+		char? c = s.read_byte();
 		if (catch err = c)
 		{
-			case IoError.EOF: return len;
-			default: return err?;
+			if (err == io::EOF) return len;
+			return err?;
 		}
 		*cptr = c;
 		len++;
@@ -142,60 +121,40 @@ macro usz! read_using_read_byte(s, char[] buffer)
 	return len;
 }

-macro void! write_byte_using_write(s, char c)
+macro void? write_byte_using_write(s, char c)
 {
 	char[1] buff = { c };
 	s.write(&buff)!;
 }

-macro void! @write_byte_using_write(&s, char c) @deprecated
-{
-	return write_byte_using_write(*s, c);
-}
-
-macro char! @read_byte_using_read(&s) @deprecated
-{
-	return read_byte_using_read(*s);
-}
-
-macro char! read_byte_using_read(s)
+macro char? read_byte_using_read(s)
 {
 	char[1] buffer;
 	usz read = s.read(&buffer)!;
-	if (read != 1) return IoError.EOF?;
+	if (read != 1) return io::EOF?;
 	return buffer[0];
 }

-def ReadByteFn = fn char!();
+alias ReadByteFn = fn char?();


-macro usz! write_using_write_byte(s, char[] bytes)
+macro usz? write_using_write_byte(s, char[] bytes)
 {
 	foreach (c : bytes) s.write_byte(self, c)!;
 	return bytes.len;
 }

-macro usz! @write_using_write_byte(&s, char[] bytes) @deprecated
-{
-	return write_using_write_byte(*s, bytes);
-}
-
-macro void! pushback_using_seek(s)
+macro void? pushback_using_seek(s)
 {
 	s.seek(-1, CURSOR)!;
 }

-macro void! @pushback_using_seek(&s) @deprecated
-{
-	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);
 	if (&dst.read_to) return dst.read_to(in);
-	$switch (env::MEMORY_ENV)
+	$switch env::MEMORY_ENV:
 		$case NORMAL:
 			return copy_through_buffer(in, dst, &&(char[4096]){});
 		$case SMALL:
@@ -206,31 +165,31 @@ 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)
 	{
-		usz! len = in.read(buffer);
+		usz? len = in.read(buffer);
 		if (catch err = len)
 		{
-			case IoError.EOF: return total_copied;
-			default: return err?;
+			if (err == io::EOF) return total_copied;
+			return err?;
 		}
 		if (!len) return total_copied;
 		usz written = dst.write(buffer[:len])!;
 		total_copied += len;
-		if (written != len) return IoError.INCOMPLETE_WRITE?;
+		if (written != len) return INCOMPLETE_WRITE?;
 	}
 }

-const char[?] MAX_VARS @private = { [2] = 3, [4] = 5, [8] = 10 };
+const char[*] MAX_VARS @private = { [2] = 3, [4] = 5, [8] = 10 };

 <*
 @require @is_instream(stream)
 @require @typekind(x_ptr) == POINTER && $typeof(x_ptr).inner.kindof.is_int()
 *>
-macro usz! read_varint(stream, x_ptr)
+macro usz? read_varint(stream, x_ptr)
 {
 	var $Type = $typefrom($typeof(x_ptr).inner);
 	const MAX = MAX_VARS[$Type.sizeof];
@@ -239,13 +198,11 @@ macro usz! read_varint(stream, x_ptr)
 	usz n;
 	for (usz i = 0; i < MAX; i++)
 	{
-		char! c = stream.read_byte();
+		char? c = stream.read_byte();
 		if (catch err = c)
 		{
-			case IoError.EOF:
-				return IoError.UNEXPECTED_EOF?;
-			default:
-				return err?;
+			if (err == io::EOF) return io::UNEXPECTED_EOF?;
+			return err?;
 		}
 		n++;
 		if (c & 0x80 == 0)
@@ -261,13 +218,13 @@ macro usz! read_varint(stream, x_ptr)
 		x |= (c & 0x7F) << shift;
 		shift += 7;
 	}
-	return MathError.OVERFLOW?;
+	return math::OVERFLOW?;
 }
 <*
 @require @is_outstream(stream)
 @require @typekind(x).is_int()
 *>
-macro usz! write_varint(stream, x)
+macro usz? write_varint(stream, x)
 {
 	var $Type = $typeof(x);
 	const MAX = MAX_VARS[$Type.sizeof];
@@ -286,7 +243,7 @@ macro usz! write_varint(stream, x)
 <*
 @require @is_instream(stream)
 *>
-macro ushort! read_be_ushort(stream)
+macro ushort? read_be_ushort(stream)
 {
 	char hi_byte = stream.read_byte()!;
 	char lo_byte = stream.read_byte()!;
@@ -296,7 +253,7 @@ macro ushort! read_be_ushort(stream)
 <*
 @require @is_instream(stream)
 *>
-macro short! read_be_short(stream)
+macro short? read_be_short(stream)
 {
 	return read_be_ushort(stream);
 }
@@ -304,7 +261,7 @@ macro short! read_be_short(stream)
 <*
 @require @is_outstream(stream)
 *>
-macro void! write_be_short(stream, ushort s)
+macro void? write_be_short(stream, ushort s)
 {
 	stream.write_byte((char)(s >> 8))!;
 	stream.write_byte((char)s)!;
@@ -313,7 +270,7 @@ macro void! write_be_short(stream, ushort s)
 <*
 @require @is_instream(stream)
 *>
-macro uint! read_be_uint(stream)
+macro uint? read_be_uint(stream)
 {
 	uint val = stream.read_byte()! << 24;
 	val += stream.read_byte()! << 16;
@@ -324,7 +281,7 @@ macro uint! read_be_uint(stream)
 <*
 @require @is_instream(stream)
 *>
-macro int! read_be_int(stream)
+macro int? read_be_int(stream)
 {
 	return read_be_uint(stream);
 }
@@ -332,7 +289,7 @@ macro int! read_be_int(stream)
 <*
 @require @is_outstream(stream)
 *>
-macro void! write_be_int(stream, uint s)
+macro void? write_be_int(stream, uint s)
 {
 	stream.write_byte((char)(s >> 24))!;
 	stream.write_byte((char)(s >> 16))!;
@@ -343,7 +300,7 @@ macro void! write_be_int(stream, uint s)
 <*
 @require @is_instream(stream)
 *>
-macro ulong! read_be_ulong(stream)
+macro ulong? read_be_ulong(stream)
 {
 	ulong val = (ulong)stream.read_byte()! << 56;
 	val += (ulong)stream.read_byte()! << 48;
@@ -358,7 +315,7 @@ macro ulong! read_be_ulong(stream)
 <*
 @require @is_instream(stream)
 *>
-macro long! read_be_long(stream)
+macro long? read_be_long(stream)
 {
 	return read_be_ulong(stream);
 }
@@ -366,7 +323,7 @@ macro long! read_be_long(stream)
 <*
 @require @is_outstream(stream)
 *>
-macro void! write_be_long(stream, ulong s)
+macro void? write_be_long(stream, ulong s)
 {
 	stream.write_byte((char)(s >> 56))!;
 	stream.write_byte((char)(s >> 48))!;
@@ -381,7 +338,7 @@ macro void! write_be_long(stream, ulong s)
 <*
 @require @is_instream(stream)
 *>
-macro uint128! read_be_uint128(stream)
+macro uint128? read_be_uint128(stream)
 {
 	uint128 val = (uint128)stream.read_byte()! << 120;
 	val += (uint128)stream.read_byte()! << 112;
@@ -404,7 +361,7 @@ macro uint128! read_be_uint128(stream)
 <*
 @require @is_instream(stream)
 *>
-macro int128! read_be_int128(stream)
+macro int128? read_be_int128(stream)
 {
 	return read_be_uint128(stream);
 }
@@ -412,7 +369,7 @@ macro int128! read_be_int128(stream)
 <*
 @require @is_outstream(stream)
 *>
-macro void! write_be_int128(stream, uint128 s)
+macro void? write_be_int128(stream, uint128 s)
 {
 	stream.write_byte((char)(s >> 120))!;
 	stream.write_byte((char)(s >> 112))!;
@@ -434,9 +391,9 @@ macro void! write_be_int128(stream, uint128 s)

 <*
 @require @is_outstream(stream)
- @require data.len < 256 "Data exceeded 255"
+ @require data.len < 256 : "Data exceeded 255"
 *>
-macro usz! write_tiny_bytearray(stream, char[] data)
+macro usz? write_tiny_bytearray(stream, char[] data)
 {
 	stream.write_byte((char)data.len)!;
 	return stream.write(data) + 1;
@@ -445,7 +402,7 @@ macro usz! write_tiny_bytearray(stream, char[] data)
 <*
 @require @is_instream(stream)
 *>
-macro char[]! read_tiny_bytearray(stream, Allocator allocator)
+macro char[]? read_tiny_bytearray(stream, Allocator allocator)
 {
 	int len = stream.read_byte()!;
 	if (!len) return {};
@@ -456,9 +413,9 @@ macro char[]! read_tiny_bytearray(stream, Allocator allocator)

 <*
 @require @is_outstream(stream)
- @require data.len < 0x1000 "Data exceeded 65535"
+ @require data.len < 0x1000 : "Data exceeded 65535"
 *>
-macro usz! write_short_bytearray(stream, char[] data)
+macro usz? write_short_bytearray(stream, char[] data)
 {
 	io::write_be_short(stream, (ushort)data.len)!;
 	return stream.write(data) + 2;
@@ -467,7 +424,7 @@ macro usz! write_short_bytearray(stream, char[] data)
 <*
 @require @is_instream(stream)
 *>
-macro char[]! read_short_bytearray(stream, Allocator allocator)
+macro char[]? read_short_bytearray(stream, Allocator allocator)
 {
 	int len = io::read_be_ushort(stream)!;
 	if (!len) return {};
--- a/lib/std/io/stream/buffer.c3
+++ b/lib/std/io/stream/buffer.c3
@@ -12,7 +12,7 @@ struct ReadBuffer (InStream)
 Buffer reads from a stream.
 @param [inout] self
 @require bytes.len > 0
- @require self.bytes.len == 0 "Init may not run on already initialized data"
+ @require self.bytes.len == 0 : "Init may not run on already initialized data"
 *>
 fn ReadBuffer* ReadBuffer.init(&self, InStream wrapped_stream, char[] bytes)
 {
@@ -24,12 +24,12 @@ fn String ReadBuffer.str_view(&self) @inline
 	return (String)self.bytes[self.read_idx:self.write_idx - self.read_idx];
 }

-fn void! ReadBuffer.close(&self) @dynamic
+fn void? ReadBuffer.close(&self) @dynamic
 {
 	if (&self.wrapped_stream.close) self.wrapped_stream.close()!;
 }

-fn usz! ReadBuffer.read(&self, char[] bytes) @dynamic
+fn usz? ReadBuffer.read(&self, char[] bytes) @dynamic
 {
 	if (self.read_idx == self.write_idx)
 	{
@@ -46,16 +46,16 @@ fn usz! ReadBuffer.read(&self, char[] bytes) @dynamic
 	return n;
 }

-fn char! ReadBuffer.read_byte(&self) @dynamic
+fn char? ReadBuffer.read_byte(&self) @dynamic
 {
 	if (self.read_idx == self.write_idx) self.refill()!;
-	if (self.read_idx == self.write_idx) return IoError.EOF?;
+	if (self.read_idx == self.write_idx) return io::EOF?;
 	char c = self.bytes[self.read_idx];
 	self.read_idx++;
 	return c;
 }

-fn void! ReadBuffer.refill(&self) @local @inline
+fn void? ReadBuffer.refill(&self) @local @inline
 {
 	self.read_idx = 0;
 	self.write_idx = self.wrapped_stream.read(self.bytes)!;
@@ -71,8 +71,8 @@ struct WriteBuffer (OutStream)
 <*
 Buffer writes to a stream. Call `flush` when done writing to the buffer.
 @param [inout] self
- @require bytes.len > 0 "Non-empty buffer required"
- @require self.bytes.len == 0 "Init may not run on already initialized data"
+ @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)
 {
@@ -85,18 +85,18 @@ fn String WriteBuffer.str_view(&self) @inline
 	return (String)self.bytes[:self.index];
 }

-fn void! WriteBuffer.close(&self) @dynamic
+fn void? WriteBuffer.close(&self) @dynamic
 {
 	if (&self.wrapped_stream.close) return self.wrapped_stream.close();
 }

-fn void! WriteBuffer.flush(&self) @dynamic
+fn void? WriteBuffer.flush(&self) @dynamic
 {
 	self.write_pending()!;
 	if (&self.wrapped_stream.flush) self.wrapped_stream.flush()!;
 }

-fn usz! WriteBuffer.write(&self, char[] bytes) @dynamic
+fn usz? WriteBuffer.write(&self, char[] bytes) @dynamic
 {
 	usz n = self.bytes.len - self.index;
 	if (bytes.len < n)
@@ -118,7 +118,7 @@ fn usz! WriteBuffer.write(&self, char[] bytes) @dynamic
 	return bytes.len;
 }

-fn void! WriteBuffer.write_byte(&self, char c) @dynamic
+fn void? WriteBuffer.write_byte(&self, char c) @dynamic
 {
 	usz n = self.bytes.len - self.index;
 	if (n == 0)
@@ -129,8 +129,8 @@ fn void! WriteBuffer.write_byte(&self, char c) @dynamic
 	self.index += 1;
 }

-fn void! WriteBuffer.write_pending(&self) @local
+fn void? WriteBuffer.write_pending(&self) @local
 {
 	self.index -= self.wrapped_stream.write(self.bytes[:self.index])!;
-	if (self.index != 0) return IoError.INCOMPLETE_WRITE?;
+	if (self.index != 0) return INCOMPLETE_WRITE?;
 }
--- a/lib/std/io/stream/bytebuffer.c3
+++ b/lib/std/io/stream/bytebuffer.c3
@@ -14,7 +14,7 @@ struct ByteBuffer (InStream, OutStream)
 <*
 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."
+ @require self.bytes.len == 0 : "Buffer already initialized."
 *>
 fn ByteBuffer* ByteBuffer.init(&self, Allocator allocator, usz max_read, usz initial_capacity = 16)
 {
@@ -24,32 +24,14 @@ fn ByteBuffer* ByteBuffer.init(&self, Allocator allocator, usz max_read, usz ini
 	return self;
 }

-<*
- 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()) @deprecated("Use init(mem)")
-{
-	*self = { .allocator = allocator, .max_read = max_read };
-	initial_capacity = max(initial_capacity, 16);
-	self.grow(initial_capacity);
-	return self;
-}
-
 fn ByteBuffer* ByteBuffer.tinit(&self, usz max_read, usz initial_capacity = 16)
 {
-	return self.init(allocator::temp(), max_read, initial_capacity);
-}
-
-fn ByteBuffer* ByteBuffer.temp_init(&self, usz max_read, usz initial_capacity = 16) @deprecated("Use tinit()")
-{
-	return self.init(allocator::temp(), max_read, initial_capacity);
+	return self.init(tmem, max_read, initial_capacity);
 }

 <*
 @require buf.len > 0
- @require self.bytes.len == 0 "Buffer already initialized."
+ @require self.bytes.len == 0 : "Buffer already initialized."
 *>
 fn ByteBuffer* ByteBuffer.init_with_buffer(&self, char[] buf)
 {
@@ -63,7 +45,7 @@ fn void ByteBuffer.free(&self)
 	*self = {};
 }

-fn usz! ByteBuffer.write(&self, char[] bytes) @dynamic
+fn usz? ByteBuffer.write(&self, char[] bytes) @dynamic
 {
 	usz cap = self.bytes.len - self.write_idx;
 	if (cap < bytes.len) self.grow(bytes.len);
@@ -72,7 +54,7 @@ fn usz! ByteBuffer.write(&self, char[] bytes) @dynamic
 	return bytes.len;
 }

-fn void! ByteBuffer.write_byte(&self, char c) @dynamic
+fn void? ByteBuffer.write_byte(&self, char c) @dynamic
 {
 	usz cap = self.bytes.len - self.write_idx;
 	if (cap == 0) self.grow(1);
@@ -80,13 +62,13 @@ fn void! ByteBuffer.write_byte(&self, char c) @dynamic
 	self.write_idx++;
 }

-fn usz! ByteBuffer.read(&self, char[] bytes) @dynamic
+fn usz? ByteBuffer.read(&self, char[] bytes) @dynamic
 {
 	usz readable = self.write_idx - self.read_idx;
 	if (readable == 0)
 	{
 		self.has_last = false;
-		return IoError.EOF?;
+		return io::EOF?;
 	}
 	usz n = min(readable, bytes.len);
 	bytes[:n] = self.bytes[self.read_idx:n];
@@ -96,13 +78,13 @@ fn usz! ByteBuffer.read(&self, char[] bytes) @dynamic
 	return n;
 }

-fn char! ByteBuffer.read_byte(&self) @dynamic
+fn char? ByteBuffer.read_byte(&self) @dynamic
 {
 	usz readable = self.write_idx - self.read_idx;
 	if (readable == 0)
 	{
 		self.has_last = false;
-		return IoError.EOF?;
+		return io::EOF?;
 	}
 	char c = self.bytes[self.read_idx];
 	self.read_idx++;
@@ -114,34 +96,34 @@ fn char! ByteBuffer.read_byte(&self) @dynamic
 <*
 Only the last byte of a successful read can be pushed back.
 *>
-fn void! ByteBuffer.pushback_byte(&self) @dynamic
+fn void? ByteBuffer.pushback_byte(&self) @dynamic
 {
-	if (!self.has_last) return IoError.EOF?;
+	if (!self.has_last) return io::EOF?;
 	assert(self.read_idx > 0);
 	self.read_idx--;
 	self.has_last = false;
 }

-fn usz! ByteBuffer.seek(&self, isz offset, Seek seek) @dynamic
+fn usz? ByteBuffer.seek(&self, isz offset, Seek seek) @dynamic
 {
 	switch (seek)
 	{
 		case SET:
-			if (offset < 0 || offset > self.write_idx) return IoError.INVALID_POSITION?;
+			if (offset < 0 || offset > self.write_idx) return INVALID_POSITION?;
 			self.read_idx = offset;
 			return offset;
 		case CURSOR:
 			if ((offset < 0 && self.read_idx < -offset) ||
-				(offset > 0 && self.read_idx + offset > self.write_idx)) return IoError.INVALID_POSITION?;
+				(offset > 0 && self.read_idx + offset > self.write_idx)) return INVALID_POSITION?;
 			self.read_idx += offset;
 		case END:
-			if (offset < 0 || offset > self.write_idx) return IoError.INVALID_POSITION?;
+			if (offset < 0 || offset > self.write_idx) return INVALID_POSITION?;
 			self.read_idx = self.write_idx - offset;
 	}
 	return self.read_idx;
 }

-fn usz! ByteBuffer.available(&self) @inline @dynamic
+fn usz? ByteBuffer.available(&self) @inline @dynamic
 {
 	return self.write_idx - self.read_idx;
 }
--- a/lib/std/io/stream/bytereader.c3
+++ b/lib/std/io/stream/bytereader.c3
@@ -17,9 +17,9 @@ fn ByteReader* ByteReader.init(&self, char[] bytes)
 	return self;
 }

-fn usz! ByteReader.read(&self, char[] bytes) @dynamic
+fn usz? ByteReader.read(&self, char[] bytes) @dynamic
 {
-	if (self.index >= self.bytes.len) return IoError.EOF?;
+	if (self.index >= self.bytes.len) return io::EOF?;
 	usz len = min(self.bytes.len - self.index, bytes.len);
 	if (len == 0) return 0;
 	mem::copy(bytes.ptr, &self.bytes[self.index], len);
@@ -27,19 +27,19 @@ fn usz! ByteReader.read(&self, char[] bytes) @dynamic
 	return len;
 }

-fn char! ByteReader.read_byte(&self) @dynamic
+fn char? ByteReader.read_byte(&self) @dynamic
 {
-	if (self.index >= self.bytes.len) return IoError.EOF?;
+	if (self.index >= self.bytes.len) return io::EOF?;
 	return self.bytes[self.index++];
 }

-fn void! ByteReader.pushback_byte(&self) @dynamic
+fn void? ByteReader.pushback_byte(&self) @dynamic
 {
-	if (!self.index) return IoError.INVALID_PUSHBACK?;
+	if (!self.index) return INVALID_PUSHBACK?;
 	self.index--;
 }

-fn usz! ByteReader.seek(&self, isz offset, Seek seek) @dynamic
+fn usz? ByteReader.seek(&self, isz offset, Seek seek) @dynamic
 {
 	isz new_index;
 	switch (seek)
@@ -48,12 +48,12 @@ fn usz! ByteReader.seek(&self, isz offset, Seek seek) @dynamic
 		case CURSOR: new_index = self.index + offset;
 		case END: new_index = self.bytes.len + offset;
 	}
-	if (new_index < 0) return IoError.INVALID_POSITION?;
+	if (new_index < 0) return INVALID_POSITION?;
 	self.index = new_index;
 	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..])!;
@@ -62,7 +62,7 @@ fn usz! ByteReader.write_to(&self, OutStream writer) @dynamic
 	return written;
 }

-fn usz! ByteReader.available(&self) @inline @dynamic
+fn usz? ByteReader.available(&self) @inline @dynamic
 {
 	return max(0, self.bytes.len - self.index);
 }
--- a/lib/std/io/stream/bytewriter.c3
+++ b/lib/std/io/stream/bytewriter.c3
@@ -11,19 +11,7 @@ struct ByteWriter (OutStream)
 <*
 @param [&inout] self
 @param [&inout] allocator
- @require self.bytes.len == 0 "Init may not run on already initialized data"
- @ensure (bool)allocator, self.index == 0
-*>
-fn ByteWriter* ByteWriter.new_init(&self, Allocator allocator = allocator::heap()) @deprecated("Use init(mem)")
-{
-	*self = { .bytes = {}, .allocator = allocator };
-	return self;
-}
-
-<*
- @param [&inout] self
- @param [&inout] allocator
- @require self.bytes.len == 0 "Init may not run on already initialized data"
+ @require self.bytes.len == 0 : "Init may not run on already initialized data"
 @ensure (bool)allocator, self.index == 0
 *>
 fn ByteWriter* ByteWriter.init(&self, Allocator allocator)
@@ -34,22 +22,12 @@ fn ByteWriter* ByteWriter.init(&self, Allocator allocator)

 <*
 @param [&inout] self
- @require self.bytes.len == 0 "Init may not run on already initialized data"
+ @require self.bytes.len == 0 : "Init may not run on already initialized data"
 @ensure self.index == 0
 *>
 fn ByteWriter* ByteWriter.tinit(&self)
 {
-	return self.init(allocator::temp()) @inline;
-}
-
-<*
- @param [&inout] self
- @require self.bytes.len == 0 "Init may not run on already initialized data"
- @ensure self.index == 0
-*>
-fn ByteWriter* ByteWriter.temp_init(&self) @deprecated("Use tinit")
-{
-	return self.init(allocator::temp()) @inline;
+	return self.init(tmem) @inline;
 }

 fn ByteWriter* ByteWriter.init_with_buffer(&self, char[] data)
@@ -58,7 +36,7 @@ fn ByteWriter* ByteWriter.init_with_buffer(&self, char[] data)
 	return self;
 }

-fn void! ByteWriter.destroy(&self) @dynamic
+fn void? ByteWriter.destroy(&self) @dynamic
 {
 	if (!self.allocator) return;
 	if (void* ptr = self.bytes.ptr) allocator::free(self.allocator, ptr);
@@ -70,17 +48,17 @@ fn String ByteWriter.str_view(&self) @inline
 	return (String)self.bytes[:self.index];
 }

-fn void! ByteWriter.ensure_capacity(&self, usz len) @inline
+fn void? ByteWriter.ensure_capacity(&self, usz len) @inline
 {
 	if (self.bytes.len > len) return;
-	if (!self.allocator) return IoError.OUT_OF_SPACE?;
+	if (!self.allocator) return OUT_OF_SPACE?;
 	if (len < 16) len = 16;
 	usz new_capacity = math::next_power_of_2(len);
 	char* new_ptr = allocator::realloc_try(self.allocator, self.bytes.ptr, new_capacity)!;
 	self.bytes = new_ptr[:new_capacity];
 }

-fn usz! ByteWriter.write(&self, char[] bytes) @dynamic
+fn usz? ByteWriter.write(&self, char[] bytes) @dynamic
 {
 	self.ensure_capacity(self.index + bytes.len)!;
 	mem::copy(&self.bytes[self.index], bytes.ptr, bytes.len);
@@ -88,7 +66,7 @@ fn usz! ByteWriter.write(&self, char[] bytes) @dynamic
 	return bytes.len;
 }

-fn void! ByteWriter.write_byte(&self, char c) @dynamic
+fn void? ByteWriter.write_byte(&self, char c) @dynamic
 {
 	self.ensure_capacity(self.index + 1)!;
 	self.bytes[self.index++] = c;
@@ -98,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)
--- a/Show More
+++ b/Show More