2025-08-06 09:50:28 +00:00
5328 changed files with 317377 additions and 481794 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -25,7 +25,3 @@ c0eacf2eb1e1c0b3bd4f71f12fef258f5b249c3f
 da8baf2aa5ce93b958aca90a0ae69f537806324b
 # Run clang-format on most sources
 369f9740de4534c28d0e81ab2afc99decbb9a3e6
-# Get rid of .internal.h convention in LIBC_INTRIN
-86d884cce24d773e298a2714c1e3d91ecab9be45
-# Remove .internal from more header filenames
-31194165d2afca36c2315a6e7ca2f0797dde09e3
--- a/.gitattributes
+++ b/.gitattributes
@ -1,10 +1,4 @@
 # -*- conf -*-
 *.gz                         binary
-*.so                         binary
-*.dll                        binary
-*.dylib                      binary
-/build/bootstrap/*           binary
-/usr/share/terminfo/*        binary
-/usr/share/terminfo/*/*      binary
+/build/bootstrap/*.com       binary
 /usr/share/zoneinfo/*        binary
-/usr/share/zoneinfo/*/*      binary
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,8 +1,5 @@
 name: build

-env:
-  COSMOCC_VERSION: 3.9.2
-
 on:
  push:
    branches:
@ -22,48 +19,13 @@ jobs:
      matrix:
        mode: ["", tiny, rel, tinylinux, optlinux]
    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Full checkout needed for git-restore-mtime-bare.
-          fetch-depth: 0
-
-      # TODO(jart): fork this action.
-      - uses: chetan/git-restore-mtime-action@v2
-
-      - uses: actions/cache/restore@v4
-        id: cache
-        with:
-          path: |
-            .cosmocc
-            o
-          key: ${{ env.COSMOCC_VERSION }}-${{ matrix.mode }}-${{ github.sha }}
-          restore-keys: |
-            ${{ env.COSMOCC_VERSION }}-${{ matrix.mode }}-
-            ${{ env.COSMOCC_VERSION }}-
-
-      - name: Restore mtimes
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          while read mtime file; do
-            [ -f "$file" ] && touch -d "@$mtime" "$file"
-          done < o/.mtimes
+      - uses: actions/checkout@v3

      - name: support ape bins 1
-        run: sudo cp -a build/bootstrap/ape.elf /usr/bin/ape
+        run: sudo cp build/bootstrap/ape.elf /usr/bin/ape

      - name: support ape bins 2
        run: sudo sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register"

      - name: make matrix
        run: V=0 make -j2 MODE=${{ matrix.mode }}
-
-      - name: Save mtimes
-        run: |
-          find o -type f -exec stat -c "%Y %n" {} \; > o/.mtimes
-
-      - uses: actions/cache/save@v4
-        with:
-          path: |
-            .cosmocc
-            o
-          key: ${{ env.COSMOCC_VERSION }}-${{ matrix.mode }}-${{ github.sha }}
--- a/.github/workflows/nightly-cosmocc.yml
+++ b/.github/workflows/nightly-cosmocc.yml
@ -1,24 +0,0 @@
-name: Nightly cosmocc
-on:
-  schedule:
-    # https://crontab.guru/#37_4_*_*_*
-    - cron: "37 4 * * *"
-  workflow_dispatch:
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-jobs:
-  build-cosmocc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          sudo cp build/bootstrap/ape.elf /usr/bin/ape
-          sudo sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register"
-      - run: tool/cosmocc/package.sh
-      # https://github.com/actions/upload-artifact/issues/590
-      - uses: actions/upload-artifact@v4.3.5
-        with:
-          name: cosmocc
-          path: cosmocc
-          compression-level: 9
--- a/.gitignore
+++ b/.gitignore
@ -15,4 +15,3 @@ __pycache__
 /tool/emacs/*.elc
 /perf.data
 /perf.data.old
-/qemu*core
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,36 +0,0 @@
-{
-    "C_Cpp.default.compilerPath": ".cosmocc/3.9.2/bin/aarch64-linux-cosmo-c++",
-    "C_Cpp.default.compilerArgs": [
-        "-nostdinc",
-        "-nostdlib",
-        "-iquote.",
-        "-isystemlibc/isystem",
-        "-isystemthird_party/libcxx",
-        "-includelibc/integral/normalize.inc",
-        "-D_COSMO_SOURCE",
-        "-D__aarch64__"
-    ],
-    "[c]": {
-        "editor.tabSize": 2,
-        "editor.insertSpaces": true
-    },
-    "[cpp]": {
-        "editor.tabSize": 2,
-        "editor.insertSpaces": true
-    },
-    "[makefile]": {
-        "editor.tabSize": 8,
-        "editor.insertSpaces": false
-    },
-    "[make]": {
-        "editor.tabSize": 8,
-        "editor.insertSpaces": false
-    },
-    "[assembly]": {
-        "editor.tabSize": 8,
-        "editor.insertSpaces": true
-    },
-    "files.associations": {
-        "log.h": "c"
-    }
-}
--- a/175
+++ b/175
@ -77,8 +77,7 @@ COMMA := ,
 PWD := $(shell pwd)

 # detect wsl2 running cosmopolitan binaries on the host by checking whether:
-# - user ran .cosmocc/current/bin/make, in which case make's working directory
-#   is in wsl
+# - user ran build/bootstrap/make, in which case make's working directory is in wsl
 # - user ran make, in which case cocmd's working directory is in wsl
 ifneq ($(findstring //wsl.localhost/,$(CURDIR) $(PWD)),)
 $(warning wsl2 interop is enabled)
@ -90,7 +89,7 @@ UNAME_S := $(shell uname -s)

 # apple still distributes a 17 year old version of gnu make
 ifeq ($(MAKE_VERSION), 3.81)
-$(error please use https://cosmo.zip/pub/cosmos/bin/make)
+$(error please use build/bootstrap/make)
 endif

 LC_ALL = C
@ -102,22 +101,23 @@ XARGS ?= xargs -P4 -rs8000
 DOT ?= dot
 CLANG = clang
 TMPDIR = o/tmp
-AR = $(BOOTSTRAP)/ar.ape
-CP = $(BOOTSTRAP)/cp.ape
-RM = $(BOOTSTRAP)/rm.ape -f
-GZIP = $(BOOTSTRAP)/gzip.ape
-ECHO = $(BOOTSTRAP)/echo.ape
-CHMOD = $(BOOTSTRAP)/chmod.ape
-TOUCH = $(BOOTSTRAP)/touch.ape
-PKG = $(BOOTSTRAP)/package.ape
-MKDEPS = $(BOOTSTRAP)/mkdeps
-ZIPOBJ = $(BOOTSTRAP)/zipobj
-ZIPCOPY = $(BOOTSTRAP)/zipcopy
-PECHECK = $(BOOTSTRAP)/pecheck
-FIXUPOBJ = $(BOOTSTRAP)/fixupobj
-OBJBINCOPY = $(BOOTSTRAP)/objbincopy
-MKDIR = $(BOOTSTRAP)/mkdir.ape -p
-COMPILE = $(BOOTSTRAP)/compile.ape -V9 -M2048m -P8192 $(QUOTA)
+AR = build/bootstrap/ar
+CP = build/bootstrap/cp
+RM = build/bootstrap/rm -f
+GZIP = build/bootstrap/gzip
+ECHO = build/bootstrap/echo
+CHMOD = build/bootstrap/chmod
+TOUCH = build/bootstrap/touch
+PKG = build/bootstrap/package
+MKDEPS = build/bootstrap/mkdeps
+ZIPOBJ = build/bootstrap/zipobj
+ZIPCOPY = build/bootstrap/zipcopy
+PECHECK = build/bootstrap/pecheck
+FIXUPOBJ = build/bootstrap/fixupobj
+MKDIR = build/bootstrap/mkdir -p
+COMPILE = build/bootstrap/compile -V9 -M2048m -P8192 $(QUOTA)
+
+IGNORE := $(shell $(MKDIR) $(TMPDIR))

 # the default build modes is empty string
 # on x86_64 hosts, MODE= is the same as MODE=x86_64
@ -133,13 +133,14 @@ endif

 ifneq ($(findstring aarch64,$(MODE)),)
 ARCH = aarch64
-HOSTS ?= pi pi5 studio freebsdarm
+HOSTS ?= pi studio freebsdarm
 else
 ARCH = x86_64
-HOSTS ?= freebsd rhel7 xnu openbsd netbsd win10 luna
+HOSTS ?= freebsd rhel7 xnu openbsd netbsd win10
 endif

 ZIPOBJ_FLAGS += -a$(ARCH)
+IGNORE := $(shell $(MKDIR) $(TMPDIR))

 export ADDR2LINE
 export LC_ALL
@ -148,12 +149,9 @@ export MODE
 export SOURCE_DATE_EPOCH
 export TMPDIR

-COSMOCC = .cosmocc/3.9.2
-BOOTSTRAP = $(COSMOCC)/bin
+COSMOCC = .cosmocc/3.3.5
 TOOLCHAIN = $(COSMOCC)/bin/$(ARCH)-linux-cosmo-
-DOWNLOAD := $(shell build/download-cosmocc.sh $(COSMOCC) 3.9.2 f4ff13af65fcd309f3f1cfd04275996fb7f72a4897726628a8c9cf732e850193)
-
-IGNORE := $(shell $(MKDIR) $(TMPDIR))
+DOWNLOAD := $(shell build/download-cosmocc.sh $(COSMOCC) 3.3.5 db78fd8d3f8706e9dff4be72bf71d37a3f12062f212f407e1c33bc4af3780dd0)

 AS = $(TOOLCHAIN)as
 CC = $(TOOLCHAIN)gcc
@ -258,6 +256,7 @@ include third_party/nsync/mem/BUILD.mk		# │  You can now use stdio
 include libc/proc/BUILD.mk			# │  You can now use threads
 include libc/dlopen/BUILD.mk			# │  You can now use processes
 include libc/thread/BUILD.mk			# │  You can finally call malloc()
+include ctl/BUILD.mk				# │
 include third_party/zlib/BUILD.mk		# │
 include libc/stdio/BUILD.mk			# │
 include tool/hello/BUILD.mk			# │
@ -275,16 +274,10 @@ include libc/BUILD.mk				#─┘
 include libc/sock/BUILD.mk			#─┐
 include net/http/BUILD.mk			# ├──ONLINE RUNTIME
 include third_party/musl/BUILD.mk		# │  You can communicate with the network
-include third_party/regex/BUILD.mk		# │
-include third_party/tr/BUILD.mk			# │
-include third_party/sed/BUILD.mk		# │
-include libc/system/BUILD.mk			# │
 include libc/x/BUILD.mk				# │
 include dsp/scale/BUILD.mk			# │
 include dsp/mpeg/BUILD.mk			# │
 include dsp/tty/BUILD.mk			# │
-include dsp/audio/BUILD.mk			# │
-include dsp/prog/BUILD.mk			# │
 include dsp/BUILD.mk				# │
 include third_party/stb/BUILD.mk		# │
 include third_party/mbedtls/BUILD.mk		# │
@ -292,13 +285,14 @@ include third_party/ncurses/BUILD.mk		# │
 include third_party/readline/BUILD.mk		# │
 include third_party/libunwind/BUILD.mk		# |
 include third_party/libcxxabi/BUILD.mk		# |
-include third_party/double-conversion/BUILD.mk	# │
-include ctl/BUILD.mk				# │
 include third_party/libcxx/BUILD.mk		# │
 include third_party/openmp/BUILD.mk		# │
+include third_party/double-conversion/BUILD.mk	# │
 include third_party/pcre/BUILD.mk		# │
 include third_party/less/BUILD.mk		# │
-include net/https/BUILD.mk			#─┘
+include net/https/BUILD.mk			# │
+include third_party/regex/BUILD.mk		# │
+include third_party/bash/BUILD.mk		#─┘
 include third_party/tidy/BUILD.mk
 include third_party/BUILD.mk
 include third_party/nsync/testing/BUILD.mk
@ -317,6 +311,8 @@ include third_party/double-conversion/test/BUILD.mk
 include third_party/lua/BUILD.mk
 include third_party/tree/BUILD.mk
 include third_party/zstd/BUILD.mk
+include third_party/tr/BUILD.mk
+include third_party/sed/BUILD.mk
 include third_party/awk/BUILD.mk
 include third_party/hiredis/BUILD.mk
 include third_party/make/BUILD.mk
@ -369,7 +365,6 @@ include test/libc/fmt/BUILD.mk
 include test/libc/time/BUILD.mk
 include test/libc/proc/BUILD.mk
 include test/libc/stdio/BUILD.mk
-include test/libc/system/BUILD.mk
 include test/libc/BUILD.mk
 include test/net/http/BUILD.mk
 include test/net/https/BUILD.mk
@ -433,71 +428,67 @@ HTAGS:	o/$(MODE)/hdrs-old.txt $(filter-out third_party/libcxx/%,$(HDRS)) #o/$(MO

 loc: private .UNSANDBOXED = 1
 loc: o/$(MODE)/tool/build/summy
-	find -name \*.h -or -name \*.hpp -or -name \*.c -or -name \*.cc -or -name \*.cpp -or -name \*.S -or -name \*.mk | \
+	find -name \*.h -or -name \*.c -or -name \*.S | \
 	$(XARGS) wc -l | grep total | awk '{print $$1}' | $<

-COSMOPOLITAN =				\
-	CTL				\
-	DSP_AUDIO			\
-	LIBC_CALLS			\
-	LIBC_DLOPEN			\
-	LIBC_ELF			\
-	LIBC_FMT			\
-	LIBC_INTRIN			\
-	LIBC_IRQ			\
-	LIBC_LOG			\
-	LIBC_MEM			\
-	LIBC_NEXGEN32E			\
-	LIBC_NT_ADVAPI32		\
-	LIBC_NT_BCRYPTPRIMITIVES	\
-	LIBC_NT_COMDLG32		\
-	LIBC_NT_GDI32			\
-	LIBC_NT_IPHLPAPI		\
-	LIBC_NT_KERNEL32		\
-	LIBC_NT_NTDLL			\
-	LIBC_NT_PDH			\
-	LIBC_NT_POWRPROF		\
-	LIBC_NT_PSAPI			\
-	LIBC_NT_REALTIME		\
-	LIBC_NT_SHELL32			\
-	LIBC_NT_SYNCHRONIZATION		\
-	LIBC_NT_USER32			\
-	LIBC_NT_WS2_32			\
-	LIBC_PROC			\
-	LIBC_RUNTIME			\
-	LIBC_SOCK			\
-	LIBC_STDIO			\
-	LIBC_STR			\
-	LIBC_SYSTEM			\
-	LIBC_SYSV			\
-	LIBC_SYSV_CALLS			\
-	LIBC_THREAD			\
-	LIBC_TINYMATH			\
-	LIBC_VGA			\
-	LIBC_X				\
+# PLEASE: MAINTAIN TOPOLOGICAL ORDER
+# FROM HIGHEST LEVEL TO LOWEST LEVEL
+COSMOPOLITAN_OBJECTS =			\
+	TOOL_ARGS			\
 	NET_HTTP			\
-	THIRD_PARTY_COMPILER_RT		\
-	THIRD_PARTY_DLMALLOC		\
-	THIRD_PARTY_DOUBLECONVERSION	\
-	THIRD_PARTY_GDTOA		\
+	LIBC_SOCK			\
+	LIBC_NT_WS2_32			\
+	LIBC_NT_IPHLPAPI		\
+	LIBC_X				\
 	THIRD_PARTY_GETOPT		\
+	LIBC_LOG			\
+	THIRD_PARTY_TZ			\
+	THIRD_PARTY_OPENMP		\
+	THIRD_PARTY_MUSL		\
+	THIRD_PARTY_ZLIB_GZ		\
 	THIRD_PARTY_LIBCXXABI		\
 	THIRD_PARTY_LIBUNWIND		\
-	THIRD_PARTY_MUSL		\
-	THIRD_PARTY_NSYNC		\
-	THIRD_PARTY_NSYNC_MEM		\
-	THIRD_PARTY_OPENMP		\
-	THIRD_PARTY_PUFF		\
+	LIBC_STDIO			\
+	THIRD_PARTY_GDTOA		\
 	THIRD_PARTY_REGEX		\
-	THIRD_PARTY_TZ			\
-	THIRD_PARTY_XED			\
+	LIBC_THREAD			\
+	LIBC_PROC			\
+	THIRD_PARTY_NSYNC_MEM		\
+	CTL				\
+	LIBC_MEM			\
+	THIRD_PARTY_DLMALLOC		\
+	LIBC_DLOPEN			\
+	LIBC_RUNTIME			\
+	THIRD_PARTY_NSYNC		\
+	LIBC_ELF			\
+	LIBC_IRQ			\
+	LIBC_CALLS			\
+	LIBC_SYSV_CALLS			\
+	LIBC_VGA			\
+	LIBC_NT_PSAPI			\
+	LIBC_NT_POWRPROF		\
+	LIBC_NT_PDH			\
+	LIBC_NT_GDI32			\
+	LIBC_NT_COMDLG32		\
+	LIBC_NT_USER32			\
+	LIBC_NT_NTDLL			\
+	LIBC_NT_ADVAPI32		\
+	LIBC_NT_SYNCHRONIZATION		\
+	LIBC_FMT			\
 	THIRD_PARTY_ZLIB		\
-	THIRD_PARTY_ZLIB_GZ		\
-	TOOL_ARGS			\
+	THIRD_PARTY_PUFF		\
+	THIRD_PARTY_COMPILER_RT		\
+	LIBC_TINYMATH			\
+	THIRD_PARTY_XED			\
+	LIBC_STR			\
+	LIBC_SYSV			\
+	LIBC_INTRIN			\
+	LIBC_NT_BCRYPTPRIMITIVES	\
+	LIBC_NT_KERNEL32		\
+	LIBC_NEXGEN32E

 COSMOPOLITAN_H_PKGS =			\
 	APE				\
-	DSP_AUDIO			\
 	LIBC				\
 	LIBC_CALLS			\
 	LIBC_ELF			\
@ -541,14 +532,14 @@ COSMOCC_PKGS =				\
 	THIRD_PARTY_INTEL

 o/$(MODE)/cosmopolitan.a:		\
-		$(call reverse,$(call uniq,$(foreach x,$(COSMOPOLITAN),$($(x)))))
+		$(foreach x,$(COSMOPOLITAN_OBJECTS),$($(x)_A_OBJS))

 COSMOCC_HDRS =								\
 	$(wildcard libc/integral/*)					\
 	$(foreach x,$(COSMOCC_PKGS),$($(x)_HDRS))			\
 	$(foreach x,$(COSMOCC_PKGS),$($(x)_INCS))

-o/cosmocc.h.txt: Makefile libc $(MAKEFILES) $(call uniq,$(foreach x,$(HDRS) $(INCS),$(dir $(x)))) $(HDRS) $(INCS)
+o/cosmocc.h.txt: Makefile
 	$(file >$@, $(call uniq,$(COSMOCC_HDRS)))

 COSMOPOLITAN_H_ROOT_HDRS =						\
--- a/README.md
+++ b/README.md
@ -3,12 +3,12 @@
 [![build](https://github.com/jart/cosmopolitan/actions/workflows/build.yml/badge.svg)](https://github.com/jart/cosmopolitan/actions/workflows/build.yml)
 # Cosmopolitan

-[Cosmopolitan Libc](https://justine.lol/cosmopolitan/index.html) makes C/C++
+[Cosmopolitan Libc](https://justine.lol/cosmopolitan/index.html) makes C
 a build-once run-anywhere language, like Java, except it doesn't need an
 interpreter or virtual machine. Instead, it reconfigures stock GCC and
 Clang to output a POSIX-approved polyglot format that runs natively on
-Linux + Mac + Windows + FreeBSD + OpenBSD 7.3 + NetBSD + BIOS with the
-best possible performance and the tiniest footprint imaginable.
+Linux + Mac + Windows + FreeBSD + OpenBSD + NetBSD + BIOS with the best
+possible performance and the tiniest footprint imaginable.

 ## Background

@ -87,22 +87,15 @@ ape/apeinstall.sh
 ```

 You can now build the mono repo with any modern version of GNU Make. To
-bootstrap your build, you can install Cosmopolitan Make from this site:
-
-https://cosmo.zip/pub/cosmos/bin/make
-
-E.g.:
+make life easier, we've included one in the cosmocc toolchain, which is
+guaranteed to be compatible and furthermore includes our extensions for
+doing build system sandboxing.

 ```sh
-curl -LO https://cosmo.zip/pub/cosmos/bin/make
-./make -j8
+build/bootstrap/make -j8
 o//examples/hello
 ```

-After you've built the repo once, you can also use the make from your
-cosmocc at `.cosmocc/current/bin/make`. You might even prefer to alias
-make to `$COSMO/.cosmocc/current/bin/make`.
-
 Since the Cosmopolitan repository is very large, you might only want to
 build one particular thing. Here's an example of a target that can be
 compiled relatively quickly, which is a simple POSIX test that only
@ -110,7 +103,7 @@ depends on core LIBC packages.

 ```sh
 rm -rf o//libc o//test
-.cosmocc/current/bin/make o//test/posix/signal_test
+build/bootstrap/make o//test/posix/signal_test
 o//test/posix/signal_test
 ```

@ -119,21 +112,21 @@ list out each individual one. For example if you wanted to build and run
 all the unit tests in the `TEST_POSIX` package, you could say:

 ```sh
-.cosmocc/current/bin/make o//test/posix
+build/bootstrap/make o//test/posix
 ```

 Cosmopolitan provides a variety of build modes. For example, if you want
 really tiny binaries (as small as 12kb in size) then you'd say:

 ```sh
-.cosmocc/current/bin/make m=tiny
+build/bootstrap/make m=tiny
 ```

 You can furthermore cut out the bloat of other operating systems, and
 have Cosmopolitan become much more similar to Musl Libc.

 ```sh
-.cosmocc/current/bin/make m=tinylinux
+build/bootstrap/make m=tinylinux
 ```

 For further details, see [//build/config.mk](build/config.mk).
@ -249,16 +242,16 @@ server. You're welcome to join us! <https://discord.gg/FwAVVu7eJ4>

 ## Support Vector

-| Platform       | Min Version    | Circa |
-| :---           | ---:           | ---:  |
-| AMD            | K8             | 2003  |
-| Intel          | Core           | 2006  |
-| Linux          | 2.6.18         | 2007  |
-| Windows        | 8 [1]          | 2012  |
-| Darwin (macOS) | 23.1.0+        | 2023  |
-| OpenBSD        | 7.3 or earlier | 2023  |
-| FreeBSD        | 13             | 2020  |
-| NetBSD         | 9.2            | 2021  |
+| Platform       | Min Version | Circa |
+| :---           | ---:        | ---:  |
+| AMD            | K8 Venus    | 2005  |
+| Intel          | Core        | 2006  |
+| Linux          | 2.6.18      | 2007  |
+| Windows        | 8 [1]       | 2012  |
+| Darwin (macOS) | 23.1.0+     | 2023  |
+| OpenBSD        | 7           | 2021  |
+| FreeBSD        | 13          | 2020  |
+| NetBSD         | 9.2         | 2021  |

 [1] See our [vista branch](https://github.com/jart/cosmopolitan/tree/vista)
    for a community supported version of Cosmopolitan that works on Windows
--- a/ape/BUILD.mk
+++ b/ape/BUILD.mk
@ -45,10 +45,10 @@ o/$(MODE)/ape: $(APE)

 o/$(MODE)/ape/aarch64.lds:			\
 	ape/aarch64.lds				\
-	libc/zip.h				\
+	libc/zip.internal.h			\
 	libc/thread/tls.h			\
 	libc/calls/struct/timespec.h		\
-	libc/macros.h				\
+	libc/macros.internal.h			\
 	libc/str/str.h

 APE_LOADER_LDFLAGS =				\
@ -162,8 +162,8 @@ o/$(MODE)/ape/ape-no-modify-self.o:		\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/thread/tls.h		\
-		libc/macho.h			\
-		libc/macros.h			\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
 		libc/nexgen32e/uart.internal.h	\
 		libc/calls/metalfile.internal.h	\
 		libc/nt/pedef.internal.h	\
@ -188,8 +188,8 @@ o/$(MODE)/ape/ape-copy-self.o:			\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/thread/tls.h		\
-		libc/macho.h			\
-		libc/macros.h			\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
 		libc/nexgen32e/uart.internal.h	\
 		libc/calls/metalfile.internal.h	\
 		libc/nt/pedef.internal.h	\
@ -218,10 +218,10 @@ o/$(MODE)/ape/loader-xnu-clang.asm: ape/loader.c
 	@$(COMPILE) -AOBJECTIFY.c $(CLANG) -DSUPPORT_VECTOR=8 -S -g0 $(APE_LOADER_FLAGS)

 o/$(MODE)/ape/ape.elf: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w $(OBJBINCOPY) -f -o $@ $<
+	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy -f -o $@ $<

 o/$(MODE)/ape/ape.macho: o/$(MODE)/ape/ape.elf.dbg
-	@$(COMPILE) -AOBJBINCOPY -w $(OBJBINCOPY) -fm -o $@ $<
+	@$(COMPILE) -AOBJBINCOPY -w build/bootstrap/objbincopy -fm -o $@ $<

 APE_LOADER_LDFLAGS =				\
 	-static					\
@ -246,6 +246,8 @@ o/$(MODE)/ape:	$(APE_CHECKS)			\
 		o/$(MODE)/ape/ape.lds		\
 		o/$(MODE)/ape/ape.elf		\
 		o/$(MODE)/ape/ape.macho		\
+		o/$(MODE)/ape/ape-copy-self.o	\
+		o/$(MODE)/ape/ape-no-modify-self.o

 endif

@ -259,8 +261,8 @@ o/$(MODE)/ape/ape.o:				\
 		libc/thread/tls.h		\
 		ape/ape.internal.h		\
 		ape/macros.internal.h		\
-		libc/macho.h			\
-		libc/macros.h			\
+		libc/macho.internal.h		\
+		libc/macros.internal.h		\
 		libc/sysv/consts/prot.h		\
 		libc/nt/pedef.internal.h	\
 		libc/runtime/pc.internal.h	\
@ -281,7 +283,7 @@ o/$(MODE)/ape/ape.lds:				\
 		libc/dce.h			\
 		libc/elf/def.h			\
 		libc/elf/pf2prot.internal.h	\
-		libc/macros.h			\
+		libc/macros.internal.h		\
 		libc/nt/pedef.internal.h	\
 		libc/str/str.h			\
-		libc/zip.h
+		libc/zip.internal.h
--- a/ape/aarch64.lds
+++ b/ape/aarch64.lds
@ -12,7 +12,7 @@ OUTPUT_FORMAT("elf64-littleaarch64",

 SECTIONS {

-  . = SEGMENT_START("text-segment", 0x000800000000);
+  . = SEGMENT_START("text-segment", 0x010000000000);
  __executable_start = .;
  . += SIZEOF_HEADERS;

@ -103,8 +103,10 @@ SECTIONS {
    *(.eh_frame_entry .eh_frame_entry.*)
  }

-  __eh_frame_hdr_start = SIZEOF(.eh_frame_hdr) > 0 ? ADDR(.eh_frame_hdr) : 0;
-  __eh_frame_hdr_end = SIZEOF(.eh_frame_hdr) > 0 ? . : 0;
+  .eh_frame : ONLY_IF_RO {
+    KEEP(*(.eh_frame))
+    *(.eh_frame.*)
+  }

  .gcc_except_table : ONLY_IF_RO {
    *(.gcc_except_table .gcc_except_table.*)
@ -125,11 +127,9 @@ SECTIONS {
  . += CONSTANT(MAXPAGESIZE);
  . = DATA_SEGMENT_ALIGN(CONSTANT(MAXPAGESIZE), CONSTANT(COMMONPAGESIZE));

-  .eh_frame : {
-    __eh_frame_start = .;
+  .eh_frame : ONLY_IF_RW {
    KEEP(*(.eh_frame))
    *(.eh_frame.*)
-    __eh_frame_end = .;
  }

  .gnu_extab : ONLY_IF_RW {
@ -259,9 +259,6 @@ SECTIONS {
  .debug_ranges       0 : { *(.debug_ranges) }
  .debug_macro        0 : { *(.debug_macro) }
  .debug_addr         0 : { *(.debug_addr) }
-  .debug_names        0 : { *(.debug_names) }
-  .debug_loclists     0 : { *(.debug_loclists) }
-  .debug_str_offsets  0 : { *(.debug_str_offsets) }
  .ARM.attributes     0 : { KEEP(*(.ARM.attributes)) KEEP(*(.gnu.attributes)) }
  .note.gnu.arm.ident 0 : { KEEP(*(.note.gnu.arm.ident)) }

--- a/ape/ape-m1.c
+++ b/ape/ape-m1.c
@ -16,12 +16,6 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#ifndef __APPLE__
-#error "ape/ape-m1.c is for apple silicon. chances you want ape/loader.c"
-#endif
-#ifndef __aarch64__
-#error "ape/ape-m1.c is for apple silicon; you want: make o//ape/ape.macho"
-#endif
 #include <assert.h>
 #include <dispatch/dispatch.h>
 #include <dlfcn.h>
--- a/ape/ape.S
+++ b/ape/ape.S
@ -37,7 +37,7 @@
 #include "libc/calls/metalfile.internal.h"
 #include "libc/dce.h"
 #include "libc/elf/def.h"
-#include "libc/macho.h"
+#include "libc/macho.internal.h"
 #include "libc/nexgen32e/uart.internal.h"
 #include "libc/nt/pedef.internal.h"
 #include "libc/runtime/pc.internal.h"
--- a/ape/ape.lds
+++ b/ape/ape.lds
@ -310,7 +310,7 @@ SECTIONS {
    . = ALIGN(__privileged_end > __privileged_start ? CONSTANT(COMMONPAGESIZE) : 0);
 /*END: morphable code */
    __privileged_start = .;
-    *(.privileged .privileged.*)
+    *(.privileged)
    __privileged_end = .;

    KEEP(*(.ape.pad.text))
@ -329,10 +329,6 @@ SECTIONS {
    *(.ubsan.types)
    *(.ubsan.data)

-    __eh_frame_hdr_start_actual = .;
-    *(.eh_frame_hdr)
-    __eh_frame_hdr_end_actual = .;
-
    /* Legal Notices */
    __notices = .;
    KEEP(*(.notice))
@ -386,13 +382,6 @@ SECTIONS {
    _tbss_end = .;
  } :Tls

-  .eh_frame : {
-    __eh_frame_start = .;
-    KEEP(*(.eh_frame))
-    *(.eh_frame.*)
-    __eh_frame_end = .;
-  } :Ram
-
  .data . : {
 /*BEGIN: Read/Write Data */
 #if SupportsWindows()
@ -441,6 +430,7 @@ SECTIONS {
    KEEP(*(.piro.pad.data))
    *(.igot.plt)
    KEEP(*(.dataepilogue))
+
    . = ALIGN(. != 0 ? CONSTANT(COMMONPAGESIZE) : 0);
 /*END: NT FORK COPYING */
    _edata = .;
@ -520,9 +510,6 @@ SECTIONS {
  .debug_rnglists    0 : { *(.debug_rnglists) }
  .debug_macro       0 : { *(.debug_macro) }
  .debug_addr        0 : { *(.debug_addr) }
-  .debug_names       0 : { *(.debug_names) }
-  .debug_loclists    0 : { *(.debug_loclists) }
-  .debug_str_offsets 0 : { *(.debug_str_offsets) }
  .gnu.attributes    0 : { KEEP(*(.gnu.attributes)) }
  .GCC.command.line  0 : { *(.GCC.command.line) }

@ -586,11 +573,11 @@ ape_rom_memsz = ape_rom_filesz;
 ape_rom_align = CONSTANT(COMMONPAGESIZE);
 ape_rom_rva = RVA(ape_rom_vaddr);

-ape_ram_vaddr = ADDR(.eh_frame);
+ape_ram_vaddr = ADDR(.data);
 ape_ram_offset = ape_ram_vaddr - __executable_start;
-ape_ram_paddr = LOADADDR(.eh_frame);
-ape_ram_filesz = ADDR(.bss) - ADDR(.eh_frame);
-ape_ram_memsz = _end - ADDR(.eh_frame);
+ape_ram_paddr = LOADADDR(.data);
+ape_ram_filesz = ADDR(.bss) - ADDR(.data);
+ape_ram_memsz = _end - ADDR(.data);
 ape_ram_align = CONSTANT(COMMONPAGESIZE);
 ape_ram_rva = RVA(ape_ram_vaddr);

@ -600,7 +587,7 @@ ape_stack_offset = 0;
 ape_stack_vaddr = DEFINED(ape_stack_vaddr) ? ape_stack_vaddr : 0x700000000000;
 ape_stack_paddr = ape_ram_paddr + ape_ram_filesz;
 ape_stack_filesz = 0;
-ape_stack_memsz = DEFINED(ape_stack_memsz) ? ape_stack_memsz : 4 * 1024 * 1024;
+ape_stack_memsz = DEFINED(ape_stack_memsz) ? ape_stack_memsz : 8 * 1024 * 1024;

 ape_note_offset = ape_cod_offset + (ape_note - ape_cod_vaddr);
 ape_note_filesz = ape_note_end - ape_note;
@ -614,9 +601,6 @@ ape_text_memsz = ape_text_filesz;
 ape_text_align = CONSTANT(COMMONPAGESIZE);
 ape_text_rva = RVA(ape_text_vaddr);

-__eh_frame_hdr_start = __eh_frame_hdr_end_actual > __eh_frame_hdr_start_actual ? __eh_frame_hdr_start_actual : 0;
-__eh_frame_hdr_end = __eh_frame_hdr_end_actual > __eh_frame_hdr_start_actual ? __eh_frame_hdr_end_actual : 0;
-
 /* we roundup here because xnu wants the file load segments page-aligned */
 /* but we don't want to add the nop padding to the ape program, so we'll */
 /* let ape.S dd read past the end of the file into the wrapping binaries */
--- a/ape/apeinstall.sh
+++ b/ape/apeinstall.sh
@ -10,8 +10,8 @@ if [ ! -f ape/loader.c ]; then
  cd "$COSMO" || exit
 fi

-if [ -x .cosmocc/current/bin/make ]; then
-  MAKE=.cosmocc/current/bin/make
+if [ -x build/bootstrap/make ]; then
+  MAKE=build/bootstrap/make
 else
  MAKE=make
 fi
--- a/ape/launch.S
+++ b/ape/launch.S
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"

 //	Calls _start() function of loaded program.
 //
--- a/ape/loader-macho.S
+++ b/ape/loader-macho.S
@ -16,10 +16,10 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macho.h"
+#include "libc/macho.internal.h"
 #include "libc/sysv/consts/prot.h"
 #include "libc/dce.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"

 //	Apple Mach-O Executable Headers
 //	Fixups are applied by objbincopy
--- a/ape/macros.internal.h
+++ b/ape/macros.internal.h
@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #ifndef APE_MACROS_H_
 #define APE_MACROS_H_
-#include "libc/macros.h"
+#include "libc/macros.internal.h"
 #ifdef __ASSEMBLER__
 /* clang-format off */

--- a/ape/specification.md
+++ b/ape/specification.md
@ -1,703 +0,0 @@
-# Actually Portable Executable Specification v0.1
-
-Actually Portable Executable (APE) is an executable file format that
-polyglots the Windows Portable Executable (PE) format with a UNIX Sixth
-Edition style shell script that doesn't have a shebang. This makes it
-possible to produce a single file binary that executes on the stock
-installations of the many OSes and architectures.
-
-## Supported OSes and Architectures
-
- AMD64
-  - Linux
-  - MacOS
-  - Windows
-  - FreeBSD
-  - OpenBSD
-  - NetBSD
-  - BIOS
-
- ARM64
-  - Linux
-  - MacOS
-  - FreeBSD
-  - Windows (non-native)
-
-## File Header
-
-APE defines three separate file magics, all of which are 8 characters
-long. Any file that starts with one of these magic values can be
-considered an APE program.
-
-### (1) APE MZ Magic
-
- ASCII: `MZqFpD='`
- Hex: 4d 5a 71 46 70 44 3d 27
-
-This is the canonical magic used by almost all APE programs. It enables
-maximum portability between OSes. When interpreted as a shell script, it
-is assigning a single quoted string to an unused variable. The shell
-will then ignore subsequent binary content that's placed inside the
-string.
-
-It is strongly recommended that this magic value be immediately followed
-by a newline (\n or hex 0a) character. Some shells, e.g. FreeBSD SH and
-Zsh impose a binary safety check before handing off files that don't
-have a shebang to `/bin/sh`. That check applies to the first line, which
-can't contain NUL characters.
-
-The letters were carefully chosen so as to be valid x86 instructions in
-all operating modes. This makes it possible to store a BIOS bootloader
-disk image inside an APE binary. For example, simple CLI programs built
-with Cosmopolitan Libc will boot from BIOS into long mode if they're
-treated as a floppy disk image.
-
-The letters also allow for the possibility of being treated on x86-64 as
-a flat executable, where the PE / ELF / Mach-O executable structures are
-ignored, and execution simply begins at the beginning of the file,
-similar to how MS-DOS .COM binaries work.
-
-The 0x4a relative offset of the magic causes execution to jump into the
-MS-DOS stub defined by Portable Executable. APE binaries built by Cosmo
-Libc use tricks in the MS-DOS stub to check the operating mode and then
-jump to the appropriate entrypoint, e.g. `_start()`.
-
-#### Decoded as i8086
-
-```asm
-  dec  %bp
-  pop  %dx
-  jno  0x4a
-  jo   0x4a
-```
-
-#### Decoded as i386
-
-```asm
-  push %ebp
-  pop  %edx
-  jno  0x4a
-  jo   0x4a
-```
-
-#### Decoded as x86-64
-
-```asm
-  rex.WRB
-  pop %r10
-  jno 0x4a
-  jo  0x4a
-```
-
-### (2) APE UNIX-Only Magic
-
- ASCII: `jartsr='`
- Hex: 6a 61 72 74 73 72 3d 27
-
-Being a novel executable format that was first published in 2020, the
-APE file format is less understood by industry tools compared to the PE,
-ELF, and Mach-O executable file formats, which have been around for
-decades. For this reason, APE programs that use the MZ magic above can
-attract attention from Windows AV software, which may be unwanted by
-developers who aren't interested in targeting the Windows platform.
-Therefore the `jartsr='` magic is defined which enables the creation of
-APE binaries that can safely target all non-Windows platforms. Even
-though this magic is less common, APE interpreters and binfmt-misc
-installations MUST support this.
-
-It is strongly recommended that this magic value be immediately followed
-by a newline (\n or hex 0a) character. Some shells, e.g. FreeBSD SH and
-Zsh impose a binary safety check before handing off files that don't
-have a shebang to `/bin/sh`. That check applies to the first line, which
-can't contain NUL characters.
-
-The letters were carefully chosen so as to be valid x86 instructions in
-all operating modes. This makes it possible to store a BIOS bootloader
-disk image inside an APE binary. For example, simple CLI programs built
-with Cosmopolitan Libc will boot from BIOS into long mode if they're
-treated as a floppy disk image.
-
-The letters also allow for the possibility of being treated on x86-64 as
-a flat executable, where the PE / ELF / Mach-O executable structures are
-ignored, and execution simply begins at the beginning of the file,
-similar to how MS-DOS .COM binaries work.
-
-The 0x78 relative offset of the magic causes execution to jump into the
-MS-DOS stub defined by Portable Executable. APE binaries built by Cosmo
-Libc use tricks in the MS-DOS stub to check the operating mode and then
-jump to the appropriate entrypoint, e.g. `_start()`.
-
-#### Decoded as i8086 / i386 / x86-64
-
-```asm
-  push $0x61
-  jb   0x78
-  jae  0x78
-```
-
-### (3) APE Debug Magic
-
- ASCII: `APEDBG='`
- Hex: 41 50 45 44 42 47 3d 27
-
-While APE files must be valid shell scripts, in practice, UNIX systems
-will oftentimes be configured to provide a faster safer alternative to
-loading an APE binary through `/bin/sh`. The Linux Kernel can be patched
-to have execve() recognize the APE format and directly load its embedded
-ELF header. Linux systems can also use binfmt-misc to recognize APE's MZ
-and jartsr magic, and pass them to a userspace program named `ape` that
-acts as an interpreter. In such environments, the need sometimes arises
-to be able to test that the `/bin/sh` is working correctly, in which
-case the `APEDBG='` magic is RECOMMENDED.
-
-APE interpreters, execve() implementations, and binfmt-misc installs
-MUST ignore this magic. If necessary, steps can be taken to help files
-with this magic be passed to `/bin/sh` like a normal shebang-less shell
-script for execution.
-
-## Embedded ELF Header
-
-APE binaries MAY embed an ELF header inside them. Unlike conventional
-executable file formats, this header is not stored at a fixed offset.
-It's instead encoded as octal escape codes in a shell script `printf`
-statement. For example:
-
-```
-printf '\177ELF\2\1\1\011\0\0\0\0\0\0\0\0\2\0\076\0\1\0\0\0\166\105\100\000\000\000\000\000\060\013\000\000\000\000\000\000\000\000\000\000\000\000\000\000\165\312\1\1\100\0\070\0\005\000\0\0\000\000\000\000'
-```
-
-This `printf` statement MUST appear in the first 8192 bytes of the APE
-executable, so as to limit how much of the initial portion of a file an
-interpreter must load.
-
-Multiple such `printf` statements MAY appear in the first 8192 bytes, in
-order to specify multiple architectures. For example, fat binaries built
-by the `apelink` program (provided by Cosmo Libc) will have two encoded
-ELF headers, for AMD64 and ARM64, each of which point into the proper
-file offsets for their respective native code. Therefore, kernels and
-interpreters which load the APE format directly MUST check the
-`e_machine` field of the `Elf64_Ehdr` that's decoded from the octal
-codes, before accepting a `printf` shell statement as valid.
-
-These printf statements MUST always use only unescaped ASCII characters
-or octal escape codes. These printf statements MUST NOT use space saving
-escape codes such as `\n`. For example, rather than saying `\n` it would
-be valid to say `\012` instead. It's also valid to say `\12` but only if
-the encoded characters that follow aren't an octal digit.
-
-For example, the following algorithm may be used for parsing octal:
-
-```c
-static int ape_parse_octal(const unsigned char page[8192], int i, int *pc)
-{
-        int c;
-        if ('0' <= page[i] && page[i] <= '7') {
-                c = page[i++] - '0';
-                if ('0' <= page[i] && page[i] <= '7') {
-                        c *= 8;
-                        c += page[i++] - '0';
-                        if ('0' <= page[i] && page[i] <= '7') {
-                                c *= 8;
-                                c += page[i++] - '0';
-                        }
-                }
-                *pc = c;
-        }
-        return i;
-}
-```
-
-APE aware interpreters SHOULD only take `e_machine` into consideration.
-It is the responsibility of the `_start()` function to detect the OS.
-Therefore, multiple `printf` statements are only embedded in the shell
-script for different CPU architectures.
-
-The OS ABI field of an APE embedded `Elf64_Ehdr` SHOULD be set to
-`ELFOSABI_FREEBSD`, since it's the only UNIX OS APE supports that
-actually checks the field. However different values MAY be chosen for
-binaries that don't intend to have FreeBSD in their support vector.
-
-Counter-intuitively, the ARM64 ELF header is used on the MacOS ARM64
-platform when loading from fat binaries.
-
-## Embedded Mach-O Header (x86-64 only)
-
-APE shell scripts that support MacOS on AMD64 must use the `dd` command
-in a very specific way to specify how the embedded binary Macho-O header
-is copied backward to the start of the file. For example:
-
-```
-dd if="$o" of="$o" bs=8 skip=433      count=66       conv=notrunc
-```
-
-These `dd` statements have traditionally been generated by the GNU as
-and ld.bfd programs by encoding ASCII into 64-bit linker relocations,
-which necessitated a fixed width for integer values. It took several
-iterations over APE's history before we eventually got it right:
-
- `arg="  9293"` is how we originally had ape do it
- `arg=$((  9293))` b/c busybox sh disliked quoted space
- `arg=9293  ` is generated by modern apelink program
-
-Software that parses the APE file format, which needs to extract the
-Macho-O x86-64 header SHOULD support the old binaries that use the
-previous encodings. To make backwards compatibility simple the following
-regular expression may be used, which generalizes to all defined
-formats:
-
-```c
-regcomp(&rx,
-        "bs="              // dd block size arg
-        "(['\"] *)?"       //   #1 optional quote w/ space
-        "(\\$\\(\\( *)?"   //   #2 optional math w/ space
-        "([[:digit:]]+)"   //   #3
-        "( *\\)\\))?"      //   #4 optional math w/ space
-        "( *['\"])?"       //   #5 optional quote w/ space
-        " +"               //
-        "skip="            // dd skip arg
-        "(['\"] *)?"       //   #6 optional quote w/ space
-        "(\\$\\(\\( *)?"   //   #7 optional math w/ space
-        "([[:digit:]]+)"   //   #8
-        "( *\\)\\))?"      //   #9 optional math w/ space
-        "( *['\"])?"       //  #10 optional quote w/ space
-        " +"               //
-        "count="           // dd count arg
-        "(['\"] *)?"       //  #11 optional quote w/ space
-        "(\\$\\(\\( *)?"   //  #12 optional math w/ space
-        "([[:digit:]]+)",  //  #13
-        REG_EXTENDED);
-```
-
-For further details, see the canonical implementation in
-`cosmopolitan/tool/build/assimilate.c`.
-
-## Static Linking
-
-Actually Portable Executables are always statically linked. This
-revision of the specification does not define any facility for storing
-code in dynamic shared objects.
-
-Cosmopolitan Libc provides a solution that enables APE binaries have
-limited access to dlopen(). By manually loading a platform-specific
-executable and asking the OS-specific libc's dlopen() to load
-OS-specific libraries, it becomes possible to use GPUs and GUIs. This
-has worked great for AI projects like llamafile.
-
-There is no way for an Actually Portable Executable to interact with
-OS-specific dynamic shared object extension modules to programming
-languages. For example, a Lua interpreter compiled as an Actually
-Portable Executable would have no way of linking extension libraries
-downloaded from the Lua Rocks package manager. This is primarily because
-different OSes define incompatible ABIs.
-
-While it was possible to polyglot PE+ELF+MachO to create multi-OS
-executables, it simply isn't possible to do that same thing for
-DLL+DYLIB+SO. Therefore, in order to have DSOs, APE would need to either
-choose one of the existing formats or invent one of its own, and then
-develop its own parallel ecosystem of extension software. In the future,
-the APE specification may expand to encompass this. However the focus to
-date has been exclusively on executables with limited dlopen() support.
-
-## Application Binary Interface (ABI)
-
-APE binaries use the System V ABI, as defined by:
-
- [System V ABI - AMD64 Architecture Processor Supplement](https://gitlab.com/x86-psABIs/x86-64-ABI)
- AARCH64 has a uniform consensus defined by ARM Limited
-
-There are however a few changes we've had to make.
-
-### No Red Zone
-
-Actually Portable Executables that have Windows and/or bare metal in
-their support vector MUST be compiled using `-mno-red-zone`. This is
-because, on Windows, DLLs and other software lurking in the va-space
-might use tricks like SetThreadContext() to take control of a thread
-whereas on bare metal, it's also generally accepted that kernel-mode
-code cannot assume a red zone either due to hardware interrupts that
-pull the exact same kinds of stunts.
-
-APE software that only has truly System V ABI conformant OSes (e.g.
-Linux) in their support vector MAY use the red zone optimization.
-
-### Thread Local Storage
-
-#### aarch64
-
-Here's the TLS memory layout on aarch64:
-
-```
-           x28
-        %tpidr_el0
-            │
-            │    _Thread_local
-        ┌───┼───┬──────────┬──────────┐
-        │tib│dtv│  .tdata  │  .tbss   │
-        ├───┴───┴──────────┴──────────┘
-        │
-    __get_tls()
-```
-
-The ARM64 code in actually portable executables use the `x28` register
-to store the address of the thread information block. All aarch64 code
-linked into these executables SHOULD be compiled with `-ffixed-x28`
-which is supported by both Clang and GCC.
-
-The runtime library for an actually portable executables MAY choose to
-use `tpidr_el0` instead, if OSes like MacOS aren't being targeted. For
-example, if the goal is to create a Linux-only fat binary linker program
-for Musl Libc, then choosing to use the existing `tpidr_el0` convention
-would be friction-free alternative.
-
-It's not possible for an APE runtime that targets the full range of OSes
-to use the `tpidr_el0` register for TLS because Apple won't allow it. On
-MacOS ARM64 systems, this register can only be used by a runtime to
-implement the `sched_getcpu()` system call. It's reserved by MacOS.
-
-#### x86-64
-
-Here's the TLS memory layout on x86_64:
-
-```
-                          __get_tls()
-                              │
-                             %fs OpenBSD/NetBSD
-           _Thread_local      │
-    ┌───┬──────────┬──────────┼───┐
-    │pad│  .tdata  │  .tbss   │tib│
-    └───┴──────────┴──────────┼───┘
-                              │
-   Linux/FreeBSD/Windows/Mac %gs
-```
-
-Quite possibly the greatest challenge in Actually Portable Executable
-working, has been overcoming the incompatibilities between OSes in how
-thread-local storage works on x86-64. The AMD64 architecture defines two
-special segment registers. Every OS uses one of these segment registers
-to implement TLS support. However not all OSes agree on which register
-to use. Some OSes grant userspace the power to define either of these
-registers to hold any value that is desired. Some OSes only effectively
-allow a single one of them to be changed. Lastly, some OSes, e.g.
-Windows, claim ownership of the memory layout these registers point
-towards too.
-
-Here's a breakdown on how much power is granted to userspace runtimes by
-each OS when it comes to changing amd64 segment registers.
-
-|         | %fs          | %gs          |
-|---------|--------------|--------------|
-| Linux   | unrestricted | unrestricted |
-| MacOS   | inaccessible | unrestricted |
-| Windows | inaccessible | restricted   |
-| FreeBSD | unrestricted | unrestricted |
-| NetBSD  | unrestricted | broken       |
-| OpenBSD | unrestricted | inaccessible |
-
-Therefore, regardless of which register one we choose, some OSes are
-going to be incompatible.
-
-APE binaries are always built with a Linux compiler. So another issue
-arises in the fact that our Linux-flavored GCC and Clang toolchains
-(which are used to produce cross-OS binaries) are also only capable of
-producing TLS instructions that use the %fs convention.
-
-To solve these challenges, the `cosmocc` compiler will rewrite binary
-objects after they've been compiled by GCC, so that the `%gs` register
-is used, rather than `%fs`. Morphing x86-64 binaries after they've been
-compiled is normally difficult, due to the complexity of the machine
-instruction language. However GCC provides `-mno-tls-direct-seg-refs`
-which greatly reduces the complexity of this task. This flag forgoes
-some optimizations to make the generated code simpler. Rather than doing
-clever arithmetic with `%fs` prefixes, the compiler will always generate
-the thread information block address load as a separate instruction.
-
-```c
-// Change AMD code to use %gs:0x30 instead of %fs:0
-// We assume -mno-tls-direct-seg-refs has been used
-static void ChangeTlsFsToGs(unsigned char *p, size_t n) {
-  unsigned char *e = p + n - 9;
-  while (p <= e) {
-    // we're checking for the following expression:
-    //   0144 == p[0] &&           // %fs
-    //   0110 == (p[1] & 0373) &&  // rex.w (and ignore rex.r)
-    //   (0213 == p[2] ||          // mov reg/mem → reg (word-sized)
-    //   0003 == p[2]) &&          // add reg/mem → reg (word-sized)
-    //   0004 == (p[3] & 0307) &&  // mod/rm (4,reg,0) means sib → reg
-    //   0045 == p[4] &&           // sib (5,4,0) → (rbp,rsp,0) → disp32
-    //   0000 == p[5] &&           // displacement (von Neumann endian)
-    //   0000 == p[6] &&           // displacement
-    //   0000 == p[7] &&           // displacement
-    //   0000 == p[8]              // displacement
-    uint64_t w = READ64LE(p) & READ64LE("\377\373\377\307\377\377\377\377");
-    if ((w == READ64LE("\144\110\213\004\045\000\000\000") ||
-         w == READ64LE("\144\110\003\004\045\000\000\000")) &&
-        !p[8]) {
-      p[0] = 0145;  // change %fs to %gs
-      p[5] = 0x30;  // change 0 to 0x30
-      p += 9;
-    } else {
-      ++p;
-    }
-  }
-}
-```
-
-By favoring `%gs` we've now ensured friction-free compatibility for the
-APE runtime on MacOS, Linux, and FreeBSD which are all able to conform
-easily to this convention. However additional work needs to be done at
-runtime when an APE program is started on Windows, OpenBSD, and NetBSD.
-On these platforms, all executable pages must be faulted and morphed to
-fixup the TLS instructions.
-
-On OpenBSD and NetBSD, this is as simple as undoing the example
-operation above. Earlier at compile-time we turned `%fs` into `%gs`.
-Now, at runtime, `%gs` must be turned back into `%fs`. Since the
-executable is morphing itself, this is easier said than done.
-
-OpenBSD for example enforces a `W^X` invariant. Code that's executing
-can't modify itself at the same time. The way Cosmopolitan solves this
-is by defining a special part of the binary called `.text.privileged`.
-This section is aligned to page boundaries. A GNU ld linker script is
-used to ensure that code which morphs code is placed into this section,
-through the use of a header-defined cosmo-specific keyword `privileged`.
-Additionally, the `fixupobj` program is used by the Cosmo build system
-to ensure that compiled objects don't contain privileged functions that
-call non-privileged functions. Needless to say, `mprotect()` needs to be
-a privileged function, so that it can be used to disable the execute bit
-on all other parts of the executable except for the privileged section,
-thereby making it writable. Once this has been done, code can change.
-
-On Windows the displacement bytes of the TLS instruction are changed to
-use the `%gs:0x1480+i*8` ABI where `i` is a number assigned by the WIN32
-`TlsAlloc()` API. This avoids the need to call `TlsGetValue()` which is
-implemented this exact same way under the hood. Even though 0x1480 isn't
-explicitly documented by MSDN, this ABI is believed to be stable because
-MSVC generates binaries that use this offset directly. The only caveat
-is that `TlsAlloc()` must be called as early in the runtime init as
-possible, to ensure an index less than 64 is returned.
-
-### Thread Information Block (TIB)
-
-The Actually Portable Executable Thread Information Block (TIB) is
-defined by this version of the specification as follows:
-
- The 64-bit TIB self-pointer is stored at offset 0x00.
- The 64-bit TIB self-pointer is also stored at offset 0x30.
- The 32-bit `errno` value is stored at offset 0x3c.
-
-All other parts of the thread information block should be considered
-unspecified and therefore reserved for future specifications.
-
-The APE thread information block is aligned on a 64-byte boundary.
-
-Cosmopolitan Libc v3.5.8 (c. 2024-07-21) currently implements a thread
-information block that's 512 bytes in size.
-
-### Foreign Function Calls
-
-Even though APE programs always use the System V ABI, there arises the
-occasional need to interface with foreign functions, e.g. WIN32. The
-`__attribute__((__ms_abi__))` annotation introduced by GCC v6 is used
-for this purpose.
-
-The ability to change a function's ABI on a case-by-case basis is
-surprisingly enough supported by GCC, Clang, NVCC, and even the AMD HIP
-compilers for both UNIX systems and Windows. All of these compilers
-support both the System V ABI and the Microsoft x64 ABI.
-
-APE binaries will actually favor the Microsoft ABI even when running on
-UNIX OSes for certain dlopen() use-cases. For example, if we control the
-code to a CUDA module, which we compile on each OS separately from our
-main APE binary, then any function that's inside the APE binary whose
-pointer may be passed into a foreign module SHOULD be compiled to use
-the Microsoft ABI. This is because in practice the OS-specific module
-may need to be compiled by MSVC, where MS ABI is the *only* ABI, which
-forces our UNIX programs to partially conform. Thankfully, all UNIX
-compilers support doing it on a case-by-case basis.
-
-### Char Signedness
-
-Actually Portable Executable defines `char` as signed.
-
-Therefore conformant APE software MUST use `-fsigned-char` when building
-code for aarch64, as well as any other architecture that (unlike x86-64)
-would otherwise define `char` as being `unsigned char` by default.
-
-This decision was one of the cases where it made sense to offer a more
-consistent runtime experience for fat multi-arch binaries. However you
-SHOULD still write code to assume `char` can go either way. But if all
-you care about is using APE, then you CAN assume `char` is signed.
-
-### Long Double
-
-On AMD64 platforms, APE binaries define `long double` as 80-bit.
-
-On ARM64 platforms, APE binaries define `long double` as 128-bit.
-
-We accept inconsistency in this case, because hardware acceleration is
-far more valuable than stylistic consistency in the case of mathematics.
-
-One challenge arises on AMD64 for supporting `long double` across OSes.
-Unlike UNIX systems, the Windows Executive on x86-64 initializes the x87
-FPU to have double (64-bit) precision rather than 80-bit. That's because
-code compiled by MSVC treats `long double` as though it were `double` to
-prefer always using the more modern SSE instructions. However System V
-requires genuine 80-bit `long double` support on AMD64.
-
-Therefore, if an APE program detects that it's been started on a Windows
-x86-64 system, then it SHOULD use the following assembly to initialize
-the x87 FPU in System V ABI mode.
-
-```asm
-	fldcw	1f(%rip)
-	.rodata
-	.balign	2
-//	8087 FPU Control Word
-//	 IM: Invalid Operation ───────────────┐
-//	 DM: Denormal Operand ───────────────┐│
-//	 ZM: Zero Divide ───────────────────┐││
-//	 OM: Overflow ─────────────────────┐│││
-//	 UM: Underflow ───────────────────┐││││
-//	 PM: Precision ──────────────────┐│││││
-//	 PC: Precision Control ───────┐  ││││││
-//	  {float,∅,double,long double}│  ││││││
-//	 RC: Rounding Control ──────┐ │  ││││││
-//	  {even, →-∞, →+∞, →0}      │┌┤  ││││││
-//	                           ┌┤││  ││││││
-//	                          d││││rr││││││
-1:	.short	0b00000000000000000001101111111
-	.previous
-```
-
-## Executable File Alignment
-
-Actually Portable Executable is a statically-linked flat executable file
-format that is, as a thing in itself, agnostic to file alignments. For
-example, the shell script payload at the beginning of the file and its
-statements have no such requirements. Alignment requirements are however
-imposed by the executable formats that APE wraps.
-
-1. ELF requires that file offsets be congruent with virtual addresses
-   modulo the CPU page size. So when we add a shell script to the start
-   of an executable, we need to round up to the page size in order to
-   maintain ELF's invariant. Although no such roundup is required on the
-   program segments once the invariant is restored. ELF loaders will
-   happily map program headers from arbitrary file intervals (which may
-   overlap) onto arbitrarily virtual intervals (which don't need to be
-   contiguous). In order to do that, the loaders will generally use
-   UNIX's mmap() function which is more restrictive and only accepts
-   addresses and offsets that are page aligned. To make it possible to
-   map an unaligned ELF program header that could potentially start and
-   stop at any byte, ELF loaders round-out the intervals, which means
-   adjacent unrelated data might also get mapped, which may need to be
-   explicitly zero'd. Thanks to the cleverness of ELF, it's possible to
-   have an executable file be very tiny, without needing any alignment
-   bytes, and it'll be loaded into a properly aligned virtual space
-   where segments can be as sparse as we want them to be.
-
-2. PE doesn't care about congruence and instead defines two separate
-   kinds of alignment. First, PE requires that the layout of segment
-   memory inside the file be aligned on at minimum the classic 512 byte
-   MS-DOS page size. This means that, unlike ELF, some alignment padding
-   may need to be encoded into the file, making it slightly larger. Next
-   PE imposes an alignment restriction on segments once they've been
-   mapped into the virtual address space, which must be rounded to the
-   system page size. Like ELF, PE segments need to be properly ordered
-   but they're allowed to drift apart once mapped in a non-contiguous
-   sparsely mapped way. When inserting shell script content at the start
-   of a PE file, the most problematic thing is the need to round up to
-   the 64kb system granularity, which results in a lot of needless bytes
-   of padding being inserted by a naive second-pass linker.
-
-3. Apple's Mach-O format is the strictest of them all. While both ELF
-   and PE are defined in such a way that invites great creativity, XNU
-   will simply refuse to an executable that does anything creative with
-   alignment. All loaded segments need to both start and end on a page
-   aligned address. XNU also wants segments to be contiguous similar to
-   portable executable, except it applies to both the file and virtual
-   spaces, which must follow the same structure.
-
-Actually Portable Executables must conform to the strictest requirements
-demanded by the support vector. Therefore an APE binary that has headers
-for all three of the above executable formats MUST conform to the Apple
-way of doing things. GNU ld linker scripts aren't very good at producing
-ELF binaries that rigidly conform to this simple naive layout. There are
-so many ways things can go wrong, where third party code might slip its
-own custom section name in-between the linker script sections that are
-explicitly defined, thereby causing ELF's powerful features to manifest
-and the resulting content overlapping. The best `ld` flag that helps is
-`--orphan-handling=error` which can help with explaining such mysteries.
-
-While Cosmopolitan was originally defined to just use stock GNU tools,
-this proved intractable over time, and the project has been evolving in
-the direction of building its own. Inventing the `apelink` program was
-what enabled the project to achieve multi-architecture binaries whereas
-previously it was only possible to do multi-OS binaries. In the future,
-our hope is that a fast power linker like Mold can be adapted to produce
-fat APE binaries directly from object files in one pass.
-
-## Position Independent Code
-
-APE doesn't currently support position independent executable formats.
-This is because APE was originally written for the GNU linker, where PIC
-and PIE were after-thoughts and never fully incorporated with the older
-more powerful linker script techniques upon which APE relies. Future
-iterations of this specification are intended to converge on modern
-standards, as our tooling becomes developed enough to support it.
-
-However this only applies to the wrapped executable formats themselves.
-While our convention to date has been to always load ELF programs at the
-4mb mark, this is not guaranteed across OSes and architectures. Programs
-should have no expectations that a program will be loaded to any given
-address. For example, Cosmo currently implements APE on AARCH64 as
-loading executables to a starting address of 0x000800000000. This
-address occupies a sweet spot of requirements.
-
-## Address Space
-
-In order to create a single binary that supports as many platforms as
-possible without needing to be recompiled, there's a very narrow range
-of addresses that can be used. That range is somewhere between 32 bits
-and 39 bits.
-
- Embedded devices that claim to be 64-bit will oftentimes only support
-  a virtual address space that's 39 bits in size.
-
- We can't load executable images on AARCH64 beneath 0x100000000 (4gb)
-  because Apple forbids doing that, possibly in an effort to enforce a
-  best practice for spotting 32-bit to 64-bit transition bugs. Please
-  note that this restriction only applies to Apple ARM64 systems. The
-  x86-64 version of XNU will happily load APE binaries to 0x00400000.
-
- The AMD64 architecture on desktops and servers can usually be counted
-  upon to provide a 47-bit address space. The Linux Kernel for instance
-  grants each userspace program full dominion over addresses 0x00200000
-  through 0x00007fffffffffff provided the hardware supports this. On
-  modern workstations supporting Intel and AMD's new PML5T feature which
-  virtualizes memory using a radix trie that's five layers deep, Linux
-  is able to offer userspace its choice of fixed addresses from
-  0x00200000 through 0x00ffffffffffffff. The only exception to this rule
-  we've encountered so far is that Windows 7 and Windows Vista behaved
-  similar to embedded devices in reducing the number of va bits.
-
-## Page Size
-
-APE software MUST be page size agnostic. For many years the industry had
-converged on a strong consensus of having a page size that's 4096 bytes.
-However this convention was never guaranteed. New computers have become
-extremely popular, such as Apple Silicon, that use a 16kb page size.
-
-By convention, Cosmopolitan Libc currently generates ELF headers for
-x86-64 that are strictly aligned on a 4096-byte page size. On ARM64
-Cosmopolitan is currently implemented to always generate ELF headers
-aligned on a 16kb page size.
-
-In addition to being page size agnostic, APE software that cares about
-working correctly on Windows needs to be aware of the concept of
-allocation granularity. While the page size on Windows is generally 4kb
-in size, memory mappings can only be created on addresses that aligned
-to the system allocation granularity, which is generally 64kb. If you
-use a function like mmap() with Cosmopolitan Libc, then the `addr` and
-`offset` parameters need to be aligned to `sysconf(_SC_GRANSIZE)` or
-else your software won't work on Windows. Windows has other limitations
-too, such as lacking the ability to carve or punch holes in mappings.
--- a/ape/start.S
+++ b/ape/start.S
@ -18,7 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/dce.h"
 #include "ape/ape.h"
-#include "libc/macros.h"
+#include "libc/macros.internal.h"

 #ifdef __aarch64__

--- a/ape/systemcall.S
+++ b/ape/systemcall.S
@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/macros.h"
+#include "libc/macros.internal.h"

 //	Invokes system call.
 //
--- a/build/bootstrap/ape.aarch64
+++ b/build/bootstrap/ape.aarch64
--- a/build/bootstrap/ape.elf
+++ b/build/bootstrap/ape.elf
--- a/build/bootstrap/ape.macho
+++ b/build/bootstrap/ape.macho
--- a/build/bootstrap/ar
+++ b/build/bootstrap/ar
--- a/build/bootstrap/chmod
+++ b/build/bootstrap/chmod
--- a/build/bootstrap/cocmd
+++ b/build/bootstrap/cocmd
--- a/build/bootstrap/compile
+++ b/build/bootstrap/compile
--- a/build/bootstrap/cp
+++ b/build/bootstrap/cp
--- a/build/bootstrap/echo
+++ b/build/bootstrap/echo
--- a/build/bootstrap/fixupobj
+++ b/build/bootstrap/fixupobj
--- a/build/bootstrap/gzip
+++ b/build/bootstrap/gzip
--- a/build/bootstrap/make
+++ b/build/bootstrap/make
--- a/build/bootstrap/mkdeps
+++ b/build/bootstrap/mkdeps
--- a/build/bootstrap/mkdir
+++ b/build/bootstrap/mkdir
--- a/build/bootstrap/objbincopy
+++ b/build/bootstrap/objbincopy
--- a/build/bootstrap/package
+++ b/build/bootstrap/package
--- a/build/bootstrap/pecheck
+++ b/build/bootstrap/pecheck
--- a/build/bootstrap/rm
+++ b/build/bootstrap/rm
--- a/build/bootstrap/rollup
+++ b/build/bootstrap/rollup
--- a/build/bootstrap/touch
+++ b/build/bootstrap/touch
--- a/build/bootstrap/zipcopy
+++ b/build/bootstrap/zipcopy
--- a/build/bootstrap/zipobj
+++ b/build/bootstrap/zipobj
--- a/build/config.mk
+++ b/build/config.mk
@ -14,6 +14,7 @@ ENABLE_FTRACE = 1
 CONFIG_OFLAGS ?= -g -ggdb
 CONFIG_CCFLAGS += -O2 $(BACKTRACES)
 CONFIG_CPPFLAGS += -DSYSDEBUG
+TARGET_ARCH ?= -msse3
 endif
 ifeq ($(MODE), x86_64)
 ENABLE_FTRACE = 1
@ -63,6 +64,7 @@ ENABLE_FTRACE = 1
 CONFIG_CCFLAGS += $(BACKTRACES) -O
 CONFIG_CPPFLAGS += -DSYSDEBUG -DDWARFLESS
 CONFIG_LDFLAGS += -S
+TARGET_ARCH ?= -msse3
 endif

 # Optimized Mode
@ -82,7 +84,7 @@ ENABLE_FTRACE = 1
 CONFIG_OFLAGS ?= -g -ggdb
 CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG
 CONFIG_CCFLAGS += $(BACKTRACES) -O3 -fmerge-all-constants
-CONFIG_TARGET_ARCH ?= -march=native
+TARGET_ARCH ?= -march=native
 endif

 # Optimized Linux Mode
@ -100,20 +102,7 @@ CONFIG_OFLAGS ?= -g -ggdb
 CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG -DSUPPORT_VECTOR=1
 CONFIG_CCFLAGS += -O3 -fmerge-all-constants
 CONFIG_COPTS += -mred-zone
-CONFIG_TARGET_ARCH ?= -march=native
-endif
-ifeq ($(MODE), x86_64-optlinux)
-CONFIG_OFLAGS ?= -g -ggdb
-CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG -DSUPPORT_VECTOR=1
-CONFIG_CCFLAGS += -O3 -fmerge-all-constants
-CONFIG_COPTS += -mred-zone
-CONFIG_TARGET_ARCH ?= -march=native
-endif
-ifeq ($(MODE), aarch64-optlinux)
-CONFIG_OFLAGS ?= -g -ggdb
-CONFIG_CPPFLAGS += -DNDEBUG -DSYSDEBUG -DSUPPORT_VECTOR=1
-CONFIG_CCFLAGS += -O3 -fmerge-all-constants
-CONFIG_COPTS += -mred-zone
+TARGET_ARCH ?= -march=native
 endif

 # Release Mode
@ -134,6 +123,7 @@ endif
 ifeq ($(MODE), rel)
 CONFIG_CPPFLAGS += -DNDEBUG -DDWARFLESS
 CONFIG_CCFLAGS += $(BACKTRACES) -O2
+TARGET_ARCH ?= -msse3
 PYFLAGS += -O1
 endif

@ -149,32 +139,18 @@ endif
 ifeq ($(MODE), dbg)
 ENABLE_FTRACE = 1
 CONFIG_OFLAGS ?= -g -ggdb
-OVERRIDE_CFLAGS += -O0
-OVERRIDE_CXXFLAGS += -O0
-CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__ -Wno-unused-variable -Wno-unused-but-set-variable
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG
-CONFIG_COPTS += -fsanitize=undefined
-OVERRIDE_CCFLAGS += -fno-pie
-QUOTA ?= -C64 -L300
-endif
-ifeq ($(MODE), x86_64-dbg)
-ENABLE_FTRACE = 1
-CONFIG_OFLAGS ?= -g -ggdb
-OVERRIDE_CFLAGS += -O0
-OVERRIDE_CXXFLAGS += -O0
-CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__ -Wno-unused-variable -Wno-unused-but-set-variable
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG
+CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__
+CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O0 -fno-inline
 CONFIG_COPTS += -fsanitize=undefined
+TARGET_ARCH ?= -msse3
 OVERRIDE_CCFLAGS += -fno-pie
 QUOTA ?= -C64 -L300
 endif
 ifeq ($(MODE), aarch64-dbg)
 ENABLE_FTRACE = 1
 CONFIG_OFLAGS ?= -g -ggdb
-OVERRIDE_CFLAGS += -O0 -fdce
-OVERRIDE_CXXFLAGS += -O0 -fdce
-CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__ -Wno-unused-variable -Wno-unused-but-set-variable
-CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG
+CONFIG_CPPFLAGS += -DMODE_DBG -D__SANITIZE_UNDEFINED__
+CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O0 -fno-inline -fdce
 CONFIG_COPTS += -fsanitize=undefined
 QUOTA ?= -C64 -L300
 endif
@ -194,6 +170,7 @@ ENABLE_FTRACE = 1
 CONFIG_OFLAGS ?= -g -ggdb
 CONFIG_CCFLAGS += $(BACKTRACES) -O2
 CONFIG_CPPFLAGS += -DSYSDEBUG -DSUPPORT_VECTOR=121
+TARGET_ARCH ?= -msse3
 endif

 # Tiny Mode
@ -223,6 +200,8 @@ CONFIG_CCFLAGS +=			\
 	-momit-leaf-frame-pointer	\
 	-foptimize-sibling-calls	\
 	-DDWARFLESS
+TARGET_ARCH ?=				\
+	-msse3
 PYFLAGS +=				\
 	-O2				\
 	-B
@ -242,6 +221,8 @@ CONFIG_CCFLAGS +=			\
 	-momit-leaf-frame-pointer	\
 	-foptimize-sibling-calls	\
 	-DDWARFLESS
+TARGET_ARCH ?=				\
+	-msse3
 PYFLAGS +=				\
 	-O2				\
 	-B
@ -293,6 +274,8 @@ CONFIG_CCFLAGS +=			\
 	-fno-align-jumps		\
 	-fno-align-labels		\
 	-fno-align-loops
+TARGET_ARCH ?=				\
+	-msse3
 endif

 # Linux+BSD Tiny Mode
@ -322,6 +305,8 @@ CONFIG_CCFLAGS +=		\
 	-fno-align-jumps	\
 	-fno-align-labels	\
 	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
 endif

 # Unix Tiny Mode
@ -350,6 +335,8 @@ CONFIG_CCFLAGS +=		\
 	-fno-align-jumps	\
 	-fno-align-labels	\
 	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
 endif

 # Tiny Metallic Unix Mode
@ -378,6 +365,8 @@ CONFIG_CCFLAGS +=		\
 	-fno-align-jumps	\
 	-fno-align-labels	\
 	-fno-align-loops
+TARGET_ARCH ?=			\
+	-msse3
 endif

 # no x87 instructions mode
@ -399,6 +388,7 @@ ENABLE_FTRACE = 1
 CONFIG_COPTS += -mlong-double-64
 CONFIG_CCFLAGS += $(BACKTRACES) -O2
 CONFIG_CPPFLAGS += -DSYSDEBUG -DNOX87
+TARGET_ARCH ?= -msse3
 endif

 # LLVM Mode
@ -411,6 +401,7 @@ endif
 #
 ifeq ($(MODE), llvm)
 .STRICT = 0
+TARGET_ARCH ?= -msse3
 CONFIG_CCFLAGS += $(BACKTRACES) -DSYSDEBUG -O2
 AS = clang
 CC = clang
@ -453,6 +444,7 @@ ifeq ($(MODE), ansi)
 CONFIG_CFLAGS += -std=c11
 #CONFIG_CPPFLAGS += -ansi
 CONFIG_CXXFLAGS += -std=c++11
+TARGET_ARCH ?= -msse3
 endif

 ifneq ($(ENABLE_FTRACE),)
@ -510,5 +502,3 @@ ifeq ($(ARCH), aarch64)
 CONFIG_CCFLAGS += -fpatchable-function-entry=7,6
 endif
 endif
-
-TARGET_ARCH ?= $(CONFIG_TARGET_ARCH)
--- a/build/definitions.mk
+++ b/build/definitions.mk
@ -92,7 +92,10 @@ DEFAULT_COPTS ?=							\
 	-fno-gnu-unique							\
 	-fstrict-aliasing						\
 	-fstrict-overflow						\
-	-fno-semantic-interposition
+	-fno-semantic-interposition					\
+	-fno-dwarf2-cfi-asm						\
+	-fno-unwind-tables						\
+	-fno-asynchronous-unwind-tables

 ifeq ($(ARCH), x86_64)
 # Microsoft says "[a]ny memory below the stack beyond the red zone
@ -112,10 +115,14 @@ ifeq ($(ARCH), aarch64)
 # - Cosmopolitan Libc uses x28 for thread-local storage because Apple
 #   forbids us from using tpidr_el0 too.
 #
+# - Cosmopolitan currently lacks an implementation of the runtime
+#   libraries needed by the -moutline-atomics flag
+#
 DEFAULT_COPTS +=							\
 	-ffixed-x18							\
 	-ffixed-x28							\
-	-fsigned-char
+	-fsigned-char							\
+	-mno-outline-atomics
 endif

 MATHEMATICAL =								\
@ -132,10 +139,12 @@ DEFAULT_CPPFLAGS +=							\
 	-isystem libc/isystem

 DEFAULT_CFLAGS =							\
-	-std=gnu23
+	-std=gnu2x

 DEFAULT_CXXFLAGS =							\
-	-std=gnu++23							\
+	-std=gnu++20							\
+	-fno-rtti							\
+	-fno-exceptions							\
 	-fuse-cxa-atexit						\
 	-Wno-int-in-bool-context					\
 	-Wno-narrowing							\
--- a/build/download-cosmocc.sh
+++ b/build/download-cosmocc.sh
@ -99,8 +99,3 @@ rm -f cosmocc.zip cosmocc.zip.sha256sum
 # commit output directory
 cd "${OLDPWD}" || die
 mv "${OUTPUT_TMP}" "${OUTPUT_DIR}" || die
-
-# update current symlink
-BASE=$(basename "${OUTPUT_DIR}")
-DIR=$(dirname "${OUTPUT_DIR}")
-ln -sfn "$BASE" "$DIR/current"
--- a/build/objdump
+++ b/build/objdump
@ -6,14 +6,14 @@ if [ -n "$OBJDUMP" ]; then
 fi

 find_objdump() {
-  if [ -x .cosmocc/3.9.2/bin/$1-linux-cosmo-objdump ]; then
-    OBJDUMP=.cosmocc/3.9.2/bin/$1-linux-cosmo-objdump
-  elif [ -x .cosmocc/3.9.2/bin/$1-linux-musl-objdump ]; then
-    OBJDUMP=.cosmocc/3.9.2/bin/$1-linux-musl-objdump
-  elif [ -x "$COSMO/.cosmocc/3.9.2/bin/$1-linux-cosmo-objdump" ]; then
-    OBJDUMP="$COSMO/.cosmocc/3.9.2/bin/$1-linux-cosmo-objdump"
-  elif [ -x "$COSMO/.cosmocc/3.9.2/bin/$1-linux-musl-objdump" ]; then
-    OBJDUMP="$COSMO/.cosmocc/3.9.2/bin/$1-linux-musl-objdump"
+  if [ -x .cosmocc/3.3.5/bin/$1-linux-cosmo-objdump ]; then
+    OBJDUMP=.cosmocc/3.3.5/bin/$1-linux-cosmo-objdump
+  elif [ -x .cosmocc/3.3.5/bin/$1-linux-musl-objdump ]; then
+    OBJDUMP=.cosmocc/3.3.5/bin/$1-linux-musl-objdump
+  elif [ -x "$COSMO/.cosmocc/3.3.5/bin/$1-linux-cosmo-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.3.5/bin/$1-linux-cosmo-objdump"
+  elif [ -x "$COSMO/.cosmocc/3.3.5/bin/$1-linux-musl-objdump" ]; then
+    OBJDUMP="$COSMO/.cosmocc/3.3.5/bin/$1-linux-musl-objdump"
  else
    echo "error: toolchain not found (try running 'cosmocc --update' or 'make' in the cosmo monorepo)" >&2
    exit 1
--- a/build/run
+++ b/build/run
@ -4,5 +4,5 @@ UNAMES=$(uname -s)
 if [ x"$UNAMES" = x"Darwin" ] && [ x"$UNAMEM" = x"arm64" ]; then
  exec ape "$@"
 else
-  exec rusage "$@"
+  exec "$@"
 fi
--- a/build/sanitycheck
+++ b/build/sanitycheck
@ -31,7 +31,7 @@ if [ ! -f /proc/sys/fs/binfmt_misc/status ]; then
  exit 0
 fi

-if ! build/bootstrap/echo -n; then
+if ! build/bootstrap/echo.com -n; then
  cat <<'EOF' >&2

 ERROR
--- a/ctl/BUILD.mk
+++ b/ctl/BUILD.mk
@ -18,13 +18,7 @@ CTL_A_CHECKS =						\
 CTL_A_DIRECTDEPS =					\
 	LIBC_INTRIN					\
 	LIBC_MEM					\
-	LIBC_NEXGEN32E					\
-	LIBC_STDIO					\
 	LIBC_STR					\
-	THIRD_PARTY_DOUBLECONVERSION			\
-	THIRD_PARTY_GDTOA				\
-	THIRD_PARTY_LIBCXXABI				\
-	THIRD_PARTY_LIBUNWIND				\

 CTL_A_DEPS := $(call uniq,$(foreach x,$(CTL_A_DIRECTDEPS),$($(x))))

--- a/ctl/allocator_traits.h
+++ b/ctl/allocator_traits.h
@ -11,55 +11,59 @@ struct allocator_traits
 {
    using allocator_type = Alloc;
    using value_type = typename Alloc::value_type;
-    using pointer = typename Alloc::value_type*;
-    using const_pointer = const typename Alloc::value_type*;
+    using pointer = typename Alloc::pointer;
+    using const_pointer = typename Alloc::const_pointer;
    using void_pointer = void*;
    using const_void_pointer = const void*;
-    using difference_type = ptrdiff_t;
-    using size_type = size_t;
+    using difference_type = typename Alloc::difference_type;
+    using size_type = typename Alloc::size_type;

-    using propagate_on_container_copy_assignment = ctl::false_type;
-    using propagate_on_container_move_assignment = ctl::true_type;
-    using propagate_on_container_swap = ctl::false_type;
-    using is_always_equal = ctl::true_type;
+    using propagate_on_container_copy_assignment = false_type;
+    using propagate_on_container_move_assignment = true_type;
+    using propagate_on_container_swap = false_type;
+    using is_always_equal = true_type;

    template<typename T>
-    struct rebind_alloc
-    {
-        using other = typename Alloc::template rebind<T>::other;
-    };
+    using rebind_alloc = typename Alloc::template rebind<T>::other;

    template<typename T>
-    using rebind_traits = allocator_traits<typename rebind_alloc<T>::other>;
+    using rebind_traits = allocator_traits<rebind_alloc<T>>;

-    static pointer allocate(Alloc& a, size_type n)
+    __attribute__((__always_inline__)) static pointer allocate(Alloc& a,
+                                                               size_type n)
    {
        return a.allocate(n);
    }

-    static void deallocate(Alloc& a, pointer p, size_type n)
+    __attribute__((__always_inline__)) static void deallocate(Alloc& a,
+                                                              pointer p,
+                                                              size_type n)
    {
        a.deallocate(p, n);
    }

    template<typename T, typename... Args>
-    static void construct(Alloc& a, T* p, Args&&... args)
+    __attribute__((__always_inline__)) static void construct(Alloc& a,
+                                                             T* p,
+                                                             Args&&... args)
    {
        ::new ((void*)p) T(static_cast<Args&&>(args)...);
    }

    template<typename T>
-    static void destroy(Alloc& a, T* p)
+    __attribute__((__always_inline__)) static void destroy(Alloc& a, T* p)
    {
        p->~T();
    }

-    static size_type max_size(const Alloc& a) noexcept
+    __attribute__((__always_inline__)) static size_type max_size(
+      const Alloc& a) noexcept
    {
-        return a.max_size();
+        return __PTRDIFF_MAX__ / sizeof(value_type);
    }

-    static Alloc select_on_container_copy_construction(const Alloc& a)
+    __attribute__((__always_inline__)) static Alloc
+    select_on_container_copy_construction(const Alloc& a)
    {
        return a;
    }
--- a/ctl/array.h
+++ b/ctl/array.h
@ -37,28 +37,24 @@ struct array
    constexpr reference at(size_type pos)
    {
        if (pos >= N)
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return elems[pos];
    }

    constexpr const_reference at(size_type pos) const
    {
        if (pos >= N)
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return elems[pos];
    }

    constexpr reference operator[](size_type pos)
    {
-        if (pos >= N)
-            __builtin_trap();
        return elems[pos];
    }

    constexpr const_reference operator[](size_type pos) const
    {
-        if (pos >= N)
-            __builtin_trap();
        return elems[pos];
    }

--- a/ctl/bad_alloc.h
+++ b/ctl/bad_alloc.h
@ -6,7 +6,7 @@

 namespace ctl {

-class bad_alloc : public ctl::exception
+class bad_alloc : public exception
 {
  public:
    bad_alloc() noexcept = default;
--- a/ctl/conditional.h
+++ b/ctl/conditional.h
@ -17,9 +17,6 @@ struct conditional<false, T, F>
    typedef F type;
 };

-template<bool B, typename T, typename F>
-using conditional_t = typename conditional<B, T, F>::type;
-
 } // namespace ctl

 #endif // CTL_CONDITIONAL_H_
--- a/ctl/decay.h
+++ b/ctl/decay.h
@ -16,16 +16,15 @@ template<typename T>
 struct decay
 {
  private:
-    typedef typename ctl::remove_reference<T>::type U;
+    typedef typename remove_reference<T>::type U;

  public:
-    typedef typename ctl::conditional<
-      ctl::is_array<U>::value,
-      typename ctl::remove_extent<U>::type*,
-      typename ctl::conditional<ctl::is_function<U>::value,
-                                typename ctl::add_pointer<U>::type,
-                                typename ctl::remove_cv<U>::type>::type>::type
-      type;
+    typedef typename conditional<
+      is_array<U>::value,
+      typename remove_extent<U>::type*,
+      typename conditional<is_function<U>::value,
+                           typename add_pointer<U>::type,
+                           typename remove_cv<U>::type>::type>::type type;
 };

 template<typename T>
--- a/ctl/distance.h
+++ b/ctl/distance.h
@ -8,30 +8,28 @@
 namespace ctl {

 template<class InputIter>
-constexpr typename ctl::iterator_traits<InputIter>::difference_type
+constexpr typename iterator_traits<InputIter>::difference_type
 distance_impl(InputIter first, InputIter last, input_iterator_tag)
 {
-    typename ctl::iterator_traits<InputIter>::difference_type res(0);
+    typename iterator_traits<InputIter>::difference_type res(0);
    for (; first != last; ++first)
        ++res;
    return res;
 }

 template<class RandIter>
-constexpr typename ctl::iterator_traits<RandIter>::difference_type
+constexpr typename iterator_traits<RandIter>::difference_type
 distance_impl(RandIter first, RandIter last, random_access_iterator_tag)
 {
    return last - first;
 }

 template<class InputIter>
-constexpr typename ctl::iterator_traits<InputIter>::difference_type
+constexpr typename iterator_traits<InputIter>::difference_type
 distance(InputIter first, InputIter last)
 {
    return distance_impl(
-      first,
-      last,
-      typename ctl::iterator_traits<InputIter>::iterator_category());
+      first, last, typename iterator_traits<InputIter>::iterator_category());
 }

 } // namespace ctl
--- a/ctl/dubble.cc
+++ b/ctl/dubble.cc
@ -1,35 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "dubble.h"
-
-namespace ctl {
-
-const double_conversion::DoubleToStringConverter kDoubleToPrintfG(
-  double_conversion::DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN |
-    double_conversion::DoubleToStringConverter::NO_TRAILING_ZERO,
-  "inf",
-  "nan",
-  'e',
-  -6,
-  10, // let 32-bit ints be represented without exponent
-  6,
-  0,
-  0);
-
-} // namespace ctl
--- a/ctl/dubble.h
+++ b/ctl/dubble.h
@ -1,13 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef COSMOPOLITAN_CTL_DUBBLE_H_
-#define COSMOPOLITAN_CTL_DUBBLE_H_
-#include "third_party/double-conversion/double-to-string.h"
-
-namespace ctl {
-
-extern const double_conversion::DoubleToStringConverter kDoubleToPrintfG;
-
-} // namespace ctl
-
-#endif // COSMOPOLITAN_CTL_DUBBLE_H_
--- a/ctl/integral_constant.h
+++ b/ctl/integral_constant.h
@ -11,12 +11,10 @@ struct integral_constant
    static constexpr T value = v;
    typedef T value_type;
    typedef integral_constant type;
-
    constexpr operator value_type() const noexcept
    {
        return value;
    }
-
    constexpr value_type operator()() const noexcept
    {
        return value;
--- a/ctl/ios.cc
+++ b/ctl/ios.cc
@ -1,39 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "ios.h"
-
-namespace ctl {
-
-ios::ios(FILE* file) : file_(file)
-{
-}
-
-ios::~ios() = default;
-
-ios&
-ios::operator=(ios&& other) noexcept
-{
-    if (this != &other) {
-        file_ = other.file_;
-        other.file_ = nullptr;
-    }
-    return *this;
-}
-
-} // namespace ctl
--- a/ctl/ios.h
+++ b/ctl/ios.h
@ -1,27 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IOS_H_
-#define CTL_IOS_H_
-#include "ios_base.h"
-
-struct FILE;
-
-namespace ctl {
-
-class ios : public ios_base
-{
-  public:
-    explicit ios(FILE*);
-    virtual ~ios();
-
-  protected:
-    ios& operator=(ios&&) noexcept;
-    FILE* file_;
-
-  private:
-    ios(const ios&) = delete;
-};
-
-} // namespace ctl
-
-#endif // CTL_IOS_H_
--- a/ctl/ios_base.cc
+++ b/ctl/ios_base.cc
@ -1,118 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "ios_base.h"
-
-namespace ctl {
-
-ios_base::ios_base() : state_(goodbit), flags_(skipws | dec)
-{
-}
-
-ios_base::~ios_base() = default;
-
-ios_base::fmtflags
-ios_base::flags() const
-{
-    return static_cast<ios_base::fmtflags>(flags_);
-}
-
-ios_base::fmtflags
-ios_base::flags(fmtflags fmtfl)
-{
-    int old = flags_;
-    flags_ = fmtfl;
-    return static_cast<ios_base::fmtflags>(old);
-}
-
-ios_base::fmtflags
-ios_base::setf(fmtflags fmtfl)
-{
-    int old = flags_;
-    flags_ |= fmtfl;
-    return static_cast<ios_base::fmtflags>(old);
-}
-
-ios_base::fmtflags
-ios_base::setf(fmtflags fmtfl, fmtflags mask)
-{
-    int old = flags_;
-    flags_ = (flags_ & ~mask) | (fmtfl & mask);
-    return static_cast<ios_base::fmtflags>(old);
-}
-
-void
-ios_base::unsetf(fmtflags mask)
-{
-    flags_ &= ~mask;
-}
-
-ios_base::iostate
-ios_base::rdstate() const
-{
-    return static_cast<ios_base::iostate>(state_);
-}
-
-void
-ios_base::clear(int state)
-{
-    state_ = state;
-}
-
-void
-ios_base::setstate(int state)
-{
-    state_ |= state;
-}
-
-bool
-ios_base::good() const
-{
-    return state_ == goodbit;
-}
-
-bool
-ios_base::eof() const
-{
-    return (state_ & eofbit) != 0;
-}
-
-bool
-ios_base::fail() const
-{
-    return (state_ & (failbit | badbit)) != 0;
-}
-
-bool
-ios_base::bad() const
-{
-    return (state_ & badbit) != 0;
-}
-
-bool
-ios_base::operator!() const
-{
-    return fail();
-}
-
-ios_base::operator bool() const
-{
-    return !fail();
-}
-
-} // namespace ctl
--- a/ctl/ios_base.h
+++ b/ctl/ios_base.h
@ -1,86 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IOS_BASE_H_
-#define CTL_IOS_BASE_H_
-
-namespace ctl {
-
-class ios_base
-{
-  public:
-    typedef size_t streamsize;
-
-    enum iostate
-    {
-        goodbit = 0,
-        badbit = 1,
-        failbit = 2,
-        eofbit = 4
-    };
-
-    enum fmtflags
-    {
-        boolalpha = 1 << 0,
-        dec = 1 << 1,
-        fixed = 1 << 2,
-        hex = 1 << 3,
-        internal = 1 << 4,
-        left = 1 << 5,
-        oct = 1 << 6,
-        right = 1 << 7,
-        scientific = 1 << 8,
-        showbase = 1 << 9,
-        showpoint = 1 << 10,
-        showpos = 1 << 11,
-        skipws = 1 << 12,
-        unitbuf = 1 << 13,
-        uppercase = 1 << 14,
-        adjustfield = left | right | internal,
-        basefield = dec | oct | hex,
-        floatfield = scientific | fixed
-    };
-
-    enum openmode
-    {
-        app = 1 << 0,
-        binary = 1 << 1,
-        in = 1 << 2,
-        out = 1 << 3,
-        trunc = 1 << 4,
-        ate = 1 << 5
-    };
-
-  protected:
-    ios_base();
-    virtual ~ios_base();
-
-    int state_;
-    int flags_;
-
-  public:
-    fmtflags flags() const;
-    fmtflags flags(fmtflags);
-    fmtflags setf(fmtflags);
-    fmtflags setf(fmtflags, fmtflags);
-    void unsetf(fmtflags);
-
-    iostate rdstate() const;
-    void clear(int = goodbit);
-    void setstate(int);
-
-    bool good() const;
-    bool eof() const;
-    bool fail() const;
-    bool bad() const;
-
-    bool operator!() const;
-    explicit operator bool() const;
-
-  private:
-    ios_base(const ios_base&) = delete;
-    ios_base& operator=(const ios_base&) = delete;
-};
-
-} // namespace ctl
-
-#endif // CTL_IOS_BASE_H_
--- a/ctl/is_abstract.h
+++ b/ctl/is_abstract.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_ABSTRACT_H_
-#define CTL_IS_ABSTRACT_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_abstract : public ctl::integral_constant<bool, __is_abstract(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_abstract_v = __is_abstract(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_ABSTRACT_H_
--- a/ctl/is_array.h
+++ b/ctl/is_array.h
@ -7,15 +7,15 @@
 namespace ctl {

 template<typename T>
-struct is_array : ctl::false_type
+struct is_array : false_type
 {};

 template<typename T, size_t N>
-struct is_array<T[N]> : ctl::true_type
+struct is_array<T[N]> : true_type
 {};

 template<typename T>
-struct is_array<T[]> : ctl::true_type
+struct is_array<T[]> : true_type
 {};

 template<typename T>
--- a/ctl/is_base_of.h
+++ b/ctl/is_base_of.h
@ -1,19 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_BASE_OF_H_
-#define CTL_IS_BASE_OF_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename Base, typename Derived>
-struct is_base_of
-  : public ctl::integral_constant<bool, __is_base_of(Base, Derived)>
-{};
-
-template<typename Base, typename Derived>
-inline constexpr bool is_base_of_v = __is_base_of(Base, Derived);
-
-} // namespace ctl
-
-#endif // CTL_IS_BASE_OF_H_
--- a/ctl/is_class.h
+++ b/ctl/is_class.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_CLASS_H_
-#define CTL_IS_CLASS_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_class : public ctl::integral_constant<bool, __is_class(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_class_v = __is_class(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_CLASS_H_
--- a/ctl/is_constructible.h
+++ b/ctl/is_constructible.h
@ -1,19 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_CONSTRUCTIBLE_H_
-#define CTL_IS_CONSTRUCTIBLE_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<class _Tp, class... _Args>
-struct is_constructible
-  : public ctl::integral_constant<bool, __is_constructible(_Tp, _Args...)>
-{};
-
-template<class _Tp, class... _Args>
-inline constexpr bool is_constructible_v = __is_constructible(_Tp, _Args...);
-
-} // namespace ctl
-
-#endif // CTL_IS_CONSTRUCTIBLE_H_
--- a/ctl/is_convertible.h
+++ b/ctl/is_convertible.h
@ -2,6 +2,7 @@
 // vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
 #ifndef CTL_IS_CONVERTIBLE_H_
 #define CTL_IS_CONVERTIBLE_H_
+
 #include "ctl/integral_constant.h"
 #include "ctl/void_t.h"

@ -15,7 +16,7 @@ declval() noexcept;
 namespace detail {

 template<typename From, typename To, typename = void>
-struct is_convertible_impl : ctl::false_type
+struct is_convertible_impl : false_type
 {};

 template<typename From, typename To>
@ -27,15 +28,15 @@ struct is_convertible_impl<From,

 // Handle void types separately
 template<>
-struct is_convertible_impl<void, void> : ctl::true_type
+struct is_convertible_impl<void, void> : true_type
 {};

 template<typename To>
-struct is_convertible_impl<void, To> : ctl::false_type
+struct is_convertible_impl<void, To> : false_type
 {};

 template<typename From>
-struct is_convertible_impl<From, void> : ctl::false_type
+struct is_convertible_impl<From, void> : false_type
 {};

 } // namespace detail
--- a/ctl/is_empty.h
+++ b/ctl/is_empty.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_EMPTY_H_
-#define CTL_IS_EMPTY_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_empty : public ctl::integral_constant<bool, __is_empty(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_empty_v = __is_empty(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_EMPTY_H_
--- a/ctl/is_enum.h
+++ b/ctl/is_enum.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_ENUM_H_
-#define CTL_IS_ENUM_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_enum : public ctl::integral_constant<bool, __is_enum(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_enum_v = __is_enum(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_ENUM_H_
--- a/ctl/is_function.h
+++ b/ctl/is_function.h
@ -8,111 +8,111 @@ namespace ctl {

 // Primary template
 template<class>
-struct is_function : ctl::false_type
+struct is_function : false_type
 {};

 // Specializations for various function types

 // Regular functions
 template<class Ret, class... Args>
-struct is_function<Ret(Args...)> : ctl::true_type
+struct is_function<Ret(Args...)> : true_type
 {};

 // Functions with cv-qualifiers
 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const> : ctl::true_type
+struct is_function<Ret(Args...) const> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) volatile> : ctl::true_type
+struct is_function<Ret(Args...) volatile> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const volatile> : ctl::true_type
+struct is_function<Ret(Args...) const volatile> : true_type
 {};

 // Functions with ref-qualifiers
 template<class Ret, class... Args>
-struct is_function<Ret(Args...)&> : ctl::true_type
+struct is_function<Ret(Args...)&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const&> : ctl::true_type
+struct is_function<Ret(Args...) const&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) volatile&> : ctl::true_type
+struct is_function<Ret(Args...) volatile&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const volatile&> : ctl::true_type
+struct is_function<Ret(Args...) const volatile&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) &&> : ctl::true_type
+struct is_function<Ret(Args...) &&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const&&> : ctl::true_type
+struct is_function<Ret(Args...) const&&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) volatile&&> : ctl::true_type
+struct is_function<Ret(Args...) volatile&&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args...) const volatile&&> : ctl::true_type
+struct is_function<Ret(Args...) const volatile&&> : true_type
 {};

 // Variadic functions
 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...)> : ctl::true_type
+struct is_function<Ret(Args..., ...)> : true_type
 {};

 // Variadic functions with cv-qualifiers
 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const> : ctl::true_type
+struct is_function<Ret(Args..., ...) const> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) volatile> : ctl::true_type
+struct is_function<Ret(Args..., ...) volatile> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const volatile> : ctl::true_type
+struct is_function<Ret(Args..., ...) const volatile> : true_type
 {};

 // Variadic functions with ref-qualifiers
 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...)&> : ctl::true_type
+struct is_function<Ret(Args..., ...)&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const&> : ctl::true_type
+struct is_function<Ret(Args..., ...) const&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) volatile&> : ctl::true_type
+struct is_function<Ret(Args..., ...) volatile&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const volatile&> : ctl::true_type
+struct is_function<Ret(Args..., ...) const volatile&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) &&> : ctl::true_type
+struct is_function<Ret(Args..., ...) &&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const&&> : ctl::true_type
+struct is_function<Ret(Args..., ...) const&&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) volatile&&> : ctl::true_type
+struct is_function<Ret(Args..., ...) volatile&&> : true_type
 {};

 template<class Ret, class... Args>
-struct is_function<Ret(Args..., ...) const volatile&&> : ctl::true_type
+struct is_function<Ret(Args..., ...) const volatile&&> : true_type
 {};

 } // namespace ctl
--- a/ctl/is_integral.h
+++ b/ctl/is_integral.h
@ -7,67 +7,67 @@
 namespace ctl {

 template<typename T>
-struct is_integral : ctl::false_type
+struct is_integral : false_type
 {};

 template<>
-struct is_integral<bool> : ctl::true_type
+struct is_integral<bool> : true_type
 {};

 template<>
-struct is_integral<char> : ctl::true_type
+struct is_integral<char> : true_type
 {};

 template<>
-struct is_integral<signed char> : ctl::true_type
+struct is_integral<signed char> : true_type
 {};

 template<>
-struct is_integral<unsigned char> : ctl::true_type
+struct is_integral<unsigned char> : true_type
 {};

 template<>
-struct is_integral<short> : ctl::true_type
+struct is_integral<short> : true_type
 {};

 template<>
-struct is_integral<unsigned short> : ctl::true_type
+struct is_integral<unsigned short> : true_type
 {};

 template<>
-struct is_integral<int> : ctl::true_type
+struct is_integral<int> : true_type
 {};

 template<>
-struct is_integral<unsigned int> : ctl::true_type
+struct is_integral<unsigned int> : true_type
 {};

 template<>
-struct is_integral<long> : ctl::true_type
+struct is_integral<long> : true_type
 {};

 template<>
-struct is_integral<unsigned long> : ctl::true_type
+struct is_integral<unsigned long> : true_type
 {};

 template<>
-struct is_integral<long long> : ctl::true_type
+struct is_integral<long long> : true_type
 {};

 template<>
-struct is_integral<unsigned long long> : ctl::true_type
+struct is_integral<unsigned long long> : true_type
 {};

 template<>
-struct is_integral<char16_t> : ctl::true_type
+struct is_integral<char16_t> : true_type
 {};

 template<>
-struct is_integral<char32_t> : ctl::true_type
+struct is_integral<char32_t> : true_type
 {};

 template<>
-struct is_integral<wchar_t> : ctl::true_type
+struct is_integral<wchar_t> : true_type
 {};

 template<typename T>
--- a/ctl/is_polymorphic.h
+++ b/ctl/is_polymorphic.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_POLYMORPHIC_H_
-#define CTL_IS_POLYMORPHIC_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_polymorphic : public ctl::integral_constant<bool, __is_polymorphic(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_polymorphic_v = __is_polymorphic(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_POLYMORPHIC_H_
--- a/ctl/is_standard_layout.h
+++ b/ctl/is_standard_layout.h
@ -1,19 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_STANDARD_LAYOUT_H_
-#define CTL_IS_STANDARD_LAYOUT_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_standard_layout
-  : public ctl::integral_constant<bool, __is_standard_layout(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_standard_layout_v = __is_standard_layout(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_STANDARD_LAYOUT_H_
--- a/ctl/is_trivial.h
+++ b/ctl/is_trivial.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_TRIVIAL_H_
-#define CTL_IS_TRIVIAL_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_trivial : public ctl::integral_constant<bool, __is_trivial(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_trivial_v = __is_trivial(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_TRIVIAL_H_
--- a/ctl/is_union.h
+++ b/ctl/is_union.h
@ -1,18 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_UNION_H_
-#define CTL_IS_UNION_H_
-#include "integral_constant.h"
-
-namespace ctl {
-
-template<typename T>
-struct is_union : public ctl::integral_constant<bool, __is_union(T)>
-{};
-
-template<typename T>
-inline constexpr bool is_union_v = __is_union(T);
-
-} // namespace ctl
-
-#endif // CTL_IS_UNION_H_
--- a/ctl/is_void.h
+++ b/ctl/is_void.h
@ -1,27 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_IS_VOID_H_
-#define CTL_IS_VOID_H_
-#include "integral_constant.h"
-#include "remove_cv.h"
-
-namespace ctl {
-
-template<typename>
-struct is_void_ : public ctl::false_type
-{};
-
-template<>
-struct is_void_<void> : public ctl::true_type
-{};
-
-template<typename _Tp>
-struct is_void : public is_void_<typename ctl::remove_cv<_Tp>::type>::type
-{};
-
-template<typename T>
-inline constexpr bool is_void_v = is_void<T>::value;
-
-} // namespace ctl
-
-#endif // CTL_IS_VOID_H_
--- a/ctl/istream.cc
+++ b/ctl/istream.cc
@ -1,238 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "istream.h"
-#include "libc/ctype.h"
-#include "libc/fmt/conv.h"
-#include "libc/stdio/stdio.h"
-#include "libc/str/str.h"
-#include "numeric_limits.h"
-#include "string.h"
-#include "utility.h"
-
-namespace ctl {
-
-istream cin(stdin);
-
-istream::~istream() = default;
-
-istream::istream(FILE* file) : ios(file), gcount_(0)
-{
-}
-
-istream::istream(istream&& other) noexcept
-  : ios(other.file_), gcount_(other.gcount_)
-{
-    other.file_ = nullptr;
-    other.gcount_ = 0;
-}
-
-istream&
-istream::operator=(istream&& other) noexcept
-{
-    if (this != &other) {
-        ios::operator=(ctl::move(other));
-        gcount_ = other.gcount_;
-        other.gcount_ = 0;
-    }
-    return *this;
-}
-
-istream&
-istream::operator>>(char& c)
-{
-    gcount_ = 0;
-    int ch = fgetc(file_);
-    if (ch == EOF) {
-        setstate(eofbit | failbit);
-    } else {
-        c = static_cast<char>(ch);
-        gcount_ = 1;
-    }
-    return *this;
-}
-
-istream&
-istream::operator>>(int& n)
-{
-    if (fscanf(file_, "%d", &n) != 1)
-        setstate(failbit);
-    return *this;
-}
-
-istream&
-istream::operator>>(long& n)
-{
-    if (fscanf(file_, "%ld", &n) != 1)
-        setstate(failbit);
-    return *this;
-}
-
-istream&
-istream::operator>>(double& d)
-{
-    if (fscanf(file_, "%f", &d) != 1)
-        setstate(failbit);
-    return *this;
-}
-
-istream&
-istream::operator>>(ctl::string& s)
-{
-    char buffer[1024];
-    if (fscanf(file_, "%1023s", buffer) == 1) {
-        s = buffer;
-    } else {
-        setstate(failbit);
-    }
-    return *this;
-}
-
-istream&
-istream::operator>>(bool& b)
-{
-    char buffer[6];
-    if (fscanf(file_, "%5s", buffer) == 1) {
-        if (strcmp(buffer, "true") == 0 || strcmp(buffer, "1") == 0) {
-            b = true;
-        } else if (strcmp(buffer, "false") == 0 || strcmp(buffer, "0") == 0) {
-            b = false;
-        } else {
-            setstate(failbit);
-        }
-    } else {
-        setstate(failbit);
-    }
-    return *this;
-}
-
-istream&
-istream::operator>>(istream& (*manip)(istream&))
-{
-    return manip(*this);
-}
-
-int
-istream::get()
-{
-    gcount_ = 0;
-    int ch = fgetc(file_);
-    if (ch == EOF) {
-        setstate(eofbit);
-    } else {
-        gcount_ = 1;
-    }
-    return ch;
-}
-
-istream&
-istream::get(char& c)
-{
-    int ch = get();
-    if (ch != EOF)
-        c = static_cast<char>(ch);
-    return *this;
-}
-
-istream&
-istream::getline(char* s, streamsize n)
-{
-    return getline(s, n, '\n');
-}
-
-istream&
-istream::getline(char* s, streamsize n, char delim)
-{
-    gcount_ = 0;
-    if (n <= 0) {
-        setstate(failbit);
-        return *this;
-    }
-    while (gcount_ < n - 1) {
-        int ch = fgetc(file_);
-        if (ch == EOF) {
-            setstate(eofbit);
-            break;
-        }
-        if (ch == delim)
-            break;
-        s[gcount_++] = static_cast<char>(ch);
-    }
-    s[gcount_] = '\0';
-    if (gcount_ == 0)
-        setstate(failbit);
-    return *this;
-}
-
-istream&
-istream::read(char* s, streamsize n)
-{
-    gcount_ = fread(s, 1, n, file_);
-    if (gcount_ < n) {
-        setstate(eofbit);
-        if (gcount_ == 0)
-            setstate(failbit);
-    }
-    return *this;
-}
-
-istream::streamsize
-istream::gcount() const
-{
-    return gcount_;
-}
-
-int
-istream::peek()
-{
-    int ch = fgetc(file_);
-    if (ch != EOF) {
-        ungetc(ch, file_);
-    } else {
-        setstate(eofbit);
-    }
-    return ch;
-}
-
-istream&
-istream::ignore(streamsize n, int delim)
-{
-    gcount_ = 0;
-    while (gcount_ < n) {
-        int ch = fgetc(file_);
-        if (ch == EOF) {
-            setstate(eofbit);
-            break;
-        }
-        ++gcount_;
-        if (ch == delim)
-            break;
-    }
-    return *this;
-}
-
-istream&
-ws(istream& is)
-{
-    int ch;
-    while ((ch = is.peek()) != EOF && isspace(ch))
-        is.get();
-    return is;
-}
-
-} // namespace ctl
--- a/ctl/istream.h
+++ b/ctl/istream.h
@ -1,53 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_ISTREAM_H_
-#define CTL_ISTREAM_H_
-#include "ios.h"
-
-namespace ctl {
-
-struct string;
-
-class istream : public ios
-{
-  public:
-    istream() = delete;
-    explicit istream(FILE*);
-    virtual ~istream();
-
-    istream& operator>>(char&);
-    istream& operator>>(int&);
-    istream& operator>>(long&);
-    istream& operator>>(double&);
-    istream& operator>>(bool&);
-    istream& operator>>(ctl::string&);
-    istream& operator>>(istream& (*)(istream&));
-
-    int get();
-    istream& get(char&);
-    istream& getline(char*, streamsize);
-    istream& getline(char*, streamsize, char);
-    istream& read(char*, streamsize);
-    streamsize gcount() const;
-
-    int peek();
-    istream& ignore(streamsize = 1, int = -1);
-
-    istream(istream&&) noexcept;
-    istream& operator=(istream&&) noexcept;
-
-  private:
-    streamsize gcount_;
-
-    istream(const istream&) = delete;
-    istream& operator=(const istream&) = delete;
-};
-
-extern istream cin;
-
-istream&
-ws(istream& is);
-
-} // namespace ctl
-
-#endif // CTL_ISTREAM_H_
--- a/ctl/istringstream.cc
+++ b/ctl/istringstream.cc
@ -1,222 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "istringstream.h"
-#include "libc/ctype.h"
-#include "libc/fmt/conv.h"
-#include "libc/str/str.h"
-
-namespace ctl {
-
-istringstream::istringstream() : buffer_(), read_pos_(0)
-{
-}
-
-istringstream::istringstream(const ctl::string_view& str)
-  : buffer_(str), read_pos_(0)
-{
-}
-
-ctl::string
-istringstream::str() const
-{
-    return buffer_;
-}
-
-void
-istringstream::str(const ctl::string& s)
-{
-    buffer_ = s;
-    read_pos_ = 0;
-    clear();
-}
-
-istringstream&
-istringstream::operator>>(char& c)
-{
-    if (good() && read_pos_ < buffer_.size()) {
-        c = buffer_[read_pos_++];
-    } else {
-        setstate(ios_base::failbit);
-    }
-    return *this;
-}
-
-istringstream&
-istringstream::operator>>(char* s)
-{
-    if (!good())
-        return *this;
-
-    while (read_pos_ < buffer_.size() && isspace(buffer_[read_pos_]))
-        ++read_pos_;
-
-    size_t start = read_pos_;
-    while (read_pos_ < buffer_.size() && !isspace(buffer_[read_pos_])) {
-        s[read_pos_ - start] = buffer_[read_pos_];
-        ++read_pos_;
-    }
-    s[read_pos_ - start] = '\0';
-
-    if (start == read_pos_) {
-        setstate(ios_base::failbit);
-    } else if (read_pos_ == buffer_.size()) {
-        setstate(ios_base::eofbit);
-    }
-
-    return *this;
-}
-
-istringstream&
-istringstream::operator>>(ctl::string& s)
-{
-    if (!good())
-        return *this;
-
-    s.clear();
-    while (read_pos_ < buffer_.size() && isspace(buffer_[read_pos_]))
-        ++read_pos_;
-
-    while (read_pos_ < buffer_.size() && !isspace(buffer_[read_pos_])) {
-        s.push_back(buffer_[read_pos_]);
-        ++read_pos_;
-    }
-
-    if (s.empty()) {
-        setstate(ios_base::failbit);
-    } else if (read_pos_ == buffer_.size()) {
-        setstate(ios_base::eofbit);
-    }
-
-    return *this;
-}
-
-template<typename T>
-istringstream&
-istringstream::read_numeric(T& value)
-{
-    if (!good())
-        return *this;
-
-    while (read_pos_ < buffer_.size() && isspace(buffer_[read_pos_]))
-        ++read_pos_;
-
-    // size_t start = read_pos_;
-    bool is_negative = false;
-    if (read_pos_ < buffer_.size() &&
-        (buffer_[read_pos_] == '-' || buffer_[read_pos_] == '+')) {
-        is_negative = (buffer_[read_pos_] == '-');
-        ++read_pos_;
-    }
-
-    T result = 0;
-    bool valid = false;
-    while (read_pos_ < buffer_.size() && isdigit(buffer_[read_pos_])) {
-        result = result * 10 + (buffer_[read_pos_] - '0');
-        ++read_pos_;
-        valid = true;
-    }
-
-    if (valid) {
-        value = is_negative ? -result : result;
-        if (read_pos_ == buffer_.size())
-            setstate(ios_base::eofbit);
-    } else {
-        setstate(ios_base::failbit);
-    }
-
-    return *this;
-}
-
-istringstream&
-istringstream::operator>>(short& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(unsigned short& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(int& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(unsigned int& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(long& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(unsigned long& n)
-{
-    return read_numeric(n);
-}
-
-istringstream&
-istringstream::operator>>(float& f)
-{
-    if (!good())
-        return *this;
-
-    char* end;
-    f = strtof(buffer_.c_str() + read_pos_, &end);
-
-    if (end == buffer_.c_str() + read_pos_) {
-        setstate(ios_base::failbit);
-    } else {
-        read_pos_ = end - buffer_.c_str();
-        if (read_pos_ == buffer_.size())
-            setstate(ios_base::eofbit);
-    }
-
-    return *this;
-}
-
-istringstream&
-istringstream::operator>>(double& d)
-{
-    if (!good())
-        return *this;
-
-    char* end;
-    d = strtod(buffer_.c_str() + read_pos_, &end);
-
-    if (end == buffer_.c_str() + read_pos_) {
-        setstate(ios_base::failbit);
-    } else {
-        read_pos_ = end - buffer_.c_str();
-        if (read_pos_ == buffer_.size())
-            setstate(ios_base::eofbit);
-    }
-
-    return *this;
-}
-
-} // namespace ctl
--- a/ctl/istringstream.h
+++ b/ctl/istringstream.h
@ -1,41 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_ISTRINGSTREAM_H_
-#define CTL_ISTRINGSTREAM_H_
-#include "ios_base.h"
-#include "string.h"
-
-namespace ctl {
-
-class istringstream : public ios_base
-{
-  public:
-    istringstream();
-    explicit istringstream(const ctl::string_view&);
-
-    string str() const;
-    void str(const string&);
-
-    istringstream& operator>>(char&);
-    istringstream& operator>>(char*);
-    istringstream& operator>>(ctl::string&);
-    istringstream& operator>>(short&);
-    istringstream& operator>>(unsigned short&);
-    istringstream& operator>>(int&);
-    istringstream& operator>>(unsigned int&);
-    istringstream& operator>>(long&);
-    istringstream& operator>>(unsigned long&);
-    istringstream& operator>>(float&);
-    istringstream& operator>>(double&);
-
-  private:
-    ctl::string buffer_;
-    size_t read_pos_;
-
-    template<typename T>
-    istringstream& read_numeric(T&);
-};
-
-} // namespace ctl
-
-#endif // CTL_ISTRINGSTREAM_H_
--- a/ctl/iterator_traits.h
+++ b/ctl/iterator_traits.h
@ -2,33 +2,12 @@
 // vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
 #ifndef CTL_ITERATOR_TRAITS_H_
 #define CTL_ITERATOR_TRAITS_H_
-#include "iterator.h"
 #include "utility.h"
-#include "void_t.h"

 namespace ctl {

-template<typename Iterator, typename = void>
+template<class Iterator>
 struct iterator_traits
-{};
-
-template<typename T>
-struct iterator_traits<T*>
-{
-    using difference_type = ptrdiff_t;
-    using value_type = T;
-    using pointer = T*;
-    using reference = T&;
-    using iterator_category = ctl::random_access_iterator_tag;
-};
-
-template<typename Iterator>
-struct iterator_traits<Iterator,
-                       ctl::void_t<typename Iterator::iterator_category,
-                                   typename Iterator::value_type,
-                                   typename Iterator::difference_type,
-                                   typename Iterator::pointer,
-                                   typename Iterator::reference>>
 {
    using iterator_category = typename Iterator::iterator_category;
    using value_type = typename Iterator::value_type;
@ -37,6 +16,16 @@ struct iterator_traits<Iterator,
    using reference = typename Iterator::reference;
 };

+template<class T>
+struct iterator_traits<T*>
+{
+    using iterator_category = void*; // We don't actually use this
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+
 } // namespace ctl

 #endif // CTL_ITERATOR_TRAITS_H_
--- a/ctl/map.h
+++ b/ctl/map.h
@ -152,12 +152,12 @@ class map

    Value& operator[](const Key& key)
    {
-        return ((data_.insert(ctl::make_pair(key, Value()))).first)->second;
+        return ((data_.insert(make_pair(key, Value()))).first)->second;
    }

    Value& operator[](Key&& key)
    {
-        return ((data_.insert(ctl::make_pair(ctl::move(key), Value()))).first)
+        return ((data_.insert(make_pair(ctl::move(key), Value()))).first)
          ->second;
    }

@ -165,7 +165,7 @@ class map
    {
        auto it = find(key);
        if (it == end())
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return it->second;
    }

@ -173,7 +173,7 @@ class map
    {
        auto it = find(key);
        if (it == end())
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return it->second;
    }

@ -244,7 +244,7 @@ class map

    size_type erase(const Key& key)
    {
-        return data_.erase(ctl::make_pair(key, Value()));
+        return data_.erase(make_pair(key, Value()));
    }

    void swap(map& other) noexcept
@ -259,47 +259,47 @@ class map

    iterator find(const Key& key)
    {
-        return data_.find(ctl::make_pair(key, Value()));
+        return data_.find(make_pair(key, Value()));
    }

    const_iterator find(const Key& key) const
    {
-        return data_.find(ctl::make_pair(key, Value()));
+        return data_.find(make_pair(key, Value()));
    }

    size_type count(const Key& key) const
    {
-        return data_.count(ctl::make_pair(key, Value()));
+        return data_.count(make_pair(key, Value()));
    }

    iterator lower_bound(const Key& key)
    {
-        return data_.lower_bound(ctl::make_pair(key, Value()));
+        return data_.lower_bound(make_pair(key, Value()));
    }

    const_iterator lower_bound(const Key& key) const
    {
-        return data_.lower_bound(ctl::make_pair(key, Value()));
+        return data_.lower_bound(make_pair(key, Value()));
    }

    iterator upper_bound(const Key& key)
    {
-        return data_.upper_bound(ctl::make_pair(key, Value()));
+        return data_.upper_bound(make_pair(key, Value()));
    }

    const_iterator upper_bound(const Key& key) const
    {
-        return data_.upper_bound(ctl::make_pair(key, Value()));
+        return data_.upper_bound(make_pair(key, Value()));
    }

    ctl::pair<iterator, iterator> equal_range(const Key& key)
    {
-        return data_.equal_range(ctl::make_pair(key, Value()));
+        return data_.equal_range(make_pair(key, Value()));
    }

    ctl::pair<const_iterator, const_iterator> equal_range(const Key& key) const
    {
-        return data_.equal_range(ctl::make_pair(key, Value()));
+        return data_.equal_range(make_pair(key, Value()));
    }

    key_compare key_comp() const
--- a/ctl/mutex.h
+++ b/ctl/mutex.h
@ -11,20 +11,17 @@ class mutex
  public:
    mutex()
    {
-        if (pthread_mutex_init(&m_, nullptr))
-            __builtin_trap();
+        pthread_mutex_init(&m_, nullptr);
    }

    ~mutex()
    {
-        if (pthread_mutex_destroy(&m_))
-            __builtin_trap();
+        pthread_mutex_destroy(&m_);
    }

    void lock()
    {
-        if (pthread_mutex_lock(&m_))
-            __builtin_trap();
+        pthread_mutex_lock(&m_);
    }

    bool try_lock()
@ -34,8 +31,7 @@ class mutex

    void unlock()
    {
-        if (pthread_mutex_unlock(&m_))
-            __builtin_trap();
+        pthread_mutex_unlock(&m_);
    }

    // Delete copy constructor and assignment operator
--- a/ctl/ostream.cc
+++ b/ctl/ostream.cc
@ -1,219 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "ostream.h"
-#include "dubble.h"
-#include "libc/fmt/itoa.h"
-#include "libc/stdio/stdio.h"
-#include "string_view.h"
-
-namespace ctl {
-
-extern const double_conversion::DoubleToStringConverter kDoubleToPrintfG;
-
-ostream cout(stdout);
-ostream cerr(stderr);
-
-ostream::~ostream() = default;
-
-ostream::ostream(FILE* file) : ios(file)
-{
-}
-
-ostream::ostream(ostream&& other) noexcept : ios(other.file_)
-{
-    other.file_ = nullptr;
-}
-
-ostream&
-ostream::operator=(ostream&& other) noexcept
-{
-    if (this != &other) {
-        file_ = other.file_;
-        other.file_ = nullptr;
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(const char* str)
-{
-    if (good() && str)
-        if (fputs(str, file_) < 0)
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-ostream::operator<<(char c)
-{
-    if (good())
-        if (fputc(c, file_) == EOF)
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-ostream::operator<<(int n)
-{
-    if (good()) {
-        char buf[12];
-        FormatInt32(buf, n);
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(unsigned n)
-{
-    if (good()) {
-        char buf[12];
-        FormatUint32(buf, n);
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(long n)
-{
-    if (good()) {
-        char buf[21];
-        FormatInt64(buf, n);
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(unsigned long n)
-{
-    if (good()) {
-        char buf[21];
-        FormatUint64(buf, n);
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(float f)
-{
-    if (good()) {
-        char buf[128];
-        double_conversion::StringBuilder b(buf, sizeof(buf));
-        kDoubleToPrintfG.ToShortestSingle(f, &b);
-        b.Finalize();
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(double d)
-{
-    if (good()) {
-        char buf[128];
-        double_conversion::StringBuilder b(buf, sizeof(buf));
-        kDoubleToPrintfG.ToShortest(d, &b);
-        b.Finalize();
-        if (fputs(buf, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(const string_view& s)
-{
-    if (good() && s.size())
-        if (!fwrite(s.data(), s.size(), 1, file_))
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-ostream::operator<<(bool b)
-{
-    if (good()) {
-        const char* value =
-          (flags() & boolalpha) ? (b ? "true" : "false") : (b ? "1" : "0");
-        if (fputs(value, file_) < 0)
-            setstate(badbit);
-    }
-    return *this;
-}
-
-ostream&
-ostream::operator<<(ostream& (*manip)(ostream&))
-{
-    return manip(*this);
-}
-
-ostream&
-ostream::put(char c)
-{
-    if (good())
-        if (fputc(c, file_) == EOF)
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-ostream::write(const char* s, streamsize n)
-{
-    if (good())
-        if (fwrite(s, 1, n, file_) != static_cast<size_t>(n))
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-ostream::flush()
-{
-    if (good())
-        if (fflush(file_) != 0)
-            setstate(badbit);
-    return *this;
-}
-
-ostream&
-endl(ostream& os)
-{
-    return os.put('\n').flush();
-}
-
-ostream&
-ends(ostream& os)
-{
-    return os.put('\0');
-}
-
-ostream&
-flush(ostream& os)
-{
-    return os.flush();
-}
-
-} // namespace ctl
--- a/ctl/ostream.h
+++ b/ctl/ostream.h
@ -1,56 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_OSTREAM_H_
-#define CTL_OSTREAM_H_
-#include "ios.h"
-
-namespace ctl {
-
-struct string_view;
-
-class ostream : public ios
-{
-  public:
-    ostream() = delete;
-    explicit ostream(FILE*);
-    virtual ~ostream();
-
-    ostream& operator<<(const char*);
-    ostream& operator<<(bool);
-    ostream& operator<<(char);
-    ostream& operator<<(int);
-    ostream& operator<<(unsigned);
-    ostream& operator<<(long);
-    ostream& operator<<(unsigned long);
-    ostream& operator<<(float);
-    ostream& operator<<(double);
-    ostream& operator<<(const ctl::string_view&);
-    ostream& operator<<(ostream& (*)(ostream&));
-
-    ostream& put(char);
-    ostream& write(const char*, streamsize);
-    ostream& flush();
-
-    ostream(ostream&&) noexcept;
-    ostream& operator=(ostream&&) noexcept;
-
-  private:
-    ostream(const ostream&) = delete;
-    ostream& operator=(const ostream&) = delete;
-};
-
-extern ostream cout;
-extern ostream cerr;
-
-ostream&
-endl(ostream&);
-
-ostream&
-ends(ostream&);
-
-ostream&
-flush(ostream&);
-
-} // namespace ctl
-
-#endif // CTL_OSTREAM_H_
--- a/ctl/ostringstream.cc
+++ b/ctl/ostringstream.cc
@ -1,150 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "ostringstream.h"
-#include "dubble.h"
-#include "libc/fmt/itoa.h"
-
-namespace ctl {
-
-extern const double_conversion::DoubleToStringConverter kDoubleToPrintfG;
-
-ostringstream::ostringstream() : buffer_(), write_pos_(0)
-{
-}
-
-ostringstream::ostringstream(const string_view& str)
-  : buffer_(str), write_pos_(0)
-{
-}
-
-string
-ostringstream::str() const
-{
-    return buffer_;
-}
-
-void
-ostringstream::str(const string& s)
-{
-    buffer_ = s;
-    write_pos_ = 0;
-}
-
-void
-ostringstream::clear()
-{
-    ios_base::clear();
-}
-
-ostringstream&
-ostringstream::operator<<(char c)
-{
-    if (good()) {
-        if (write_pos_ < buffer_.size()) {
-            buffer_[write_pos_++] = c;
-        } else {
-            buffer_.push_back(c);
-            ++write_pos_;
-        }
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(const string_view& s)
-{
-    if (good()) {
-        if (write_pos_ + s.size() <= buffer_.size()) {
-            buffer_.replace(write_pos_, s.size(), s);
-        } else {
-            buffer_.replace(write_pos_, buffer_.size() - write_pos_, s);
-            buffer_.append(s.substr(buffer_.size() - write_pos_));
-        }
-        write_pos_ += s.size();
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(int n)
-{
-    if (good()) {
-        char buf[12];
-        *this << string_view(buf, FormatInt32(buf, n) - buf);
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(unsigned n)
-{
-    if (good()) {
-        char buf[12];
-        *this << string_view(buf, FormatUint32(buf, n) - buf);
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(long n)
-{
-    if (good()) {
-        char buf[21];
-        *this << string_view(buf, FormatInt64(buf, n) - buf);
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(unsigned long n)
-{
-    if (good()) {
-        char buf[21];
-        *this << string_view(buf, FormatUint64(buf, n) - buf);
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(float f)
-{
-    if (good()) {
-        char buf[128];
-        double_conversion::StringBuilder b(buf, sizeof(buf));
-        kDoubleToPrintfG.ToShortestSingle(f, &b);
-        b.Finalize();
-        *this << string_view(buf);
-    }
-    return *this;
-}
-
-ostringstream&
-ostringstream::operator<<(double d)
-{
-    if (good()) {
-        char buf[128];
-        double_conversion::StringBuilder b(buf, sizeof(buf));
-        kDoubleToPrintfG.ToShortest(d, &b);
-        b.Finalize();
-        *this << string_view(buf);
-    }
-    return *this;
-}
-
-} // namespace ctl
--- a/ctl/ostringstream.h
+++ b/ctl/ostringstream.h
@ -1,36 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_OSTRINGSTREAM_H_
-#define CTL_OSTRINGSTREAM_H_
-#include "ios_base.h"
-#include "string.h"
-
-namespace ctl {
-
-class ostringstream : public ios_base
-{
-  public:
-    ostringstream();
-    explicit ostringstream(const ctl::string_view&);
-
-    ctl::string str() const;
-    void str(const ctl::string& s);
-    void clear();
-
-    ostringstream& operator<<(char);
-    ostringstream& operator<<(const ctl::string_view&);
-    ostringstream& operator<<(int);
-    ostringstream& operator<<(unsigned int);
-    ostringstream& operator<<(long);
-    ostringstream& operator<<(unsigned long);
-    ostringstream& operator<<(float);
-    ostringstream& operator<<(double);
-
-  private:
-    ctl::string buffer_;
-    size_t write_pos_;
-};
-
-} // namespace ctl
-
-#endif // CTL_OSTRINGSTREAM_H_
--- a/ctl/out_of_range.h
+++ b/ctl/out_of_range.h
@ -6,7 +6,7 @@

 namespace ctl {

-class out_of_range : public ctl::exception
+class out_of_range : public exception
 {
  public:
    out_of_range() noexcept = default;
--- a/ctl/require_input_iterator.h
+++ b/ctl/require_input_iterator.h
@ -1,19 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_REQUIRE_INPUT_ITERATOR_H_
-#define CTL_REQUIRE_INPUT_ITERATOR_H_
-#include "enable_if.h"
-#include "is_convertible.h"
-#include "iterator.h"
-#include "iterator_traits.h"
-
-namespace ctl {
-
-template<typename InputIt>
-using require_input_iterator = typename ctl::enable_if<
-  ctl::is_convertible<typename ctl::iterator_traits<InputIt>::iterator_category,
-                      ctl::input_iterator_tag>::value>::type;
-
-} // namespace ctl
-
-#endif /* CTL_REQUIRE_INPUT_ITERATOR_H_ */
--- a/ctl/reverse_iterator.h
+++ b/ctl/reverse_iterator.h
@ -13,12 +13,11 @@ class reverse_iterator
  public:
    using iterator_type = Iterator;
    using iterator_category =
-      typename ctl::iterator_traits<Iterator>::iterator_category;
-    using value_type = typename ctl::iterator_traits<Iterator>::value_type;
-    using difference_type =
-      typename ctl::iterator_traits<Iterator>::difference_type;
-    using pointer = typename ctl::iterator_traits<Iterator>::pointer;
-    using reference = typename ctl::iterator_traits<Iterator>::reference;
+      typename iterator_traits<Iterator>::iterator_category;
+    using value_type = typename iterator_traits<Iterator>::value_type;
+    using difference_type = typename iterator_traits<Iterator>::difference_type;
+    using pointer = typename iterator_traits<Iterator>::pointer;
+    using reference = typename iterator_traits<Iterator>::reference;

    constexpr reverse_iterator() : current()
    {
--- a/ctl/set.h
+++ b/ctl/set.h
@ -8,39 +8,23 @@

 namespace ctl {

-template<typename Key, typename Compare = ctl::less<Key>>
+template<typename Key, typename Compare = less<Key>>
 class set
 {
    struct rbtree
    {
-        uintptr_t left_;
+        rbtree* left;
        rbtree* right;
        rbtree* parent;
+        bool is_red;
        Key value;

-        rbtree* left() const
-        {
-            return (rbtree*)(left_ & -2);
-        }
-
-        void left(rbtree* val)
-        {
-            left_ = (uintptr_t)val | (left_ & 1);
-        }
-
-        bool is_red() const
-        {
-            return left_ & 1;
-        }
-
-        void is_red(bool val)
-        {
-            left_ &= -2;
-            left_ |= val;
-        }
-
        rbtree(const Key& val)
-          : left_(1), right(nullptr), parent(nullptr), value(val)
+          : left(nullptr)
+          , right(nullptr)
+          , parent(nullptr)
+          , is_red(true)
+          , value(val)
        {
        }
    };
@ -101,14 +85,14 @@ class set
        {
            if (node_ == nullptr)
                __builtin_trap();
-            if (node_->left()) {
-                node_ = rightmost(node_->left());
+            if (node_->left) {
+                node_ = rightmost(node_->left);
            } else {
                node_type* parent = node_->parent;
                for (;;) {
                    if (parent == nullptr)
                        break;
-                    if (node_ == parent->left()) {
+                    if (node_ == parent->left) {
                        node_ = parent;
                        parent = parent->parent;
                    } else {
@ -177,11 +161,11 @@ class set

        reverse_iterator& operator++()
        {
-            if (node_->left()) {
-                node_ = rightmost(node_->left());
+            if (node_->left) {
+                node_ = rightmost(node_->left);
            } else {
                node_type* parent = node_->parent;
-                while (parent && node_ == parent->left()) {
+                while (parent && node_ == parent->left) {
                    node_ = parent;
                    parent = parent->parent;
                }
@ -241,9 +225,8 @@ class set
      private:
        friend class set;
        node_type* node_;
-        node_type* root_;

-        explicit reverse_iterator(node_type* node, node_type* root) : node_(node), root_(root)
+        explicit reverse_iterator(node_type* node) : node_(node)
        {
        }
    };
@ -348,17 +331,17 @@ class set

    reverse_iterator rbegin()
    {
-        return reverse_iterator(rightmost(root_), root_);
+        return reverse_iterator(rightmost(root_));
    }

    const_reverse_iterator rbegin() const
    {
-        return const_reverse_iterator(rightmost(root_), root_);
+        return const_reverse_iterator(rightmost(root_));
    }

    const_reverse_iterator crbegin() const
    {
-        return const_reverse_iterator(rightmost(root_), root_);
+        return const_reverse_iterator(rightmost(root_));
    }

    iterator end() noexcept
@ -378,17 +361,17 @@ class set

    reverse_iterator rend()
    {
-        return reverse_iterator(nullptr, root_);
+        return reverse_iterator(nullptr);
    }

    const_reverse_iterator rend() const
    {
-        return const_reverse_iterator(nullptr, root_);
+        return const_reverse_iterator(nullptr);
    }

    const_reverse_iterator crend() const
    {
-        return const_reverse_iterator(nullptr, root_);
+        return const_reverse_iterator(nullptr);
    }

    void clear() noexcept
@ -398,12 +381,12 @@ class set
        size_ = 0;
    }

-    ctl::pair<iterator, bool> insert(value_type&& value)
+    pair<iterator, bool> insert(value_type&& value)
    {
        return insert_node(new node_type(ctl::move(value)));
    }

-    ctl::pair<iterator, bool> insert(const value_type& value)
+    pair<iterator, bool> insert(const value_type& value)
    {
        return insert_node(new node_type(value));
    }
@ -432,7 +415,7 @@ class set
    }

    template<class... Args>
-    ctl::pair<iterator, bool> emplace(Args&&... args)
+    pair<iterator, bool> emplace(Args&&... args)
    {
        value_type value(ctl::forward<Args>(args)...);
        return insert(ctl::move(value));
@ -468,13 +451,12 @@ class set
        ctl::swap(size_, other.size_);
    }

-    ctl::pair<iterator, iterator> equal_range(const key_type& key)
+    pair<iterator, iterator> equal_range(const key_type& key)
    {
        return { iterator(get_floor(key)), iterator(get_ceiling(key)) };
    }

-    ctl::pair<const_iterator, const_iterator> equal_range(
-      const key_type& key) const
+    pair<const_iterator, const_iterator> equal_range(const key_type& key) const
    {
        return { const_iterator(get_floor(key)),
                 const_iterator(get_ceiling(key)) };
@ -525,7 +507,7 @@ class set
    {
        size_type count = 0;
        if (root_ != nullptr) {
-            if (root_->is_red())
+            if (root_->is_red)
                // ILLEGAL TREE: root node must be black
                __builtin_trap();
            int black_height = -1;
@ -540,8 +522,8 @@ class set
  private:
    static node_type* leftmost(node_type* node) noexcept
    {
-        while (node && node->left())
-            node = node->left();
+        while (node && node->left)
+            node = node->left;
        return node;
    }

@ -552,35 +534,35 @@ class set
        return node;
    }

-    static optimizesize void clearer(node_type* node) noexcept
+    static void clearer(node_type* node) noexcept
    {
        node_type* right;
        for (; node; node = right) {
            right = node->right;
-            clearer(node->left());
+            clearer(node->left);
            delete node;
        }
    }

-    static optimizesize node_type* copier(const node_type* node)
+    static node_type* copier(const node_type* node)
    {
        if (node == nullptr)
            return nullptr;
        node_type* new_node = new node_type(node->value);
-        new_node->left(copier(node->left()));
+        new_node->left = copier(node->left);
        new_node->right = copier(node->right);
-        if (new_node->left())
-            new_node->left()->parent = new_node;
+        if (new_node->left)
+            new_node->left->parent = new_node;
        if (new_node->right)
            new_node->right->parent = new_node;
        return new_node;
    }

-    static optimizesize size_type tally(const node_type* node)
+    static size_type tally(const node_type* node)
    {
        if (node == nullptr)
            return 0;
-        return 1 + tally(node->left()) + tally(node->right);
+        return 1 + tally(node->left) + tally(node->right);
    }

    template<typename K>
@ -589,7 +571,7 @@ class set
        node_type* current = root_;
        while (current != nullptr) {
            if (comp_(key, current->value)) {
-                current = current->left();
+                current = current->left;
            } else if (comp_(current->value, key)) {
                current = current->right;
            } else {
@ -607,7 +589,7 @@ class set
        while (current != nullptr) {
            if (!comp_(current->value, key)) {
                result = current;
-                current = current->left();
+                current = current->left;
            } else {
                current = current->right;
            }
@ -623,7 +605,7 @@ class set
        while (current != nullptr) {
            if (comp_(key, current->value)) {
                result = current;
-                current = current->left();
+                current = current->left;
            } else {
                current = current->right;
            }
@ -631,11 +613,11 @@ class set
        return result;
    }

-    optimizesize ctl::pair<iterator, bool> insert_node(node_type* node)
+    pair<iterator, bool> insert_node(node_type* node)
    {
        if (root_ == nullptr) {
            root_ = node;
-            root_->is_red(false);
+            root_->is_red = false;
            size_++;
            return { iterator(root_), true };
        }
@ -644,7 +626,7 @@ class set
        while (current != nullptr) {
            parent = current;
            if (comp_(node->value, current->value)) {
-                current = current->left();
+                current = current->left;
            } else if (comp_(current->value, node->value)) {
                current = current->right;
            } else {
@ -653,7 +635,7 @@ class set
            }
        }
        if (comp_(node->value, parent->value)) {
-            parent->left(node);
+            parent->left = node;
        } else {
            parent->right = node;
        }
@ -663,23 +645,23 @@ class set
        return { iterator(node), true };
    }

-    optimizesize void erase_node(node_type* node)
+    void erase_node(node_type* node)
    {
        node_type* y = node;
        node_type* x = nullptr;
        node_type* x_parent = nullptr;
-        bool y_original_color = y->is_red();
-        if (node->left() == nullptr) {
+        bool y_original_color = y->is_red;
+        if (node->left == nullptr) {
            x = node->right;
            transplant(node, node->right);
            x_parent = node->parent;
        } else if (node->right == nullptr) {
-            x = node->left();
-            transplant(node, node->left());
+            x = node->left;
+            transplant(node, node->left);
            x_parent = node->parent;
        } else {
            y = leftmost(node->right);
-            y_original_color = y->is_red();
+            y_original_color = y->is_red;
            x = y->right;
            if (y->parent == node) {
                if (x)
@ -692,9 +674,9 @@ class set
                x_parent = y->parent;
            }
            transplant(node, y);
-            y->left(node->left());
-            y->left()->parent = y;
-            y->is_red(node->is_red());
+            y->left = node->left;
+            y->left->parent = y;
+            y->is_red = node->is_red;
        }
        if (!y_original_color)
            rebalance_after_erase(x, x_parent);
@ -702,28 +684,28 @@ class set
        --size_;
    }

-    optimizesize void left_rotate(node_type* x)
+    void left_rotate(node_type* x)
    {
        node_type* y = x->right;
-        x->right = y->left();
-        if (y->left() != nullptr)
-            y->left()->parent = x;
+        x->right = y->left;
+        if (y->left != nullptr)
+            y->left->parent = x;
        y->parent = x->parent;
        if (x->parent == nullptr) {
            root_ = y;
-        } else if (x == x->parent->left()) {
-            x->parent->left(y);
+        } else if (x == x->parent->left) {
+            x->parent->left = y;
        } else {
            x->parent->right = y;
        }
-        y->left(x);
+        y->left = x;
        x->parent = y;
    }

-    optimizesize void right_rotate(node_type* y)
+    void right_rotate(node_type* y)
    {
-        node_type* x = y->left();
-        y->left(x->right);
+        node_type* x = y->left;
+        y->left = x->right;
        if (x->right != nullptr)
            x->right->parent = y;
        x->parent = y->parent;
@ -732,18 +714,18 @@ class set
        } else if (y == y->parent->right) {
            y->parent->right = x;
        } else {
-            y->parent->left(x);
+            y->parent->left = x;
        }
        x->right = y;
        y->parent = x;
    }

-    optimizesize void transplant(node_type* u, node_type* v)
+    void transplant(node_type* u, node_type* v)
    {
        if (u->parent == nullptr) {
            root_ = v;
-        } else if (u == u->parent->left()) {
-            u->parent->left(v);
+        } else if (u == u->parent->left) {
+            u->parent->left = v;
        } else {
            u->parent->right = v;
        }
@ -751,10 +733,10 @@ class set
            v->parent = u->parent;
    }

-    optimizesize void checker(const node_type* node,
-                              const node_type* parent,
-                              int black_count,
-                              int& black_height) const
+    void checker(const node_type* node,
+                 const node_type* parent,
+                 int black_count,
+                 int& black_height) const
    {
        if (node == nullptr) {
            // Leaf nodes are considered black
@ -770,121 +752,117 @@ class set
            // ILLEGAL TREE: Parent link is incorrect
            __builtin_trap();
        if (parent) {
-            if (parent->left() == node && !comp_(node->value, parent->value))
+            if (parent->left == node && !comp_(node->value, parent->value))
                // ILLEGAL TREE: Binary search property violated on left child
                __builtin_trap();
            if (parent->right == node && !comp_(parent->value, node->value))
                // ILLEGAL TREE: Binary search property violated on right child
                __builtin_trap();
        }
-        if (!node->is_red()) {
+        if (!node->is_red) {
            black_count++;
-        } else if (parent != nullptr && parent->is_red()) {
+        } else if (parent != nullptr && parent->is_red) {
            // ILLEGAL TREE: Red node has red child
            __builtin_trap();
        }
-        checker(node->left(), node, black_count, black_height);
+        checker(node->left, node, black_count, black_height);
        checker(node->right, node, black_count, black_height);
    }

-    optimizesize void rebalance_after_insert(node_type* node)
+    void rebalance_after_insert(node_type* node)
    {
-        node->is_red(true);
-        while (node != root_ && node->parent->is_red()) {
-            if (node->parent == node->parent->parent->left()) {
+        node->is_red = true;
+        while (node != root_ && node->parent->is_red) {
+            if (node->parent == node->parent->parent->left) {
                node_type* uncle = node->parent->parent->right;
-                if (uncle && uncle->is_red()) {
-                    node->parent->is_red(false);
-                    uncle->is_red(false);
-                    node->parent->parent->is_red(true);
+                if (uncle && uncle->is_red) {
+                    node->parent->is_red = false;
+                    uncle->is_red = false;
+                    node->parent->parent->is_red = true;
                    node = node->parent->parent;
                } else {
                    if (node == node->parent->right) {
                        node = node->parent;
                        left_rotate(node);
                    }
-                    node->parent->is_red(false);
-                    node->parent->parent->is_red(true);
+                    node->parent->is_red = false;
+                    node->parent->parent->is_red = true;
                    right_rotate(node->parent->parent);
                }
            } else {
-                node_type* uncle = node->parent->parent->left();
-                if (uncle && uncle->is_red()) {
-                    node->parent->is_red(false);
-                    uncle->is_red(false);
-                    node->parent->parent->is_red(true);
+                node_type* uncle = node->parent->parent->left;
+                if (uncle && uncle->is_red) {
+                    node->parent->is_red = false;
+                    uncle->is_red = false;
+                    node->parent->parent->is_red = true;
                    node = node->parent->parent;
                } else {
-                    if (node == node->parent->left()) {
+                    if (node == node->parent->left) {
                        node = node->parent;
                        right_rotate(node);
                    }
-                    node->parent->is_red(false);
-                    node->parent->parent->is_red(true);
+                    node->parent->is_red = false;
+                    node->parent->parent->is_red = true;
                    left_rotate(node->parent->parent);
                }
            }
        }
-        root_->is_red(false);
+        root_->is_red = false;
    }

-    optimizesize void rebalance_after_erase(node_type* node, node_type* parent)
+    void rebalance_after_erase(node_type* node, node_type* parent)
    {
-        while (node != root_ && (node == nullptr || !node->is_red())) {
-            if (node == parent->left()) {
+        while (node != root_ && (node == nullptr || !node->is_red)) {
+            if (node == parent->left) {
                node_type* sibling = parent->right;
-                if (sibling->is_red()) {
-                    sibling->is_red(false);
-                    parent->is_red(true);
+                if (sibling->is_red) {
+                    sibling->is_red = false;
+                    parent->is_red = true;
                    left_rotate(parent);
                    sibling = parent->right;
                }
-                if ((sibling->left() == nullptr ||
-                     !sibling->left()->is_red()) &&
-                    (sibling->right == nullptr || !sibling->right->is_red())) {
-                    sibling->is_red(true);
+                if ((sibling->left == nullptr || !sibling->left->is_red) &&
+                    (sibling->right == nullptr || !sibling->right->is_red)) {
+                    sibling->is_red = true;
                    node = parent;
                    parent = node->parent;
                } else {
-                    if (sibling->right == nullptr ||
-                        !sibling->right->is_red()) {
-                        sibling->left()->is_red(false);
-                        sibling->is_red(true);
+                    if (sibling->right == nullptr || !sibling->right->is_red) {
+                        sibling->left->is_red = false;
+                        sibling->is_red = true;
                        right_rotate(sibling);
                        sibling = parent->right;
                    }
-                    sibling->is_red(parent->is_red());
-                    parent->is_red(false);
-                    sibling->right->is_red(false);
+                    sibling->is_red = parent->is_red;
+                    parent->is_red = false;
+                    sibling->right->is_red = false;
                    left_rotate(parent);
                    node = root_;
                    break;
                }
            } else {
-                node_type* sibling = parent->left();
-                if (sibling->is_red()) {
-                    sibling->is_red(false);
-                    parent->is_red(true);
+                node_type* sibling = parent->left;
+                if (sibling->is_red) {
+                    sibling->is_red = false;
+                    parent->is_red = true;
                    right_rotate(parent);
-                    sibling = parent->left();
+                    sibling = parent->left;
                }
-                if ((sibling->right == nullptr || !sibling->right->is_red()) &&
-                    (sibling->left() == nullptr ||
-                     !sibling->left()->is_red())) {
-                    sibling->is_red(true);
+                if ((sibling->right == nullptr || !sibling->right->is_red) &&
+                    (sibling->left == nullptr || !sibling->left->is_red)) {
+                    sibling->is_red = true;
                    node = parent;
                    parent = node->parent;
                } else {
-                    if (sibling->left() == nullptr ||
-                        !sibling->left()->is_red()) {
-                        sibling->right->is_red(false);
-                        sibling->is_red(true);
+                    if (sibling->left == nullptr || !sibling->left->is_red) {
+                        sibling->right->is_red = false;
+                        sibling->is_red = true;
                        left_rotate(sibling);
-                        sibling = parent->left();
+                        sibling = parent->left;
                    }
-                    sibling->is_red(parent->is_red());
-                    parent->is_red(false);
-                    sibling->left()->is_red(false);
+                    sibling->is_red = parent->is_red;
+                    parent->is_red = false;
+                    sibling->left->is_red = false;
                    right_rotate(parent);
                    node = root_;
                    break;
@ -892,7 +870,7 @@ class set
            }
        }
        if (node != nullptr)
-            node->is_red(false);
+            node->is_red = false;
    }

    node_type* root_;
@ -900,7 +878,7 @@ class set
    Compare comp_;
 };

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator==(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
@ -915,7 +893,7 @@ operator==(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
    return true;
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator<(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
@ -930,35 +908,35 @@ operator<(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
    return i == lhs.end() && j != rhs.end();
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator!=(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
    return !(lhs == rhs);
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator<=(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
    return !(rhs < lhs);
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator>(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
    return rhs < lhs;
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 bool
 operator>=(const set<Key, Compare>& lhs, const set<Key, Compare>& rhs)
 {
    return !(lhs < rhs);
 }

-template<class Key, typename Compare = ctl::less<Key>>
+template<class Key, typename Compare = less<Key>>
 void
 swap(set<Key, Compare>& lhs, set<Key, Compare>& rhs) noexcept;

--- a/ctl/shared_ptr.h
+++ b/ctl/shared_ptr.h
@ -1,618 +0,0 @@
-// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_SHARED_PTR_H_
-#define CTL_SHARED_PTR_H_
-
-#include "exception.h"
-#include "is_base_of.h"
-#include "is_constructible.h"
-#include "is_convertible.h"
-#include "remove_extent.h"
-#include "unique_ptr.h"
-
-// XXX currently needed to use placement-new syntax (move to cxx.inc?)
-void*
-operator new(size_t, void*) noexcept;
-
-namespace ctl {
-
-class bad_weak_ptr : public exception
-{
-  public:
-    const char* what() const noexcept override
-    {
-        return "ctl::bad_weak_ptr";
-    }
-};
-
-namespace __ {
-
-template<typename T>
-struct ptr_ref
-{
-    using type = T&;
-};
-
-template<>
-struct ptr_ref<void>
-{
-    using type = void;
-};
-
-static inline __attribute__((always_inline)) void
-incref(size_t* r) noexcept
-{
-#ifdef NDEBUG
-    __atomic_fetch_add(r, 1, __ATOMIC_RELAXED);
-#else
-    ssize_t refs = __atomic_fetch_add(r, 1, __ATOMIC_RELAXED);
-    if (refs < 0)
-        __builtin_trap();
-#endif
-}
-
-static inline __attribute__((always_inline)) bool
-decref(size_t* r) noexcept
-{
-    if (!__atomic_fetch_sub(r, 1, __ATOMIC_RELEASE)) {
-        __atomic_thread_fence(__ATOMIC_ACQUIRE);
-        return true;
-    }
-    return false;
-}
-
-class shared_ref
-{
-  public:
-    constexpr shared_ref() noexcept = default;
-    shared_ref(const shared_ref&) = delete;
-    shared_ref& operator=(const shared_ref&) = delete;
-
-    virtual ~shared_ref() = default;
-
-    void keep_shared() noexcept
-    {
-        incref(&shared);
-    }
-
-    void drop_shared() noexcept
-    {
-        if (decref(&shared)) {
-            dispose();
-            drop_weak();
-        }
-    }
-
-    void keep_weak() noexcept
-    {
-        incref(&weak);
-    }
-
-    void drop_weak() noexcept
-    {
-        if (decref(&weak)) {
-            delete this;
-        }
-    }
-
-    size_t use_count() const noexcept
-    {
-        return __atomic_load_n(&shared, __ATOMIC_RELAXED) + 1;
-    }
-
-    size_t weak_count() const noexcept
-    {
-        return __atomic_load_n(&weak, __ATOMIC_RELAXED);
-    }
-
-  private:
-    virtual void dispose() noexcept = 0;
-
-    size_t shared = 0;
-    size_t weak = 0;
-};
-
-template<typename T, typename D>
-class shared_pointer : public shared_ref
-{
-  public:
-    static shared_pointer* make(T* const p, D d)
-    {
-        return make(unique_ptr<T, D>(p, move(d)));
-    }
-
-    static shared_pointer* make(unique_ptr<T, D> p)
-    {
-        return new shared_pointer(p.release(), move(p.get_deleter()));
-    }
-
-  private:
-    shared_pointer(T* const p, D d) noexcept : p(p), d(move(d))
-    {
-    }
-
-    void dispose() noexcept override
-    {
-        move(d)(p);
-    }
-
-    T* const p;
-    [[no_unique_address]] D d;
-};
-
-template<typename T>
-class shared_emplace : public shared_ref
-{
-  public:
-    union
-    {
-        T t;
-    };
-
-    ~shared_emplace() override
-    {
-    }
-
-    template<typename... Args>
-    void construct(Args&&... args)
-    {
-        ::new (&t) T(forward<Args>(args)...);
-    }
-
-    static unique_ptr<shared_emplace> make()
-    {
-        return unique_ptr(new shared_emplace());
-    }
-
-  private:
-    explicit constexpr shared_emplace() noexcept
-    {
-    }
-
-    void dispose() noexcept override
-    {
-        t.~T();
-    }
-};
-
-template<typename T, typename U>
-concept shared_ptr_compatible = is_convertible_v<U*, T*>;
-
-} // namespace __
-
-template<typename T>
-class weak_ptr;
-
-template<typename T>
-class shared_ptr
-{
-  public:
-    using element_type = remove_extent_t<T>;
-    using weak_type = weak_ptr<T>;
-
-    constexpr shared_ptr() noexcept = default;
-    constexpr shared_ptr(nullptr_t) noexcept
-    {
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    explicit shared_ptr(U* const p) : shared_ptr(p, default_delete<U>())
-    {
-    }
-
-    template<typename U, typename D>
-        requires __::shared_ptr_compatible<T, U>
-    shared_ptr(U*, D);
-
-    template<typename U>
-    shared_ptr(const shared_ptr<U>& r, element_type* p) noexcept
-      : p(p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_shared();
-    }
-
-    template<typename U>
-    shared_ptr(shared_ptr<U>&& r, element_type* p) noexcept : p(p), rc(r.rc)
-    {
-        r.p = nullptr;
-        r.rc = nullptr;
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    shared_ptr(const shared_ptr<U>& r) noexcept : p(r.p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_shared();
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    shared_ptr(shared_ptr<U>&& r) noexcept : p(r.p), rc(r.rc)
-    {
-        r.p = nullptr;
-        r.rc = nullptr;
-    }
-
-    shared_ptr(const shared_ptr& r) noexcept : p(r.p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_shared();
-    }
-
-    shared_ptr(shared_ptr&& r) noexcept : p(r.p), rc(r.rc)
-    {
-        r.p = nullptr;
-        r.rc = nullptr;
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    explicit shared_ptr(const weak_ptr<U>& r) : p(r.p), rc(r.rc)
-    {
-        if (r.expired()) {
-            throw bad_weak_ptr();
-        }
-        rc->keep_shared();
-    }
-
-    template<typename U, typename D>
-        requires __::shared_ptr_compatible<T, U>
-    shared_ptr(unique_ptr<U, D>&& r)
-      : p(r.p), rc(__::shared_pointer<U, D>::make(move(r)))
-    {
-    }
-
-    ~shared_ptr()
-    {
-        if (rc)
-            rc->drop_shared();
-    }
-
-    shared_ptr& operator=(shared_ptr r) noexcept
-    {
-        swap(r);
-        return *this;
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    shared_ptr& operator=(shared_ptr<U> r) noexcept
-    {
-        shared_ptr<T>(move(r)).swap(*this);
-        return *this;
-    }
-
-    void reset() noexcept
-    {
-        shared_ptr().swap(*this);
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    void reset(U* const p2)
-    {
-        shared_ptr<T>(p2).swap(*this);
-    }
-
-    template<typename U, typename D>
-        requires __::shared_ptr_compatible<T, U>
-    void reset(U* const p2, D d)
-    {
-        shared_ptr<T>(p2, d).swap(*this);
-    }
-
-    void swap(shared_ptr& r) noexcept
-    {
-        using ctl::swap;
-        swap(p, r.p);
-        swap(rc, r.rc);
-    }
-
-    element_type* get() const noexcept
-    {
-        return p;
-    }
-
-    typename __::ptr_ref<T>::type operator*() const noexcept
-    {
-        if (!p)
-            __builtin_trap();
-        return *p;
-    }
-
-    T* operator->() const noexcept
-    {
-        if (!p)
-            __builtin_trap();
-        return p;
-    }
-
-    long use_count() const noexcept
-    {
-        return rc ? rc->use_count() : 0;
-    }
-
-    explicit operator bool() const noexcept
-    {
-        return p;
-    }
-
-    template<typename U>
-    bool owner_before(const shared_ptr<U>& r) const noexcept
-    {
-        return rc < r.rc;
-    }
-
-    template<typename U>
-    bool owner_before(const weak_ptr<U>& r) const noexcept
-    {
-        return rc < r.rc;
-    }
-
-  private:
-    template<typename U>
-    friend class weak_ptr;
-
-    template<typename U>
-    friend class shared_ptr;
-
-    template<typename U, typename... Args>
-    friend shared_ptr<U> make_shared(Args&&... args);
-
-    element_type* p = nullptr;
-    __::shared_ref* rc = nullptr;
-};
-
-template<typename T>
-class weak_ptr
-{
-  public:
-    using element_type = remove_extent_t<T>;
-
-    constexpr weak_ptr() noexcept = default;
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    weak_ptr(const shared_ptr<U>& r) noexcept : p(r.p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_weak();
-    }
-
-    weak_ptr(const weak_ptr& r) noexcept : p(r.p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_weak();
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    weak_ptr(const weak_ptr<U>& r) noexcept : p(r.p), rc(r.rc)
-    {
-        if (rc)
-            rc->keep_weak();
-    }
-
-    weak_ptr(weak_ptr&& r) noexcept : p(r.p), rc(r.rc)
-    {
-        r.p = nullptr;
-        r.rc = nullptr;
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    weak_ptr(weak_ptr<U>&& r) noexcept : p(r.p), rc(r.rc)
-    {
-        r.p = nullptr;
-        r.rc = nullptr;
-    }
-
-    ~weak_ptr()
-    {
-        if (rc)
-            rc->drop_weak();
-    }
-
-    long use_count() const noexcept
-    {
-        return rc ? rc->use_count() : 0;
-    }
-
-    bool expired() const noexcept
-    {
-        return !use_count();
-    }
-
-    void reset() noexcept
-    {
-        weak_ptr().swap(*this);
-    }
-
-    void swap(weak_ptr& r) noexcept
-    {
-        using ctl::swap;
-        swap(p, r.p);
-        swap(rc, r.rc);
-    }
-
-    weak_ptr& operator=(weak_ptr r) noexcept
-    {
-        swap(r);
-        return *this;
-    }
-
-    template<typename U>
-        requires __::shared_ptr_compatible<T, U>
-    weak_ptr& operator=(weak_ptr<U> r) noexcept
-    {
-        weak_ptr<T>(move(r)).swap(*this);
-    }
-
-    shared_ptr<T> lock() const noexcept
-    {
-        if (expired())
-            return nullptr;
-        shared_ptr<T> r;
-        r.p = p;
-        r.rc = rc;
-        if (rc)
-            rc->keep_shared();
-        return r;
-    }
-
-    template<typename U>
-    bool owner_before(const weak_ptr<U>& r) const noexcept
-    {
-        return rc < r.rc;
-    }
-
-    template<typename U>
-    bool owner_before(const shared_ptr<U>& r) const noexcept
-    {
-        return rc < r.rc;
-    }
-
-  private:
-    template<typename U>
-    friend class shared_ptr;
-
-    template<typename U, typename... Args>
-    friend shared_ptr<U> make_shared(Args&&...);
-
-    element_type* p = nullptr;
-    __::shared_ref* rc = nullptr;
-};
-
-template<typename T>
-class enable_shared_from_this
-{
-  public:
-    shared_ptr<T> shared_from_this()
-    {
-        return shared_ptr<T>(weak_this);
-    }
-    shared_ptr<T const> shared_from_this() const
-    {
-        return shared_ptr<T>(weak_this);
-    }
-
-    weak_ptr<T> weak_from_this()
-    {
-        return weak_this;
-    }
-    weak_ptr<T const> weak_from_this() const
-    {
-        return weak_this;
-    }
-
-  protected:
-    constexpr enable_shared_from_this() noexcept = default;
-    enable_shared_from_this(const enable_shared_from_this& r) noexcept
-    {
-    }
-    ~enable_shared_from_this() = default;
-
-    enable_shared_from_this& operator=(
-      const enable_shared_from_this& r) noexcept
-    {
-        return *this;
-    }
-
-  private:
-    template<typename U, typename... Args>
-    friend shared_ptr<U> make_shared(Args&&...);
-
-    template<typename U>
-    friend class shared_ptr;
-
-    weak_ptr<T> weak_this;
-};
-
-template<typename T>
-template<typename U, typename D>
-    requires __::shared_ptr_compatible<T, U>
-shared_ptr<T>::shared_ptr(U* const p, D d)
-  : p(p), rc(__::shared_pointer<U, D>::make(p, move(d)))
-{
-    if constexpr (is_base_of_v<enable_shared_from_this<U>, U>) {
-        p->weak_this = *this;
-    }
-}
-
-// Our make_shared supports passing a weak self reference as the first parameter
-// to your constructor, e.g.:
-//
-//     struct Tree : ctl::weak_self_base
-//     {
-//         ctl::shared_ptr<Tree> l, r;
-//         ctl::weak_ptr<Tree> parent;
-//         Tree(weak_ptr<Tree> const& self, auto&& l2, auto&& r2)
-//           : l(ctl::forward<decltype(l2)>(l2)),
-//             r(ctl::forward<decltype(r2)>(r2))
-//         {
-//             if (l) l->parent = self;
-//             if (r) r->parent = self;
-//         }
-//     };
-//
-//     int main() {
-//         auto t = ctl::make_shared<Tree>(
-//             ctl::make_shared<Tree>(nullptr, nullptr), nullptr);
-//         return t->l->parent.lock().get() == t.get() ? 0 : 1;
-//     }
-//
-// As shown, passing the parameter at object construction time lets you complete
-// object construction without needing a separate Init method. But because we go
-// off spec as far as the STL is concerned, there is a potential ambiguity where
-// you might have a constructor with a weak_ptr first parameter that is intended
-// to be something other than a self-reference. So this feature is opt-in by way
-// of inheriting from the following struct.
-struct weak_self_base
-{};
-
-template<typename T, typename... Args>
-shared_ptr<T>
-make_shared(Args&&... args)
-{
-    unique_ptr rc = __::shared_emplace<T>::make();
-    if constexpr (is_base_of_v<weak_self_base, T> &&
-                  is_constructible_v<T, const weak_ptr<T>&, Args...>) {
-        // A __::shared_ref has a virtual weak reference that is owned by all of
-        // the shared references. We can avoid some unnecessary refcount changes
-        // by "borrowing" that reference and passing it to the constructor, then
-        // promoting it to a shared reference by swapping it with the shared_ptr
-        // that we return.
-        weak_ptr<T> w;
-        w.p = &rc->t;
-        w.rc = rc.get();
-        try {
-            rc->construct(const_cast<const weak_ptr<T>&>(w),
-                          forward<Args>(args)...);
-        } catch (...) {
-            w.p = nullptr;
-            w.rc = nullptr;
-            throw;
-        }
-        rc.release();
-        shared_ptr<T> r;
-        swap(r.p, w.p);
-        swap(r.rc, w.rc);
-        return r;
-    } else {
-        rc->construct(forward<Args>(args)...);
-        shared_ptr<T> r;
-        r.p = &rc->t;
-        r.rc = rc.release();
-        if constexpr (is_base_of_v<enable_shared_from_this<T>, T>) {
-            r->weak_this = r;
-        }
-        return r;
-    }
-}
-
-} // namespace ctl
-
-#endif // CTL_SHARED_PTR_H_
--- a/ctl/string.cc
+++ b/ctl/string.cc
@ -21,9 +21,6 @@
 #include <__atomic/fence.h>
 #include <stdckdint.h>

-#include "libc/mem/mem.h"
-#include "libc/str/str.h"
-
 namespace ctl {

 void
@ -383,72 +380,4 @@ string::erase(const size_t pos, size_t count) noexcept
    return *this;
 }

-void
-string::append(const ctl::string_view& s, size_t pos, size_t count) noexcept
-{
-    append(s.substr(pos, count));
-}
-
-size_t
-string::find_last_of(char c, size_t pos) const noexcept
-{
-    const char* b = data();
-    size_t n = size();
-    if (pos > n)
-        pos = n;
-    const char* p = (const char*)memrchr(b, c, pos);
-    return p ? p - b : npos;
-}
-
-size_t
-string::find_last_of(ctl::string_view set, size_t pos) const noexcept
-{
-    if (empty() || set.empty())
-        return npos;
-    bool lut[256] = {};
-    for (char c : set)
-        lut[c & 255] = true;
-    const char* b = data();
-    size_t last = size() - 1;
-    if (pos > last)
-        pos = last;
-    for (;;) {
-        if (lut[b[pos] & 255])
-            return pos;
-        if (!pos)
-            return npos;
-        --pos;
-    }
-}
-
-size_t
-string::find_first_of(char c, size_t pos) const noexcept
-{
-    size_t n = size();
-    if (pos >= n)
-        return npos;
-    const char* b = data();
-    const char* p = (const char*)memchr(b + pos, c, n - pos);
-    return p ? p - b : npos;
-}
-
-size_t
-string::find_first_of(ctl::string_view set, size_t pos) const noexcept
-{
-    if (set.empty())
-        return npos;
-    bool lut[256] = {};
-    for (char c : set)
-        lut[c & 255] = true;
-    const char* b = data();
-    size_t n = size();
-    for (;;) {
-        if (pos >= n)
-            return npos;
-        if (lut[b[pos] & 255])
-            return pos;
-        ++pos;
-    }
-}
-
 } // namespace ctl
--- a/ctl/string.h
+++ b/ctl/string.h
@ -9,7 +9,7 @@ namespace ctl {

 class string;

-ctl::string strcat(ctl::string_view, ctl::string_view) noexcept __wur;
+string strcat(string_view, string_view) noexcept __wur;

 namespace __ {

@ -66,7 +66,7 @@ class string
        *(((size_t*)blob) + 2) = __::sso_max << (sizeof(size_t) - 1) * 8;
    }

-    string(const ctl::string_view s) noexcept
+    string(const string_view s) noexcept
    {
        if (s.n <= __::sso_max) {
            __builtin_memcpy(blob, s.p, s.n);
@ -89,7 +89,7 @@ class string
    }

    string(const char* const p) noexcept
-      : string(ctl::string_view(p, __builtin_strlen(p)))
+      : string(string_view(p, __builtin_strlen(p)))
    {
    }

@ -104,7 +104,7 @@ class string
    }

    string(const char* const p, const size_t n) noexcept
-      : string(ctl::string_view(p, n))
+      : string(string_view(p, n))
    {
    }

@ -125,22 +125,17 @@ class string
    void append(char, size_t) noexcept;
    void append(unsigned long) noexcept;
    void append(const void*, size_t) noexcept;
-    void append(const ctl::string_view&, size_t, size_t = npos) noexcept;
-    string& insert(size_t, ctl::string_view) noexcept;
+    string& insert(size_t, string_view) noexcept;
    string& erase(size_t = 0, size_t = npos) noexcept;
    string substr(size_t = 0, size_t = npos) const noexcept;
-    string& replace(size_t, size_t, ctl::string_view) noexcept;
-    bool operator==(ctl::string_view) const noexcept;
-    bool operator!=(ctl::string_view) const noexcept;
-    bool contains(ctl::string_view) const noexcept;
-    bool ends_with(ctl::string_view) const noexcept;
-    bool starts_with(ctl::string_view) const noexcept;
+    string& replace(size_t, size_t, string_view) noexcept;
+    bool operator==(string_view) const noexcept;
+    bool operator!=(string_view) const noexcept;
+    bool contains(string_view) const noexcept;
+    bool ends_with(string_view) const noexcept;
+    bool starts_with(string_view) const noexcept;
    size_t find(char, size_t = 0) const noexcept;
-    size_t find(ctl::string_view, size_t = 0) const noexcept;
-    size_t find_first_of(char, size_t = 0) const noexcept;
-    size_t find_first_of(ctl::string_view, size_t = 0) const noexcept;
-    size_t find_last_of(char, size_t = npos) const noexcept;
-    size_t find_last_of(ctl::string_view, size_t = npos) const noexcept;
+    size_t find(string_view, size_t = 0) const noexcept;

    void swap(string& s) noexcept
    {
@ -307,14 +302,14 @@ class string
        append(ch);
    }

-    void append(const ctl::string_view& s) noexcept
+    void append(const string_view s) noexcept
    {
        append(s.p, s.n);
    }

-    operator ctl::string_view() const noexcept
+    operator string_view() const noexcept
    {
-        return ctl::string_view(data(), size());
+        return string_view(data(), size());
    }

    string& operator=(const char* s) noexcept
@ -324,7 +319,7 @@ class string
        return *this;
    }

-    string& operator=(const ctl::string_view s) noexcept
+    string& operator=(const string_view s) noexcept
    {
        clear();
        append(s);
@ -337,66 +332,38 @@ class string
        return *this;
    }

-    string& operator+=(const char* s) noexcept
+    string& operator+=(const string_view s) noexcept
    {
        append(s);
        return *this;
    }

-    string& operator+=(const ctl::string s) noexcept
-    {
-        append(s);
-        return *this;
-    }
-
-    string& operator+=(const ctl::string_view s) noexcept
-    {
-        append(s);
-        return *this;
-    }
-
-    string operator+(const char c) const noexcept
-    {
-        char s[2] = { c };
-        return strcat(*this, s);
-    }
-
-    string operator+(const char* s) const noexcept
+    string operator+(const string_view s) const noexcept
    {
        return strcat(*this, s);
    }

-    string operator+(const string& s) const noexcept
-    {
-        return strcat(*this, s);
-    }
-
-    string operator+(const ctl::string_view s) const noexcept
-    {
-        return strcat(*this, s);
-    }
-
-    int compare(const ctl::string_view s) const noexcept
+    int compare(const string_view s) const noexcept
    {
        return strcmp(*this, s);
    }

-    bool operator<(const ctl::string_view s) const noexcept
+    bool operator<(const string_view s) const noexcept
    {
        return compare(s) < 0;
    }

-    bool operator<=(const ctl::string_view s) const noexcept
+    bool operator<=(const string_view s) const noexcept
    {
        return compare(s) <= 0;
    }

-    bool operator>(const ctl::string_view s) const noexcept
+    bool operator>(const string_view s) const noexcept
    {
        return compare(s) > 0;
    }

-    bool operator>=(const ctl::string_view s) const noexcept
+    bool operator>=(const string_view s) const noexcept
    {
        return compare(s) >= 0;
    }
@ -404,7 +371,7 @@ class string
  private:
    void destroy_big() noexcept;
    void init_big(const string&) noexcept;
-    void init_big(ctl::string_view) noexcept;
+    void init_big(string_view) noexcept;
    void init_big(size_t, char) noexcept;

    __attribute__((__always_inline__)) bool isbig() const noexcept
@ -428,7 +395,7 @@ class string
        __b.c = c2 | ~__::big_mask;
    }

-    friend string strcat(ctl::string_view, ctl::string_view) noexcept;
+    friend string strcat(string_view, string_view) noexcept;

    union
    {
@ -442,33 +409,6 @@ static_assert(sizeof(string) == __::string_size);
 static_assert(sizeof(__::small_string) == __::string_size);
 static_assert(sizeof(__::big_string) == __::string_size);

-ctl::string
-to_string(int) noexcept;
-
-ctl::string
-to_string(long) noexcept;
-
-ctl::string
-to_string(long long) noexcept;
-
-ctl::string
-to_string(unsigned) noexcept;
-
-ctl::string
-to_string(unsigned long) noexcept;
-
-ctl::string
-to_string(unsigned long long) noexcept;
-
-ctl::string
-to_string(float) noexcept;
-
-ctl::string
-to_string(double) noexcept;
-
-ctl::string
-to_string(long double) noexcept;
-
 } // namespace ctl

 #pragma GCC diagnostic push
--- a/ctl/string_view.cc
+++ b/ctl/string_view.cc
@ -108,66 +108,4 @@ string_view::starts_with(const string_view s) const noexcept
    return !memcmp(p, s.p, s.n);
 }

-size_t
-string_view::find_last_of(char c, size_t pos) const noexcept
-{
-    const char* b = data();
-    size_t n = size();
-    if (pos > n)
-        pos = n;
-    const char* p = (const char*)memrchr(b, c, pos);
-    return p ? p - b : npos;
-}
-
-size_t
-string_view::find_last_of(ctl::string_view set, size_t pos) const noexcept
-{
-    if (empty() || set.empty())
-        return npos;
-    bool lut[256] = {};
-    for (char c : set)
-        lut[c & 255] = true;
-    const char* b = data();
-    size_t last = size() - 1;
-    if (pos > last)
-        pos = last;
-    for (;;) {
-        if (lut[b[pos] & 255])
-            return pos;
-        if (!pos)
-            return npos;
-        --pos;
-    }
-}
-
-size_t
-string_view::find_first_of(char c, size_t pos) const noexcept
-{
-    size_t n = size();
-    if (pos >= n)
-        return npos;
-    const char* b = data();
-    const char* p = (const char*)memchr(b + pos, c, n - pos);
-    return p ? p - b : npos;
-}
-
-size_t
-string_view::find_first_of(ctl::string_view set, size_t pos) const noexcept
-{
-    if (set.empty())
-        return npos;
-    bool lut[256] = {};
-    for (char c : set)
-        lut[c & 255] = true;
-    const char* b = data();
-    size_t n = size();
-    for (;;) {
-        if (pos >= n)
-            return npos;
-        if (lut[b[pos] & 255])
-            return pos;
-        ++pos;
-    }
-}
-
 } // namespace ctl
--- a/ctl/string_view.h
+++ b/ctl/string_view.h
@ -1,7 +1,7 @@
 // -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
 // vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_STRINGVIEW_H_
-#define CTL_STRINGVIEW_H_
+#ifndef COSMOPOLITAN_CTL_STRINGVIEW_H_
+#define COSMOPOLITAN_CTL_STRINGVIEW_H_
 #include "utility.h"

 namespace ctl {
@ -45,10 +45,6 @@ struct string_view
    string_view substr(size_t = 0, size_t = npos) const noexcept;
    size_t find(char, size_t = 0) const noexcept;
    size_t find(string_view, size_t = 0) const noexcept;
-    size_t find_first_of(char, size_t = 0) const noexcept;
-    size_t find_first_of(ctl::string_view, size_t = 0) const noexcept;
-    size_t find_last_of(char, size_t = npos) const noexcept;
-    size_t find_last_of(ctl::string_view, size_t = npos) const noexcept;

    constexpr string_view& operator=(const string_view s) noexcept
    {
@ -113,12 +109,12 @@ struct string_view
        return p[n - 1];
    }

-    constexpr const_iterator begin() const noexcept
+    constexpr const_iterator begin() noexcept
    {
        return p;
    }

-    constexpr const_iterator end() const noexcept
+    constexpr const_iterator end() noexcept
    {
        return p + n;
    }
@ -161,4 +157,4 @@ struct string_view

 } // namespace ctl

-#endif // CTL_STRINGVIEW_H_
+#endif // COSMOPOLITAN_CTL_STRINGVIEW_H_
--- a/ctl/to_string.cc
+++ b/ctl/to_string.cc
@ -1,109 +0,0 @@
-// -*- mode:c++; indent-tabs-mode:nil; c-basic-offset:4; coding:utf-8 -*-
-// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-//
-// Copyright 2024 Justine Alexandra Roberts Tunney
-//
-// Permission to use, copy, modify, and/or distribute this software for
-// any purpose with or without fee is hereby granted, provided that the
-// above copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-// WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-// AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-// DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-// PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#include "dubble.h"
-#include "libc/fmt/itoa.h"
-#include "libc/math.h"
-#include "string.h"
-#include "third_party/gdtoa/gdtoa.h"
-
-namespace ctl {
-
-extern const double_conversion::DoubleToStringConverter kDoubleToPrintfG;
-
-string
-to_string(int value) noexcept
-{
-    char buf[12];
-    return { buf, FormatInt32(buf, value) - buf };
-}
-
-string
-to_string(unsigned value) noexcept
-{
-    char buf[12];
-    return { buf, FormatUint32(buf, value) - buf };
-}
-
-string
-to_string(long value) noexcept
-{
-    char buf[21];
-    return { buf, FormatInt64(buf, value) - buf };
-}
-
-string
-to_string(unsigned long value) noexcept
-{
-    char buf[21];
-    return { buf, FormatUint64(buf, value) - buf };
-}
-
-string
-to_string(long long value) noexcept
-{
-    char buf[21];
-    return { buf, FormatInt64(buf, value) - buf };
-}
-
-string
-to_string(unsigned long long value) noexcept
-{
-    char buf[21];
-    return { buf, FormatUint64(buf, value) - buf };
-}
-
-string
-to_string(float value) noexcept
-{
-    char buf[128];
-    double_conversion::StringBuilder b(buf, sizeof(buf));
-    kDoubleToPrintfG.ToShortestSingle(value, &b);
-    b.Finalize();
-    return string(buf);
-}
-
-string
-to_string(double value) noexcept
-{
-    char buf[128];
-    double_conversion::StringBuilder b(buf, sizeof(buf));
-    kDoubleToPrintfG.ToShortest(value, &b);
-    b.Finalize();
-    return string(buf);
-}
-
-string
-to_string(long double value) noexcept
-{
-#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
-    return to_string((double)value);
-#else
-    char buf[128];
-#if LDBL_MANT_DIG == 113
-    g_Qfmt_p(buf, &value, 16, 128, NIK(2, 0, 0));
-#elif LDBL_MANT_DIG == 64
-    g_xfmt_p(buf, &value, 16, 128, NIK(2, 0, 0));
-#else
-#error "unsupported long double"
-#endif
-    return string(buf);
-#endif
-}
-
-} // namespace ctl
--- a/ctl/utility.h
+++ b/ctl/utility.h
@ -1,7 +1,7 @@
 // -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
 // vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
-#ifndef CTL_UTILITY_H_
-#define CTL_UTILITY_H_
+#ifndef COSMOPOLITAN_CTL_UTILITY_H_
+#define COSMOPOLITAN_CTL_UTILITY_H_
 #include "remove_reference.h"

 namespace ctl {
@ -66,4 +66,4 @@ declval() noexcept;

 } // namespace ctl

-#endif // CTL_UTILITY_H_
+#endif // COSMOPOLITAN_CTL_UTILITY_H_
--- a/ctl/vector.h
+++ b/ctl/vector.h
@ -15,7 +15,6 @@
 #include "move_backward.h"
 #include "move_iterator.h"
 #include "out_of_range.h"
-#include "require_input_iterator.h"
 #include "reverse_iterator.h"
 #include "uninitialized_fill.h"
 #include "uninitialized_fill_n.h"
@ -66,7 +65,7 @@ class vector
        resize(count);
    }

-    template<class InputIt, typename = ctl::require_input_iterator<InputIt>>
+    template<class InputIt>
    vector(InputIt first, InputIt last, const Allocator& alloc = Allocator())
      : alloc_(alloc), data_(nullptr), size_(0), capacity_(0)
    {
@ -174,7 +173,7 @@ class vector
        size_ = count;
    }

-    template<class InputIt, typename = ctl::require_input_iterator<InputIt>>
+    template<class InputIt>
    void assign(InputIt first, InputIt last)
    {
        clear();
@ -190,28 +189,24 @@ class vector
    reference at(size_type pos)
    {
        if (pos >= size_)
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return data_[pos];
    }

    const_reference at(size_type pos) const
    {
        if (pos >= size_)
-            throw ctl::out_of_range();
+            throw ctl::out_of_range("out of range");
        return data_[pos];
    }

    reference operator[](size_type pos)
    {
-        if (pos >= size_)
-            __builtin_trap();
        return data_[pos];
    }

    const_reference operator[](size_type pos) const
    {
-        if (pos >= size_)
-            __builtin_trap();
        return data_[pos];
    }

@ -373,7 +368,7 @@ class vector
        return it;
    }

-    template<class InputIt, typename = ctl::require_input_iterator<InputIt>>
+    template<class InputIt>
    iterator insert(const_iterator pos, InputIt first, InputIt last)
    {
        difference_type count = ctl::distance(first, last);
@ -411,17 +406,16 @@ class vector
        return erase(pos, pos + 1);
    }

-    constexpr iterator erase(const_iterator first, const_iterator last)
+    iterator erase(const_iterator first, const_iterator last)
    {
        difference_type index = first - begin();
        difference_type count = last - first;
        iterator it = begin() + index;
-        for (iterator move_it = it + count; move_it != end(); ++move_it, ++it)
-            *it = ctl::move(*move_it);
+        ctl::move(it + count, end(), it);
        for (difference_type i = 0; i < count; ++i)
            ctl::allocator_traits<Allocator>::destroy(alloc_, end() - i - 1);
        size_ -= count;
-        return begin() + index;
+        return it;
    }

    void push_back(const T& value)
@ -525,7 +519,7 @@ class vector
        capacity_ = new_capacity;
    }

-    [[no_unique_address]] Allocator alloc_;
+    Allocator alloc_;
    pointer data_;
    size_type size_;
    size_type capacity_;
--- a/Show more
+++ b/Show more