Inter

2026-04-02 21:11:27 +00:00 · 2025-05-16 18:35:33 -05:00
118 changed files with 933 additions and 2620 deletions
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -1,4 +1,4 @@
-image: openbsd/7.7
+image: openbsd/7.4
 sources:
 - https://git.sr.ht/~bakpakin/janet
 packages:
@@ -10,17 +10,13 @@ tasks:
    gmake
    gmake test
    doas gmake install
+    gmake test-install
    doas gmake uninstall
 - meson_min: |
    cd janet
    meson setup build_meson_min --buildtype=release -Dsingle_threaded=true -Dnanbox=false -Ddynamic_modules=false -Ddocstrings=false -Dnet=false -Dsourcemaps=false -Dpeg=false -Dassembler=false -Dint_types=false -Dreduced_os=true -Dffi=false
    cd build_meson_min
    ninja
- meson_reduced: |
-    cd janet
-    meson setup build_meson_reduced --buildtype=release -Dreduced_os=true
-    cd build_meson_reduced
-    ninja
 - meson_prf: |
    cd janet
    meson setup build_meson_prf --buildtype=release -Dprf=true
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [ ubuntu-latest, macos-latest, macos-14 ]
+        os: [ ubuntu-latest, macos-latest, macos-13 ]
    steps:
      - name: Checkout the repository
        uses: actions/checkout@master
@@ -25,7 +25,7 @@ jobs:
    name: Build and test on Windows
    strategy:
      matrix:
-        os: [ windows-latest, windows-2022 ]
+        os: [ windows-latest, windows-2019 ]
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout the repository
@@ -46,7 +46,7 @@ jobs:
    name: Build and test on Windows Minimal build
    strategy:
      matrix:
-        os: [ windows-2022 ]
+        os: [ windows-2019 ]
    runs-on: ${{ matrix.os }}
    steps:
      - name: Checkout the repository
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,49 +2,6 @@
 All notable changes to this project will be documented in this file.

 ## Unreleased - ???
- Allow overriding the loader when doing imports with the `:loader` argument.
- Allow importing modules with a path extension to do what one would expect.
- Add `find-all` argument to `module/find`
- Add :threads, :unmarshal, :compiler, and :asm sandbox flags.
- Add support for persistent REPL history with the environment variable `JANET_HISTFILE`
- Fix a number of fuzzer-found compiler bugs
- Fix windows processes launching bug with empty environment table that caused process-launch failures.
- Add `:I`, `:V`, and `:N` flags to `os/open` for more control when creating streams.
- Add `ev/go-gather` for a dynamic `ev/gather`.
- Use color in script output if color is being used in REPL output.
- Fix `varfn` macros handling of extra metadata.
- Disallow certain degenerate uses of fibers with the ev/ module.
- Add linting for unused bindings.
- Add linting for extra or wrong parameters to &named functions.
- Add `janet_optuinteger` and `janet_optuinteger64` to the C API.
- Add `cms` combinator to PEGs.
- Add `thaw-keep-keys` as a variant of thaw
- The `repl` function now respects the `*repl-prompt*` dynamic binding by default.
- Allow matching exact lengths of datastructures with the `match` macro using a dollar suffix.
- Add initial support for Plan 9. Some modules (e.g. ev) are not yet enabled.
- Allow specifying `:flycheck` for individual defines to annotate that they are safe to evaluate for flychecking.
-
-## 1.40.1 - 2025-11-16
- Fix `JANET_REDUCED_OS` build regression caused by `os/posix-chroot`.
- Code formatting
-
-## 1.40.0 - 2025-11-15
- Add `os/posix-chroot`
- Fix `ev/deadline` with interrupt race condition bug on Windows.
- Improve `flycheck` by allowing functions and macros to define their own flycheck behavior via the metadata `:flycheck`.
- Add `*flychecking*` dynamic binding to check if inside flycheck evalutation
- Add `gcperthread` callback for abstract types. This lets threaded abstracts have a finalizer that is called per thread, as well as a global finalizer.
- Add `JANET_DO_ERROR_*` flags to describe the return value of `janet_dobytes` and `janet_dostring`.
-
-## 1.39.1 - 2025-08-30
- Add support for chdir in os/spawn on older macOS versions
- Expose channels properly in C API
-
-## 1.39.0 - 2025-08-24
- Various bug fixes
- Add `net/socket`
- Add support for illumos OS
- Raise helpful errors for incorrect arguments to `import`.
 - Allow configuring `JANET_THREAD_LOCAL` during builds to allow multi-threading on unknown compilers.
 - Make `ffi/write` append to a buffer instead of insert at 0 by default.
 - Add `os/getpid` to get the current process id.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,7 +61,7 @@ ensure a consistent code style for C.

 ## Janet style

-All janet code in the project should be formatted similar to the code in src/boot/boot.janet.
+All janet code in the project should be formatted similar to the code in core.janet.
 The auto formatting from janet.vim will work well.

 ## Typo Fixing and One-Line changes
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2026 Calvin Rose and contributors
+Copyright (c) 2025 Calvin Rose and contributors

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
--- a/58
+++ b/58
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -47,7 +47,6 @@ SPORK_TAG?=master
 HAS_SHARED?=1
 DEBUGGER=gdb
 SONAME_SETTER=-Wl,-soname,
-STRIPFLAGS=-x -S

 # For cross compilation
 HOSTCC?=$(CC)
@@ -55,9 +54,10 @@ HOSTAR?=$(AR)
 # Symbols are (optionally) removed later, keep -g as default!
 CFLAGS?=-O2 -g
 LDFLAGS?=-rdynamic
-LIBJANET_LDFLAGS?=$(LDFLAGS)
+LIBJANET_LDFLAGS?=$(LD_FLAGS)
 RUN:=$(RUN)

+
 COMMON_CFLAGS:=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fvisibility=hidden -fPIC
 BOOT_CFLAGS:=-DJANET_BOOTSTRAP -DJANET_BUILD=$(JANET_BUILD) -O0 $(COMMON_CFLAGS) -g
 BUILD_CFLAGS:=$(CFLAGS) $(COMMON_CFLAGS)
@@ -80,12 +80,6 @@ ifeq ($(UNAME), Darwin)
 	LDCONFIG:=true
 else ifeq ($(UNAME), Linux)
 	CLIBS:=$(CLIBS) -lrt -ldl
-else ifeq ($(UNAME), SunOS)
-	BUILD_CFLAGS+=-D__EXTENSIONS__ -DJANET_NO_NANBOX
-	BOOT_CFLAGS+=-D__EXTENSIONS__ -DJANET_NO_NANBOX
-	CLIBS:=-lsocket -lm
-	STRIPFLAGS=-x
-	LDCONFIG:=false
 endif

 # For other unix likes, add flags here!
@@ -219,9 +213,9 @@ build/%.bin.o: src/%.c $(JANET_HEADERS) $(JANET_LOCAL_HEADERS) Makefile
 ########################

 ifeq ($(UNAME), Darwin)
-SONAME=libjanet.1.41.dylib
+SONAME=libjanet.1.38.dylib
 else
-SONAME=libjanet.so.1.41
+SONAME=libjanet.so.1.38
 endif

 ifeq ($(MINGW_COMPILER), clang)
@@ -260,7 +254,6 @@ $(JANET_STATIC_LIBRARY): $(JANET_TARGET_OBJECTS)
 # Testing assumes HOSTCC=CC

 TEST_SCRIPTS=$(wildcard test/suite*.janet)
-EXAMPLE_SCRIPTS=$(wildcard examples/*.janet)

 repl: $(JANET_TARGET)
 	$(RUN) ./$(JANET_TARGET)
@@ -268,26 +261,21 @@ repl: $(JANET_TARGET)
 debug: $(JANET_TARGET)
 	$(DEBUGGER) ./$(JANET_TARGET)

-VALGRIND_COMMAND=$(RUN) valgrind --leak-check=full --quiet
-CALLGRIND_COMMAND=$(RUN) valgrind --tool=callgrind
+VALGRIND_COMMAND=valgrind --leak-check=full --quiet

 valgrind: $(JANET_TARGET)
 	$(VALGRIND_COMMAND) ./$(JANET_TARGET)

-test: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
+test: $(JANET_TARGET) $(TEST_PROGRAMS)
 	for f in test/suite*.janet; do $(RUN) ./$(JANET_TARGET) "$$f" || exit; done
 	for f in examples/*.janet; do $(RUN) ./$(JANET_TARGET) -k "$$f"; done

-valtest: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
+valtest: $(JANET_TARGET) $(TEST_PROGRAMS)
 	for f in test/suite*.janet; do $(VALGRIND_COMMAND) ./$(JANET_TARGET) "$$f" || exit; done
-	for f in examples/*.janet; do $(VALGRIND_COMMAND) ./$(JANET_TARGET) -k "$$f"; done
+	for f in examples/*.janet; do ./$(JANET_TARGET) -k "$$f"; done

 callgrind: $(JANET_TARGET)
-	$(CALLGRIND_COMMAND) ./$(JANET_TARGET)
-
-calltest: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
-	for f in test/suite*.janet; do $(CALLGRIND_COMMAND) ./$(JANET_TARGET) "$$f" || exit; done
-	for f in examples/*.janet; do $(CALLGRIND_COMMAND) ./$(JANET_TARGET) -k "$$f"; done
+	for f in test/suite*.janet; do valgrind --tool=callgrind ./$(JANET_TARGET) "$$f" || exit; done

 ########################
 ##### Distribution #####
@@ -301,7 +289,7 @@ build/janet-%.tar.gz: $(JANET_TARGET) \
 	README.md build/c/janet.c build/c/shell.c
 	mkdir -p build/$(JANET_DIST_DIR)/bin
 	cp $(JANET_TARGET) build/$(JANET_DIST_DIR)/bin/
-	strip $(STRIPFLAGS) 'build/$(JANET_DIST_DIR)/bin/janet'
+	strip -x -S 'build/$(JANET_DIST_DIR)/bin/janet'
 	mkdir -p build/$(JANET_DIST_DIR)/include
 	cp build/janet.h build/$(JANET_DIST_DIR)/include/
 	mkdir -p build/$(JANET_DIST_DIR)/lib/
@@ -346,23 +334,22 @@ build/janet.pc: $(JANET_TARGET)
 	echo 'Libs.private: $(CLIBS)' >> $@

 install: $(JANET_TARGET) $(JANET_LIBRARY) $(JANET_STATIC_LIBRARY) build/janet.pc build/janet.h
-	$(eval JANET_VERSION := $(shell $(JANET_TARGET) -e '(print janet/version)'))
 	mkdir -p '$(DESTDIR)$(BINDIR)'
 	cp $(JANET_TARGET) '$(DESTDIR)$(BINDIR)/janet'
-	strip $(STRIPFLAGS) '$(DESTDIR)$(BINDIR)/janet'
+	strip -x -S '$(DESTDIR)$(BINDIR)/janet'
 	mkdir -p '$(DESTDIR)$(INCLUDEDIR)/janet'
 	cp -r build/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet'
 	ln -sf ./janet/janet.h '$(DESTDIR)$(INCLUDEDIR)/janet.h'
 	mkdir -p '$(DESTDIR)$(JANET_PATH)'
 	mkdir -p '$(DESTDIR)$(LIBDIR)'
 	if test $(UNAME) = Darwin ; then \
-		cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.$(JANET_VERSION).dylib' ; \
+		cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.$(shell $(JANET_TARGET) -e '(print janet/version)').dylib' ; \
 		ln -sf $(SONAME) '$(DESTDIR)$(LIBDIR)/libjanet.dylib' ; \
-		ln -sf libjanet.$(JANET_VERSION).dylib $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
+		ln -sf libjanet.$(shell $(JANET_TARGET) -e '(print janet/version)').dylib $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
 	else \
-		cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.so.$(JANET_VERSION)' ; \
+		cp $(JANET_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.so.$(shell $(JANET_TARGET) -e '(print janet/version)')' ; \
 		ln -sf $(SONAME) '$(DESTDIR)$(LIBDIR)/libjanet.so' ; \
-		ln -sf libjanet.so.$(JANET_VERSION) $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
+		ln -sf libjanet.so.$(shell $(JANET_TARGET) -e '(print janet/version)') $(DESTDIR)$(LIBDIR)/$(SONAME) ; \
 	fi
 	cp $(JANET_STATIC_LIBRARY) '$(DESTDIR)$(LIBDIR)/libjanet.a'
 	mkdir -p '$(DESTDIR)$(JANET_MANPATH)'
@@ -419,6 +406,9 @@ clean:
 	-rm -rf build vgcore.* callgrind.*
 	-rm -rf test/install/build test/install/modpath

+test-install:
+	echo "JPM has been removed from default install."
+
 help:
 	@echo
 	@echo 'Janet: A Dynamic Language & Bytecode VM'
@@ -430,8 +420,7 @@ help:
 	@echo '   make test       Test a built Janet'
 	@echo '   make valgrind   Assess Janet with Valgrind'
 	@echo '   make callgrind  Assess Janet with Valgrind, using Callgrind'
-	@echo '   make valtest    Run the test suite and examples with Valgrind to check for memory leaks'
-	@echo '   make calltest   Run the test suite and examples with Callgrind'
+	@echo '   make valtest    Run the test suite with Valgrind to check for memory leaks'
 	@echo '   make dist       Create a distribution tarball'
 	@echo '   make docs       Generate documentation'
 	@echo '   make debug      Run janet with GDB or LLDB'
@@ -441,9 +430,6 @@ help:
 	@echo "   make format     Format Janet's own source files"
 	@echo '   make grammar    Generate a TextMate language grammar'
 	@echo
-	@echo '   make install-jpm-git   Install jpm into the current filesystem'
-	@echo '   make install-spork-git Install spork into the current filesystem'
-	@echo

-.PHONY: clean install install-jpm-git install-spork-git repl debug valgrind test \
-	valtest callgrind callgrind-test dist uninstall docs grammar format help compile-commands
+.PHONY: clean install repl debug valgrind test \
+	valtest dist uninstall docs grammar format help compile-commands
--- a/README.md
+++ b/README.md
@@ -148,40 +148,8 @@ You can get the source on [GitHub](https://github.com/janet-lang/janet) or
 [SourceHut](https://git.sr.ht/~bakpakin/janet). While the GitHub repo is the official repo,
 the SourceHut mirror is actively maintained.

-## Spork and JPM
-
-Spork and JPM are two companion projects to Janet. They are optional, especially in an embedding use case.
-
-Spork is a collection of common utility modules, and several packaged scripts
-like `janet-format` for code formatting, `janet-netrepl` for a socket-based
-REPL, and `janet-pm` for a comprehensive Janet project manager tool. The
-modules in `spork` are less stable than the interfaces in core Janet, although
-we try to prevent breaking changes to existing modules, with a preference to
-add new modules and functions. Spork requires a C compiler to build and install
-various extenstion components such as miniz and JSON utilities. Many spork
-sub-modules, for example spork/path, are independent and can be manually
-vendored in programmer projects without fully installing spork.
-
-When install Spork, scripts will be installed to $JANET_PATH/bin/ on POSIX systems by default.
-This likely needs to be added to the path to use these scripts.
-
-JPM is the older, more opinionated, project manager tool, which has it's pros
-and cons. It does not require a C compiler to build and install, but is less
-flexible and is not receiving many changes and improvements going forward. It
-may also be harder to configure correctly on new systems. In that sense, it may
-be more stable.
-
-JPM will install to /usr/local/bin/ on posix systems by default, which may or
-may not be on your PATH.
-
 ## Building

-When building from source, for stability, please use the latest tagged release. For
-example, run `git checkout $(git describe --tags --abbrev=0)` after cloning but
-before building. For the latest development, build directly on the master
-branch. The master branch is not-necessarily stable as most Janet development
-happens directly on the master branch.
-
 ### macOS and Unix-like

 The Makefile is non-portable and requires GNU-flavored make.
@@ -192,18 +160,15 @@ make
 make test
 make repl
 make install
-make install-spork-git # optional
-make install-jpm-git # optional
+make install-jpm-git
 ```

 Find out more about the available make targets by running `make help`.

 ### Alpine Linux

-To build a statically-linked build of Janet, Alpine Linux + MUSL is a good
-combination. Janet can also be built inside a docker container or similar in
-this manner. This is a great way to try Janet without committing to a full
-install or needing to customize the default install.
+To build a statically-linked build of Janet, Alpine Linux + MUSL is a good combination. Janet can also
+be built inside a docker container or similar in this manner.

 ```sh
 docker run -it --rm alpine /bin/ash
@@ -213,13 +178,8 @@ $ cd janet
 $ make -j10
 $ make test
 $ make install
-$ make install-spork-git # optional
-$ make install-jpm-git # optional
 ```

-Note that for a true statically-linked binary with MUSL, one needs to add `-static` to the Makefile flags. This
-will also disable runtime loading of native modules (plugins) as well as the FFI.
-
 ### 32-bit Haiku

 32-bit Haiku build instructions are the same as the UNIX-like build instructions,
@@ -231,8 +191,7 @@ make CC=gcc-x86
 make test
 make repl
 make install
-make install-spork-git # optional
-make install-jpm-git # optional
+make install-jpm-git
 ```

 ### FreeBSD
@@ -246,8 +205,7 @@ gmake
 gmake test
 gmake repl
 gmake install
-gmake install-spork-git # optional
-gmake install-jpm-git # optional
+gmake install-jpm-git
 ```

 ### NetBSD
@@ -255,10 +213,6 @@ gmake install-jpm-git # optional
 NetBSD build instructions are the same as the FreeBSD build instructions.
 Alternatively, install the package directly with `pkgin install janet`.

-### illumos
-
-Building on illumos is exactly the same as building on FreeBSD.
-
 ### Windows

 1. Install [Visual Studio](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15#) or [Visual Studio Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=15#).
@@ -362,8 +316,8 @@ If installed, you can also run `man janet` to get usage information.
 ## Embedding

 Janet can be embedded in a host program very easily. The normal build
-will create a file `build/c/janet.c`, a C source code file that
-that contains the amalgamated source to Janet. This file, along with
+will create a file `build/janet.c`, which is a single C file
+that contains all the source to Janet. This file, along with
 `src/include/janet.h` and `src/conf/janetconf.h`, can be dragged into any C
 project and compiled into it. Janet should be compiled with `-std=c99`
 on most compilers, and will need to be linked to the math library, `-lm`, and
--- a/build_win.bat
+++ b/build_win.bat
@@ -49,7 +49,6 @@ for %%f in (src\boot\*.c) do (
 )
 %JANET_LINK% /out:build\janet_boot.exe build\boot\*.obj
@if errorlevel 1 goto :BUILDFAIL
-@rem note that there is no default syspath being baked in
 build\janet_boot . > build\c\janet.c
@if errorlevel 1 goto :BUILDFAIL

--- a/examples/abstract-unix-socket.janet
+++ b/examples/abstract-unix-socket.janet
@@ -1,6 +0,0 @@
-# Linux only - uses abstract unix domain sockets
-(ev/spawn (net/server :unix "@abc123" (fn [conn] (print (:read conn 1024)) (:close conn))))
-(ev/sleep 1)
-(def s (net/connect :unix "@abc123" :stream))
-(:write s "hello")
-(:close s)
--- a/examples/chatserver.janet
+++ b/examples/chatserver.janet
@@ -26,7 +26,7 @@
          (broadcast name (string msg)))
        (print name " disconnected")))))

-(defn main [&]
+(defn main [& args]
  (printf "STARTING SERVER...")
  (flush)
  (def my-server (net/listen "127.0.0.1" "8000"))
--- a/examples/debugger.janet
+++ b/examples/debugger.janet
@@ -132,7 +132,7 @@
  "Go to the next breakpoint."
  [&opt n]
  (var res nil)
-  (repeat (or n 1)
+  (for i 0 (or n 1)
    (set res (resume (.fiber))))
  res)

@@ -146,6 +146,6 @@
  "Execute the next n instructions."
  [&opt n]
  (var res nil)
-  (repeat (or n 1)
+  (for i 0 (or n 1)
    (set res (debug/step (.fiber))))
  res)
--- a/examples/rtest.janet
+++ b/examples/rtest.janet
@@ -2,7 +2,7 @@

 (def counts (seq [_ :range [0 100]] 0))

-(repeat 1000000
+(for i 0 1000000
  (let [x (math/random)
        intrange (math/floor (* 100 x))
        oldcount (counts intrange)]
--- a/examples/sample-bad-bundle2/badmod.janet
+++ b/examples/sample-bad-bundle2/badmod.janet
--- a/examples/sample-bad-bundle2/bundle.janet
+++ b/examples/sample-bad-bundle2/bundle.janet
--- a/examples/sample-bad-bundle1/info.jdn
+++ b/examples/sample-bad-bundle1/info.jdn
@@ -1,3 +0,0 @@
-@{
-  :name "sample-bad-bundle1"
-}
--- a/examples/sample-bad-bundle2/info.jdn
+++ b/examples/sample-bad-bundle2/info.jdn
@@ -1,3 +0,0 @@
-@{
-  :name "sample-bad-bundle2"
-}
--- a/examples/sample-dep1/bundle/info.jdn
+++ b/examples/sample-dep1/bundle/info.jdn
@@ -1,4 +1,4 @@
@{
  :name "sample-dep1"
-  :dependencies [{:name "sample-dep2"}]
+  :dependencies ["sample-dep2"]
 }
--- a/examples/threaded-channels.janet
+++ b/examples/threaded-channels.janet
@@ -7,7 +7,7 @@
  (ev/give chan (math/random))
  (ev/give chan (math/random))
  (ev/sleep 0.5)
-  (repeat 10
+  (for i 0 10
    (print "giving to channel...")
    (ev/give chan (math/random))
    (ev/sleep 1))
--- a/janet.1
+++ b/janet.1
@@ -156,7 +156,7 @@ Shows the version text and exits immediately.

 .TP
 .BR \-s
-Read raw input from stdin and forgo fancy input, which includes prompt history and other readline-like features.
+Read raw input from stdin and forgo prompt history and other readline-like features.

 .TP
 .BR \-e\ code
@@ -214,7 +214,7 @@ Don't execute a script, only compile it to check for errors. Useful for linting
 .BR \-m\ syspath
 Set the dynamic binding :syspath to the string syspath so that Janet will load system modules
 from a directory different than the default. The default is set when Janet is built, and defaults to
-/usr/local/lib/janet on Linux/Posix. On Windows, there is no default value. This option supersedes JANET_PATH.
+/usr/local/lib/janet on Linux/Posix, and C:/Janet/Library on Windows. This option supersedes JANET_PATH.

 .TP
 .BR \-c\ source\ output
@@ -255,7 +255,8 @@ and then arguments to the script.
 .RS
 The location to look for Janet libraries. This is the only environment variable Janet needs to
 find native and source code modules. If no JANET_PATH is set, Janet will look in
-the default location set at compile time. This should be a colon-separated list of directory names on Linux/Posix, and a semicolon-separated list on Windows. Note that a typical setup (i.e. not NixOS / Guix) will only use a single directory.
+the default location set at compile time. This should be a list of as well as a colon
+separate list of such directories.
 .RE

 .B JANET_PROFILE
@@ -272,12 +273,6 @@ This variable does nothing in the default configuration of Janet, as PRF is disa
 cannot be defined for this variable to have an effect.
 .RE

-.B JANET_HISTFILE
-.RS
-A file location to use for the default shell's REPL history when using fancy input. This relative path is where commands are persisted between sessions.
-If unset, no repl history well be used. Does not work with the -s flag where fancy input is disabled.
-.RE
-
 .B NO_COLOR
 .RS
 Turn off color by default in the repl and in the error handler of scripts. This can be changed at runtime
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose and contributors
+# Copyright (c) 2025 Calvin Rose and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -20,7 +20,7 @@

 project('janet', 'c',
  default_options : ['c_std=c99', 'build.c_std=c99', 'b_lundef=false', 'default_library=both'],
-  version : '1.41.0')
+  version : '1.38.0')

 # Global settings
 janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')
@@ -281,14 +281,12 @@ test_files = [
  'test/suite-corelib.janet',
  'test/suite-debug.janet',
  'test/suite-ev.janet',
-  'test/suite-ev2.janet',
  'test/suite-ffi.janet',
  'test/suite-filewatch.janet',
  'test/suite-inttypes.janet',
  'test/suite-io.janet',
  'test/suite-marsh.janet',
  'test/suite-math.janet',
-  'test/suite-net.janet',
  'test/suite-os.janet',
  'test/suite-parse.janet',
  'test/suite-peg.janet',
--- a/plan9.mk
+++ b/plan9.mk
@@ -1,49 +0,0 @@
-</$objtype/mkfile
-
-TARG=janet
-HFILES=src/include/janet.h src/conf/janetconf.h
-JANET_PATH=/sys/lib/janet
-BIN=/$objtype/bin/
-DISABLED=EV NET ASSEMBLER FFI UTC_MKTIME REALPATH DYNAMIC_MODULES THREADS SYMLINKS LOCALES UMASK SPAWN
-JANET_CONFIG=JANET_SINGLE_THREADED JANET_OS_NAME=plan9 JANET_ARCH_NAME=$objtype JANET_API='' JANET_NO_RETURN='' JANET_SIMPLE_GETLINE `{echo JANET_NO_^$DISABLED} PLAN9_`{echo -n $objtype}
-CFLAGS=-FTVBNcwp -D _POSIX_SOURCE -DJANET_PLAN9 -D_BSD_EXTENSION -D_LIMITS_EXTENSION -Isrc/include -Isrc/conf -I/sys/include/npe -Dtypestr=janettypestr -DJANET_API `{echo '-D'^$JANET_CONFIG}
-BOOT_CFLAGS=$CFLAGS -DJANET_BOOTSTRAP
-
-JANET_CORE_HEADERS=`{ls src/core/*.h}
-JANET_CORE_SOURCES=`{ls src/core/*.c}
-
-JANET_BOOT_SOURCES=src/boot/array_test.c \
-				   src/boot/boot.c \
-				   src/boot/buffer_test.c \
-				   src/boot/number_test.c \
-				   src/boot/system_test.c \
-				   src/boot/table_test.c
-JANET_BOOT_HEADERS=src/boot/tests.h
-JANET_BOOT_OBJECTS=`{echo $JANET_CORE_SOURCES $JANET_BOOT_SOURCES | sed -e 's/\.c/.boot.'$O'/g'}
-
-OFILES=janet.$O src/mainclient/shell.$O
-
-default:V:all
-
-src/%.boot.$O: src/%.c $JANET_HEADERS $JANET_CORE_HEADERS $JANET_BOOT_HEADERS
-	$CC $BOOT_CFLAGS  -o $target $prereq(1)
-
-src/mainclient/shell.$O: src/mainclient/shell.c
-	$CC $BOOT_CFLAGS  -o $target $prereq(1)
-
-$O.janetboot: $JANET_BOOT_OBJECTS
-	$LD $LDFLAGS -o $target $prereq
-
-janet.c: $O.janetboot src/boot/boot.janet
-	$prereq(1) . JANET_PATH $JANET_PATH >$target
-
-build/janet.$O: build/c/janet.c src/conf/janetconf.h src/include/janet.h
-	$CC $CFLAGS -D^$JANET_CONFIG -o $target $prereq(1)
-
-build/shell.$O: src/mainclient/shell.c src/conf/janetconf.h src/include/janet.h
-	$CC $CFLAGS -D^$JANET_CONFIG -o $target $prereq(1)
-
-</sys/src/cmd/mkone
-
-clean:V:
-	rm -f src/core/*.[$OS] src/boot/*.[$OS] *.a[$OS] y.tab.? lex.yy.c y.debug y.output [$OS].??* $TARG janet.[$OS] janet.c src/mainclient/shell.[$OS]
--- a/src/boot/array_test.c
+++ b/src/boot/array_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/boot.janet
+++ b/src/boot/boot.janet
--- a/src/boot/buffer_test.c
+++ b/src/boot/buffer_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/boot/number_test.c
+++ b/src/boot/number_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -44,9 +44,7 @@ static void test_valid_str(const char *str) {
 }

 int number_test() {
-#ifdef JANET_PLAN9
-    return 0;
-#endif
+
    test_valid_str("1.0");
    test_valid_str("1");
    test_valid_str("2.1");
--- a/src/boot/system_test.c
+++ b/src/boot/system_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -51,10 +51,6 @@ int system_test() {
    assert(janet_equals(janet_wrap_number(1.4), janet_wrap_number(1.4)));
    assert(janet_equals(janet_wrap_number(3.14159265), janet_wrap_number(3.14159265)));
 #ifdef NAN
-#ifdef JANET_PLAN9
-    // Plan 9 traps NaNs by default; disable that.
-    setfcr(0);
-#endif
    assert(janet_checktype(janet_wrap_number(NAN), JANET_NUMBER));
 #else
    assert(janet_checktype(janet_wrap_number(0.0 / 0.0), JANET_NUMBER));
--- a/src/boot/table_test.c
+++ b/src/boot/table_test.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/conf/janetconf.h
+++ b/src/conf/janetconf.h
@@ -4,10 +4,10 @@
 #define JANETCONF_H

 #define JANET_VERSION_MAJOR 1
-#define JANET_VERSION_MINOR 41
+#define JANET_VERSION_MINOR 38
 #define JANET_VERSION_PATCH 0
-#define JANET_VERSION_EXTRA "-dev"
-#define JANET_VERSION "1.41.0-dev"
+#define JANET_VERSION_EXTRA ""
+#define JANET_VERSION "1.38.0"

 /* #define JANET_BUILD "local" */

--- a/src/core/abstract.c
+++ b/src/core/abstract.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -201,17 +201,4 @@ int32_t janet_abstract_decref(void *abst) {
    return janet_atomic_dec(&janet_abstract_head(abst)->gc.data.refcount);
 }

-int32_t janet_abstract_decref_maybe_free(void *abst) {
-    int32_t result = janet_abstract_decref(abst);
-    if (0 == result) {
-        JanetAbstractHead *head = janet_abstract_head(abst);
-        if (head->type->gc) {
-            janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
-        }
-        /* Free memory */
-        janet_free(head);
-    }
-    return result;
-}
-
 #endif
--- a/src/core/array.c
+++ b/src/core/array.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/asm.c
+++ b/src/core/asm.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -567,13 +567,6 @@ static JanetAssembleResult janet_asm1(JanetAssembler *parent, Janet source, int
    x = janet_get1(s, janet_ckeywordv("structarg"));
    if (janet_truthy(x)) def->flags |= JANET_FUNCDEF_FLAG_STRUCTARG;

-    /* Check namedarg */
-    x = janet_get1(s, janet_ckeywordv("namedargs"));
-    if (janet_checkint(x)) {
-        def->flags |= JANET_FUNCDEF_FLAG_NAMEDARGS;
-        def->named_args_count = janet_unwrap_integer(x);
-    }
-
    /* Check source */
    x = janet_get1(s, janet_ckeywordv("source"));
    if (janet_checktype(x, JANET_STRING)) def->source = janet_unwrap_string(x);
@@ -989,14 +982,6 @@ static Janet janet_disasm_structarg(JanetFuncDef *def) {
    return janet_wrap_boolean(def->flags & JANET_FUNCDEF_FLAG_STRUCTARG);
 }

-static Janet janet_disasm_namedargs(JanetFuncDef *def) {
-    if (def->flags & JANET_FUNCDEF_FLAG_NAMEDARGS) {
-        return janet_wrap_integer(def->named_args_count);
-    } else {
-        return janet_wrap_nil();
-    }
-}
-
 static Janet janet_disasm_constants(JanetFuncDef *def) {
    JanetArray *constants = janet_array(def->constants_length);
    for (int32_t i = 0; i < def->constants_length; i++) {
@@ -1047,7 +1032,6 @@ Janet janet_disasm(JanetFuncDef *def) {
    janet_table_put(ret, janet_ckeywordv("source"), janet_disasm_source(def));
    janet_table_put(ret, janet_ckeywordv("vararg"), janet_disasm_vararg(def));
    janet_table_put(ret, janet_ckeywordv("structarg"), janet_disasm_structarg(def));
-    janet_table_put(ret, janet_ckeywordv("namedargs"), janet_disasm_namedargs(def));
    janet_table_put(ret, janet_ckeywordv("name"), janet_disasm_name(def));
    janet_table_put(ret, janet_ckeywordv("slotcount"), janet_disasm_slotcount(def));
    janet_table_put(ret, janet_ckeywordv("symbolmap"), janet_disasm_symbolslots(def));
@@ -1064,7 +1048,6 @@ JANET_CORE_FN(cfun_asm,
              "The syntax for the assembly can be found on the Janet website, and should correspond\n"
              "to the return value of disasm. Will throw an\n"
              "error on invalid assembly.") {
-    janet_sandbox_assert(JANET_SANDBOX_ASM);
    janet_fixarity(argc, 1);
    JanetAssembleResult res;
    res = janet_asm(argv[0], 0);
@@ -1084,8 +1067,6 @@ JANET_CORE_FN(cfun_disasm,
              "* :min-arity - minimum number of arguments function can be called with.\n"
              "* :max-arity - maximum number of arguments function can be called with.\n"
              "* :vararg - true if function can take a variable number of arguments.\n"
-              "* :structarg - true if function can take a variable number of arguments using the &keys option.\n"
-              "* :namedargs - if function can take a variable number of arguments using the &named option, this will be the number of named arguments.\n"
              "* :bytecode - array of parsed bytecode instructions. Each instruction is a tuple.\n"
              "* :source - name of source file that this function was compiled from.\n"
              "* :name - name of function.\n"
@@ -1095,7 +1076,6 @@ JANET_CORE_FN(cfun_disasm,
              "* :sourcemap - a mapping of each bytecode instruction to a line and column in the source file.\n"
              "* :environments - an internal mapping of which enclosing functions are referenced for bindings.\n"
              "* :defs - other function definitions that this function may instantiate.\n") {
-    janet_sandbox_assert(JANET_SANDBOX_ASM);
    janet_arity(argc, 1, 2);
    JanetFunction *f = janet_getfunction(argv, 0);
    if (argc == 2) {
@@ -1108,7 +1088,6 @@ JANET_CORE_FN(cfun_disasm,
        if (!janet_cstrcmp(kw, "name")) return janet_disasm_name(f->def);
        if (!janet_cstrcmp(kw, "vararg")) return janet_disasm_vararg(f->def);
        if (!janet_cstrcmp(kw, "structarg")) return janet_disasm_structarg(f->def);
-        if (!janet_cstrcmp(kw, "namedargs")) return janet_disasm_namedargs(f->def);
        if (!janet_cstrcmp(kw, "slotcount")) return janet_disasm_slotcount(f->def);
        if (!janet_cstrcmp(kw, "constants")) return janet_disasm_constants(f->def);
        if (!janet_cstrcmp(kw, "sourcemap")) return janet_disasm_sourcemap(f->def);
--- a/src/core/buffer.c
+++ b/src/core/buffer.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -74,7 +74,6 @@ JanetBuffer *janet_pointer_buffer_unsafe(void *memory, int32_t capacity, int32_t
 void janet_buffer_deinit(JanetBuffer *buffer) {
    if (!(buffer->gc.flags & JANET_BUFFER_FLAG_NO_REALLOC)) {
        janet_free(buffer->data);
-        buffer->data = NULL;
    }
 }

--- a/src/core/bytecode.c
+++ b/src/core/bytecode.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -522,7 +522,6 @@ JanetFuncDef *janet_funcdef_alloc(void) {
    def->bytecode_length = 0;
    def->environments_length = 0;
    def->symbolmap_length = 0;
-    def->named_args_count = 0;
    return def;
 }

--- a/src/core/capi.c
+++ b/src/core/capi.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -460,7 +460,7 @@ Janet janet_dyn(const char *name) {
        return janet_table_get(janet_vm.top_dyns, janet_ckeywordv(name));
    }
    if (janet_vm.fiber->env) {
-        return janet_table_get_keyword(janet_vm.fiber->env, name);
+        return janet_table_get(janet_vm.fiber->env, janet_ckeywordv(name));
    } else {
        return janet_wrap_nil();
    }
@@ -557,18 +557,6 @@ void *janet_optabstract(const Janet *argv, int32_t argc, int32_t n, const JanetA
    return janet_getabstract(argv, n, at);
 }

-uint32_t janet_optuinteger(const Janet *argv, int32_t argc, int32_t n, uint32_t dflt) {
-    if (argc <= n) return dflt;
-    if (janet_checktype(argv[n], JANET_NIL)) return dflt;
-    return janet_getuinteger(argv, n);
-}
-
-uint64_t janet_optuinteger64(const Janet *argv, int32_t argc, int32_t n, uint64_t dflt) {
-    if (argc <= n) return dflt;
-    if (janet_checktype(argv[n], JANET_NIL)) return dflt;
-    return janet_getuinteger64(argv, n);
-}
-
 /* Atomic refcounts */

 JanetAtomicInt janet_atomic_inc(JanetAtomicInt volatile *x) {
@@ -576,8 +564,6 @@ JanetAtomicInt janet_atomic_inc(JanetAtomicInt volatile *x) {
    return _InterlockedIncrement(x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_fetch_add_explicit(x, 1, memory_order_relaxed) + 1;
-#elif defined(JANET_PLAN9)
-    return aincl((void*)x, 1);
 #else
    return __atomic_add_fetch(x, 1, __ATOMIC_RELAXED);
 #endif
@@ -588,8 +574,6 @@ JanetAtomicInt janet_atomic_dec(JanetAtomicInt volatile *x) {
    return _InterlockedDecrement(x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_fetch_add_explicit(x, -1, memory_order_acq_rel) - 1;
-#elif defined(JANET_PLAN9)
-    return aincl((void*)x, -1);
 #else
    return __atomic_add_fetch(x, -1, __ATOMIC_ACQ_REL);
 #endif
@@ -598,8 +582,6 @@ JanetAtomicInt janet_atomic_dec(JanetAtomicInt volatile *x) {
 JanetAtomicInt janet_atomic_load(JanetAtomicInt volatile *x) {
 #ifdef _MSC_VER
    return _InterlockedOr(x, 0);
-#elif defined(JANET_PLAN9)
-    return agetl((void*)x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_load_explicit(x, memory_order_acquire);
 #else
@@ -610,8 +592,6 @@ JanetAtomicInt janet_atomic_load(JanetAtomicInt volatile *x) {
 JanetAtomicInt janet_atomic_load_relaxed(JanetAtomicInt volatile *x) {
 #ifdef _MSC_VER
    return _InterlockedOr(x, 0);
-#elif defined(JANET_PLAN9)
-    return agetl((void*)x);
 #elif defined(JANET_USE_STDATOMIC)
    return atomic_load_explicit(x, memory_order_relaxed);
 #else
--- a/src/core/cfuns.c
+++ b/src/core/cfuns.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/compile.c
+++ b/src/core/compile.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -98,22 +98,6 @@ void janetc_nameslot(JanetCompiler *c, const uint8_t *sym, JanetSlot s) {
    sp.sym2 = sym;
    sp.slot = s;
    sp.keep = 0;
-    sp.referenced = sym[0] == '_'; /* Fake ref if symbol is _ to avoid lints */
-    sp.slot.flags |= JANET_SLOT_NAMED;
-    sp.birth_pc = cnt ? cnt - 1 : 0;
-    sp.death_pc = UINT32_MAX;
-    janet_v_push(c->scope->syms, sp);
-}
-
-/* Same as janetc_nameslot, but don't have a lint for unused bindings. */
-void janetc_nameslot_no_unused(JanetCompiler *c, const uint8_t *sym, JanetSlot s) {
-    SymPair sp;
-    int32_t cnt = janet_v_count(c->buffer);
-    sp.sym = sym;
-    sp.sym2 = sym;
-    sp.slot = s;
-    sp.keep = 0;
-    sp.referenced = 1;
    sp.slot.flags |= JANET_SLOT_NAMED;
    sp.birth_pc = cnt ? cnt - 1 : 0;
    sp.death_pc = UINT32_MAX;
@@ -186,10 +170,6 @@ void janetc_popscope(JanetCompiler *c) {
        /* Keep upvalue slots and symbols for debugging. */
        for (int32_t i = 0; i < janet_v_count(oldscope->syms); i++) {
            SymPair pair = oldscope->syms[i];
-            /* Check for unused symbols */
-            if (pair.referenced == 0 && pair.sym) {
-                janetc_lintf(c, JANET_C_LINT_STRICT, "binding %q is unused", janet_wrap_symbol(pair.sym));
-            }
            /* The variable should not be lexically accessible */
            pair.sym = NULL;
            if (pair.death_pc == UINT32_MAX) {
@@ -282,7 +262,6 @@ JanetSlot janetc_resolve(
            pair = scope->syms + i;
            if (pair->sym == sym) {
                ret = pair->slot;
-                pair->referenced = 1;
                goto found;
            }
        }
@@ -295,7 +274,7 @@ JanetSlot janetc_resolve(
    {
        JanetBinding binding = janet_resolve_ext(c->env, sym);
        if (binding.type == JANET_BINDING_NONE) {
-            Janet handler = janet_table_get_keyword(c->env, "missing-symbol");
+            Janet handler = janet_table_get(c->env, janet_ckeywordv("missing-symbol"));
            switch (janet_type(handler)) {
                case JANET_NIL:
                    break;
@@ -367,7 +346,6 @@ found:
    /* non-local scope needs to expose its environment */
    JanetScope *original_scope = scope;
    pair->keep = 1;
-    pair->referenced = 1;
    while (scope && !(scope->flags & JANET_SCOPE_FUNCTION))
        scope = scope->parent;
    janet_assert(scope, "invalid scopes");
@@ -536,9 +514,9 @@ void janetc_throwaway(JanetFopts opts, Janet x) {
    JanetScope unusedScope;
    int32_t bufstart = janet_v_count(c->buffer);
    int32_t mapbufstart = janet_v_count(c->mapbuffer);
-    janetc_scope(&unusedScope, c, JANET_SCOPE_UNUSED, "unused");
+    janetc_scope(&unusedScope, c, JANET_SCOPE_UNUSED, "unusued");
    janetc_value(opts, x);
-    janetc_lintf(c, JANET_C_LINT_STRICT, "dead code, consider removing %.4q", x);
+    janetc_lintf(c, JANET_C_LINT_STRICT, "dead code, consider removing %.2q", x);
    janetc_popscope(c);
    if (c->buffer) {
        janet_v__cnt(c->buffer) = bufstart;
@@ -548,7 +526,7 @@ void janetc_throwaway(JanetFopts opts, Janet x) {
 }

 /* Compile a call or tailcall instruction */
-static JanetSlot janetc_call(JanetFopts opts, JanetSlot *slots, JanetSlot fun, const Janet *form) {
+static JanetSlot janetc_call(JanetFopts opts, JanetSlot *slots, JanetSlot fun) {
    JanetSlot retslot;
    JanetCompiler *c = opts.compiler;
    int specialized = 0;
@@ -574,8 +552,6 @@ static JanetSlot janetc_call(JanetFopts opts, JanetSlot *slots, JanetSlot fun, c
                    JanetFunction *f = janet_unwrap_function(fun.constant);
                    int32_t min = f->def->min_arity;
                    int32_t max = f->def->max_arity;
-                    int structarg = f->def->flags & JANET_FUNCDEF_FLAG_STRUCTARG;
-                    int namedarg = f->def->flags & JANET_FUNCDEF_FLAG_NAMEDARGS;
                    if (min_arity < 0) {
                        /* Call has splices */
                        min_arity = -1 - min_arity;
@@ -599,47 +575,6 @@ static JanetSlot janetc_call(JanetFopts opts, JanetSlot *slots, JanetSlot fun, c
                                                    fun.constant, min, min == 1 ? "" : "s", min_arity);
                            janetc_error(c, es);
                        }
-                        if (structarg && (min_arity > f->def->arity) && ((min_arity - f->def->arity) & 1)) {
-                            /* If we have an odd number of variadic arguments to a `&keys` function, that is almost certainly wrong. */
-                            if (namedarg) {
-                                janetc_lintf(c, JANET_C_LINT_NORMAL,
-                                             "odd number of named arguments to `&named` function %v", fun.constant);
-                            } else {
-                                janetc_lintf(c, JANET_C_LINT_NORMAL,
-                                             "odd number of named arguments to `&keys` function %v", fun.constant);
-                            }
-                        }
-                        if (namedarg && f->def->named_args_count > 0) {
-                            /* For each argument passed in, check if it is one of the used named arguments
-                             * by checking the list defined in the function def. If not, raise a normal compiler
-                             * lint. We can also do a strict lint for _missing_ named arguments, although in many
-                             * cases those are assumed to have some kind of default, or we have dynamic keys. */
-                            int32_t first_arg_key_index = f->def->arity + 1;
-                            for (int32_t i = first_arg_key_index; i < janet_tuple_length(form); i += 2) {
-                                Janet argkey = form[i];
-                                /* Assumption: The first N constants of a function are its named argument keys. This
-                                 * may change if the compiler changes, but is true for all Janet generated functions. */
-                                int found = 0;
-                                if (janet_checktype(argkey, JANET_KEYWORD)) {
-                                    for (int32_t j = 0; j < f->def->named_args_count && j < f->def->constants_length; j++) {
-                                        if (janet_equals(argkey, f->def->constants[j])) {
-                                            found = 1;
-                                            break;
-                                        }
-                                    }
-                                } else if (janet_checktype(argkey, JANET_TUPLE)) {
-                                    /* Possible lint : too dynamic, be dumber
-                                     * (defn f [&named x] [x])
-                                     * (f (if (coin-flip) :x :w) 10)
-                                     * A tuple could be a function call the evaluates to a valid key */
-                                    found = 1;
-                                }
-                                if (!found) {
-                                    janetc_lintf(c, JANET_C_LINT_NORMAL,
-                                                 "unused named argument %v to function %v", argkey, fun.constant);
-                                }
-                            }
-                        }
                    }
                }
                break;
@@ -874,16 +809,14 @@ JanetSlot janetc_value(JanetFopts opts, Janet x) {
                } else if (janet_tuple_flag(tup) & JANET_TUPLE_FLAG_BRACKETCTOR) { /* [] tuples are not function call */
                    ret = janetc_tuple(opts, x);
                } else {
-                    /* Function calls */
                    JanetSlot head = janetc_value(subopts, tup[0]);
                    subopts.flags = JANET_FUNCTION | JANET_CFUNCTION;
-                    ret = janetc_call(opts, janetc_toslots(c, tup + 1, janet_tuple_length(tup) - 1), head, tup);
+                    ret = janetc_call(opts, janetc_toslots(c, tup + 1, janet_tuple_length(tup) - 1), head);
                    janetc_freeslot(c, head);
                }
                ret.flags &= ~JANET_SLOT_SPLICED;
            }
            break;
-            /* Data Constructors */
            case JANET_SYMBOL:
                ret = janetc_resolve(c, janet_unwrap_symbol(x));
                break;
@@ -923,21 +856,19 @@ void janet_def_addflags(JanetFuncDef *def) {
    int32_t set_flags = 0;
    int32_t unset_flags = 0;
    /* pos checks */
-    if (def->name)              set_flags |= JANET_FUNCDEF_FLAG_HASNAME;
-    if (def->source)            set_flags |= JANET_FUNCDEF_FLAG_HASSOURCE;
-    if (def->defs)              set_flags |= JANET_FUNCDEF_FLAG_HASDEFS;
-    if (def->environments)      set_flags |= JANET_FUNCDEF_FLAG_HASENVS;
-    if (def->sourcemap)         set_flags |= JANET_FUNCDEF_FLAG_HASSOURCEMAP;
-    if (def->closure_bitset)    set_flags |= JANET_FUNCDEF_FLAG_HASCLOBITSET;
-    if (def->named_args_count)  set_flags |= JANET_FUNCDEF_FLAG_NAMEDARGS;
+    if (def->name)            set_flags |= JANET_FUNCDEF_FLAG_HASNAME;
+    if (def->source)          set_flags |= JANET_FUNCDEF_FLAG_HASSOURCE;
+    if (def->defs)            set_flags |= JANET_FUNCDEF_FLAG_HASDEFS;
+    if (def->environments)    set_flags |= JANET_FUNCDEF_FLAG_HASENVS;
+    if (def->sourcemap)       set_flags |= JANET_FUNCDEF_FLAG_HASSOURCEMAP;
+    if (def->closure_bitset)  set_flags |= JANET_FUNCDEF_FLAG_HASCLOBITSET;
    /* negative checks */
-    if (!def->name)             unset_flags |= JANET_FUNCDEF_FLAG_HASNAME;
-    if (!def->source)           unset_flags |= JANET_FUNCDEF_FLAG_HASSOURCE;
-    if (!def->defs)             unset_flags |= JANET_FUNCDEF_FLAG_HASDEFS;
-    if (!def->environments)     unset_flags |= JANET_FUNCDEF_FLAG_HASENVS;
-    if (!def->sourcemap)        unset_flags |= JANET_FUNCDEF_FLAG_HASSOURCEMAP;
-    if (!def->closure_bitset)   unset_flags |= JANET_FUNCDEF_FLAG_HASCLOBITSET;
-    if (!def->named_args_count) unset_flags |= JANET_FUNCDEF_FLAG_NAMEDARGS;
+    if (!def->name)           unset_flags |= JANET_FUNCDEF_FLAG_HASNAME;
+    if (!def->source)         unset_flags |= JANET_FUNCDEF_FLAG_HASSOURCE;
+    if (!def->defs)           unset_flags |= JANET_FUNCDEF_FLAG_HASDEFS;
+    if (!def->environments)   unset_flags |= JANET_FUNCDEF_FLAG_HASENVS;
+    if (!def->sourcemap)      unset_flags |= JANET_FUNCDEF_FLAG_HASSOURCEMAP;
+    if (!def->closure_bitset) unset_flags |= JANET_FUNCDEF_FLAG_HASCLOBITSET;
    /* Update flags */
    def->flags |= set_flags;
    def->flags &= ~unset_flags;
@@ -1008,9 +939,8 @@ JanetFuncDef *janetc_pop_funcdef(JanetCompiler *c) {
            JANET_OUT_OF_MEMORY;
        }
        memcpy(chunks, scope->ua.chunks, sizeof(uint32_t) * numchunks);
-        /* fprintf(stderr, "slot chunks: %d, scope->ua.count: %d, numchunks: %d\n", slotchunks, scope->ua.count, numchunks); */
        /* Register allocator preallocates some registers [240-255, high 16 bits of chunk index 7], we can ignore those. */
-        if (scope->ua.count > 7 && slotchunks > 7) chunks[7] &= 0xFFFFU;
+        if (scope->ua.count > 7) chunks[7] &= 0xFFFFU;
        def->closure_bitset = chunks;
    }

@@ -1044,10 +974,6 @@ JanetFuncDef *janetc_pop_funcdef(JanetCompiler *c) {
        SymPair pair = scope->syms[i];
        if (pair.sym2) {
            JanetSymbolMap jsm;
-            /* Check for unused symbols */
-            if (pair.referenced == 0 && pair.sym) {
-                janetc_lintf(c, JANET_C_LINT_STRICT, "binding %q is unused", janet_wrap_symbol(pair.sym));
-            }
            if (pair.death_pc == UINT32_MAX) {
                jsm.death_pc = def->bytecode_length;
            } else {
@@ -1156,7 +1082,6 @@ JANET_CORE_FN(cfun_compile,
              "struct with keys :line, :column, and :error if compilation fails. "
              "If a `lints` array is given, linting messages will be appended to the array. "
              "Each message will be a tuple of the form `(level line col message)`.") {
-    janet_sandbox_assert(JANET_SANDBOX_COMPILE);
    janet_arity(argc, 1, 4);
    JanetTable *env = (argc > 1 && !janet_checktype(argv[1], JANET_NIL))
                      ? janet_gettable(argv, 1) : janet_vm.fiber->env;
--- a/src/core/compile.h
+++ b/src/core/compile.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -114,7 +114,6 @@ typedef struct SymPair {
    const uint8_t *sym;
    const uint8_t *sym2;
    int keep;
-    int referenced; /* Has this value been used */
    uint32_t birth_pc;
    uint32_t death_pc;
 } SymPair;
@@ -223,7 +222,6 @@ const JanetSpecial *janetc_special(const uint8_t *name);

 void janetc_freeslot(JanetCompiler *c, JanetSlot s);
 void janetc_nameslot(JanetCompiler *c, const uint8_t *sym, JanetSlot s);
-void janetc_nameslot_no_unused(JanetCompiler *c, const uint8_t *sym, JanetSlot s);
 JanetSlot janetc_farslot(JanetCompiler *c);

 /* Throw away some code after checking that it is well formed. */
--- a/src/core/corelib.c
+++ b/src/core/corelib.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -66,7 +66,7 @@ JanetModule janet_native(const char *name, const uint8_t **error) {
    JanetBuildConfig modconf = getter();
    JanetBuildConfig host = janet_config_current();
    if (host.major != modconf.major ||
-            host.minor != modconf.minor ||
+            host.minor < modconf.minor ||
            host.bits != modconf.bits) {
        char errbuf[128];
        snprintf(errbuf, sizeof(errbuf), "config mismatch - host %d.%.d.%d(%.4x) vs. module %d.%d.%d(%.4x)",
@@ -653,15 +653,22 @@ JANET_CORE_FN(janet_core_check_int,
              "(int? x)",
              "Check if x can be exactly represented as a 32 bit signed two's complement integer.") {
    janet_fixarity(argc, 1);
-    return janet_wrap_boolean(janet_checkint(argv[0]));
+    if (!janet_checktype(argv[0], JANET_NUMBER)) goto ret_false;
+    double num = janet_unwrap_number(argv[0]);
+    return janet_wrap_boolean(num == (double)((int32_t)num));
+ret_false:
+    return janet_wrap_false();
 }

 JANET_CORE_FN(janet_core_check_nat,
              "(nat? x)",
              "Check if x can be exactly represented as a non-negative 32 bit signed two's complement integer.") {
    janet_fixarity(argc, 1);
-    if (!janet_checkint(argv[0])) return janet_wrap_false();
-    return janet_wrap_boolean(janet_unwrap_integer(argv[0]) >= 0);
+    if (!janet_checktype(argv[0], JANET_NUMBER)) goto ret_false;
+    double num = janet_unwrap_number(argv[0]);
+    return janet_wrap_boolean(num >= 0 && (num == (double)((int32_t)num)));
+ret_false:
+    return janet_wrap_false();
 }

 JANET_CORE_FN(janet_core_is_bytes,
@@ -746,9 +753,6 @@ typedef struct SandboxOption {

 static const SandboxOption sandbox_options[] = {
    {"all", JANET_SANDBOX_ALL},
-    {"asm", JANET_SANDBOX_ASM},
-    {"chroot", JANET_SANDBOX_CHROOT},
-    {"compile", JANET_SANDBOX_COMPILE},
    {"env", JANET_SANDBOX_ENV},
    {"ffi", JANET_SANDBOX_FFI},
    {"ffi-define", JANET_SANDBOX_FFI_DEFINE},
@@ -766,8 +770,6 @@ static const SandboxOption sandbox_options[] = {
    {"sandbox", JANET_SANDBOX_SANDBOX},
    {"signal", JANET_SANDBOX_SIGNAL},
    {"subprocess", JANET_SANDBOX_SUBPROCESS},
-    {"threads", JANET_SANDBOX_THREADS},
-    {"unmarshal", JANET_SANDBOX_UNMARSHAL},
    {NULL, 0}
 };

@@ -776,9 +778,6 @@ JANET_CORE_FN(janet_core_sandbox,
              "Disable feature sets to prevent the interpreter from using certain system resources. "
              "Once a feature is disabled, there is no way to re-enable it. Capabilities can be:\n\n"
              "* :all - disallow all (except IO to stdout, stderr, and stdin)\n"
-              "* :asm - disallow calling `asm` and `disasm` functions.\n"
-              "* :chroot - disallow calling `os/posix-chroot`\n"
-              "* :compile - disallow calling `compile`. This will disable a lot of functionality, such as `eval`.\n"
              "* :env - disallow reading and write env variables\n"
              "* :ffi - disallow FFI (recommended if disabling anything else)\n"
              "* :ffi-define - disallow loading new FFI modules and binding new functions\n"
@@ -795,9 +794,7 @@ JANET_CORE_FN(janet_core_sandbox,
              "* :net-listen - disallow accepting inbound network connections\n"
              "* :sandbox - disallow calling this function\n"
              "* :signal - disallow adding or removing signal handlers\n"
-              "* :subprocess - disallow running subprocesses\n"
-              "* :threads - disallow spawning threads with `ev/thread`. Certain helper threads may still be spawned.\n"
-              "* :unmarshal - disallow calling the unmarshal function.\n") {
+              "* :subprocess - disallow running subprocesses") {
    uint32_t flags = 0;
    for (int32_t i = 0; i < argc; i++) {
        JanetKeyword kw = janet_getkeyword(argv, i);
@@ -1005,11 +1002,11 @@ static void make_apply(JanetTable *env) {
    janet_quick_asm(env, JANET_FUN_APPLY | JANET_FUNCDEF_FLAG_VARARG,
                    "apply", 1, 1, INT32_MAX, 6, apply_asm, sizeof(apply_asm),
                    JDOC("(apply f & args)\n\n"
-                         "Applies a function f to a variable number of arguments. Each "
-                         "element in args is used as an argument to f, except the last "
-                         "element in args, which is expected to be an array or a tuple. "
-                         "Each element in this last argument is then also pushed as an "
-                         "argument to f."));
+         "Applies a function f to a variable number of arguments. Each "
+         "element in args is used as an argument to f, except the last "
+         "element in args, which is expected to be an array or a tuple. "
+         "Each element in this last argument is then also pushed as an "
+         "argument to f."));
 }

 static const uint32_t error_asm[] = {
@@ -1162,82 +1159,82 @@ JanetTable *janet_core_env(JanetTable *replacements) {
    janet_quick_asm(env, JANET_FUN_CMP,
                    "cmp", 2, 2, 2, 2, cmp_asm, sizeof(cmp_asm),
                    JDOC("(cmp x y)\n\n"
-                         "Returns -1 if x is strictly less than y, 1 if y is strictly greater "
-                         "than x, and 0 otherwise. To return 0, x and y must be the exact same type."));
+         "Returns -1 if x is strictly less than y, 1 if y is strictly greater "
+         "than x, and 0 otherwise. To return 0, x and y must be the exact same type."));
    janet_quick_asm(env, JANET_FUN_NEXT,
                    "next", 2, 1, 2, 2, next_asm, sizeof(next_asm),
                    JDOC("(next ds &opt key)\n\n"
-                         "Gets the next key in a data structure. Can be used to iterate through "
-                         "the keys of a data structure in an unspecified order. Keys are guaranteed "
-                         "to be seen only once per iteration if the data structure is not mutated "
-                         "during iteration. If key is nil, next returns the first key. If next "
-                         "returns nil, there are no more keys to iterate through."));
+         "Gets the next key in a data structure. Can be used to iterate through "
+         "the keys of a data structure in an unspecified order. Keys are guaranteed "
+         "to be seen only once per iteration if the data structure is not mutated "
+         "during iteration. If key is nil, next returns the first key. If next "
+         "returns nil, there are no more keys to iterate through."));
    janet_quick_asm(env, JANET_FUN_PROP,
                    "propagate", 2, 2, 2, 2, propagate_asm, sizeof(propagate_asm),
                    JDOC("(propagate x fiber)\n\n"
-                         "Propagate a signal from a fiber to the current fiber and "
-                         "set the last value of the current fiber to `x`.  The signal "
-                         "value is then available as the status of the current fiber. "
-                         "The resulting stack trace from the current fiber will include "
-                         "frames from fiber. If fiber is in a state that can be resumed, "
-                         "resuming the current fiber will first resume `fiber`. "
-                         "This function can be used to re-raise an error without losing "
-                         "the original stack trace."));
+         "Propagate a signal from a fiber to the current fiber and "
+         "set the last value of the current fiber to `x`.  The signal "
+         "value is then available as the status of the current fiber. "
+         "The resulting stack trace from the current fiber will include "
+         "frames from fiber. If fiber is in a state that can be resumed, "
+         "resuming the current fiber will first resume `fiber`. "
+         "This function can be used to re-raise an error without losing "
+         "the original stack trace."));
    janet_quick_asm(env, JANET_FUN_DEBUG,
                    "debug", 1, 0, 1, 1, debug_asm, sizeof(debug_asm),
                    JDOC("(debug &opt x)\n\n"
-                         "Throws a debug signal that can be caught by a parent fiber and used to inspect "
-                         "the running state of the current fiber. Returns the value passed in by resume."));
+         "Throws a debug signal that can be caught by a parent fiber and used to inspect "
+         "the running state of the current fiber. Returns the value passed in by resume."));
    janet_quick_asm(env, JANET_FUN_ERROR,
                    "error", 1, 1, 1, 1, error_asm, sizeof(error_asm),
                    JDOC("(error e)\n\n"
-                         "Throws an error e that can be caught and handled by a parent fiber."));
+         "Throws an error e that can be caught and handled by a parent fiber."));
    janet_quick_asm(env, JANET_FUN_YIELD,
                    "yield", 1, 0, 1, 2, yield_asm, sizeof(yield_asm),
                    JDOC("(yield &opt x)\n\n"
-                         "Yield a value to a parent fiber. When a fiber yields, its execution is paused until "
-                         "another thread resumes it. The fiber will then resume, and the last yield call will "
-                         "return the value that was passed to resume."));
+         "Yield a value to a parent fiber. When a fiber yields, its execution is paused until "
+         "another thread resumes it. The fiber will then resume, and the last yield call will "
+         "return the value that was passed to resume."));
    janet_quick_asm(env, JANET_FUN_CANCEL,
                    "cancel", 2, 2, 2, 2, cancel_asm, sizeof(cancel_asm),
                    JDOC("(cancel fiber err)\n\n"
-                         "Resume a fiber but have it immediately raise an error. This lets a programmer unwind a pending fiber. "
-                         "Returns the same result as resume."));
+         "Resume a fiber but have it immediately raise an error. This lets a programmer unwind a pending fiber. "
+         "Returns the same result as resume."));
    janet_quick_asm(env, JANET_FUN_RESUME,
                    "resume", 2, 1, 2, 2, resume_asm, sizeof(resume_asm),
                    JDOC("(resume fiber &opt x)\n\n"
-                         "Resume a new or suspended fiber and optionally pass in a value to the fiber that "
-                         "will be returned to the last yield in the case of a pending fiber, or the argument to "
-                         "the dispatch function in the case of a new fiber. Returns either the return result of "
-                         "the fiber's dispatch function, or the value from the next yield call in fiber."));
+         "Resume a new or suspended fiber and optionally pass in a value to the fiber that "
+         "will be returned to the last yield in the case of a pending fiber, or the argument to "
+         "the dispatch function in the case of a new fiber. Returns either the return result of "
+         "the fiber's dispatch function, or the value from the next yield call in fiber."));
    janet_quick_asm(env, JANET_FUN_IN,
                    "in", 3, 2, 3, 4, in_asm, sizeof(in_asm),
                    JDOC("(in ds key &opt dflt)\n\n"
-                         "Get value in ds at key, works on associative data structures. Arrays, tuples, tables, structs, "
-                         "strings, symbols, and buffers are all associative and can be used. Arrays, tuples, strings, buffers, "
-                         "and symbols must use integer keys that are in bounds or an error is raised. Structs and tables can "
-                         "take any value as a key except nil and will return nil or dflt if not found."));
+         "Get value in ds at key, works on associative data structures. Arrays, tuples, tables, structs, "
+         "strings, symbols, and buffers are all associative and can be used. Arrays, tuples, strings, buffers, "
+         "and symbols must use integer keys that are in bounds or an error is raised. Structs and tables can "
+         "take any value as a key except nil and will return nil or dflt if not found."));
    janet_quick_asm(env, JANET_FUN_GET,
                    "get", 3, 2, 3, 4, get_asm, sizeof(in_asm),
                    JDOC("(get ds key &opt dflt)\n\n"
-                         "Get the value mapped to key in data structure ds, and return dflt or nil if not found. "
-                         "Similar to in, but will not throw an error if the key is invalid for the data structure "
-                         "unless the data structure is an abstract type. In that case, the abstract type getter may throw "
-                         "an error."));
+         "Get the value mapped to key in data structure ds, and return dflt or nil if not found. "
+         "Similar to in, but will not throw an error if the key is invalid for the data structure "
+         "unless the data structure is an abstract type. In that case, the abstract type getter may throw "
+         "an error."));
    janet_quick_asm(env, JANET_FUN_PUT,
                    "put", 3, 3, 3, 3, put_asm, sizeof(put_asm),
                    JDOC("(put ds key value)\n\n"
-                         "Associate a key with a value in any mutable associative data structure. Indexed data structures "
-                         "(arrays and buffers) only accept non-negative integer keys, and will expand if an out of bounds "
-                         "value is provided. In an array, extra space will be filled with nils, and in a buffer, extra "
-                         "space will be filled with 0 bytes. In a table, putting a key that is contained in the table prototype "
-                         "will hide the association defined by the prototype, but will not mutate the prototype table. Putting "
-                         "a value nil into a table will remove the key from the table. Returns the data structure ds."));
+         "Associate a key with a value in any mutable associative data structure. Indexed data structures "
+         "(arrays and buffers) only accept non-negative integer keys, and will expand if an out of bounds "
+         "value is provided. In an array, extra space will be filled with nils, and in a buffer, extra "
+         "space will be filled with 0 bytes. In a table, putting a key that is contained in the table prototype "
+         "will hide the association defined by the prototype, but will not mutate the prototype table. Putting "
+         "a value nil into a table will remove the key from the table. Returns the data structure ds."));
    janet_quick_asm(env, JANET_FUN_LENGTH,
                    "length", 1, 1, 1, 1, length_asm, sizeof(length_asm),
                    JDOC("(length ds)\n\n"
-                         "Returns the length or count of a data structure in constant time as an integer. For "
-                         "structs and tables, returns the number of key-value pairs in the data structure."));
+         "Returns the length or count of a data structure in constant time as an integer. For "
+         "structs and tables, returns the number of key-value pairs in the data structure."));
    janet_quick_asm(env, JANET_FUN_BNOT,
                    "bnot", 1, 1, 1, 1, bnot_asm, sizeof(bnot_asm),
                    JDOC("(bnot x)\n\nReturns the bit-wise inverse of integer x."));
@@ -1246,74 +1243,74 @@ JanetTable *janet_core_env(JanetTable *replacements) {
    /* Variadic ops */
    templatize_varop(env, JANET_FUN_ADD, "+", 0, 0, JOP_ADD,
                     JDOC("(+ & xs)\n\n"
-                          "Returns the sum of all xs. If xs is empty, return 0."));
+         "Returns the sum of all xs. xs must be integers or real numbers only. If xs is empty, return 0."));
    templatize_varop(env, JANET_FUN_SUBTRACT, "-", 0, 0, JOP_SUBTRACT,
                     JDOC("(- & xs)\n\n"
-                          "Returns the difference of xs. If xs is empty, returns 0. If xs has one element, returns the "
-                          "negative value of that element. Otherwise, returns the first element in xs minus the sum of "
-                          "the rest of the elements."));
+         "Returns the difference of xs. If xs is empty, returns 0. If xs has one element, returns the "
+         "negative value of that element. Otherwise, returns the first element in xs minus the sum of "
+         "the rest of the elements."));
    templatize_varop(env, JANET_FUN_MULTIPLY, "*", 1, 1, JOP_MULTIPLY,
                     JDOC("(* & xs)\n\n"
-                          "Returns the product of all elements in xs. If xs is empty, returns 1."));
+         "Returns the product of all elements in xs. If xs is empty, returns 1."));
    templatize_varop(env, JANET_FUN_DIVIDE, "/", 1, 1, JOP_DIVIDE,
                     JDOC("(/ & xs)\n\n"
-                          "Returns the quotient of xs. If xs is empty, returns 1. If xs has one value x, returns "
-                          "the reciprocal of x. Otherwise return the first value of xs repeatedly divided by the remaining "
-                          "values."));
+         "Returns the quotient of xs. If xs is empty, returns 1. If xs has one value x, returns "
+         "the reciprocal of x. Otherwise return the first value of xs repeatedly divided by the remaining "
+         "values."));
    templatize_varop(env, JANET_FUN_DIVIDE_FLOOR, "div", 1, 1, JOP_DIVIDE_FLOOR,
                     JDOC("(div & xs)\n\n"
-                          "Returns the floored division of xs. If xs is empty, returns 1. If xs has one value x, returns "
-                          "the reciprocal of x. Otherwise return the first value of xs repeatedly divided by the remaining "
-                          "values."));
+         "Returns the floored division of xs. If xs is empty, returns 1. If xs has one value x, returns "
+         "the reciprocal of x. Otherwise return the first value of xs repeatedly divided by the remaining "
+         "values."));
    templatize_varop(env, JANET_FUN_MODULO, "mod", 0, 1, JOP_MODULO,
                     JDOC("(mod & xs)\n\n"
-                          "Returns the result of applying the modulo operator on the first value of xs with each remaining value. "
-                          "`(mod x 0)` is defined to be `x`."));
+         "Returns the result of applying the modulo operator on the first value of xs with each remaining value. "
+         "`(mod x 0)` is defined to be `x`."));
    templatize_varop(env, JANET_FUN_REMAINDER, "%", 0, 1, JOP_REMAINDER,
                     JDOC("(% & xs)\n\n"
-                          "Returns the remainder of dividing the first value of xs by each remaining value."));
+         "Returns the remainder of dividing the first value of xs by each remaining value."));
    templatize_varop(env, JANET_FUN_BAND, "band", -1, -1, JOP_BAND,
                     JDOC("(band & xs)\n\n"
-                          "Returns the bit-wise and of all values in xs. Each x in xs must be an integer."));
+         "Returns the bit-wise and of all values in xs. Each x in xs must be an integer."));
    templatize_varop(env, JANET_FUN_BOR, "bor", 0, 0, JOP_BOR,
                     JDOC("(bor & xs)\n\n"
-                          "Returns the bit-wise or of all values in xs. Each x in xs must be an integer."));
+         "Returns the bit-wise or of all values in xs. Each x in xs must be an integer."));
    templatize_varop(env, JANET_FUN_BXOR, "bxor", 0, 0, JOP_BXOR,
                     JDOC("(bxor & xs)\n\n"
-                          "Returns the bit-wise xor of all values in xs. Each x in xs must be an integer."));
+         "Returns the bit-wise xor of all values in xs. Each in xs must be an integer."));
    templatize_varop(env, JANET_FUN_LSHIFT, "blshift", 1, 1, JOP_SHIFT_LEFT,
                     JDOC("(blshift x & shifts)\n\n"
-                          "Returns the value of x bit shifted left by the sum of all values in shifts. x "
-                          "and each element in shift must be an integer."));
+         "Returns the value of x bit shifted left by the sum of all values in shifts. x "
+         "and each element in shift must be an integer."));
    templatize_varop(env, JANET_FUN_RSHIFT, "brshift", 1, 1, JOP_SHIFT_RIGHT,
                     JDOC("(brshift x & shifts)\n\n"
-                          "Returns the value of x bit shifted right by the sum of all values in shifts. x "
-                          "and each element in shift must be an integer."));
+         "Returns the value of x bit shifted right by the sum of all values in shifts. x "
+         "and each element in shift must be an integer."));
    templatize_varop(env, JANET_FUN_RSHIFTU, "brushift", 1, 1, JOP_SHIFT_RIGHT_UNSIGNED,
                     JDOC("(brushift x & shifts)\n\n"
-                          "Returns the value of x bit shifted right by the sum of all values in shifts. x "
-                          "and each element in shift must be an integer. The sign of x is not preserved, so "
-                          "for positive shifts the return value will always be positive."));
+         "Returns the value of x bit shifted right by the sum of all values in shifts. x "
+         "and each element in shift must be an integer. The sign of x is not preserved, so "
+         "for positive shifts the return value will always be positive."));

    /* Variadic comparators */
    templatize_comparator(env, JANET_FUN_GT, ">", 0, JOP_GREATER_THAN,
                          JDOC("(> & xs)\n\n"
-                               "Check if xs is in descending order. Returns a boolean."));
+         "Check if xs is in descending order. Returns a boolean."));
    templatize_comparator(env, JANET_FUN_LT, "<", 0, JOP_LESS_THAN,
                          JDOC("(< & xs)\n\n"
-                               "Check if xs is in ascending order. Returns a boolean."));
+         "Check if xs is in ascending order. Returns a boolean."));
    templatize_comparator(env, JANET_FUN_GTE, ">=", 0, JOP_GREATER_THAN_EQUAL,
                          JDOC("(>= & xs)\n\n"
-                               "Check if xs is in non-ascending order. Returns a boolean."));
+         "Check if xs is in non-ascending order. Returns a boolean."));
    templatize_comparator(env, JANET_FUN_LTE, "<=", 0, JOP_LESS_THAN_EQUAL,
                          JDOC("(<= & xs)\n\n"
-                               "Check if xs is in non-descending order. Returns a boolean."));
+         "Check if xs is in non-descending order. Returns a boolean."));
    templatize_comparator(env, JANET_FUN_EQ, "=", 0, JOP_EQUALS,
                          JDOC("(= & xs)\n\n"
-                               "Check if all values in xs are equal. Returns a boolean."));
+         "Check if all values in xs are equal. Returns a boolean."));
    templatize_comparator(env, JANET_FUN_NEQ, "not=", 1, JOP_EQUALS,
                          JDOC("(not= & xs)\n\n"
-                               "Check if any values in xs are not equal. Returns a boolean."));
+         "Check if any values in xs are not equal. Returns a boolean."));

    /* Platform detection */
    janet_def(env, "janet/version", janet_cstringv(JANET_VERSION),
@@ -1322,7 +1319,7 @@ JanetTable *janet_core_env(JanetTable *replacements) {
              JDOC("The build identifier of the running janet program."));
    janet_def(env, "janet/config-bits", janet_wrap_integer(JANET_CURRENT_CONFIG_BITS),
              JDOC("The flag set of config options from janetconf.h which is used to check "
-                   "if native modules are compatible with the host program."));
+         "if native modules are compatible with the host program."));

    /* Allow references to the environment */
    janet_def(env, "root-env", janet_wrap_table(env),
@@ -1362,16 +1359,12 @@ JanetTable *janet_core_env(JanetTable *replacements) {
    lidv = midv = janet_wrap_nil();
    janet_resolve(env, janet_csymbol("load-image-dict"), &lidv);
    janet_resolve(env, janet_csymbol("make-image-dict"), &midv);
-
-    /* Check that we actually got tables - if we are using a smaller corelib, may not exist */
-    if (janet_checktype(lidv, JANET_TABLE) && janet_checktype(midv, JANET_TABLE)) {
-        JanetTable *lid = janet_unwrap_table(lidv);
-        JanetTable *mid = janet_unwrap_table(midv);
-        for (int32_t i = 0; i < lid->capacity; i++) {
-            const JanetKV *kv = lid->data + i;
-            if (!janet_checktype(kv->key, JANET_NIL)) {
-                janet_table_put(mid, kv->value, kv->key);
-            }
+    JanetTable *lid = janet_unwrap_table(lidv);
+    JanetTable *mid = janet_unwrap_table(midv);
+    for (int32_t i = 0; i < lid->capacity; i++) {
+        const JanetKV *kv = lid->data + i;
+        if (!janet_checktype(kv->key, JANET_NIL)) {
+            janet_table_put(mid, kv->value, kv->key);
        }
    }

--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/emit.c
+++ b/src/core/emit.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/emit.h
+++ b/src/core/emit.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/ev.c
+++ b/src/core/ev.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -117,9 +117,6 @@ typedef struct {
    double sec;
    JanetVM *vm;
    JanetFiber *fiber;
-#ifdef JANET_WINDOWS
-    HANDLE cancel_event;
-#endif
 } JanetThreadedTimeout;

 #define JANET_MAX_Q_CAPACITY 0x7FFFFFF
@@ -539,9 +536,6 @@ void janet_schedule_soon(JanetFiber *fiber, Janet value, JanetSignal sig) {
 }

 void janet_cancel(JanetFiber *fiber, Janet value) {
-    if (!(fiber->gc.flags & JANET_FIBER_FLAG_ROOT)) {
-        janet_panic("cannot cancel non-task fiber");
-    }
    janet_schedule_signal(fiber, value, JANET_SIGNAL_ERROR);
 }

@@ -610,43 +604,8 @@ void janet_ev_init_common(void) {
 #endif
 }

-#if JANET_ANDROID
-static void janet_timeout_stop(int sig_num) {
-    if (sig_num == SIGUSR1) {
-        pthread_exit(0);
-    }
-}
-#endif
-
-static void handle_timeout_worker(JanetTimeout to, int cancel) {
-    if (!to.has_worker) return;
-#ifdef JANET_WINDOWS
-    if (cancel && to.worker_event) {
-        SetEvent(to.worker_event);
-    }
-    WaitForSingleObject(to.worker, INFINITE);
-    CloseHandle(to.worker);
-    if (to.worker_event) {
-        CloseHandle(to.worker_event);
-    }
-#else
-#ifdef JANET_ANDROID
-    if (cancel) janet_assert(!pthread_kill(to.worker, SIGUSR1), "pthread_kill");
-#else
-    if (cancel) janet_assert(!pthread_cancel(to.worker), "pthread_cancel");
-#endif
-    void *res = NULL;
-    janet_assert(!pthread_join(to.worker, &res), "pthread_join");
-#endif
-}
-
 /* Common deinit code */
 void janet_ev_deinit_common(void) {
-    JanetTimeout to;
-    while (peek_timeout(&to)) {
-        handle_timeout_worker(to, 1);
-        pop_timeout(0);
-    }
    janet_q_deinit(&janet_vm.spawn);
    janet_free(janet_vm.tq);
    janet_table_deinit(&janet_vm.threaded_abstracts);
@@ -689,6 +648,19 @@ void janet_addtimeout_nil(double sec) {
    add_timeout(to);
 }

+#ifdef JANET_WINDOWS
+static VOID CALLBACK janet_timeout_stop(ULONG_PTR ptr) {
+    UNREFERENCED_PARAMETER(ptr);
+    ExitThread(0);
+}
+#elif JANET_ANDROID
+static void janet_timeout_stop(int sig_num) {
+    if (sig_num == SIGUSR1) {
+        pthread_exit(0);
+    }
+}
+#endif
+
 static void janet_timeout_cb(JanetEVGenericMessage msg) {
    (void) msg;
    janet_interpreter_interrupt_handled(&janet_vm);
@@ -698,16 +670,8 @@ static void janet_timeout_cb(JanetEVGenericMessage msg) {
 static DWORD WINAPI janet_timeout_body(LPVOID ptr) {
    JanetThreadedTimeout tto = *(JanetThreadedTimeout *)ptr;
    janet_free(ptr);
-    JanetTimestamp wait_begin = ts_now();
-    DWORD duration = (DWORD)round(tto.sec * 1000);
-    DWORD res = WAIT_TIMEOUT;
-    JanetTimestamp wait_end = ts_now();
-    for (DWORD i = 1; res == WAIT_TIMEOUT && (wait_end - wait_begin) < duration; i++) {
-        res = WaitForSingleObject(tto.cancel_event, (duration + i));
-        wait_end = ts_now();
-    }
-    /* only send interrupt message if result is WAIT_TIMEOUT */
-    if (res == WAIT_TIMEOUT) {
+    SleepEx((DWORD)(tto.sec * 1000), TRUE);
+    if (janet_fiber_can_resume(tto.fiber)) {
        janet_interpreter_interrupt(tto.vm);
        JanetEVGenericMessage msg = {0};
        janet_ev_post_event(tto.vm, janet_timeout_cb, msg);
@@ -732,9 +696,11 @@ static void *janet_timeout_body(void *ptr) {
                 ? (long)((tto.sec - ((uint32_t)tto.sec)) * 1000000000)
                 : 0;
    nanosleep(&ts, &ts);
-    janet_interpreter_interrupt(tto.vm);
-    JanetEVGenericMessage msg = {0};
-    janet_ev_post_event(tto.vm, janet_timeout_cb, msg);
+    if (janet_fiber_can_resume(tto.fiber)) {
+        janet_interpreter_interrupt(tto.vm);
+        JanetEVGenericMessage msg = {0};
+        janet_ev_post_event(tto.vm, janet_timeout_cb, msg);
+    }
    return NULL;
 }
 #endif
@@ -854,34 +820,6 @@ static int janet_chanat_gc(void *p, size_t s) {
    return 0;
 }

-static void janet_chanat_remove_vmref(JanetQueue *fq) {
-    JanetChannelPending *pending = fq->data;
-    if (fq->head <= fq->tail) {
-        for (int32_t i = fq->head; i < fq->tail; i++) {
-            if (pending[i].thread == &janet_vm) pending[i].thread = NULL;
-        }
-    } else {
-        for (int32_t i = fq->head; i < fq->capacity; i++) {
-            if (pending[i].thread == &janet_vm) pending[i].thread = NULL;
-        }
-        for (int32_t i = 0; i < fq->tail; i++) {
-            if (pending[i].thread == &janet_vm) pending[i].thread = NULL;
-        }
-    }
-}
-
-static int janet_chanat_gcperthread(void *p, size_t s) {
-    (void) s;
-    JanetChannel *chan = p;
-    janet_chan_lock(chan);
-    /* Make sure that the internals of the threaded channel no longer reference _this_ thread. Replace
-     * those references with NULL. */
-    janet_chanat_remove_vmref(&chan->read_pending);
-    janet_chanat_remove_vmref(&chan->write_pending);
-    janet_chan_unlock(chan);
-    return 0;
-}
-
 static void janet_chanat_mark_fq(JanetQueue *fq) {
    JanetChannelPending *pending = fq->data;
    if (fq->head <= fq->tail) {
@@ -964,9 +902,8 @@ static void janet_thread_chan_cb(JanetEVGenericMessage msg) {
        int is_read = (mode == JANET_CP_MODE_CHOICE_READ) || (mode == JANET_CP_MODE_READ);
        if (is_read) {
            JanetChannelPending reader;
-            while (!janet_q_pop(&channel->read_pending, &reader, sizeof(reader))) {
+            if (!janet_q_pop(&channel->read_pending, &reader, sizeof(reader))) {
                JanetVM *vm = reader.thread;
-                if (!vm) continue;
                JanetEVGenericMessage msg;
                msg.tag = reader.mode;
                msg.fiber = reader.fiber;
@@ -974,13 +911,11 @@ static void janet_thread_chan_cb(JanetEVGenericMessage msg) {
                msg.argp = channel;
                msg.argj = x;
                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-                break;
            }
        } else {
            JanetChannelPending writer;
-            while (!janet_q_pop(&channel->write_pending, &writer, sizeof(writer))) {
+            if (!janet_q_pop(&channel->write_pending, &writer, sizeof(writer))) {
                JanetVM *vm = writer.thread;
-                if (!vm) continue;
                JanetEVGenericMessage msg;
                msg.tag = writer.mode;
                msg.fiber = writer.fiber;
@@ -988,7 +923,6 @@ static void janet_thread_chan_cb(JanetEVGenericMessage msg) {
                msg.argp = channel;
                msg.argj = janet_wrap_nil();
                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-                break;
            }
        }
    }
@@ -1052,9 +986,7 @@ static int janet_channel_push_with_lock(JanetChannel *channel, Janet x, int mode
            msg.argi = (int32_t) reader.sched_id;
            msg.argp = channel;
            msg.argj = x;
-            if (vm) {
-                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-            }
+            janet_ev_post_event(vm, janet_thread_chan_cb, msg);
        } else {
            if (reader.mode == JANET_CP_MODE_CHOICE_READ) {
                janet_schedule(reader.fiber, make_read_result(channel, x));
@@ -1085,7 +1017,7 @@ static int janet_channel_pop_with_lock(JanetChannel *channel, Janet *item, int i
    int is_threaded = janet_chan_is_threaded(channel);
    if (janet_q_pop(&channel->items, item, sizeof(Janet))) {
        /* Queue empty */
-        if (is_choice == 2) return 0; /* Skip pending read */
+        if (is_choice == 2) return 0; // Skip pending read
        JanetChannelPending pending;
        pending.thread = &janet_vm;
        pending.fiber = janet_vm.root_fiber,
@@ -1109,9 +1041,7 @@ static int janet_channel_pop_with_lock(JanetChannel *channel, Janet *item, int i
            msg.argi = (int32_t) writer.sched_id;
            msg.argp = channel;
            msg.argj = janet_wrap_nil();
-            if (vm) {
-                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-            }
+            janet_ev_post_event(vm, janet_thread_chan_cb, msg);
        } else {
            if (writer.mode == JANET_CP_MODE_CHOICE_WRITE) {
                janet_schedule(writer.fiber, make_write_result(channel));
@@ -1272,13 +1202,11 @@ JANET_CORE_FN(cfun_channel_choice,
        if (janet_indexed_view(argv[i], &data, &len) && len == 2) {
            /* Write */
            JanetChannel *chan = janet_getchannel(data, 0);
-            janet_chan_lock(chan);
            janet_channel_push_with_lock(chan, data[1], 1);
        } else {
            /* Read */
            Janet item;
            JanetChannel *chan = janet_getchannel(argv, i);
-            janet_chan_lock(chan);
            janet_channel_pop_with_lock(chan, &item, 1);
        }
    }
@@ -1377,11 +1305,9 @@ JANET_CORE_FN(cfun_channel_close,
                msg.tag = JANET_CP_MODE_CLOSE;
                msg.argi = (int32_t) writer.sched_id;
                msg.argj = janet_wrap_nil();
-                if (vm) {
-                    janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-                }
+                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
            } else {
-                if (janet_fiber_can_resume(writer.fiber) && writer.sched_id == writer.fiber->sched_id) {
+                if (janet_fiber_can_resume(writer.fiber)) {
                    if (writer.mode == JANET_CP_MODE_CHOICE_WRITE) {
                        janet_schedule(writer.fiber, make_close_result(channel));
                    } else {
@@ -1400,11 +1326,9 @@ JANET_CORE_FN(cfun_channel_close,
                msg.tag = JANET_CP_MODE_CLOSE;
                msg.argi = (int32_t) reader.sched_id;
                msg.argj = janet_wrap_nil();
-                if (vm) {
-                    janet_ev_post_event(vm, janet_thread_chan_cb, msg);
-                }
+                janet_ev_post_event(vm, janet_thread_chan_cb, msg);
            } else {
-                if (janet_fiber_can_resume(reader.fiber) && reader.sched_id == reader.fiber->sched_id) {
+                if (janet_fiber_can_resume(reader.fiber)) {
                    if (reader.mode == JANET_CP_MODE_CHOICE_READ) {
                        janet_schedule(reader.fiber, make_close_result(channel));
                    } else {
@@ -1495,10 +1419,7 @@ const JanetAbstractType janet_channel_type = {
    NULL, /* compare */
    NULL, /* hash */
    janet_chanat_next,
-    NULL, /* call */
-    NULL, /* length */
-    NULL, /* bytes */
-    janet_chanat_gcperthread
+    JANET_ATEND_NEXT
 };

 /* Main event loop */
@@ -1531,7 +1452,6 @@ JanetFiber *janet_loop1(void) {
                }
            }
        }
-        handle_timeout_worker(to, 0);
    }

    /* Run scheduled fibers unless interrupts need to be handled. */
@@ -1579,14 +1499,27 @@ JanetFiber *janet_loop1(void) {
        while ((has_timeout = peek_timeout(&to))) {
            if (to.curr_fiber != NULL) {
                if (!janet_fiber_can_resume(to.curr_fiber)) {
-                    pop_timeout(0);
+                    if (to.has_worker) {
+#ifdef JANET_WINDOWS
+                        QueueUserAPC(janet_timeout_stop, to.worker, 0);
+                        WaitForSingleObject(to.worker, INFINITE);
+                        CloseHandle(to.worker);
+#else
+#ifdef JANET_ANDROID
+                        pthread_kill(to.worker, SIGUSR1);
+#else
+                        pthread_cancel(to.worker);
+#endif
+                        void *res;
+                        pthread_join(to.worker, &res);
+#endif
+                    }
                    janet_table_remove(&janet_vm.active_tasks, janet_wrap_fiber(to.curr_fiber));
-                    handle_timeout_worker(to, 1);
+                    pop_timeout(0);
                    continue;
                }
            } else if (to.fiber->sched_id != to.sched_id) {
                pop_timeout(0);
-                handle_timeout_worker(to, 1);
                continue;
            }
            break;
@@ -1751,7 +1684,7 @@ void janet_stream_level_triggered(JanetStream *stream) {

 static JanetTimestamp ts_now(void) {
    struct timespec now;
-    janet_assert(-1 != janet_gettime(&now, JANET_TIME_MONOTONIC), "failed to get time");
+    janet_assert(-1 != clock_gettime(CLOCK_MONOTONIC, &now), "failed to get time");
    uint64_t res = 1000 * now.tv_sec;
    res += now.tv_nsec / 1000000;
    return res;
@@ -1909,7 +1842,7 @@ JanetTimestamp to_interval(const JanetTimestamp ts) {

 static JanetTimestamp ts_now(void) {
    struct timespec now;
-    janet_assert(-1 != janet_gettime(&now, JANET_TIME_MONOTONIC), "failed to get time");
+    janet_assert(-1 != clock_gettime(CLOCK_MONOTONIC, &now), "failed to get time");
    uint64_t res = 1000 * now.tv_sec;
    res += now.tv_nsec / 1000000;
    return res;
@@ -2063,7 +1996,7 @@ void janet_ev_deinit(void) {

 static JanetTimestamp ts_now(void) {
    struct timespec now;
-    janet_assert(-1 != janet_gettime(&now, JANET_TIME_MONOTONIC), "failed to get time");
+    janet_assert(-1 != clock_gettime(CLOCK_REALTIME, &now), "failed to get time");
    uint64_t res = 1000 * now.tv_sec;
    res += now.tv_nsec / 1000000;
    return res;
@@ -2235,7 +2168,7 @@ void janet_ev_post_event(JanetVM *vm, JanetCallback cb, JanetEVGenericMessage ms
    event.cb = cb;
    int fd = vm->selfpipe[1];
    /* handle a bit of back pressure before giving up. */
-    int tries = 20;
+    int tries = 4;
    while (tries > 0) {
        int status;
        do {
@@ -3007,14 +2940,12 @@ error:

 JANET_CORE_FN(cfun_ev_go,
              "(ev/go fiber-or-fun &opt value supervisor)",
-              "Put a fiber on the event loop to be resumed later. If a "
-              "function is used, it is wrapped with `fiber/new` first. "
-              "Returns a task fiber. Optionally pass a value to resume "
-              "with, otherwise resumes with nil. An optional `core/channel` "
-              "can be provided as a supervisor. When various events occur "
-              "in the newly scheduled fiber, an event will be pushed to the "
-              "supervisor. If not provided, the new fiber will inherit the "
-              "current supervisor.") {
+              "Put a fiber on the event loop to be resumed later. If a function is used, it is wrapped "
+              "with `fiber/new` first. "
+              "Optionally pass a value to resume with, otherwise resumes with nil. Returns the fiber. "
+              "An optional `core/channel` can be provided as a supervisor. When various "
+              "events occur in the newly scheduled fiber, an event will be pushed to the supervisor. "
+              "If not provided, the new fiber will inherit the current supervisor.") {
    janet_arity(argc, 1, 3);
    Janet value = argc >= 2 ? argv[1] : janet_wrap_nil();
    void *supervisor = janet_optabstract(argv, argc, 2, &janet_channel_type, janet_vm.root_fiber->supervisor_channel);
@@ -3040,9 +2971,6 @@ JANET_CORE_FN(cfun_ev_go,
        fiber->env->proto = janet_vm.fiber->env;
    } else {
        fiber = janet_getfiber(argv, 0);
-        if (janet_fiber_status(fiber) != JANET_STATUS_NEW) {
-            janet_panic("can only schedule new fibers where (= (fiber/status f) :new)");
-        }
    }
    fiber->supervisor_channel = supervisor;
    janet_schedule(fiber, value);
@@ -3178,7 +3106,6 @@ JANET_CORE_FN(cfun_ev_thread,
              "* `:t` - set the task-id of the new thread to value. The task-id is passed in messages to the supervisor channel.\n"
              "* `:a` - don't copy abstract registry to new thread (performance optimization)\n"
              "* `:c` - don't copy cfunction registry to new thread (performance optimization)") {
-    janet_sandbox_assert(JANET_SANDBOX_THREADS);
    janet_arity(argc, 1, 4);
    Janet value = argc >= 2 ? argv[1] : janet_wrap_nil();
    if (!janet_checktype(argv[0], JANET_FUNCTION)) janet_getfiber(argv, 0);
@@ -3247,7 +3174,6 @@ JANET_NO_RETURN void janet_sleep_await(double sec) {
    to.is_error = 0;
    to.sched_id = to.fiber->sched_id;
    to.curr_fiber = NULL;
-    to.has_worker = 0;
    add_timeout(to);
    janet_await();
 }
@@ -3293,13 +3219,7 @@ JANET_CORE_FN(cfun_ev_deadline,
        tto->vm = &janet_vm;
        tto->fiber = tocheck;
 #ifdef JANET_WINDOWS
-        HANDLE cancel_event = CreateEvent(NULL, TRUE, FALSE, NULL);
-        if (NULL == cancel_event) {
-            janet_free(tto);
-            janet_panic("failed to create cancel event");
-        }
-        tto->cancel_event = cancel_event;
-        HANDLE worker = CreateThread(NULL, 0, janet_timeout_body, tto, CREATE_SUSPENDED, NULL);
+        HANDLE worker = CreateThread(NULL, 0, janet_timeout_body, tto, 0, NULL);
        if (NULL == worker) {
            janet_free(tto);
            janet_panic("failed to create thread");
@@ -3311,13 +3231,10 @@ JANET_CORE_FN(cfun_ev_deadline,
            janet_free(tto);
            janet_panicf("%s", janet_strerror(err));
        }
+        janet_assert(!pthread_detach(worker), "pthread_detach");
 #endif
        to.has_worker = 1;
        to.worker = worker;
-#ifdef JANET_WINDOWS
-        to.worker_event = cancel_event;
-        ResumeThread(worker);
-#endif
    } else {
        to.has_worker = 0;
    }
@@ -3327,8 +3244,7 @@ JANET_CORE_FN(cfun_ev_deadline,

 JANET_CORE_FN(cfun_ev_cancel,
              "(ev/cancel fiber err)",
-              "Cancel a suspended task fiber in the event loop. Differs from "
-              "`cancel` in that it returns the canceled fiber immediately.") {
+              "Cancel a suspended fiber in the event loop. Differs from cancel in that it returns the canceled fiber immediately.") {
    janet_fixarity(argc, 2);
    JanetFiber *fiber = janet_getfiber(argv, 0);
    Janet err = argv[1];
@@ -3561,7 +3477,7 @@ JANET_CORE_FN(janet_cfun_to_file,

 JANET_CORE_FN(janet_cfun_ev_all_tasks,
              "(ev/all-tasks)",
-              "Get an array of all active task fibers that are being used by the scheduler.") {
+              "Get an array of all active fibers that are being used by the scheduler.") {
    janet_fixarity(argc, 0);
    (void) argv;
    JanetArray *array = janet_array(janet_vm.active_tasks.count);
@@ -3613,6 +3529,8 @@ void janet_lib_ev(JanetTable *env) {
    janet_register_abstract_type(&janet_channel_type);
    janet_register_abstract_type(&janet_mutex_type);
    janet_register_abstract_type(&janet_rwlock_type);
+
+    janet_lib_filewatch(env);
 }

 #endif
--- a/src/core/features.h
+++ b/src/core/features.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/ffi.c
+++ b/src/core/ffi.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -1344,15 +1344,6 @@ typedef double (win64_variant_f_ffif)(double, double, uint64_t, double);
 typedef double (win64_variant_f_fffi)(double, double, double, uint64_t);
 typedef double (win64_variant_f_ffff)(double, double, double, double);

-/* MSVC stack frame runtime error checking (/RTCs) prepends alloca() allocations with an _RTC_ALLOCA_NODE
- * header; misalligning stack-based FFI arguments and causing the memmove() (by stack_shift) to corrupt
- * the _RTC_ALLOCA_NODE header.
- *
- * We turn off the RTC-instrumented alloca() and adding of _RTC_CheckStackVars to function prologue just
- * for janet_ffi_win64() */
-#ifdef __MSVC_RUNTIME_CHECKS
-#pragma runtime_checks( "s", off )
-#endif
 static Janet janet_ffi_win64(JanetFFISignature *signature, void *function_pointer, const Janet *argv) {
    union {
        uint64_t integer;
@@ -1502,10 +1493,6 @@ static Janet janet_ffi_win64(JanetFFISignature *signature, void *function_pointe

    return janet_ffi_read_one(ret_mem, signature->ret.type, JANET_FFI_MAX_RECUR);
 }
-#ifdef __MSVC_RUNTIME_CHECKS
-// Restore stack frame runtime error checking (/RTCs) if it was enabled.
-#pragma runtime_checks ( "s", restore )
-#endif

 #endif

--- a/src/core/fiber.c
+++ b/src/core/fiber.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -610,9 +610,8 @@ JANET_CORE_FN(cfun_fiber_current,

 JANET_CORE_FN(cfun_fiber_root,
              "(fiber/root)",
-              "Returns the current root fiber. The root fiber is the oldest "
-              "ancestor that does not have a parent. Note that a root fiber "
-              "is also a task fiber.") {
+              "Returns the current root fiber. The root fiber is the oldest ancestor "
+              "that does not have a parent.") {
    (void) argv;
    janet_fixarity(argc, 0);
    return janet_wrap_fiber(janet_vm.root_fiber);
--- a/src/core/fiber.h
+++ b/src/core/fiber.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/filewatch.c
+++ b/src/core/filewatch.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -521,23 +521,23 @@ static void janet_watcher_add(JanetWatcher *watcher, const char *path, uint32_t
    (void) watcher;
    (void) flags;
    (void) path;
-    janet_panic("filewatch not supported on this platform");
+    janet_panic("nyi");
 }

 static void janet_watcher_remove(JanetWatcher *watcher, const char *path) {
    (void) watcher;
    (void) path;
-    janet_panic("filewatch not supported on this platform");
+    janet_panic("nyi");
 }

 static void janet_watcher_listen(JanetWatcher *watcher) {
    (void) watcher;
-    janet_panic("filewatch not supported on this platform");
+    janet_panic("nyi");
 }

 static void janet_watcher_unlisten(JanetWatcher *watcher) {
    (void) watcher;
-    janet_panic("filewatch not supported on this platform");
+    janet_panic("nyi");
 }

 #endif
@@ -573,7 +573,7 @@ static const JanetAbstractType janet_filewatch_at = {
 };

 JANET_CORE_FN(cfun_filewatch_make,
-              "(filewatch/new channel & default-flags)",
+              "(filewatch/new channel &opt default-flags)",
              "Create a new filewatcher that will give events to a channel channel. See `filewatch/add` for available flags.\n\n"
              "When an event is triggered by the filewatcher, a struct containing information will be given to channel as with `ev/give`. "
              "The contents of the channel depend on the OS, but will contain some common keys:\n\n"
@@ -597,7 +597,7 @@ JANET_CORE_FN(cfun_filewatch_make,
 }

 JANET_CORE_FN(cfun_filewatch_add,
-              "(filewatch/add watcher path flag & more-flags)",
+              "(filewatch/add watcher path &opt flags)",
              "Add a path to the watcher. Available flags depend on the current OS, and are as follows:\n\n"
              "Windows/MINGW (flags correspond to `FILE_NOTIFY_CHANGE_*` flags in win32 documentation):\n\n"
              "* `:all` - trigger an event for all of the below triggers.\n\n"
@@ -633,7 +633,7 @@ JANET_CORE_FN(cfun_filewatch_add,
              "* `:modified`\n\n"
              "* `:renamed-old`\n\n"
              "* `:renamed-new`\n\n"
-              "On Linux, events will have a `:type` corresponding to the possible flags, excluding `:all`.\n"
+              "On Linux, events will a `:type` corresponding to the possible flags, excluding `:all`.\n"
              "") {
    janet_arity(argc, 2, -1);
    JanetWatcher *watcher = janet_getabstract(argv, 0, &janet_filewatch_at);
--- a/src/core/gc.c
+++ b/src/core/gc.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -346,9 +346,6 @@ static void janet_deinit_block(JanetGCObject *mem) {
            break;
        case JANET_MEMORY_ABSTRACT: {
            JanetAbstractHead *head = (JanetAbstractHead *)mem;
-            if (head->type->gcperthread) {
-                janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
-            }
            if (head->type->gc) {
                janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
            }
@@ -500,11 +497,15 @@ void janet_sweep() {
            /* If not visited... */
            if (!janet_truthy(items[i].value)) {
                void *abst = janet_unwrap_abstract(items[i].key);
-                JanetAbstractHead *head = janet_abstract_head(abst);
-                if (head->type->gcperthread) {
-                    janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
+                if (0 == janet_abstract_decref(abst)) {
+                    /* Run finalizer */
+                    JanetAbstractHead *head = janet_abstract_head(abst);
+                    if (head->type->gc) {
+                        janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
+                    }
+                    /* Free memory */
+                    janet_free(janet_abstract_head(abst));
                }
-                janet_abstract_decref_maybe_free(abst);

                /* Mark as tombstone in place */
                items[i].key = janet_wrap_nil();
@@ -671,11 +672,13 @@ void janet_clear_memory(void) {
    for (int32_t i = 0; i < janet_vm.threaded_abstracts.capacity; i++) {
        if (janet_checktype(items[i].key, JANET_ABSTRACT)) {
            void *abst = janet_unwrap_abstract(items[i].key);
-            JanetAbstractHead *head = janet_abstract_head(abst);
-            if (head->type->gcperthread) {
-                janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
+            if (0 == janet_abstract_decref(abst)) {
+                JanetAbstractHead *head = janet_abstract_head(abst);
+                if (head->type->gc) {
+                    janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
+                }
+                janet_free(janet_abstract_head(abst));
            }
-            janet_abstract_decref_maybe_free(abst);
        }
    }
 #endif
--- a/src/core/gc.h
+++ b/src/core/gc.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/inttypes.c
+++ b/src/core/inttypes.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose & contributors
+* Copyright (c) 2025 Calvin Rose & contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/io.c
+++ b/src/core/io.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -113,7 +113,7 @@ static void *makef(FILE *f, int32_t flags) {
    JanetFile *iof = (JanetFile *) janet_abstract(&janet_file_type, sizeof(JanetFile));
    iof->file = f;
    iof->flags = flags;
-#if !(defined(JANET_WINDOWS) || defined(JANET_PLAN9))
+#ifndef JANET_WINDOWS
    /* While we would like fopen to set cloexec by default (like O_CLOEXEC) with the e flag, that is
     * not standard. */
    if (!(flags & JANET_FILE_NOT_CLOSEABLE))
@@ -165,7 +165,7 @@ JANET_CORE_FN(cfun_io_fopen,
    }
    FILE *f = fopen((const char *)fname, (const char *)fmode);
    if (f != NULL) {
-#if !(defined(JANET_WINDOWS) || defined(JANET_PLAN9))
+#ifndef JANET_WINDOWS
        struct stat st;
        fstat(fileno(f), &st);
        if (S_ISDIR(st.st_mode)) {
@@ -249,9 +249,9 @@ JANET_CORE_FN(cfun_io_fread,

 /* Write bytes to a file */
 JANET_CORE_FN(cfun_io_fwrite,
-              "(file/write f & bytes)",
-              "Writes to a file `f`. Each value of `bytes` must be a "
-              "string, buffer, symbol, or keyword. Returns the file.") {
+              "(file/write f bytes)",
+              "Writes to a file. 'bytes' must be string, buffer, or symbol. Returns the "
+              "file.") {
    janet_arity(argc, 1, -1);
    JanetFile *iof = janet_getabstract(argv, 0, &janet_file_type);
    if (iof->flags & JANET_FILE_CLOSED)
@@ -721,15 +721,8 @@ JANET_CORE_FN(cfun_io_eflush,
 void janet_dynprintf(const char *name, FILE *dflt_file, const char *format, ...) {
    va_list args;
    va_start(args, format);
-    JanetType xtype;
-    Janet x;
-    if (!name || name[0] == '\0') { /* Allow NULL or empty string to just use dflt_file directly */
-        x = janet_wrap_nil();
-        xtype = JANET_NIL;
-    } else {
-        x = janet_dyn(name);
-        xtype = janet_type(x);
-    }
+    Janet x = janet_dyn(name);
+    JanetType xtype = janet_type(x);
    switch (xtype) {
        default:
            /* Other values simply do nothing */
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -276,8 +276,6 @@ static void marshal_one_def(MarshalState *st, JanetFuncDef *def, int flags) {
    pushint(st, def->max_arity);
    pushint(st, def->constants_length);
    pushint(st, def->bytecode_length);
-    if (def->flags & JANET_FUNCDEF_FLAG_NAMEDARGS)
-        pushint(st, def->named_args_count);
    if (def->flags & JANET_FUNCDEF_FLAG_HASENVS)
        pushint(st, def->environments_length);
    if (def->flags & JANET_FUNCDEF_FLAG_HASDEFS)
@@ -916,7 +914,6 @@ static const uint8_t *unmarshal_one_def(
        def->sourcemap = NULL;
        def->symbolmap = NULL;
        def->symbolmap_length = 0;
-        def->named_args_count = 0;
        janet_v_push(st->lookup_defs, def);

        /* Set default lengths to zero */
@@ -936,8 +933,6 @@ static const uint8_t *unmarshal_one_def(
        /* Read some lengths */
        constants_length = readnat(st, &data);
        bytecode_length = readnat(st, &data);
-        if (def->flags & JANET_FUNCDEF_FLAG_NAMEDARGS)
-            def->named_args_count = readnat(st, &data);
        if (def->flags & JANET_FUNCDEF_FLAG_HASENVS)
            environments_length = readnat(st, &data);
        if (def->flags & JANET_FUNCDEF_FLAG_HASDEFS)
@@ -1698,7 +1693,6 @@ JANET_CORE_FN(cfun_unmarshal,
              "Unmarshal a value from a buffer. An optional lookup table "
              "can be provided to allow for aliases to be resolved. Returns the value "
              "unmarshalled from the buffer.") {
-    janet_sandbox_assert(JANET_SANDBOX_UNMARSHAL);
    janet_arity(argc, 1, 2);
    JanetByteView view = janet_getbytes(argv, 0);
    JanetTable *reg = NULL;
--- a/src/core/math.c
+++ b/src/core/math.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -271,30 +271,28 @@ JANET_DEFINE_MATHOP(cosh, "Returns the hyperbolic cosine of x.")
 JANET_DEFINE_MATHOP(acosh, "Returns the hyperbolic arccosine of x.")
 JANET_DEFINE_MATHOP(sin, "Returns the sine of x.")
 JANET_DEFINE_MATHOP(sinh, "Returns the hyperbolic sine of x.")
+JANET_DEFINE_MATHOP(asinh, "Returns the hyperbolic arcsine of x.")
 JANET_DEFINE_MATHOP(tan, "Returns the tangent of x.")
 JANET_DEFINE_MATHOP(tanh, "Returns the hyperbolic tangent of x.")
+JANET_DEFINE_MATHOP(atanh, "Returns the hyperbolic arctangent of x.")
 JANET_DEFINE_MATHOP(exp, "Returns e to the power of x.")
 JANET_DEFINE_MATHOP(exp2, "Returns 2 to the power of x.")
-JANET_DEFINE_MATHOP(log1p, "Returns (log base e of x) + 1 more accurately than (+ (math/log x) 1)")
-#ifndef JANET_PLAN9
 JANET_DEFINE_MATHOP(expm1, "Returns e to the power of x minus 1.")
-JANET_DEFINE_MATHOP(cbrt, "Returns the cube root of x.")
-JANET_DEFINE_MATHOP(erf, "Returns the error function of x.")
-JANET_DEFINE_MATHOP(erfc, "Returns the complementary error function of x.")
-JANET_DEFINE_NAMED_MATHOP("log-gamma", lgamma, "Returns log-gamma(x).")
-JANET_DEFINE_NAMED_MATHOP("gamma", tgamma, "Returns gamma(x).")
-JANET_DEFINE_MATHOP(atanh, "Returns the hyperbolic arctangent of x.")
-JANET_DEFINE_MATHOP(asinh, "Returns the hyperbolic arcsine of x.")
-#endif
 JANET_DEFINE_MATHOP(log, "Returns the natural logarithm of x.")
 JANET_DEFINE_MATHOP(log10, "Returns the log base 10 of x.")
 JANET_DEFINE_MATHOP(log2, "Returns the log base 2 of x.")
 JANET_DEFINE_MATHOP(sqrt, "Returns the square root of x.")
+JANET_DEFINE_MATHOP(cbrt, "Returns the cube root of x.")
 JANET_DEFINE_MATHOP(ceil, "Returns the smallest integer value number that is not less than x.")
 JANET_DEFINE_MATHOP(floor, "Returns the largest integer value number that is not greater than x.")
 JANET_DEFINE_MATHOP(trunc, "Returns the integer between x and 0 nearest to x.")
 JANET_DEFINE_MATHOP(round, "Returns the integer nearest to x.")
+JANET_DEFINE_MATHOP(log1p, "Returns (log base e of x) + 1 more accurately than (+ (math/log x) 1)")
+JANET_DEFINE_MATHOP(erf, "Returns the error function of x.")
+JANET_DEFINE_MATHOP(erfc, "Returns the complementary error function of x.")
+JANET_DEFINE_NAMED_MATHOP("log-gamma", lgamma, "Returns log-gamma(x).")
 JANET_DEFINE_NAMED_MATHOP("abs", fabs, "Return the absolute value of x.")
+JANET_DEFINE_NAMED_MATHOP("gamma", tgamma, "Returns gamma(x).")

 #define JANET_DEFINE_MATH2OP(name, fop, signature, doc)\
 JANET_CORE_FN(janet_##name, signature, doc) {\
@@ -307,9 +305,7 @@ JANET_CORE_FN(janet_##name, signature, doc) {\
 JANET_DEFINE_MATH2OP(atan2, atan2, "(math/atan2 y x)", "Returns the arctangent of y/x. Works even when x is 0.")
 JANET_DEFINE_MATH2OP(pow, pow, "(math/pow a x)", "Returns a to the power of x.")
 JANET_DEFINE_MATH2OP(hypot, hypot, "(math/hypot a b)", "Returns c from the equation c^2 = a^2 + b^2.")
-#ifndef JANET_PLAN9
 JANET_DEFINE_MATH2OP(nextafter, nextafter,  "(math/next x y)", "Returns the next representable floating point value after x in the direction of y.")
-#endif

 JANET_CORE_FN(janet_not, "(not x)", "Returns the boolean inverse of x.") {
    janet_fixarity(argc, 1);
@@ -390,17 +386,7 @@ void janet_lib_math(JanetTable *env) {
        JANET_CORE_REG("math/log10", janet_log10),
        JANET_CORE_REG("math/log2", janet_log2),
        JANET_CORE_REG("math/sqrt", janet_sqrt),
-#ifndef JANET_PLAN9
        JANET_CORE_REG("math/cbrt", janet_cbrt),
-        JANET_CORE_REG("math/gamma", janet_tgamma),
-        JANET_CORE_REG("math/log-gamma", janet_lgamma),
-        JANET_CORE_REG("math/erfc", janet_erfc),
-        JANET_CORE_REG("math/erf", janet_erf),
-        JANET_CORE_REG("math/expm1", janet_expm1),
-        JANET_CORE_REG("math/atanh", janet_atanh),
-        JANET_CORE_REG("math/asinh", janet_asinh),
-        JANET_CORE_REG("math/next", janet_nextafter),
-#endif
        JANET_CORE_REG("math/floor", janet_floor),
        JANET_CORE_REG("math/ceil", janet_ceil),
        JANET_CORE_REG("math/pow", janet_pow),
@@ -408,6 +394,8 @@ void janet_lib_math(JanetTable *env) {
        JANET_CORE_REG("math/sinh", janet_sinh),
        JANET_CORE_REG("math/cosh", janet_cosh),
        JANET_CORE_REG("math/tanh", janet_tanh),
+        JANET_CORE_REG("math/atanh", janet_atanh),
+        JANET_CORE_REG("math/asinh", janet_asinh),
        JANET_CORE_REG("math/acosh", janet_acosh),
        JANET_CORE_REG("math/atan2", janet_atan2),
        JANET_CORE_REG("math/rng", cfun_rng_make),
@@ -417,8 +405,14 @@ void janet_lib_math(JanetTable *env) {
        JANET_CORE_REG("math/hypot", janet_hypot),
        JANET_CORE_REG("math/exp2", janet_exp2),
        JANET_CORE_REG("math/log1p", janet_log1p),
+        JANET_CORE_REG("math/gamma", janet_tgamma),
+        JANET_CORE_REG("math/log-gamma", janet_lgamma),
+        JANET_CORE_REG("math/erfc", janet_erfc),
+        JANET_CORE_REG("math/erf", janet_erf),
+        JANET_CORE_REG("math/expm1", janet_expm1),
        JANET_CORE_REG("math/trunc", janet_trunc),
        JANET_CORE_REG("math/round", janet_round),
+        JANET_CORE_REG("math/next", janet_nextafter),
        JANET_CORE_REG("math/gcd", janet_cfun_gcd),
        JANET_CORE_REG("math/lcm", janet_cfun_lcm),
        JANET_CORE_REG("math/frexp", janet_cfun_frexp),
@@ -441,9 +435,9 @@ void janet_lib_math(JanetTable *env) {
    JANET_CORE_DEF(env, "math/int32-max", janet_wrap_number(INT32_MAX),
                   "The maximum contiguous integer representable by a 32 bit signed integer");
    JANET_CORE_DEF(env, "math/int-min", janet_wrap_number(JANET_INTMIN_DOUBLE),
-                   "The minimum contiguous integer representable by a double (-(2^53))");
+                   "The minimum contiguous integer representable by a double (2^53)");
    JANET_CORE_DEF(env, "math/int-max", janet_wrap_number(JANET_INTMAX_DOUBLE),
-                   "The maximum contiguous integer representable by a double (2^53)");
+                   "The maximum contiguous integer representable by a double (-(2^53))");
 #ifdef NAN
    JANET_CORE_DEF(env, "math/nan", janet_wrap_number(NAN), "Not a number (IEEE-754 NaN)");
 #else
--- a/src/core/net.c
+++ b/src/core/net.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose and contributors.
+* Copyright (c) 2025 Calvin Rose and contributors.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -120,25 +120,6 @@ static void janet_net_socknoblock(JSock s) {
 #endif
 }

-/* Allow specifying IPV6 vs. IPV4 (or unix domain socket) */
-static int net_get_address_family(Janet x) {
-    if (janet_checktype(x, JANET_NIL)) {
-        return AF_UNSPEC;
-    }
-    if (janet_keyeq(x, "ipv4")) {
-        return AF_INET;
-    }
-    if (janet_keyeq(x, "ipv6")) {
-        return AF_INET6;
-    }
-#ifndef JANET_WINDOWS
-    if (janet_keyeq(x, "unix")) {
-        return AF_UNIX;
-    }
-#endif
-    return AF_UNSPEC;
-}
-
 /* State machine for async connect */

 void net_callback_connect(JanetFiber *fiber, JanetAsyncEvent event) {
@@ -360,7 +341,7 @@ static int janet_get_sockettype(Janet *argv, int32_t argc, int32_t n) {
 /* Needs argc >= offset + 2 */
 /* For unix paths, just rertuns a single sockaddr and sets *is_unix to 1,
 * otherwise 0. Also, ignores is_bind when is a unix socket. */
-static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset, int socktype, int passive, int *is_unix, socklen_t *sizeout) {
+static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset, int socktype, int passive, int *is_unix) {
    /* Unix socket support - not yet supported on windows. */
 #ifndef JANET_WINDOWS
    if (janet_keyeq(argv[offset], "unix")) {
@@ -371,14 +352,15 @@ static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset, int sock
        }
        saddr->sun_family = AF_UNIX;
        size_t path_size = sizeof(saddr->sun_path);
-        snprintf(saddr->sun_path, path_size, "%s", path);
-        *sizeout = sizeof(struct sockaddr_un);
 #ifdef JANET_LINUX
        if (path[0] == '@') {
            saddr->sun_path[0] = '\0';
-            *sizeout = offsetof(struct sockaddr_un, sun_path) + janet_string_length(path);
-        }
+            snprintf(saddr->sun_path + 1, path_size - 1, "%s", path + 1);
+        } else
 #endif
+        {
+            snprintf(saddr->sun_path, path_size, "%s", path);
+        }
        *is_unix = 1;
        return (struct addrinfo *) saddr;
    }
@@ -403,11 +385,6 @@ static struct addrinfo *janet_get_addrinfo(Janet *argv, int32_t offset, int sock
        janet_panicf("could not get address info: %s", gai_strerror(status));
    }
    *is_unix = 0;
-#ifdef JANET_WINDOWS
-    *sizeout = 0;
-#else
-    *sizeout = sizeof(struct sockaddr_un);
-#endif
    return ai;
 }

@@ -428,13 +405,12 @@ JANET_CORE_FN(cfun_net_sockaddr,
    int socktype = janet_get_sockettype(argv, argc, 2);
    int is_unix = 0;
    int make_arr = (argc >= 3 && janet_truthy(argv[3]));
-    socklen_t addrsize = 0;
-    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, &addrsize);
+    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix);
 #ifndef JANET_WINDOWS
    /* no unix domain socket support on windows yet */
    if (is_unix) {
-        void *abst = janet_abstract(&janet_address_type, addrsize);
-        memcpy(abst, ai, addrsize);
+        void *abst = janet_abstract(&janet_address_type, sizeof(struct sockaddr_un));
+        memcpy(abst, ai, sizeof(struct sockaddr_un));
        Janet ret = janet_wrap_abstract(abst);
        return make_arr ? janet_wrap_array(janet_array_n(&ret, 1)) : ret;
    }
@@ -485,8 +461,7 @@ JANET_CORE_FN(cfun_net_connect,
    }

    /* Where we're connecting to */
-    socklen_t addrlen = 0;
-    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix, &addrlen);
+    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 0, &is_unix);

    /* Check if we're binding address */
    struct addrinfo *binding = NULL;
@@ -511,6 +486,7 @@ JANET_CORE_FN(cfun_net_connect,
    /* Create socket */
    JSock sock = JSOCKDEFAULT;
    void *addr = NULL;
+    socklen_t addrlen = 0;
 #ifndef JANET_WINDOWS
    if (is_unix) {
        sock = socket(AF_UNIX, socktype | JSOCKFLAGS, 0);
@@ -520,6 +496,7 @@ JANET_CORE_FN(cfun_net_connect,
            janet_panicf("could not create socket: %V", v);
        }
        addr = (void *) ai;
+        addrlen = sizeof(struct sockaddr_un);
    } else
 #endif
    {
@@ -566,9 +543,7 @@ JANET_CORE_FN(cfun_net_connect,
    }

    /* Wrap socket in abstract type JanetStream */
-    uint32_t udp_flag = 0;
-    if (socktype == SOCK_DGRAM) udp_flag = JANET_STREAM_UDPSERVER;
-    JanetStream *stream = make_stream(sock, JANET_STREAM_READABLE | JANET_STREAM_WRITABLE | udp_flag);
+    JanetStream *stream = make_stream(sock, JANET_STREAM_READABLE | JANET_STREAM_WRITABLE);

    /* Set up the socket for non-blocking IO before connecting */
    janet_net_socknoblock(sock);
@@ -591,15 +566,7 @@ JANET_CORE_FN(cfun_net_connect,
    }
 #endif

-    if (status == 0) {
-        /* Connect completed synchronously (common for unix domain sockets).
-         * Return the stream directly without scheduling an async wait,
-         * as edge-triggered kqueue may not signal EVFILT_WRITE if the socket
-         * is already connected when registered. */
-        return janet_wrap_abstract(stream);
-    }
-
-    if (status == -1) {
+    if (status) {
 #ifdef JANET_WINDOWS
        if (err != WSAEWOULDBLOCK) {
 #else
@@ -614,64 +581,6 @@ JANET_CORE_FN(cfun_net_connect,
    net_sched_connect(stream);
 }

-JANET_CORE_FN(cfun_net_socket,
-              "(net/socket &opt type address-family)",
-              "Creates a new unbound socket. Type is an optional keyword, "
-              "either a :stream (usually tcp), or :datagram (usually udp). The default is :stream. "
-              "`address-family` should be one of :ipv4 or :ipv6.") {
-    janet_arity(argc, 0, 2);
-
-    int socktype = janet_get_sockettype(argv, argc, 0);
-
-    /* Create socket */
-    JSock sfd = JSOCKDEFAULT;
-    struct addrinfo *ai = NULL;
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = socktype;
-#ifdef AI_NUMERICSERV
-    hints.ai_flags = AI_NUMERICSERV; /* Explicitly prevent name resolution */
-#else
-    hints.ai_flags = 0;
-#endif
-    if (argc >= 2) {
-        hints.ai_family = net_get_address_family(argv[1]);
-    }
-    int status = getaddrinfo(NULL, "0", &hints, &ai);
-    if (status) {
-        janet_panicf("could not get address info: %s", gai_strerror(status));
-    }
-
-    struct addrinfo *rp = NULL;
-    for (rp = ai; rp != NULL; rp = rp->ai_next) {
-#ifdef JANET_WINDOWS
-        sfd = WSASocketW(rp->ai_family, rp->ai_socktype | JSOCKFLAGS, rp->ai_protocol, NULL, 0, WSA_FLAG_OVERLAPPED);
-#else
-        sfd = socket(rp->ai_family, rp->ai_socktype | JSOCKFLAGS, rp->ai_protocol);
-#endif
-        if (JSOCKVALID(sfd)) {
-            break;
-        }
-    }
-    freeaddrinfo(ai);
-
-    if (!JSOCKVALID(sfd)) {
-        Janet v = janet_ev_lasterr();
-        janet_panicf("could not create socket: %V", v);
-    }
-
-    /* Wrap socket in abstract type JanetStream */
-    uint32_t udp_flag = 0;
-    if (socktype == SOCK_DGRAM) udp_flag = JANET_STREAM_UDPSERVER;
-    JanetStream *stream = make_stream(sfd, JANET_STREAM_READABLE | JANET_STREAM_WRITABLE | udp_flag);
-
-    /* Set up the socket for non-blocking IO */
-    janet_net_socknoblock(sfd);
-
-    return janet_wrap_abstract(stream);
-}
-
 static const char *serverify_socket(JSock sfd, int reuse_addr, int reuse_port) {
    /* Set various socket options */
    int enable = 1;
@@ -755,8 +664,7 @@ JANET_CORE_FN(cfun_net_listen,
    /* Get host, port, and handler*/
    int socktype = janet_get_sockettype(argv, argc, 2);
    int is_unix = 0;
-    socklen_t addrlen = 0;
-    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 1, &is_unix, &addrlen);
+    struct addrinfo *ai = janet_get_addrinfo(argv, 0, socktype, 1, &is_unix);
    int reuse = !(argc >= 4 && janet_truthy(argv[3]));

    JSock sfd = JSOCKDEFAULT;
@@ -768,7 +676,7 @@ JANET_CORE_FN(cfun_net_listen,
            janet_panicf("could not create socket: %V", janet_ev_lasterr());
        }
        const char *err = serverify_socket(sfd, reuse, 0);
-        if (NULL != err || bind(sfd, (struct sockaddr *)ai, addrlen)) {
+        if (NULL != err || bind(sfd, (struct sockaddr *)ai, sizeof(struct sockaddr_un))) {
            JSOCKCLOSE(sfd);
            janet_free(ai);
            if (err) {
@@ -1065,8 +973,6 @@ static const struct sockopt_type sockopt_type_list[] = {
 #ifndef JANET_NO_IPV6
    { "ipv6-join-group", IPPROTO_IPV6, IPV6_JOIN_GROUP, JANET_POINTER },
    { "ipv6-leave-group", IPPROTO_IPV6, IPV6_LEAVE_GROUP, JANET_POINTER },
-    { "ipv6-multicast-hops", IPPROTO_IPV6, IPV6_MULTICAST_HOPS, JANET_NUMBER },
-    { "ipv6-unicast-hops", IPPROTO_IPV6, IPV6_UNICAST_HOPS, JANET_NUMBER },
 #endif
    { NULL, 0, 0, JANET_POINTER }
 };
@@ -1083,10 +989,7 @@ JANET_CORE_FN(cfun_net_setsockopt,
              "- :ip-add-membership string\n"
              "- :ip-drop-membership string\n"
              "- :ipv6-join-group string\n"
-              "- :ipv6-leave-group string\n"
-              "- :ipv6-multicast-hops number\n"
-              "- :ipv6-unicast-hops number\n"
-             ) {
+              "- :ipv6-leave-group string\n") {
    janet_arity(argc, 3, 3);
    JanetStream *stream = janet_getabstract(argv, 0, &janet_stream_type);
    janet_stream_flags(stream, JANET_STREAM_SOCKET);
@@ -1105,7 +1008,6 @@ JANET_CORE_FN(cfun_net_setsockopt,
    }

    union {
-        unsigned char v_uchar;
        int v_int;
        struct ip_mreq v_mreq;
 #ifndef JANET_NO_IPV6
@@ -1120,19 +1022,8 @@ JANET_CORE_FN(cfun_net_setsockopt,
        val.v_int = janet_getboolean(argv, 2);
        optlen = sizeof(val.v_int);
    } else if (st->type == JANET_NUMBER) {
-#ifdef JANET_BSD
-        int v_int = janet_getinteger(argv, 2);
-        if (st->optname == IP_MULTICAST_TTL) {
-            val.v_uchar = v_int;
-            optlen = sizeof(val.v_uchar);
-        } else {
-            val.v_int = v_int;
-            optlen = sizeof(val.v_int);
-        }
-#else
        val.v_int = janet_getinteger(argv, 2);
        optlen = sizeof(val.v_int);
-#endif
    } else if (st->optname == IP_ADD_MEMBERSHIP || st->optname == IP_DROP_MEMBERSHIP) {
        const char *addr = janet_getcstring(argv, 2);
        memset(&val.v_mreq, 0, sizeof val.v_mreq);
@@ -1187,7 +1078,6 @@ void janet_lib_net(JanetTable *env) {
    JanetRegExt net_cfuns[] = {
        JANET_CORE_REG("net/address", cfun_net_sockaddr),
        JANET_CORE_REG("net/listen", cfun_net_listen),
-        JANET_CORE_REG("net/socket", cfun_net_socket),
        JANET_CORE_REG("net/accept", cfun_stream_accept),
        JANET_CORE_REG("net/accept-loop", cfun_stream_accept_loop),
        JANET_CORE_REG("net/read", cfun_stream_read),
--- a/src/core/os.c
+++ b/src/core/os.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose and contributors.
+* Copyright (c) 2025 Calvin Rose and contributors.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -57,9 +57,7 @@
 #include <process.h>
 #define JANET_SPAWN_CHDIR
 #else
-#ifndef JANET_PLAN9
 #include <spawn.h>
-#endif
 #include <utime.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -68,9 +66,7 @@
 #ifdef JANET_APPLE
 #include <crt_externs.h>
 #define environ (*_NSGetEnviron())
-#include <AvailabilityMacros.h>
-int chroot(const char *dirname);
-#elif !defined(JANET_PLAN9)
+#else
 extern char **environ;
 #endif
 #ifdef JANET_THREADS
@@ -85,14 +81,8 @@ extern char **environ;
 #ifndef JANET_SPAWN_NO_CHDIR
 #ifdef __GLIBC__
 #define JANET_SPAWN_CHDIR
-#elif defined(JANET_APPLE)
-/* The posix_spawn_file_actions_addchdir_np function
- * has only been implemented since macOS 10.15 */
-#if defined(MAC_OS_X_VERSION_10_15) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15)
+#elif defined(JANET_APPLE) /* Some older versions may not work here. */
 #define JANET_SPAWN_CHDIR
-#else
-#define JANET_SPAWN_NO_CHDIR
-#endif
 #elif defined(__FreeBSD__) /* Not all BSDs work, for example openBSD doesn't seem to support this */
 #define JANET_SPAWN_CHDIR
 #endif
@@ -142,8 +132,8 @@ static void janet_unlock_environ(void) {
 #define janet_stringify(x) janet_stringify1(x)

 JANET_CORE_FN(os_which,
-              "(os/which &opt test)",
-              "Check the current operating system. If `test` is nil or unset, Returns one of:\n\n"
+              "(os/which)",
+              "Check the current operating system. Returns one of:\n\n"
              "* :windows\n\n"
              "* :mingw\n\n"
              "* :cygwin\n\n"
@@ -156,12 +146,9 @@ JANET_CORE_FN(os_which,
              "* :dragonfly\n\n"
              "* :bsd\n\n"
              "* :posix - A POSIX compatible system (default)\n\n"
-              "May also return a custom keyword specified at build time. Is `test` is truthy, will check if the current operating system equals `test` and return true if they are the same, false otherwise.") {
-    janet_arity(argc, 0, 1);
-    if (argc == 1 && janet_truthy(argv[0])) {
-        janet_getkeyword(argv, 0); /* Constrain to keywords */
-        return janet_wrap_boolean(janet_equals(argv[0], os_which(0, NULL)));
-    }
+              "May also return a custom keyword specified at build time.") {
+    janet_fixarity(argc, 0);
+    (void) argv;
 #if defined(JANET_OS_NAME)
    return janet_ckeywordv(janet_stringify(JANET_OS_NAME));
 #elif defined(JANET_MINGW)
@@ -186,8 +173,6 @@ JANET_CORE_FN(os_which,
    return janet_ckeywordv("dragonfly");
 #elif defined(JANET_BSD)
    return janet_ckeywordv("bsd");
-#elif defined(JANET_ILLUMOS)
-    return janet_ckeywordv("illumos");
 #else
    return janet_ckeywordv("posix");
 #endif
@@ -249,7 +234,6 @@ JANET_CORE_FN(os_compiler,
              "* :gcc\n\n"
              "* :clang\n\n"
              "* :msvc\n\n"
-              "* :kencc\n\n"
              "* :unknown\n\n") {
    janet_fixarity(argc, 0);
    (void) argv;
@@ -259,8 +243,6 @@ JANET_CORE_FN(os_compiler,
    return janet_ckeywordv("clang");
 #elif defined(__GNUC__)
    return janet_ckeywordv("gcc");
-#elif defined(JANET_PLAN9)
-    return janet_ckeywordv("kencc");
 #else
    return janet_ckeywordv("unknown");
 #endif
@@ -299,43 +281,39 @@ JANET_CORE_FN(os_cpu_count,
              "Get an approximate number of CPUs available on for this process to use. If "
              "unable to get an approximation, will return a default value dflt.") {
    janet_arity(argc, 0, 1);
-    (void) argv; /* Prevent unused argument warning */
+    Janet dflt = argc > 0 ? argv[0] : janet_wrap_nil();
 #ifdef JANET_WINDOWS
+    (void) dflt;
    SYSTEM_INFO info;
    GetSystemInfo(&info);
    return janet_wrap_integer(info.dwNumberOfProcessors);
 #elif defined(JANET_LINUX)
+    (void) dflt;
    cpu_set_t cs;
    CPU_ZERO(&cs);
    sched_getaffinity(0, sizeof(cs), &cs);
    int count = CPU_COUNT(&cs);
    return janet_wrap_integer(count);
 #elif defined(JANET_BSD) && defined(HW_NCPUONLINE)
+    (void) dflt;
    const int name[2] = {CTL_HW, HW_NCPUONLINE};
    int result = 0;
    size_t len = sizeof(int);
    if (-1 == sysctl(name, 2, &result, &len, NULL, 0)) {
-        return argc > 0 ? argv[0] : janet_wrap_nil();
+        return dflt;
    }
    return janet_wrap_integer(result);
 #elif defined(JANET_BSD) && defined(HW_NCPU)
+    (void) dflt;
    const int name[2] = {CTL_HW, HW_NCPU};
    int result = 0;
    size_t len = sizeof(int);
    if (-1 == sysctl(name, 2, &result, &len, NULL, 0)) {
-        return argc > 0 ? argv[0] : janet_wrap_nil();
+        return dflt;
    }
    return janet_wrap_integer(result);
-#elif defined(JANET_ILLUMOS)
-    long result = sysconf(_SC_NPROCESSORS_CONF);
-    if (result < 0) {
-        return argc > 0 ? argv[0] : janet_wrap_nil();
-    }
-    return janet_wrap_integer(result);
-#elif defined(JANET_PLAN9)
-    return janet_wrap_integer(atoi(getenv("NPROC")));
 #else
-    return argc > 0 ? argv[0] : janet_wrap_nil();
+    return dflt;
 #endif
 }

@@ -365,8 +343,6 @@ static EnvBlock os_execute_env(int32_t argc, const Janet *argv) {
        janet_buffer_push_bytes(temp, vals, janet_string_length(vals));
        janet_buffer_push_u8(temp, '\0');
    }
-    /* Windows environment blocks must be double-NULL terminated */
-    if (temp->count == 0) janet_buffer_push_u8(temp, '\0');
    janet_buffer_push_u8(temp, '\0');
    char *ret = janet_smalloc(temp->count);
    memcpy(ret, temp->data, temp->count);
@@ -1214,7 +1190,7 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
        if (is_spawn && janet_keyeq(maybe_stderr, "pipe")) {
            new_err = make_pipes(&pipe_err, 0, &pipe_errflag);
            pipe_owner_flags |= JANET_PROC_OWNS_STDERR;
-        } else if (janet_keyeq(maybe_stderr, "out")) {
+        } else if (is_spawn && janet_keyeq(maybe_stderr, "out")) {
            stderr_is_stdout = 1;
        } else if (!janet_checktype(maybe_stderr, JANET_NIL)) {
            new_err = janet_getjstream(&maybe_stderr, 0, &orig_err);
@@ -1300,7 +1276,6 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
    }

    int cp_failed = 0;
-    DWORD cp_error_code = 0;
    if (!CreateProcess(janet_flag_at(flags, 1) ? NULL : path,
                       (char *) buf->data, /* Single CLI argument */
                       &saAttr, /* no proc inheritance */
@@ -1312,7 +1287,6 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
                       &startupInfo,
                       &processInfo)) {
        cp_failed = 1;
-        cp_error_code = GetLastError();
    }

    if (pipe_in != JANET_HANDLE_NONE) CloseHandle(pipe_in);
@@ -1322,25 +1296,7 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
    os_execute_cleanup(envp, NULL);

    if (cp_failed)  {
-        char msgbuf[256];
-        msgbuf[0] = '\0';
-        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                      NULL,
-                      cp_error_code,
-                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                      msgbuf,
-                      sizeof(msgbuf),
-                      NULL);
-        if (!*msgbuf) sprintf(msgbuf, "%d", cp_error_code);
-        char *c = msgbuf;
-        while (*c) {
-            if (*c == '\n' || *c == '\r') {
-                *c = '\0';
-                break;
-            }
-            c++;
-        }
-        janet_panicf("failed to create process: %s", janet_cstringv(msgbuf));
+        janet_panic("failed to create process");
    }

    pHandle = processInfo.hProcess;
@@ -1366,9 +1322,6 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
    /* exec mode */
    if (mode == JANET_EXECUTE_EXEC) {
        int status;
-#ifdef JANET_PLAN9
-        status = exec(cargv[0], cargv);
-#else
        if (!use_environ) {
            environ = envp;
        }
@@ -1379,11 +1332,9 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
                status = execv(cargv[0], cargv);
            }
        } while (status == -1 && errno == EINTR);
-#endif
        janet_panicf("%p: %s", cargv[0], janet_strerror(errno ? errno : ENOENT));
    }

-#ifndef JANET_NO_SPAWN
    /* Use posix_spawn to spawn new process */

    /* Posix spawn setup */
@@ -1452,8 +1403,6 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
    }

 #endif
-#endif
-#ifndef JANET_NO_SPAWN
    JanetProc *proc = janet_abstract(&ProcAT, sizeof(JanetProc));
    proc->return_code = -1;
 #ifdef JANET_WINDOWS
@@ -1491,7 +1440,6 @@ static Janet os_execute_impl(int32_t argc, Janet *argv, JanetExecuteMode mode) {
        return os_proc_wait_impl(proc);
 #endif
    }
-#endif
 }

 JANET_CORE_FN(os_execute,
@@ -1552,7 +1500,7 @@ JANET_CORE_FN(os_posix_exec,
 JANET_CORE_FN(os_posix_fork,
              "(os/posix-fork)",
              "Make a `fork` system call and create a new process. Return nil if in the new process, otherwise a core/process object (as returned by os/spawn). "
-              "Not supported on all systems (POSIX and Plan 9 only).") {
+              "Not supported on all systems (POSIX only).") {
    janet_sandbox_assert(JANET_SANDBOX_SUBPROCESS);
    janet_fixarity(argc, 0);
    (void) argv;
@@ -1560,13 +1508,9 @@ JANET_CORE_FN(os_posix_fork,
    janet_panic("not supported on Windows");
 #else
    pid_t result;
-#ifdef JANET_PLAN9
-    result = fork();
-#else
    do {
        result = fork();
    } while (result == -1 && errno == EINTR);
-#endif
    if (result == -1) {
        janet_panic(janet_strerror(errno));
    }
@@ -1581,28 +1525,6 @@ JANET_CORE_FN(os_posix_fork,
 #endif
 }

-JANET_CORE_FN(os_posix_chroot,
-              "(os/posix-chroot dirname)",
-              "Call `chroot` to change the root directory to `dirname`. "
-              "Not supported on all systems (POSIX only).") {
-    janet_sandbox_assert(JANET_SANDBOX_CHROOT);
-    janet_fixarity(argc, 1);
-#if defined(JANET_WINDOWS) || defined(JANET_PLAN9)
-    (void) argv;
-    janet_panic("not supported on Windows or Plan 9");
-#else
-    const char *root = janet_getcstring(argv, 0);
-    int result;
-    do {
-        result = chroot(root);
-    } while (result == -1 && errno == EINTR);
-    if (result == -1) {
-        janet_panic(janet_strerror(errno));
-    }
-    return janet_wrap_nil();
-#endif
-}
-
 #ifdef JANET_EV
 /* Runs in a separate thread */
 static JanetEVGenericMessage os_shell_subr(JanetEVGenericMessage args) {
@@ -1638,7 +1560,6 @@ JANET_CORE_FN(os_shell,

 #endif /* JANET_NO_PROCESSES */

-#ifndef JANET_PLAN9
 JANET_CORE_FN(os_environ,
              "(os/environ)",
              "Get a copy of the OS environment table.") {
@@ -1670,7 +1591,6 @@ JANET_CORE_FN(os_environ,
    janet_unlock_environ();
    return janet_wrap_table(t);
 }
-#endif

 JANET_CORE_FN(os_getenv,
              "(os/getenv variable &opt dflt)",
@@ -1695,9 +1615,6 @@ JANET_CORE_FN(os_setenv,
 #ifdef JANET_WINDOWS
 #define SETENV(K,V) _putenv_s(K, V)
 #define UNSETENV(K) _putenv_s(K, "")
-#elif defined(JANET_PLAN9)
-#define SETENV(K,V) putenv(K, V)
-#define UNSETENV(K) unsetenv(K)
 #else
 #define SETENV(K,V) setenv(K, V, 1)
 #define UNSETENV(K) unsetenv(K)
@@ -1870,8 +1787,6 @@ static struct tm *time_to_tm(const Janet *argv, int32_t argc, int32_t n, struct
        _tzset();
        localtime_s(t_infos, &t);
        t_info = t_infos;
-#elif defined(JANET_PLAN9)
-        t_info = localtime(&t);
 #else
        tzset();
        t_info = localtime_r(&t, t_infos);
@@ -1881,8 +1796,6 @@ static struct tm *time_to_tm(const Janet *argv, int32_t argc, int32_t n, struct
 #ifdef JANET_WINDOWS
        gmtime_s(t_infos, &t);
        t_info = t_infos;
-#elif defined(JANET_PLAN9)
-        t_info = gmtime(&t);
 #else
        t_info = gmtime_r(&t, t_infos);
 #endif
@@ -1893,8 +1806,9 @@ static struct tm *time_to_tm(const Janet *argv, int32_t argc, int32_t n, struct
 JANET_CORE_FN(os_date,
              "(os/date &opt time local)",
              "Returns the given time as a date struct, or the current time if `time` is not given. "
+              "Returns a struct with following key values. Note that all numbers are 0-indexed. "
              "Date is given in UTC unless `local` is truthy, in which case the date is formatted for "
-              "the local timezone. Returns a struct with following key values. Note that all numbers are 0-indexed.\n\n"
+              "the local timezone.\n\n"
              "* :seconds - number of seconds [0-61]\n\n"
              "* :minutes - number of minutes [0-59]\n\n"
              "* :hours - number of hours [0-23]\n\n"
@@ -1903,9 +1817,7 @@ JANET_CORE_FN(os_date,
              "* :year - years since year 0 (e.g. 2019)\n\n"
              "* :week-day - day of the week [0-6]\n\n"
              "* :year-day - day of the year [0-365]\n\n"
-              "* :dst - if Day Light Savings is in effect\n\n"
-              "You can set local timezone by setting TZ environment variable. "
-              "See tzset(<time.h>) or _tzset(<time.h>) for further details.") {
+              "* :dst - if Day Light Savings is in effect") {
    janet_arity(argc, 0, 2);
    (void) argv;
    struct tm t_infos;
@@ -1923,15 +1835,14 @@ JANET_CORE_FN(os_date,
    return janet_wrap_struct(janet_struct_end(st));
 }

-#define SIZETIMEFMT 250
+#define SIZETIMEFMT     250

 JANET_CORE_FN(os_strftime,
              "(os/strftime fmt &opt time local)",
              "Format the given time as a string, or the current time if `time` is not given. "
              "The time is formatted according to the same rules as the ISO C89 function strftime(). "
              "The time is formatted in UTC unless `local` is truthy, in which case the date is formatted for "
-              "the local timezone. You can set local timezone by setting TZ environment variable. "
-              "See tzset(<time.h>) or _tzset(<time.h>) for further details.") {
+              "the local timezone.") {
    janet_arity(argc, 1, 3);
    const char *fmt = janet_getcstring(argv, 0);
    /* ANSI X3.159-1989, section 4.12.3.5 "The strftime function" */
@@ -1939,9 +1850,6 @@ JANET_CORE_FN(os_strftime,
    const char *p = fmt;
    while (*p) {
        if (*p++ == '%') {
-            if (!*p) {
-                janet_panic("invalid conversion specifier");
-            }
            if (!strchr(valid, *p)) {
                janet_panicf("invalid conversion specifier '%%%c'", *p);
            }
@@ -1951,7 +1859,7 @@ JANET_CORE_FN(os_strftime,
    struct tm t_infos;
    struct tm *t_info = time_to_tm(argv, argc, 1, &t_infos);
    char buf[SIZETIMEFMT];
-    (void)strftime(buf, sizeof(buf), fmt, t_info);
+    (void)strftime(buf, SIZETIMEFMT, fmt, t_info);
    return janet_cstringv(buf);
 }

@@ -1959,7 +1867,7 @@ static int entry_getdst(Janet env_entry) {
    Janet v;
    if (janet_checktype(env_entry, JANET_TABLE)) {
        JanetTable *entry = janet_unwrap_table(env_entry);
-        v = janet_table_get_keyword(entry, "dst");
+        v = janet_table_get(entry, janet_ckeywordv("dst"));
    } else if (janet_checktype(env_entry, JANET_STRUCT)) {
        const JanetKV *entry = janet_unwrap_struct(env_entry);
        v = janet_struct_get(entry, janet_ckeywordv("dst"));
@@ -1983,7 +1891,7 @@ static timeint_t entry_getint(Janet env_entry, char *field) {
    Janet i;
    if (janet_checktype(env_entry, JANET_TABLE)) {
        JanetTable *entry = janet_unwrap_table(env_entry);
-        i = janet_table_get_keyword(entry, field);
+        i = janet_table_get(entry, janet_ckeywordv(field));
    } else if (janet_checktype(env_entry, JANET_STRUCT)) {
        const JanetKV *entry = janet_unwrap_struct(env_entry);
        i = janet_struct_get(entry, janet_ckeywordv(field));
@@ -2062,7 +1970,6 @@ JANET_CORE_FN(os_mktime,
 #define j_symlink symlink
 #endif

-#ifndef JANET_NO_LOCALES
 JANET_CORE_FN(os_setlocale,
              "(os/setlocale &opt locale category)",
              "Set the system locale, which affects how dates and numbers are formatted. "
@@ -2099,20 +2006,19 @@ JANET_CORE_FN(os_setlocale,
    if (old == NULL) return janet_wrap_nil();
    return janet_cstringv(old);
 }
-#endif

 JANET_CORE_FN(os_link,
              "(os/link oldpath newpath &opt symlink)",
              "Create a link at newpath that points to oldpath and returns nil. "
              "Iff symlink is truthy, creates a symlink. "
              "Iff symlink is falsey or not provided, "
-              "creates a hard link. Does not work on Windows or Plan 9.") {
+              "creates a hard link. Does not work on Windows.") {
    janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
    janet_arity(argc, 2, 3);
-#if defined(JANET_WINDOWS) || defined(JANET_PLAN9)
+#ifdef JANET_WINDOWS
    (void) argc;
    (void) argv;
-    janet_panic("not supported on Windows or Plan 9");
+    janet_panic("not supported on Windows");
 #else
    const char *oldpath = janet_getcstring(argv, 0);
    const char *newpath = janet_getcstring(argv, 1);
@@ -2127,10 +2033,10 @@ JANET_CORE_FN(os_symlink,
              "Create a symlink from oldpath to newpath, returning nil. Same as `(os/link oldpath newpath true)`.") {
    janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
    janet_fixarity(argc, 2);
-#if defined(JANET_WINDOWS) || defined(JANET_PLAN9)
+#ifdef JANET_WINDOWS
    (void) argc;
    (void) argv;
-    janet_panic("not supported on Windows or Plan 9");
+    janet_panic("not supported on Windows");
 #else
    const char *oldpath = janet_getcstring(argv, 0);
    const char *newpath = janet_getcstring(argv, 1);
@@ -2168,8 +2074,6 @@ JANET_CORE_FN(os_rmdir,
    const char *path = janet_getcstring(argv, 0);
 #ifdef JANET_WINDOWS
    int res = _rmdir(path);
-#elif defined(JANET_PLAN9)
-    int res = remove(path);
 #else
    int res = rmdir(path);
 #endif
@@ -2296,13 +2200,11 @@ static const uint8_t *janet_decode_mode(mode_t m) {
    const char *str = "other";
    if (S_ISREG(m)) str = "file";
    else if (S_ISDIR(m)) str = "directory";
-#ifndef JANET_PLAN9
    else if (S_ISFIFO(m)) str = "fifo";
    else if (S_ISBLK(m)) str = "block";
    else if (S_ISSOCK(m)) str = "socket";
    else if (S_ISLNK(m)) str = "link";
    else if (S_ISCHR(m)) str = "character";
-#endif
    return janet_ckeyword(str);
 }

@@ -2467,9 +2369,6 @@ static Janet os_stat_or_lstat(int do_lstat, int32_t argc, Janet *argv) {
 #ifdef JANET_WINDOWS
    (void) do_lstat;
    int res = _stat(path, &st);
-#elif defined(JANET_PLAN9)
-    (void)do_lstat;
-    int res = stat(path, &st);
 #else
    int res;
    if (do_lstat) {
@@ -2530,13 +2429,9 @@ JANET_CORE_FN(os_chmod,
              "Change file permissions, where `mode` is a permission string as returned by "
              "`os/perm-string`, or an integer as returned by `os/perm-int`. "
              "When `mode` is an integer, it is interpreted as a Unix permission value, best specified in octal, like "
-              "8r666 or 8r400. Windows will not differentiate between user, group, and other permissions, and thus will combine all of these permissions. Returns nil."
-              "Unsupported on plan9.") {
+              "8r666 or 8r400. Windows will not differentiate between user, group, and other permissions, and thus will combine all of these permissions. Returns nil.") {
    janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
    janet_fixarity(argc, 2);
-#ifdef JANET_PLAN9
-    janet_panic("not supported on Plan 9");
-#else
    const char *path = janet_getcstring(argv, 0);
 #ifdef JANET_WINDOWS
    int res = _chmod(path, os_getmode(argv, 1));
@@ -2545,7 +2440,6 @@ JANET_CORE_FN(os_chmod,
 #endif
    if (-1 == res) janet_panicf("%s: %s", janet_strerror(errno), path);
    return janet_wrap_nil();
-#endif
 }

 #ifndef JANET_NO_UMASK
@@ -2644,15 +2538,7 @@ JANET_CORE_FN(os_realpath,
 #endif
    if (NULL == dest) janet_panicf("%s: %s", janet_strerror(errno), src);
    Janet ret = janet_cstringv(dest);
-#ifdef JANET_WINDOWS
-    DWORD attrib = GetFileAttributes(dest);
-    free(dest); /* if janet_malloc is redefined, still use free to correspond with _fullpath */
-    if (attrib == INVALID_FILE_ATTRIBUTES) {
-        janet_panicf("path does not exist: %v", ret);
-    }
-#else
    janet_free(dest);
-#endif
    return ret;
 #endif
 }
@@ -2696,11 +2582,10 @@ JANET_CORE_FN(os_open,
              "  * :c - create a new file (O\\_CREATE)\n"
              "  * :e - fail if the file exists (O\\_EXCL)\n"
              "  * :t - shorten an existing file to length 0 (O\\_TRUNC)\n\n"
-              "  * :a - append to a file (O\\_APPEND on posix, FILE_APPEND_DATA on windows)\n"
              "Posix-only flags:\n\n"
+              "  * :a - append to a file (O\\_APPEND)\n"
              "  * :x - O\\_SYNC\n"
              "  * :C - O\\_NOCTTY\n\n"
-              "  * :N - Turn off O\\_NONBLOCK and disable ev reading/writing\n\n"
              "Windows-only flags:\n\n"
              "  * :R - share reads (FILE\\_SHARE\\_READ)\n"
              "  * :W - share writes (FILE\\_SHARE\\_WRITE)\n"
@@ -2710,24 +2595,19 @@ JANET_CORE_FN(os_open,
              "  * :F - FILE\\_ATTRIBUTE\\_OFFLINE\n"
              "  * :T - FILE\\_ATTRIBUTE\\_TEMPORARY\n"
              "  * :d - FILE\\_FLAG\\_DELETE\\_ON\\_CLOSE\n"
-              "  * :V - Turn off FILE\\_FLAG\\_OVERLAPPED and disable ev reading/writing\n"
-              "  * :I - set bInheritHandle on the created file so it can be passed to other processes.\n"
              "  * :b - FILE\\_FLAG\\_NO\\_BUFFERING\n") {
    janet_arity(argc, 1, 3);
    const char *path = janet_getcstring(argv, 0);
    const uint8_t *opt_flags = janet_optkeyword(argv, argc, 1, (const uint8_t *) "r");
    jmode_t mode = os_optmode(argc, argv, 2, 0666);
    uint32_t stream_flags = 0;
-    int disable_stream_mode = 0;
    JanetHandle fd;
 #ifdef JANET_WINDOWS
    (void) mode;
-    int inherited_handle = 0;
    DWORD desiredAccess = 0;
    DWORD shareMode = 0;
    DWORD creationDisp = 0;
-    DWORD fileFlags = FILE_FLAG_OVERLAPPED;
-    DWORD fileAttributes = 0;
+    DWORD flagsAndAttributes = FILE_FLAG_OVERLAPPED;
    /* We map unix-like open flags to the creationDisp parameter */
    int creatUnix = 0;
 #define OCREAT 1
@@ -2747,11 +2627,6 @@ JANET_CORE_FN(os_open,
                stream_flags |= JANET_STREAM_WRITABLE;
                janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
                break;
-            case 'a':
-                desiredAccess |= FILE_APPEND_DATA;
-                stream_flags |= JANET_STREAM_WRITABLE;
-                janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
-                break;
            case 'c':
                creatUnix |= OCREAT;
                janet_sandbox_assert(JANET_SANDBOX_FS_WRITE);
@@ -2774,29 +2649,22 @@ JANET_CORE_FN(os_open,
                shareMode |= FILE_SHARE_WRITE;
                break;
            case 'H':
-                fileAttributes |= FILE_ATTRIBUTE_HIDDEN;
+                flagsAndAttributes |= FILE_ATTRIBUTE_HIDDEN;
                break;
            case 'O':
-                fileAttributes |= FILE_ATTRIBUTE_READONLY;
+                flagsAndAttributes |= FILE_ATTRIBUTE_READONLY;
                break;
            case 'F':
-                fileAttributes |= FILE_ATTRIBUTE_OFFLINE;
+                flagsAndAttributes |= FILE_ATTRIBUTE_OFFLINE;
                break;
            case 'T':
-                fileAttributes |= FILE_ATTRIBUTE_TEMPORARY;
+                flagsAndAttributes |= FILE_ATTRIBUTE_TEMPORARY;
                break;
            case 'd':
-                fileFlags |= FILE_FLAG_DELETE_ON_CLOSE;
+                flagsAndAttributes |= FILE_FLAG_DELETE_ON_CLOSE;
                break;
            case 'b':
-                fileFlags |= FILE_FLAG_NO_BUFFERING;
-                break;
-            case 'I':
-                inherited_handle = 1;
-                break;
-            case 'V':
-                fileFlags &= ~FILE_FLAG_OVERLAPPED;
-                disable_stream_mode = 1;
+                flagsAndAttributes |= FILE_FLAG_NO_BUFFERING;
                break;
                /* we could potentially add more here -
                 * https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilea
@@ -2822,16 +2690,7 @@ JANET_CORE_FN(os_open,
            creationDisp = TRUNCATE_EXISTING;
            break;
    }
-    if (fileAttributes == 0) {
-        fileAttributes = FILE_ATTRIBUTE_NORMAL;
-    }
-    SECURITY_ATTRIBUTES saAttr;
-    memset(&saAttr, 0, sizeof(saAttr));
-    saAttr.nLength = sizeof(saAttr);
-    if (inherited_handle) {
-        saAttr.bInheritHandle = TRUE; /* Needed to do interesting things with file */
-    }
-    fd = CreateFileA(path, desiredAccess, shareMode, &saAttr, creationDisp, fileFlags | fileAttributes, NULL);
+    fd = CreateFileA(path, desiredAccess, shareMode, NULL, creationDisp, flagsAndAttributes, NULL);
    if (fd == INVALID_HANDLE_VALUE) janet_panicv(janet_ev_lasterr());
 #else
    int open_flags = O_NONBLOCK;
@@ -2875,10 +2734,6 @@ JANET_CORE_FN(os_open,
            case 'a':
                open_flags |= O_APPEND;
                break;
-            case 'N':
-                open_flags &= ~O_NONBLOCK;
-                disable_stream_mode = 1;
-                break;
        }
    }
    /* If both read and write, fix up to O_RDWR */
@@ -2895,7 +2750,7 @@ JANET_CORE_FN(os_open,
    } while (fd == -1 && errno == EINTR);
    if (fd == -1) janet_panicv(janet_ev_lasterr());
 #endif
-    return janet_wrap_abstract(janet_stream(fd, disable_stream_mode ? 0 : stream_flags, NULL));
+    return janet_wrap_abstract(janet_stream(fd, stream_flags, NULL));
 }

 JANET_CORE_FN(os_pipe,
@@ -2963,14 +2818,10 @@ void janet_lib_os(JanetTable *env) {
        JANET_CORE_REG("os/strftime", os_strftime),
        JANET_CORE_REG("os/sleep", os_sleep),
        JANET_CORE_REG("os/isatty", os_isatty),
-#ifndef JANET_NO_LOCALES
        JANET_CORE_REG("os/setlocale", os_setlocale),
-#endif

        /* env functions */
-#ifndef JANET_PLAN9
        JANET_CORE_REG("os/environ", os_environ),
-#endif
        JANET_CORE_REG("os/getenv", os_getenv),
        JANET_CORE_REG("os/setenv", os_setenv),

@@ -3006,16 +2857,12 @@ void janet_lib_os(JanetTable *env) {
        JANET_CORE_REG("os/shell", os_shell),
        JANET_CORE_REG("os/posix-fork", os_posix_fork),
        JANET_CORE_REG("os/posix-exec", os_posix_exec),
-        JANET_CORE_REG("os/posix-chroot", os_posix_chroot),
        /* no need to sandbox process management if you can't create processes
         * (allows for limited functionality if use exposes C-functions to create specific processes) */
        JANET_CORE_REG("os/proc-wait", os_proc_wait),
        JANET_CORE_REG("os/proc-kill", os_proc_kill),
        JANET_CORE_REG("os/proc-close", os_proc_close),
        JANET_CORE_REG("os/getpid", os_proc_getpid),
-#ifdef JANET_EV
-        JANET_CORE_REG("os/sigaction", os_sigaction),
-#endif
 #endif

        /* high resolution timers */
@@ -3024,6 +2871,7 @@ void janet_lib_os(JanetTable *env) {
 #ifdef JANET_EV
        JANET_CORE_REG("os/open", os_open), /* fs read and write */
        JANET_CORE_REG("os/pipe", os_pipe),
+        JANET_CORE_REG("os/sigaction", os_sigaction),
 #endif
 #endif
        JANET_REG_END
--- a/src/core/parse.c
+++ b/src/core/parse.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -105,6 +105,15 @@ static int to_hex(uint8_t c) {
    }
 }

+typedef int (*Consumer)(JanetParser *p, JanetParseState *state, uint8_t c);
+struct JanetParseState {
+    int32_t counter;
+    int32_t argn;
+    int flags;
+    size_t line;
+    size_t column;
+    Consumer consumer;
+};

 /* Define a stack on the main parser struct */
 #define DEF_PARSER_STACK(NAME, T, STACK, STACKCOUNT, STACKCAP) \
--- a/src/core/peg.c
+++ b/src/core/peg.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -194,41 +194,6 @@ tail:
            return memcmp(text, rule + 2, len) ? NULL : text + len;
        }

-        case RULE_DEBUG: {
-            char buffer[32] = {0};
-            size_t len = (size_t)(s->outer_text_end - text);
-            memcpy(buffer, text, (len > 31 ? 31 : len));
-            janet_eprintf("?? at [%s] (index %d)\n", buffer, (int32_t)(text - s->text_start));
-            int has_color = janet_truthy(janet_dyn("err-color"));
-            /* Accumulate buffer */
-            if (s->scratch->count) {
-                janet_eprintf("accumulate buffer: %v\n", janet_wrap_buffer(s->scratch));
-            }
-            /* Normal captures */
-            if (s->captures->count) {
-                janet_eprintf("stack [%d]:\n", s->captures->count);
-                for (int32_t i = 0; i < s->captures->count; i++) {
-                    if (has_color) {
-                        janet_eprintf("  [%d]: %M\n", i, s->captures->data[i]);
-                    } else {
-                        janet_eprintf("  [%d]: %m\n", i, s->captures->data[i]);
-                    }
-                }
-            }
-            /* Tagged captures */
-            if (s->tagged_captures->count) {
-                janet_eprintf("tag stack [%d]:\n", s->tagged_captures->count);
-                for (int32_t i = 0; i < s->tagged_captures->count; i++) {
-                    if (has_color) {
-                        janet_eprintf("  [%d] tag=%d: %M\n", i, s->tags->data[i], s->tagged_captures->data[i]);
-                    } else {
-                        janet_eprintf("  [%d] tag=%d: %m\n", i, s->tags->data[i], s->tagged_captures->data[i]);
-                    }
-                }
-            }
-            return text;
-        }
-
        case RULE_NCHAR: {
            uint32_t n = rule[1];
            return (text + n > s->text_end) ? NULL : text + n;
@@ -657,7 +622,6 @@ tail:
        }

        case RULE_REPLACE:
-        case RULE_MATCHSPLICE:
        case RULE_MATCHTIME: {
            uint32_t tag = rule[3];
            int oldmode = s->mode;
@@ -698,17 +662,8 @@ tail:
                    break;
            }
            cap_load_keept(s, cs);
-            if (rule[0] != RULE_REPLACE && !janet_truthy(cap)) return NULL; /* matchtime or matchtime flatten */
-            const Janet *elements = NULL;
-            int32_t len = 0;
-            if ((rule[0] == RULE_MATCHSPLICE) && janet_indexed_view(cap, &elements, &len)) {
-                /* unpack and flatten capture */
-                for (int32_t i = 0; i < len; i++) {
-                    pushcap(s, elements[i], tag);
-                }
-            } else {
-                pushcap(s, cap, tag);
-            }
+            if (rule[0] == RULE_MATCHTIME && !janet_truthy(cap)) return NULL;
+            pushcap(s, cap, tag);
            return result;
        }

@@ -1280,14 +1235,6 @@ static void spec_constant(Builder *b, int32_t argc, const Janet *argv) {
    emit_2(r, RULE_CONSTANT, emit_constant(b, argv[0]), tag);
 }

-static void spec_debug(Builder *b, int32_t argc, const Janet *argv) {
-    peg_arity(b, argc, 0, 0);
-    Reserve r = reserve(b, 1);
-    uint32_t empty = 0;
-    (void) argv;
-    emit_rule(r, RULE_DEBUG, 0, &empty);
-}
-
 static void spec_replace(Builder *b, int32_t argc, const Janet *argv) {
    peg_arity(b, argc, 2, 3);
    Reserve r = reserve(b, 4);
@@ -1297,7 +1244,7 @@ static void spec_replace(Builder *b, int32_t argc, const Janet *argv) {
    emit_3(r, RULE_REPLACE, subrule, constant, tag);
 }

-static void spec_matchtime_impl(Builder *b, int32_t argc, const Janet *argv, uint32_t op) {
+static void spec_matchtime(Builder *b, int32_t argc, const Janet *argv) {
    peg_arity(b, argc, 2, 3);
    Reserve r = reserve(b, 4);
    uint32_t subrule = peg_compile1(b, argv[0]);
@@ -1308,15 +1255,7 @@ static void spec_matchtime_impl(Builder *b, int32_t argc, const Janet *argv, uin
    }
    uint32_t tag = (argc == 3) ? emit_tag(b, argv[2]) : 0;
    uint32_t cindex = emit_constant(b, fun);
-    emit_3(r, op, subrule, cindex, tag);
-}
-
-static void spec_matchtime(Builder *b, int32_t argc, const Janet *argv) {
-    spec_matchtime_impl(b, argc, argv, RULE_MATCHTIME);
-}
-
-static void spec_matchtime_splice(Builder *b, int32_t argc, const Janet *argv) {
-    spec_matchtime_impl(b, argc, argv, RULE_MATCHSPLICE);
+    emit_3(r, RULE_MATCHTIME, subrule, cindex, tag);
 }

 static void spec_sub(Builder *b, int32_t argc, const Janet *argv) {
@@ -1392,7 +1331,6 @@ static const SpecialPair peg_specials[] = {
    {"<-", spec_capture},
    {">", spec_look},
    {"?", spec_opt},
-    {"??", spec_debug},
    {"accumulate", spec_accumulate},
    {"any", spec_any},
    {"argument", spec_argument},
@@ -1403,11 +1341,9 @@ static const SpecialPair peg_specials[] = {
    {"between", spec_between},
    {"capture", spec_capture},
    {"choice", spec_choice},
-    {"cms", spec_matchtime_splice},
    {"cmt", spec_matchtime},
    {"column", spec_column},
    {"constant", spec_constant},
-    {"debug", spec_debug},
    {"drop", spec_drop},
    {"error", spec_error},
    {"group", spec_group},
@@ -1661,7 +1597,7 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
    /* After here, no panics except for the bad: label. */

    /* Keep track at each index if an instruction was
-     * referenced (0x01) or is in a main bytecode position
+     * reference (0x01) or is in a main bytecode position
     * (0x02). This lets us do a linear scan and not
     * need to a depth first traversal. It is stricter
     * than a dfs by not allowing certain kinds of unused
@@ -1684,10 +1620,6 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
            case RULE_LITERAL:
                i += 2 + ((rule[1] + 3) >> 2);
                break;
-            case RULE_DEBUG:
-                /* [0 words] */
-                i += 1;
-                break;
            case RULE_NCHAR:
            case RULE_NOTNCHAR:
            case RULE_RANGE:
@@ -1771,7 +1703,6 @@ static void *peg_unmarshal(JanetMarshalContext *ctx) {
                break;
            case RULE_REPLACE:
            case RULE_MATCHTIME:
-            case RULE_MATCHSPLICE:
                /* [rule, constant, tag] */
                if (rule[1] >= blen) goto bad;
                if (rule[2] >= clen) goto bad;
@@ -1903,8 +1834,8 @@ static JanetPeg *compile_peg(Janet x) {
 JANET_CORE_FN(cfun_peg_compile,
              "(peg/compile peg)",
              "Compiles a peg source data structure into a <core/peg>. This will speed up matching "
-              "if the same peg will be used multiple times. `(dyn :peg-grammar)` replaces "
-              "`default-peg-grammar` for the grammar of the peg.") {
+              "if the same peg will be used multiple times. Will also use `(dyn :peg-grammar)` to supplement "
+              "the grammar of the peg for otherwise undefined peg keywords.") {
    janet_fixarity(argc, 1);
    JanetPeg *peg = compile_peg(argv[0]);
    return janet_wrap_abstract(peg);
--- a/src/core/pp.c
+++ b/src/core/pp.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -1023,20 +1023,10 @@ void janet_buffer_format(
            char form[MAX_FORMAT], item[MAX_ITEM];
            char width[3], precision[3];
            int nb = 0; /* number of bytes in added item */
-#ifdef JANET_PLAN9
-            if (*strfrmt == 'r') {
-                rerrstr(item, MAX_ITEM);
-                nb = strlen(item);
-            } else
-#endif
-                if (++arg >= argc)
-                    janet_panic("not enough values for format");
+            if (++arg >= argc)
+                janet_panic("not enough values for format");
            strfrmt = scanformat(strfrmt, form, width, precision);
            switch (*strfrmt++) {
-#ifdef JANET_PLAN9
-                case 'r':
-                    break;
-#endif
                case 'c': {
                    nb = snprintf(item, MAX_ITEM, form, (int)
                                  janet_getinteger(argv, arg));
@@ -1070,11 +1060,19 @@ void janet_buffer_format(
                    break;
                }
                case 's': {
-                    const char *s = janet_getcbytes(argv, arg);
+                    JanetByteView bytes = janet_getbytes(argv, arg);
+                    const uint8_t *s = bytes.bytes;
+                    int32_t l = bytes.len;
                    if (form[2] == '\0')
-                        janet_buffer_push_cstring(b, s);
+                        janet_buffer_push_bytes(b, s, l);
                    else {
-                        nb = snprintf(item, MAX_ITEM, form, s);
+                        if (l != (int32_t) strlen((const char *) s))
+                            janet_panic("string contains zeros");
+                        if (!strchr(form, '.') && l >= 100) {
+                            janet_panic("no precision and string is too long to be formatted");
+                        } else {
+                            nb = snprintf(item, MAX_ITEM, form, s);
+                        }
                    }
                    break;
                }
--- a/src/core/regalloc.c
+++ b/src/core/regalloc.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/regalloc.h
+++ b/src/core/regalloc.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/run.c
+++ b/src/core/run.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -26,8 +26,7 @@
 #include "state.h"
 #endif

-/* Run a string of code. The return value is a set of error flags, JANET_DO_ERROR_RUNTIME, JANET_DO_ERROR_COMPILE, and JANET_DOR_ERROR_PARSE if
- * any errors were encountered in those phases. More information is printed to stderr. */
+/* Run a string */
 int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char *sourcePath, Janet *out) {
    JanetParser *parser;
    int errflags = 0, done = 0;
@@ -56,10 +55,11 @@ int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char
                JanetSignal status = janet_continue(fiber, janet_wrap_nil(), &ret);
                if (status != JANET_SIGNAL_OK && status != JANET_SIGNAL_EVENT) {
                    janet_stacktrace_ext(fiber, ret, "");
-                    errflags |= JANET_DO_ERROR_RUNTIME;
+                    errflags |= 0x01;
                    done = 1;
                }
            } else {
+                ret = janet_wrap_string(cres.error);
                int32_t line = (int32_t) parser->line;
                int32_t col = (int32_t) parser->column;
                if ((cres.error_mapping.line > 0) &&
@@ -67,19 +67,15 @@ int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char
                    line = cres.error_mapping.line;
                    col = cres.error_mapping.column;
                }
-                JanetString ctx = janet_formatc("%s:%d:%d: compile error",
-                                                sourcePath, line, col);
-                JanetString errstr = janet_formatc("%s: %s",
-                                                   (const char *)ctx,
-                                                   (const char *)cres.error);
-                ret = janet_wrap_string(errstr);
                if (cres.macrofiber) {
-                    janet_eprintf("%s", (const char *)ctx);
+                    janet_eprintf("%s:%d:%d: compile error", sourcePath,
+                                  line, col);
                    janet_stacktrace_ext(cres.macrofiber, ret, "");
                } else {
-                    janet_eprintf("%s\n", (const char *)errstr);
+                    janet_eprintf("%s:%d:%d: compile error: %s\n", sourcePath,
+                                  line, col, (const char *)cres.error);
                }
-                errflags |= JANET_DO_ERROR_COMPILE;
+                errflags |= 0x02;
                done = 1;
            }
        }
@@ -92,14 +88,12 @@ int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char
                done = 1;
                break;
            case JANET_PARSE_ERROR: {
-                errflags |= JANET_DO_ERROR_PARSE;
+                const char *e = janet_parser_error(parser);
+                errflags |= 0x04;
+                ret = janet_cstringv(e);
                int32_t line = (int32_t) parser->line;
                int32_t col = (int32_t) parser->column;
-                JanetString errstr = janet_formatc("%s:%d:%d: parse error: %s",
-                                                   sourcePath, line, col,
-                                                   janet_parser_error(parser));
-                ret = janet_wrap_string(errstr);
-                janet_eprintf("%s\n", (const char *)errstr);
+                janet_eprintf("%s:%d:%d: parse error: %s\n", sourcePath, line, col, e);
                done = 1;
                break;
            }
@@ -127,8 +121,7 @@ int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char
        janet_loop();
        if (fiber) {
            janet_gcunroot(janet_wrap_fiber(fiber));
-            if (!errflags)
-                ret = fiber->last_value;
+            ret = fiber->last_value;
        }
    }
 #endif
--- a/src/core/specials.c
+++ b/src/core/specials.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -307,14 +307,14 @@ static JanetSlot janetc_varset(JanetFopts opts, int32_t argn, const Janet *argv)
 /* Add attributes to a global def or var table */
 static JanetTable *handleattr(JanetCompiler *c, const char *kind, int32_t argn, const Janet *argv) {
    int32_t i;
-    if (argn < 2) {
-        janetc_error(c, janet_formatc("expected at least 2 arguments to %s", kind));
-        return NULL;
-    }
    JanetTable *tab = janet_table(2);
    const char *binding_name = janet_type(argv[0]) == JANET_SYMBOL
                               ? ((const char *)janet_unwrap_symbol(argv[0]))
                               : "<multiple bindings>";
+    if (argn < 2) {
+        janetc_error(c, janet_formatc("expected at least 2 arguments to %s", kind));
+        return NULL;
+    }
    for (i = 1; i < argn - 1; i++) {
        Janet attr = argv[i];
        switch (janet_type(attr)) {
@@ -362,23 +362,6 @@ SlotHeadPair *dohead_destructure(JanetCompiler *c, SlotHeadPair *into, JanetFopt
        janet_indexed_view(lhs, &view_lhs.items, &view_lhs.len);
        janet_indexed_view(rhs, &view_rhs.items, &view_rhs.len);
        int found_amp = 0;
-        int found_splice = 0;
-        /* Check for (def [x y z] [(splice [1 2 3]) 4 5 6]), bail out of optimization */
-        for (int32_t i = 0; i < view_rhs.len; i++) {
-            if (!janet_checktype(view_rhs.items[i], JANET_TUPLE)) {
-                continue;
-            }
-            JanetTuple tup = janet_unwrap_tuple(view_rhs.items[i]);
-            if (janet_tuple_length(tup) == 0) {
-                continue;
-            }
-            if (janet_symeq(tup[0], "splice")) {
-                found_splice = 1;
-                /* Good error will be generated later. */
-                break;
-            }
-        }
-        /* Check for (def [x & more] [1 2 3]), bail out of optimization */
        for (int32_t i = 0; i < view_lhs.len; i++) {
            if (janet_symeq(view_lhs.items[i], "&")) {
                found_amp = 1;
@@ -386,7 +369,7 @@ SlotHeadPair *dohead_destructure(JanetCompiler *c, SlotHeadPair *into, JanetFopt
                break;
            }
        }
-        if (!found_amp && !found_splice) {
+        if (!found_amp) {
            for (int32_t i = 0; i < view_lhs.len; i++) {
                Janet sub_rhs = view_rhs.len <= i ? janet_wrap_nil() : view_rhs.items[i];
                into = dohead_destructure(c, into, subopts, view_lhs.items[i], sub_rhs);
@@ -404,7 +387,7 @@ SlotHeadPair *dohead_destructure(JanetCompiler *c, SlotHeadPair *into, JanetFopt
 }

 /* Def or var a symbol in a local scope */
-static int namelocal(JanetCompiler *c, const uint8_t *head, int32_t flags, JanetSlot ret, int no_unused) {
+static int namelocal(JanetCompiler *c, const uint8_t *head, int32_t flags, JanetSlot ret) {
    int isUnnamedRegister = !(ret.flags & JANET_SLOT_NAMED) &&
                            ret.index > 0 &&
                            ret.envindex >= 0;
@@ -425,11 +408,7 @@ static int namelocal(JanetCompiler *c, const uint8_t *head, int32_t flags, Janet
        ret = localslot;
    }
    ret.flags |= flags;
-    if ((c->scope->flags & JANET_SCOPE_TOP) || no_unused) {
-        janetc_nameslot_no_unused(c, head, ret);
-    } else {
-        janetc_nameslot(c, head, ret);
-    }
+    janetc_nameslot(c, head, ret);
    return !isUnnamedRegister;
 }

@@ -443,7 +422,8 @@ static int varleaf(
        JanetSlot refslot;
        JanetTable *entry = janet_table_clone(reftab);

-        int is_redef = janet_truthy(janet_table_get_keyword(c->env, "redef"));
+        Janet redef_kw = janet_ckeywordv("redef");
+        int is_redef = janet_truthy(janet_table_get(c->env, redef_kw));

        JanetArray *ref;
        JanetBinding old_binding;
@@ -463,17 +443,7 @@ static int varleaf(
        janetc_emit_ssu(c, JOP_PUT_INDEX, refslot, s, 0, 0);
        return 1;
    } else {
-        int no_unused = reftab && reftab->count && janet_truthy(janet_table_get_keyword(reftab, "unused"));
-        return namelocal(c, sym, JANET_SLOT_MUTABLE, s, no_unused);
-    }
-}
-
-static void check_metadata_lint(JanetCompiler *c, JanetTable *attr_table) {
-    if (!(c->scope->flags & JANET_SCOPE_TOP) && attr_table && attr_table->count) {
-        /* A macro is a normal lint, other metadata is a strict lint */
-        if (janet_truthy(janet_table_get_keyword(attr_table, "macro"))) {
-            janetc_lintf(c, JANET_C_LINT_NORMAL, "macro tag is ignored in inner scopes");
-        }
+        return namelocal(c, sym, JANET_SLOT_MUTABLE, s);
    }
 }

@@ -483,7 +453,6 @@ static JanetSlot janetc_var(JanetFopts opts, int32_t argn, const Janet *argv) {
    if (c->result.status == JANET_COMPILE_ERROR) {
        return janetc_cslot(janet_wrap_nil());
    }
-    check_metadata_lint(c, attr_table);
    SlotHeadPair *into = NULL;
    into = dohead_destructure(c, into, opts, argv[0], argv[argn - 1]);
    if (c->result.status == JANET_COMPILE_ERROR) {
@@ -510,8 +479,9 @@ static int defleaf(
        janet_table_put(entry, janet_ckeywordv("source-map"),
                        janet_wrap_tuple(janetc_make_sourcemap(c)));

-        int is_redef = janet_truthy(janet_table_get_keyword(c->env, "redef"));
-        if (is_redef) janet_table_put(entry, janet_ckeywordv("redef"), janet_wrap_true());
+        Janet redef_kw = janet_ckeywordv("redef");
+        int is_redef = janet_truthy(janet_table_get(c->env, redef_kw));
+        if (is_redef) janet_table_put(entry, redef_kw, janet_wrap_true());

        if (is_redef) {
            JanetBinding binding = janet_resolve_ext(c->env, sym);
@@ -534,8 +504,7 @@ static int defleaf(
        /* Add env entry to env */
        janet_table_put(c->env, janet_wrap_symbol(sym), janet_wrap_table(entry));
    }
-    int no_unused = tab && tab->count && janet_truthy(janet_table_get_keyword(tab, "unused"));
-    return namelocal(c, sym, 0, s, no_unused);
+    return namelocal(c, sym, 0, s);
 }

 static JanetSlot janetc_def(JanetFopts opts, int32_t argn, const Janet *argv) {
@@ -544,7 +513,6 @@ static JanetSlot janetc_def(JanetFopts opts, int32_t argn, const Janet *argv) {
    if (c->result.status == JANET_COMPILE_ERROR) {
        return janetc_cslot(janet_wrap_nil());
    }
-    check_metadata_lint(c, attr_table);
    opts.flags &= ~JANET_FOPTS_HINT;
    SlotHeadPair *into = NULL;
    into = dohead_destructure(c, into, opts, argv[0], argv[argn - 1]);
@@ -684,10 +652,8 @@ static JanetSlot janetc_if(JanetFopts opts, int32_t argn, const Janet *argv) {

    /* Write jumps - only add jump lengths if jump actually emitted */
    labeld = janet_v_count(c->buffer);
-    if (labeljr < labeld) {
-        c->buffer[labeljr] |= (labelr - labeljr) << 16;
-        if (!tail && labeljd < labeld) c->buffer[labeljd] |= (labeld - labeljd) << 8;
-    }
+    c->buffer[labeljr] |= (labelr - labeljr) << 16;
+    if (!tail) c->buffer[labeljd] |= (labeld - labeljd) << 8;

    if (tail) target.flags |= JANET_SLOT_RETURNED;
    return target;
@@ -1076,14 +1042,6 @@ static JanetSlot janetc_fn(JanetFopts opts, int32_t argn, const Janet *argv) {
        }
    }

-    /* Compile named arguments */
-    if (namedargs) {
-        Janet param = janet_wrap_table(named_table);
-        destructure(c, param, named_slot, defleaf, NULL);
-        janetc_freeslot(c, named_slot);
-        janet_v_free(named_params);
-    }
-
    /* Compile destructed params */
    int32_t j = 0;
    for (i = 0; i < paramcount; i++) {
@@ -1097,6 +1055,14 @@ static JanetSlot janetc_fn(JanetFopts opts, int32_t argn, const Janet *argv) {
    }
    janet_v_free(destructed_params);

+    /* Compile named arguments */
+    if (namedargs) {
+        Janet param = janet_wrap_table(named_table);
+        destructure(c, param, named_slot, defleaf, NULL);
+        janetc_freeslot(c, named_slot);
+        janet_v_free(named_params);
+    }
+
    max_arity = (vararg || allow_extra) ? INT32_MAX : arity;
    if (!seenopt) min_arity = arity;

@@ -1118,7 +1084,7 @@ static JanetSlot janetc_fn(JanetFopts opts, int32_t argn, const Janet *argv) {
            JanetSlot slot = janetc_farslot(c);
            slot.flags = JANET_SLOT_NAMED | JANET_FUNCTION;
            janetc_emit_s(c, JOP_LOAD_SELF, slot, 1);
-            janetc_nameslot_no_unused(c, sym, slot);
+            janetc_nameslot(c, sym, slot);
        }
    }

@@ -1139,12 +1105,8 @@ static JanetSlot janetc_fn(JanetFopts opts, int32_t argn, const Janet *argv) {
    def->arity = arity;
    def->min_arity = min_arity;
    def->max_arity = max_arity;
-    if (named_table != NULL) {
-        def->named_args_count = named_table->count;
-    }
    if (vararg) def->flags |= JANET_FUNCDEF_FLAG_VARARG;
    if (structarg) def->flags |= JANET_FUNCDEF_FLAG_STRUCTARG;
-    if (namedargs) def->flags |= JANET_FUNCDEF_FLAG_NAMEDARGS;

    if (hasname) def->name = janet_unwrap_symbol(head); /* Also correctly unwraps keyword */
    janet_def_addflags(def);
--- a/src/core/state.c
+++ b/src/core/state.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/state.h
+++ b/src/core/state.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -23,11 +23,8 @@
 #ifndef JANET_STATE_H_defined
 #define JANET_STATE_H_defined

-#ifndef JANET_AMALG
-#include "features.h"
 #include <janet.h>
 #include <stdint.h>
-#endif

 #ifdef JANET_EV
 #ifdef JANET_WINDOWS
@@ -68,7 +65,6 @@ typedef struct {
    int has_worker;
 #ifdef JANET_WINDOWS
    HANDLE worker;
-    HANDLE worker_event;
 #else
    pthread_t worker;
 #endif
--- a/src/core/string.c
+++ b/src/core/string.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/strtod.c
+++ b/src/core/strtod.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/struct.c
+++ b/src/core/struct.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/symcache.c
+++ b/src/core/symcache.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/symcache.h
+++ b/src/core/symcache.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/table.c
+++ b/src/core/table.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -155,17 +155,6 @@ Janet janet_table_get(JanetTable *t, Janet key) {
    return janet_wrap_nil();
 }

-/* Used internally for compiler stuff */
-Janet janet_table_get_keyword(JanetTable *t, const char *keyword) {
-    int32_t keyword_len = strlen(keyword);
-    for (int i = JANET_MAX_PROTO_DEPTH; t && i; t = t->proto, --i) {
-        JanetKV *bucket = (JanetKV *) janet_dict_find_keyword(t->data, t->capacity, (const uint8_t *) keyword, keyword_len);
-        if (NULL != bucket && !janet_checktype(bucket->key, JANET_NIL))
-            return bucket->value;
-    }
-    return janet_wrap_nil();
-}
-
 /* Get a value out of the table, and record which prototype it was from. */
 Janet janet_table_get_ex(JanetTable *t, Janet key, JanetTable **which) {
    for (int i = JANET_MAX_PROTO_DEPTH; t && i; t = t->proto, --i) {
--- a/src/core/tuple.c
+++ b/src/core/tuple.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -321,54 +321,6 @@ const JanetKV *janet_dict_find(const JanetKV *buckets, int32_t cap, Janet key) {
    return first_bucket;
 }

-/* Helper to find a keyword, symbol, or string in a Janet struct or table without allocating
- * memory or needing to find interned symbols */
-const JanetKV *janet_dict_find_keyword(
-    const JanetKV *buckets, int32_t cap,
-    const uint8_t *cstr, int32_t cstr_len) {
-    int32_t hash = janet_string_calchash(cstr, cstr_len);
-    int32_t index = janet_maphash(cap, hash);
-    int32_t i;
-    const JanetKV *first_bucket = NULL;
-    /* Higher half */
-    for (i = index; i < cap; i++) {
-        const JanetKV *kv = buckets + i;
-        if (janet_checktype(kv->key, JANET_NIL)) {
-            if (janet_checktype(kv->value, JANET_NIL)) {
-                return kv;
-            } else if (NULL == first_bucket) {
-                first_bucket = kv;
-            }
-        } else if (janet_checktype(kv->key, JANET_KEYWORD)) {
-            /* Works for symbol and keyword, too */
-            JanetString str = janet_unwrap_string(kv->key);
-            int32_t len = janet_string_length(str);
-            if (hash == janet_string_hash(str) && len == cstr_len && !memcmp(str, cstr, len)) {
-                return buckets + i;
-            }
-        }
-    }
-    /* Lower half */
-    for (i = 0; i < index; i++) {
-        const JanetKV *kv = buckets + i;
-        if (janet_checktype(kv->key, JANET_NIL)) {
-            if (janet_checktype(kv->value, JANET_NIL)) {
-                return kv;
-            } else if (NULL == first_bucket) {
-                first_bucket = kv;
-            }
-        } else if (janet_checktype(kv->key, JANET_KEYWORD)) {
-            /* Works for symbol and keyword, too */
-            JanetString str = janet_unwrap_string(kv->key);
-            int32_t len = janet_string_length(str);
-            if (hash == janet_string_hash(str) && len == cstr_len && !memcmp(str, cstr, len)) {
-                return buckets + i;
-            }
-        }
-    }
-    return first_bucket;
-}
-
 /* Get a value from a janet struct or table. */
 Janet janet_dictionary_get(const JanetKV *data, int32_t cap, Janet key) {
    const JanetKV *kv = janet_dict_find(data, cap, key);
@@ -676,11 +628,8 @@ JanetBinding janet_binding_from_entry(Janet entry) {
        return binding;
    entry_table = janet_unwrap_table(entry);

-    Janet deprecate = janet_table_get_keyword(entry_table, "deprecated");
-    int macro = janet_truthy(janet_table_get_keyword(entry_table, "macro"));
-    Janet value = janet_table_get_keyword(entry_table, "value");
-    Janet ref = janet_table_get_keyword(entry_table, "ref");
-
+    /* deprecation check */
+    Janet deprecate = janet_table_get(entry_table, janet_ckeywordv("deprecated"));
    if (janet_checktype(deprecate, JANET_KEYWORD)) {
        JanetKeyword depkw = janet_unwrap_keyword(deprecate);
        if (!janet_cstrcmp(depkw, "relaxed")) {
@@ -694,8 +643,11 @@ JanetBinding janet_binding_from_entry(Janet entry) {
        binding.deprecation = JANET_BINDING_DEP_NORMAL;
    }

+    int macro = janet_truthy(janet_table_get(entry_table, janet_ckeywordv("macro")));
+    Janet value = janet_table_get(entry_table, janet_ckeywordv("value"));
+    Janet ref = janet_table_get(entry_table, janet_ckeywordv("ref"));
    int ref_is_valid = janet_checktype(ref, JANET_ARRAY);
-    int redef = ref_is_valid && janet_truthy(janet_table_get_keyword(entry_table, "redef"));
+    int redef = ref_is_valid && janet_truthy(janet_table_get(entry_table, janet_ckeywordv("redef")));

    if (macro) {
        binding.value = redef ? ref : value;
@@ -896,15 +848,11 @@ int janet_checksize(Janet x) {
        return 0;
    double dval = janet_unwrap_number(x);
    if (dval != (double)((size_t) dval)) return 0;
-#ifdef JANET_PLAN9
-    return dval <= SIZE_MAX;
-#else
    if (SIZE_MAX > JANET_INTMAX_INT64) {
        return dval <= JANET_INTMAX_INT64;
    } else {
        return dval <= SIZE_MAX;
    }
-#endif
 }

 JanetTable *janet_get_core_table(const char *name) {
@@ -983,24 +931,27 @@ int janet_gettime(struct timespec *spec, enum JanetTimeSource source) {
 #include <mach/clock.h>
 #include <mach/mach.h>
 int janet_gettime(struct timespec *spec, enum JanetTimeSource source) {
-    if (source == JANET_TIME_CPUTIME) {
-        clock_t tmp = clock();
-        spec->tv_sec = tmp / CLOCKS_PER_SEC;
-        spec->tv_nsec = ((tmp - (spec->tv_sec * CLOCKS_PER_SEC)) * 1000000000) / CLOCKS_PER_SEC;
-    } else {
+    if (source == JANET_TIME_REALTIME) {
        clock_serv_t cclock;
        mach_timespec_t mts;
-        clock_id_t cid = CALENDAR_CLOCK;
-        if (source == JANET_TIME_REALTIME) {
-            cid = CALENDAR_CLOCK;
-        } else if (source == JANET_TIME_MONOTONIC) {
-            cid = SYSTEM_CLOCK;
-        }
-        host_get_clock_service(mach_host_self(), cid, &cclock);
+        host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
        clock_get_time(cclock, &mts);
        mach_port_deallocate(mach_task_self(), cclock);
        spec->tv_sec = mts.tv_sec;
        spec->tv_nsec = mts.tv_nsec;
+    } else if (source == JANET_TIME_MONOTONIC) {
+        clock_serv_t cclock;
+        int nsecs;
+        mach_msg_type_number_t count;
+        host_get_clock_service(mach_host_self(), clock, &cclock);
+        clock_get_attributes(cclock, CLOCK_GET_TIME_RES, (clock_attr_t)&nsecs, &count);
+        mach_port_deallocate(mach_task_self(), cclock);
+        clock_getres(CLOCK_MONOTONIC, spec);
+    }
+    if (source == JANET_TIME_CPUTIME) {
+        clock_t tmp = clock();
+        spec->tv_sec = tmp;
+        spec->tv_nsec = (tmp - spec->tv_sec) * 1.0e9;
    }
    return 0;
 }
--- a/src/core/util.h
+++ b/src/core/util.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -66,72 +66,42 @@

 /* Utils */
 uint32_t janet_hash_mix(uint32_t input, uint32_t more);
-
 #define janet_maphash(cap, hash) ((uint32_t)(hash) & (cap - 1))
-
 int janet_valid_utf8(const uint8_t *str, int32_t len);
-
 int janet_is_symbol_char(uint8_t c);
-
 extern const char janet_base64[65];
-
 int32_t janet_array_calchash(const Janet *array, int32_t len);
-
 int32_t janet_kv_calchash(const JanetKV *kvs, int32_t len);
-
 int32_t janet_string_calchash(const uint8_t *str, int32_t len);
-
 int32_t janet_tablen(int32_t n);
-
 void safe_memcpy(void *dest, const void *src, size_t len);
-
 void janet_buffer_push_types(JanetBuffer *buffer, int types);
-
 const JanetKV *janet_dict_find(const JanetKV *buckets, int32_t cap, Janet key);
-
 void janet_memempty(JanetKV *mem, int32_t count);
-
 void *janet_memalloc_empty(int32_t count);
-
 JanetTable *janet_get_core_table(const char *name);
-
 void janet_def_addflags(JanetFuncDef *def);
-
 void janet_buffer_dtostr(JanetBuffer *buffer, double x);
-
 const char *janet_strerror(int e);
-
 const void *janet_strbinsearch(
    const void *tab,
    size_t tabcount,
    size_t itemsize,
    const uint8_t *key);
-
 void janet_buffer_format(
    JanetBuffer *b,
    const char *strfrmt,
    int32_t argstart,
    int32_t argc,
    Janet *argv);
-
 Janet janet_next_impl(Janet ds, Janet key, int is_interpreter);
-
 JanetBinding janet_binding_from_entry(Janet entry);
-
 JanetByteView janet_text_substitution(
    Janet *subst,
    const uint8_t *bytes,
    uint32_t len,
    JanetArray *extra_args);

-const JanetKV *janet_dict_find_keyword(
-    const JanetKV *buckets,
-    int32_t cap,
-    const uint8_t *cstr,
-    int32_t cstr_len);
-
-Janet janet_table_get_keyword(JanetTable *t, const char *keyword);
-
 /* Registry functions */
 void janet_registry_put(
    JanetCFunction key,
@@ -197,11 +167,7 @@ typedef void *Clib;
 #endif
 char *get_processed_name(const char *name);

-#ifdef JANET_PLAN9
-#define RETRY_EINTR(RC, CALL) (RC) = CALL;
-#else
 #define RETRY_EINTR(RC, CALL) do { (RC) = CALL; } while((RC) < 0 && errno == EINTR)
-#endif

 /* Initialize builtin libraries */
 void janet_lib_io(JanetTable *env);
--- a/src/core/value.c
+++ b/src/core/value.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -322,8 +322,7 @@ int32_t janet_hash(Janet x) {
            break;
        case JANET_TUPLE:
            hash = janet_tuple_hash(janet_unwrap_tuple(x));
-            uint32_t inc = (janet_tuple_flag(janet_unwrap_tuple(x)) & JANET_TUPLE_FLAG_BRACKETCTOR) ? 1 : 0;
-            hash = (int32_t)((uint32_t)hash + inc); /* avoid overflow undefined behavior */
+            hash += (janet_tuple_flag(janet_unwrap_tuple(x)) & JANET_TUPLE_FLAG_BRACKETCTOR) ? 1 : 0;
            break;
        case JANET_STRUCT:
            hash = janet_struct_hash(janet_unwrap_struct(x));
@@ -768,8 +767,7 @@ void janet_put(Janet ds, Janet key, Janet value) {
            JanetArray *array = janet_unwrap_array(ds);
            int32_t index = getter_checkint(type, key, INT32_MAX - 1);
            if (index >= array->count) {
-                janet_array_ensure(array, index + 1, 2);
-                array->count = index + 1;
+                janet_array_setcount(array, index + 1);
            }
            array->data[index] = value;
            break;
@@ -780,8 +778,7 @@ void janet_put(Janet ds, Janet key, Janet value) {
            if (!janet_checkint(value))
                janet_panicf("can only put integers in buffers, got %v", value);
            if (index >= buffer->count) {
-                janet_buffer_ensure(buffer, index + 1, 2);
-                buffer->count = index + 1;
+                janet_buffer_setcount(buffer, index + 1);
            }
            buffer->data[index] = (uint8_t)(janet_unwrap_integer(value) & 0xFF);
            break;
--- a/src/core/vector.c
+++ b/src/core/vector.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/vector.h
+++ b/src/core/vector.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/vm.c
+++ b/src/core/vm.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/core/wrap.c
+++ b/src/core/wrap.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/src/include/janet.h
+++ b/src/include/janet.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -77,11 +77,6 @@ extern "C" {
 #define JANET_CYGWIN 1
 #endif

-/* Check for Illumos */
-#if defined(__illumos__)
-#define JANET_ILLUMOS 1
-#endif
-
 /* Check Unix */
 #if defined(_AIX) \
    || defined(__APPLE__) /* Darwin */ \
@@ -121,7 +116,6 @@ extern "C" {
    || (defined(__sparc__) && defined(__arch64__) || defined (__sparcv9)) /* BE */ \
    || defined(__s390x__) /* S390 64-bit (BE) */ \
    || (defined(__ppc64__) || defined(__PPC64__)) \
-    || defined(PLAN9_arm64) || defined(PLAN9_amd64) \
    || defined(__aarch64__) /* ARM 64-bit */ \
    || (defined(__riscv) && (__riscv_xlen == 64)) /* RISC-V 64-bit */ \
    || defined(__loongarch64) /* LoongArch64 64-bit */
@@ -148,7 +142,6 @@ extern "C" {
    || defined(__s390x__) /* S390 64-bit */ \
    || defined(__s390__)  /* S390 32-bit */ \
    || defined(__ARMEB__) /* ARM big endian */ \
-    || defined(__AARCH64EB__) /* ARM64 big endian */ \
    || ((defined(__CC_ARM) || defined(__ARMCC__)) /* ARM RealView compiler */ \
        && defined(__BIG_ENDIAN))
 #define JANET_BIG_ENDIAN 1
@@ -169,7 +162,7 @@ extern "C" {
 #endif

 /* Check sun */
-#if defined(__sun) && !defined(JANET_ILLUMOS)
+#ifdef __sun
 #define JANET_NO_UTC_MKTIME
 #endif

@@ -668,8 +661,6 @@ JANET_API void janet_stream_level_triggered(JanetStream *stream);
 * signals. Define them here */
 #ifdef JANET_WINDOWS
 typedef long JanetAtomicInt;
-#elif defined(JANET_PLAN9)
-typedef long JanetAtomicInt;
 #else
 typedef int32_t JanetAtomicInt;
 #endif
@@ -1074,7 +1065,6 @@ struct JanetAbstractHead {
 #define JANET_FUNCDEF_FLAG_HASSOURCEMAP 0x800000
 #define JANET_FUNCDEF_FLAG_STRUCTARG 0x1000000
 #define JANET_FUNCDEF_FLAG_HASCLOBITSET 0x2000000
-#define JANET_FUNCDEF_FLAG_NAMEDARGS 0x4000000
 #define JANET_FUNCDEF_FLAG_TAG 0xFFFF

 /* Source mapping structure for a bytecode instruction */
@@ -1116,7 +1106,6 @@ struct JanetFuncDef {
    int32_t environments_length;
    int32_t defs_length;
    int32_t symbolmap_length;
-    int32_t named_args_count;
 };

 /* A function environment */
@@ -1140,21 +1129,9 @@ struct JanetFunction {
    JanetFuncEnv *envs[];
 };

-/* Use to read Janet data structures into memory from source code */
 typedef struct JanetParseState JanetParseState;
 typedef struct JanetParser JanetParser;

-typedef int (*Consumer)(JanetParser *p, JanetParseState *state, uint8_t c);
-
-struct JanetParseState {
-    int32_t counter;
-    int32_t argn;
-    int flags;
-    size_t line;
-    size_t column;
-    Consumer consumer;
-};
-
 enum JanetParserStatus {
    JANET_PARSE_ROOT,
    JANET_PARSE_ERROR,
@@ -1190,10 +1167,7 @@ typedef struct {
    const JanetAbstractType *at;
 } JanetMarshalContext;

-/* Defines an abstract type. Use a const pointer to one of these structures
- * when creating abstract types. The memory for this pointer should not be free
- * until after janet_deinit is called. Usually, this means declaring JanetAbstractType's
- * as const data at file scope, and creating instances with janet_abstract(&MyType, sizeof(MyTypeStruct)); */
+/* Defines an abstract type */
 struct JanetAbstractType {
    const char *name;
    int (*gc)(void *data, size_t len);
@@ -1209,7 +1183,6 @@ struct JanetAbstractType {
    Janet(*call)(void *p, int32_t argc, Janet *argv);
    size_t (*length)(void *p, size_t len);
    JanetByteView(*bytes)(void *p, size_t len);
-    int (*gcperthread)(void *data, size_t len);
 };

 /* Some macros to let us add extra types to JanetAbstract types without
@@ -1229,8 +1202,7 @@ struct JanetAbstractType {
 #define JANET_ATEND_NEXT        NULL,JANET_ATEND_CALL
 #define JANET_ATEND_CALL        NULL,JANET_ATEND_LENGTH
 #define JANET_ATEND_LENGTH      NULL,JANET_ATEND_BYTES
-#define JANET_ATEND_BYTES       NULL,JANET_ATEND_GCPERTHREAD
-#define JANET_ATEND_GCPERTHREAD
+#define JANET_ATEND_BYTES

 struct JanetReg {
    const char *name;
@@ -1445,7 +1417,6 @@ JANET_API void janet_loop(void);
 *     } else {
 *       janet_schedule(interrupted_fiber, janet_wrap_nil());
 *     }
- *     janet_interpreter_interrupt_handled(NULL);
 *   }
 * }
 *
@@ -1485,27 +1456,18 @@ JANET_API void janet_ev_dec_refcount(void);
 JANET_API void *janet_abstract_begin_threaded(const JanetAbstractType *atype, size_t size);
 JANET_API void *janet_abstract_end_threaded(void *x);
 JANET_API void *janet_abstract_threaded(const JanetAbstractType *atype, size_t size);
-
-/* Allow reference counting on threaded abstract types. This is useful when external code , either
- * in the current OS thread or in a different OS thread, takes a pointer to this abstract type. The programmer
- * should tncrement the reference count when taking the pointer, and then decrement and possibly cleanup and free
- * if the reference count is 0. */
 JANET_API int32_t janet_abstract_incref(void *abst);
 JANET_API int32_t janet_abstract_decref(void *abst);

-/* If this returns 0, *abst will be deinitialized and freed. Useful shorthand if there is no other cleanup for
- * this abstract type before calling `janet_free` on it's backing memory. */
-JANET_API int32_t janet_abstract_decref_maybe_free(void *abst);
-
 /* Expose channel utilities */
-JANET_API JanetChannel *janet_channel_make(uint32_t limit);
-JANET_API JanetChannel *janet_channel_make_threaded(uint32_t limit);
-JANET_API JanetChannel *janet_getchannel(const Janet *argv, int32_t n);
-JANET_API JanetChannel *janet_optchannel(const Janet *argv, int32_t argc, int32_t n, JanetChannel *dflt);
+JanetChannel *janet_channel_make(uint32_t limit);
+JanetChannel *janet_channel_make_threaded(uint32_t limit);
+JanetChannel *janet_getchannel(const Janet *argv, int32_t n);
+JanetChannel *janet_optchannel(const Janet *argv, int32_t argc, int32_t n, JanetChannel *dflt);
 JANET_API int janet_channel_give(JanetChannel *channel, Janet x);
 JANET_API int janet_channel_take(JanetChannel *channel, Janet *out);

-/* Expose some OS sync primitives - mutexes and reader-writer locks */
+/* Expose some OS sync primitives */
 JANET_API size_t janet_os_mutex_size(void);
 JANET_API size_t janet_os_rwlock_size(void);
 JANET_API void janet_os_mutex_init(JanetOSMutex *mutex);
@@ -1573,8 +1535,7 @@ JANET_API void janet_ev_post_event(JanetVM *vm, JanetCallback cb, JanetEVGeneric
 /* Callback used by janet_ev_threaded_await */
 JANET_API void janet_ev_default_threaded_callback(JanetEVGenericMessage return_value);

-/* Read async from a stream. These function yield to the event-loop with janet_await(), and so do not return.
- * When the fiber is resumed, the fiber will simply continue to the next Janet abstract machine instruction. */
+/* Read async from a stream */
 JANET_NO_RETURN JANET_API void janet_ev_read(JanetStream *stream, JanetBuffer *buf, int32_t nbytes);
 JANET_NO_RETURN JANET_API void janet_ev_readchunk(JanetStream *stream, JanetBuffer *buf, int32_t nbytes);
 #ifdef JANET_NET
@@ -1583,8 +1544,7 @@ JANET_NO_RETURN JANET_API void janet_ev_recvchunk(JanetStream *stream, JanetBuff
 JANET_NO_RETURN JANET_API void janet_ev_recvfrom(JanetStream *stream, JanetBuffer *buf, int32_t nbytes, int flags);
 #endif

-/* Write async to a stream. These function yield to the event-loop with janet_await(), and so do not return.
- * When the fiber is resumed, the fiber will simply continue to the next Janet abstract machine instruction. */
+/* Write async to a stream */
 JANET_NO_RETURN JANET_API void janet_ev_write_buffer(JanetStream *stream, JanetBuffer *buf);
 JANET_NO_RETURN JANET_API void janet_ev_write_string(JanetStream *stream, JanetString str);
 #ifdef JANET_NET
@@ -1596,63 +1556,17 @@ JANET_NO_RETURN JANET_API void janet_ev_sendto_string(JanetStream *stream, Janet

 #endif

-/* Parsing.
- *
- * E.g.
- *
- * JanetParser parser;
- * janet_parser_init(&parser);
- * for (int i = 0; i < source_code_length + 1; i++) {
- *   if (i >= source_code_length) {
- *     janet_parser_eof(&parser);
- *   } else {
- *     janet_parser_consume(&parser, source_code[i]);
- *   }
- *   while (janet_parser_has_more(&parser)) {
- *      Janet x = janet_parser_produce(&parser);
- *      janet_printf("got value: %v\n", x);
- *   }
- *   switch (janet_parser_status(&parser)) {
- *      case JANET_PARSE_PENDING: break;
- *      case JANET_PARSE_ERROR: janet_eprintf("error: %s\n", janet_parser_error(&parser)); break;
- *      case JANET_PARSE_ROOT: break;
- *      case JANET_PARSE_DEAD: break;
- *   }
- * }
- * janet_parser_deinit(&parser);
- *
- * */
+/* Parsing */
 extern JANET_API const JanetAbstractType janet_parser_type;
-
-/* Construct/destruct a parser. Parsers can be allocated on the stack or the heap. */
 JANET_API void janet_parser_init(JanetParser *parser);
 JANET_API void janet_parser_deinit(JanetParser *parser);
-
-/* Feed bytes into the parser. Check the parser state after every byte to handle errors. */
 JANET_API void janet_parser_consume(JanetParser *parser, uint8_t c);
-
-/* Check the current status of the parser */
 JANET_API enum JanetParserStatus janet_parser_status(JanetParser *parser);
-
-/* Produce a value from the parser. Call this when janet_parser_has_more(&parser) is non-zero. */
 JANET_API Janet janet_parser_produce(JanetParser *parser);
-
-/* Produce a value from the parser, wrapped in a tuple. The tuple is used to carry the source mapping information of the
- * top level form, such as a line number or symbol. */
 JANET_API Janet janet_parser_produce_wrapped(JanetParser *parser);
-
-/* When there is an error while parsing (janet_parser_status(&parser) == JANET_PARSE_ERROR), get a nice error string.
- * Calling this will also flush the parser. */
 JANET_API const char *janet_parser_error(JanetParser *parser);
-
-/* If there is a parsing error, flush the parser to set the state back to empty.
- * This allows for better error recover and less confusing error messages on bad syntax deep inside nested data structures. */
 JANET_API void janet_parser_flush(JanetParser *parser);
-
-/* Indicate that there is no more source code */
 JANET_API void janet_parser_eof(JanetParser *parser);
-
-/* If non-zero, the parser has values ready to be produced. */
 JANET_API int janet_parser_has_more(JanetParser *parser);

 /* Assembly */
@@ -1696,13 +1610,7 @@ JANET_API JanetCompileResult janet_compile_lint(
 JANET_API JanetTable *janet_core_env(JanetTable *replacements);
 JANET_API JanetTable *janet_core_lookup_table(JanetTable *replacements);

-/* Execute strings.
- *
- * These functions wrap parsing, compilation, and evalutation into convenient functions.
- * */
-#define JANET_DO_ERROR_RUNTIME 0x01
-#define JANET_DO_ERROR_COMPILE 0x02
-#define JANET_DO_ERROR_PARSE 0x04
+/* Execute strings */
 JANET_API int janet_dobytes(JanetTable *env, const uint8_t *bytes, int32_t len, const char *sourcePath, Janet *out);
 JANET_API int janet_dostring(JanetTable *env, const char *str, const char *sourcePath, Janet *out);

@@ -1893,41 +1801,21 @@ JANET_API JanetTable *janet_env_lookup(JanetTable *env);
 JANET_API void janet_env_lookup_into(JanetTable *renv, JanetTable *env, const char *prefix, int recurse);

 /* GC */
-
-/* The main interface to garbage collection. Call this to do a full mark and sweep cleanup. */
-JANET_API void janet_collect(void);
-
-/* Add "roots" to the garbage collector to prevent the runtime from freeing objects.
- * This is only needed if code outside of Janet keeps references to Janet values */
-JANET_API void janet_gcroot(Janet root);
-JANET_API int janet_gcunroot(Janet root);
-
-/* Allow disabling garbage collection temporarily or for certain sections of code.
- * this is a very cheap operation. */
-JANET_API int janet_gclock(void);
-JANET_API void janet_gcunlock(int handle);
-
-/* The mark and sweep components of the mark and sweep collector. Prefer using janet_collect directly. */
 JANET_API void janet_mark(Janet x);
 JANET_API void janet_sweep(void);
-
-/* Clear all gced memory and call all destructors. Used as part of the standard cleanup routune, most programmers will not need this. */
+JANET_API void janet_collect(void);
 JANET_API void janet_clear_memory(void);
-
-/* Remove all GC roots. Used as part of the standard cleanup routine, most programmers will not need this. */
+JANET_API void janet_gcroot(Janet root);
+JANET_API int janet_gcunroot(Janet root);
 JANET_API int janet_gcunrootall(Janet root);
-
-/* Hint to the collector that memory of size s was just allocated to help it better understand when to free memory. */
+JANET_API int janet_gclock(void);
+JANET_API void janet_gcunlock(int handle);
 JANET_API void janet_gcpressure(size_t s);

 /* Functions */
 JANET_API JanetFuncDef *janet_funcdef_alloc(void);
 JANET_API JanetFunction *janet_thunk(JanetFuncDef *def);
-
-/* Get a function that when called with no args, will return x. */
 JANET_API JanetFunction *janet_thunk_delay(Janet x);
-
-/* Do some simple verfification on constructed bytecode to disallow any trivial incorrect bytecode. */
 JANET_API int janet_verify(JanetFuncDef *def);

 /* Pretty printing */
@@ -1976,7 +1864,7 @@ JANET_API void janet_vm_free(JanetVM *vm);
 JANET_API void janet_vm_save(JanetVM *into);
 JANET_API void janet_vm_load(JanetVM *from);
 JANET_API void janet_interpreter_interrupt(JanetVM *vm);
-JANET_API void janet_interpreter_interrupt_handled(JanetVM *vm); /* Call this after running interrupt handler */
+JANET_API void janet_interpreter_interrupt_handled(JanetVM *vm);
 JANET_API JanetSignal janet_continue(JanetFiber *fiber, Janet in, Janet *out);
 JANET_API JanetSignal janet_continue_signal(JanetFiber *fiber, Janet in, Janet *out, JanetSignal sig);
 JANET_API JanetSignal janet_pcall(JanetFunction *fun, int32_t argn, const Janet *argv, Janet *out, JanetFiber **f);
@@ -2001,14 +1889,9 @@ JANET_API void janet_stacktrace_ext(JanetFiber *fiber, Janet err, const char *pr
 #define JANET_SANDBOX_FFI_USE 2048
 #define JANET_SANDBOX_FFI_JIT 4096
 #define JANET_SANDBOX_SIGNAL 8192
-#define JANET_SANDBOX_CHROOT 16384
 #define JANET_SANDBOX_FFI (JANET_SANDBOX_FFI_DEFINE | JANET_SANDBOX_FFI_USE | JANET_SANDBOX_FFI_JIT)
 #define JANET_SANDBOX_FS (JANET_SANDBOX_FS_WRITE | JANET_SANDBOX_FS_READ | JANET_SANDBOX_FS_TEMP)
 #define JANET_SANDBOX_NET (JANET_SANDBOX_NET_CONNECT | JANET_SANDBOX_NET_LISTEN)
-#define JANET_SANDBOX_COMPILE 32768
-#define JANET_SANDBOX_ASM 65536
-#define JANET_SANDBOX_THREADS 131072
-#define JANET_SANDBOX_UNMARSHAL 262144
 #define JANET_SANDBOX_ALL (UINT32_MAX)
 JANET_API void janet_sandbox(uint32_t flags);
 JANET_API void janet_sandbox_assert(uint32_t forbidden_flags);
@@ -2053,14 +1936,7 @@ JANET_API JanetBinding janet_resolve_ext(JanetTable *env, JanetSymbol sym);
 /* Get values from the core environment. */
 JANET_API Janet janet_resolve_core(const char *name);

-/* New C API
- *
- * The "New" C API is intended to make constructing good documentation and source maps
- * much more straightforward. This not only ensures doc strings for functions in native
- * modules, it also add source code mapping for C functions so that programmers can see which
- * file and line a native function that calls janet_panic came from.
- *
- * */
+/* New C API */

 /* Shorthand for janet C function declarations */
 #define JANET_CFUN(name) Janet name (int32_t argc, Janet *argv)
@@ -2215,8 +2091,6 @@ JANET_API int32_t janet_optinteger(const Janet *argv, int32_t argc, int32_t n, i
 JANET_API int64_t janet_optinteger64(const Janet *argv, int32_t argc, int32_t n, int64_t dflt);
 JANET_API size_t janet_optsize(const Janet *argv, int32_t argc, int32_t n, size_t dflt);
 JANET_API JanetAbstract janet_optabstract(const Janet *argv, int32_t argc, int32_t n, const JanetAbstractType *at, JanetAbstract dflt);
-JANET_API uint32_t janet_optuinteger(const Janet *argv, int32_t argc, int32_t n, uint32_t dflt);
-JANET_API uint64_t janet_optuinteger64(const Janet *argv, int32_t argc, int32_t n, uint64_t dflt);

 /* Mutable optional types specify a size default, and construct a new value if none is provided */
 JANET_API JanetBuffer *janet_optbuffer(const Janet *argv, int32_t argc, int32_t n, int32_t dflt_len);
@@ -2317,9 +2191,7 @@ typedef enum {
    RULE_SPLIT,        /* [rule, rule] */
    RULE_NTH,          /* [nth, rule, tag] */
    RULE_ONLY_TAGS,    /* [rule] */
-    RULE_MATCHSPLICE,  /* [rule, constant, tag] */
-    RULE_DEBUG,        /* [] */
-} JanetPegOpcode;
+} JanetPegOpcod;

 typedef struct {
    uint32_t *bytecode;
--- a/src/mainclient/shell.c
+++ b/src/mainclient/shell.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
@@ -79,11 +79,9 @@ static void simpleline(JanetBuffer *buffer) {
    int c;
    for (;;) {
        c = fgetc(in);
-#ifndef JANET_PLAN9
        if (c < 0 && !feof(in) && errno == EINTR) {
            continue;
        }
-#endif
        if (feof(in) || c < 0) {
            break;
        }
@@ -112,8 +110,6 @@ static JANET_THREAD_LOCAL int gbl_historyi = 0;
 static JANET_THREAD_LOCAL JanetByteView gbl_matches[JANET_MATCH_MAX];
 static JANET_THREAD_LOCAL int gbl_match_count = 0;
 static JANET_THREAD_LOCAL int gbl_lines_below = 0;
-static JANET_THREAD_LOCAL int gbl_history_loaded = 0;
-static JANET_THREAD_LOCAL char *gbl_history_file = NULL;
 #endif

 /* Fallback */
@@ -311,9 +307,7 @@ static int curpos(void) {
    char buf[32];
    int cols, rows;
    unsigned int i = 0;
-#ifndef JANET_PLAN9
    if (write_console("\x1b[6n", 4) != 4) return -1;
-#endif
    while (i < sizeof(buf) - 1) {
        if (read_console(buf + i, 1) != 1) break;
        if (buf[i] == 'R') break;
@@ -385,12 +379,10 @@ static void refresh(void) {
    janet_buffer_push_cstring(&b, gbl_prompt);
    janet_buffer_push_bytes(&b, (uint8_t *) _buf, _len);
    /* Erase to right */
-    janet_buffer_push_cstring(&b, "\x1b[0K\r");
+    janet_buffer_push_cstring(&b, "\x1b[0K");
    /* Move cursor to original position. */
-    if (_pos + gbl_plen) {
-        snprintf(seq, 64, "\x1b[%dC", (int)(_pos + gbl_plen));
-        janet_buffer_push_cstring(&b, seq);
-    }
+    snprintf(seq, 64, "\r\x1b[%dC", (int)(_pos + gbl_plen));
+    janet_buffer_push_cstring(&b, seq);
    if (write_console((char *) b.data, b.count) == -1) {
        exit(1);
    }
@@ -432,63 +424,6 @@ static int insert(char c, int draw) {
    return 0;
 }

-static void calc_history_file(void) {
-    char *hist = getenv("JANET_HISTFILE");
-    if (hist != NULL) {
-        gbl_history_file = sdup(hist);
-    } else {
-        gbl_history_file = NULL;
-    }
-}
-
-static void loadhistory(void) {
-    if (gbl_history_loaded) return;
-    calc_history_file();
-    gbl_history_loaded = 1;
-    if (NULL == gbl_history_file) return;
-    FILE *history_file = fopen(gbl_history_file, "rb");
-    if (NULL == history_file) return;
-    JanetParser p;
-    janet_parser_init(&p);
-    int c = 0;
-    while ((c = fgetc(history_file))) {
-        if (c == EOF) {
-            janet_parser_eof(&p);
-        } else {
-            janet_parser_consume(&p, c);
-        }
-
-        while (janet_parser_has_more(&p) && gbl_history_count < JANET_HISTORY_MAX) {
-            if (janet_parser_status(&p) == JANET_PARSE_ERROR) {
-                janet_eprintf("bad history file: %s\n", janet_parser_error(&p));
-                goto parsing_done;
-            }
-            Janet x = janet_parser_produce(&p);
-            const char *cstr = (const char *) janet_to_string(x);
-            if (cstr[0]) { /* Drop empty strings */
-                gbl_history[gbl_history_count++] = sdup(cstr);
-            }
-        }
-
-        if (c == EOF) break;
-    }
-parsing_done:
-    janet_parser_deinit(&p);
-    gbl_historyi = 0;
-    fclose(history_file);
-}
-
-static void savehistory(void) {
-    if (gbl_history_count < 1 || (gbl_history_file == NULL)) return;
-    FILE *history_file = fopen(gbl_history_file, "wb");
-    for (int i = 0; i < gbl_history_count; i++) {
-        if (gbl_history[i][0]) { /* Drop empty strings */
-            janet_dynprintf(NULL, history_file, "%j\n", janet_cstringv(gbl_history[i]));
-        }
-    }
-    fclose(history_file);
-}
-
 static void historymove(int delta) {
    if (gbl_history_count > 1) {
        janet_free(gbl_history[gbl_historyi]);
@@ -955,7 +890,6 @@ static int line() {
            case 3:     /* ctrl-c */
                clearlines();
                norawmode();
-                savehistory();
 #ifdef _WIN32
                ExitProcess(1);
 #else
@@ -1149,21 +1083,17 @@ void janet_line_init() {
 }

 void janet_line_deinit() {
+    int i;
    norawmode();
-    for (int i = 0; i < gbl_history_count; i++)
+    for (i = 0; i < gbl_history_count; i++)
        janet_free(gbl_history[i]);
    gbl_historyi = 0;
-    if (gbl_history_file) {
-        janet_free(gbl_history_file);
-        gbl_history_file = NULL;
-    }
 }

 void janet_line_get(const char *p, JanetBuffer *buffer) {
    gbl_prompt = p;
    buffer->count = 0;
    gbl_historyi = 0;
-    loadhistory();
    if (check_simpleline(buffer)) return;
    FILE *out = janet_dynfile("err", stderr);
    if (line()) {
@@ -1199,10 +1129,6 @@ int main(int argc, char **argv) {
    JanetArray *args;
    JanetTable *env;

-#ifdef JANET_PLAN9
-    setfcr(0);
-#endif
-
 #ifdef _WIN32
    setup_console_output();
 #endif
@@ -1258,7 +1184,6 @@ int main(int argc, char **argv) {
    status = janet_loop_fiber(fiber);

    /* Deinitialize vm */
-    savehistory();
    janet_deinit();
    janet_line_deinit();

--- a/test/amalg/main.c
+++ b/test/amalg/main.c
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2026 Calvin Rose
+* Copyright (c) 2025 Calvin Rose
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to
--- a/test/helper.janet
+++ b/test/helper.janet
@@ -1,8 +1,5 @@
 # Helper code for running tests

-# Turn on strict linting by default in test suite.
-(put root-env *lint-warn* :strict)
-
 (var num-tests-passed 0)
 (var num-tests-run 0)
 (var suite-name 0)
@@ -10,7 +7,7 @@
 (var skip-count 0)
 (var skip-n 0)

-(var is-verbose (os/getenv "VERBOSE"))
+(def is-verbose (os/getenv "VERBOSE"))

 (defn- assert-no-tail
  "Override's the default assert with some nice error handling."
@@ -22,6 +19,7 @@
    (break x))
  (default e "assert error")
  (when x (++ num-tests-passed))
+  (def str (string e))
  (def stack (debug/stack (fiber/current)))
  (def frame (last stack))
  (def line-info (string/format "%s:%d"
@@ -52,11 +50,6 @@
  (def errsym (keyword (gensym)))
  ~(assert (= ,errsym (try (do ,;forms) ([_] ,errsym))) ,msg))

-(defmacro assert-error-value
-  [msg errval & forms]
-  (def e (gensym))
-  ~(assert (= ,errval (try (do ,;forms) ([,e] ,e))) ,msg))
-
 (defn check-compile-error
  [form]
  (def result (compile form))
@@ -67,8 +60,8 @@
  (def e (gensym))
  (def f (gensym))
  (if is-verbose
-  ~(try (do ,;forms (as-macro ,assert true ,msg)) ([,e ,f] (as-macro ,assert false ,msg) (,debug/stacktrace ,f ,e "\e[31m✘\e[0m ")))
-  ~(try (do ,;forms (as-macro ,assert true ,msg)) ([_] (as-macro ,assert false ,msg)))))
+  ~(try (do ,;forms (,assert true ,msg)) ([,e ,f] (,assert false ,msg) (,debug/stacktrace ,f ,e "\e[31m✘\e[0m ")))
+  ~(try (do ,;forms (,assert true ,msg)) ([_] (,assert false ,msg)))))

 (defn start-suite [&opt x]
  (default x (dyn :current-file))
--- a/test/suite-array.janet
+++ b/test/suite-array.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-asm.janet
+++ b/test/suite-asm.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -21,8 +21,6 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)

-(setdyn *lint-warn* :none)
-
 # Assembly test
 # Fibonacci sequence, implemented with naive recursion.
 # a679f60
--- a/test/suite-boot.janet
+++ b/test/suite-boot.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -21,8 +21,6 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)

-(setdyn *lint-warn* :none)
-
 # Let
 # 807f981
 (assert (= (let [a 1 b 2] (+ a b)) 3) "simple let")
@@ -867,13 +865,6 @@
 (assert (deep= ~(,import* "a" :as "b" :fresh maybe)
               (macex '(import a :as b :fresh maybe))) "import macro 2")

-# 2af3f21d
-(assert-error "import macro 2" (macex '(import a :fresh)))
-(assert-error "import macro 3" (macex '(import a :as b :fresh)))
-(assert-error "import macro 4" (macex '(import b "notakeyword" value)))
-(assert (deep= ~(,import* "a" :fresh nil)
-               (macex '(import a :fresh nil))) "import macro 5")
-
 # #477 walk preserving bracket type
 # 0a1d902f4
 (assert (= :brackets (tuple/type (postwalk identity '[])))
@@ -1025,11 +1016,4 @@
 (assert (deep-not= @{:key1 "value1" [@"key2"] @"value2"}
                   @{:key1 "value1" [@"key2"] @"value2"}) "deep= mutable keys")

-# different try overloads
-(assert (= (try (error :error) ([] :caught)) :caught))
-(assert (= (try (error :error) ([e] e)) :error))
-(assert (= (try (error :error) ([e fib] [e (fiber? fib)])) [:error true]))
-# regression test for #1659
-(assert (= (try (error :error) ([_ _] :caught)) :caught))
-
 (end-suite)
--- a/test/suite-buffer.janet
+++ b/test/suite-buffer.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-bundle.janet
+++ b/test/suite-bundle.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -117,17 +117,8 @@
 (assert (= 0 (length (bundle/list))) "bundles are listed correctly 7")
 (assert (= 0 (length (bundle/topolist))) "bundles are listed correctly 8")

-# Try installing a bundle that is missing bundle script
-(assert-error-value "bundle missing bundle script"
-                    "bundle must contain bundle.janet or bundle/init.janet"
-                    (bundle/install "./examples/sample-bad-bundle1"))
-(assert (= 0 (length (bundle/list))) "check failure 0")
-(assert (= 0 (length (bundle/topolist))) "check failure 1")
-
 # Try installing a bundle that fails check
-(assert-error-value "bundle check hook fails"
-                    "Check failed!"
-                    (bundle/install "./examples/sample-bad-bundle2" :check true))
+(assert-error "bad test" (bundle/install "./examples/sample-bad-bundle" :check true))
 (assert (= 0 (length (bundle/list))) "check failure 0")
 (assert (= 0 (length (bundle/topolist))) "check failure 1")

--- a/test/suite-capi.janet
+++ b/test/suite-capi.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-cfuns.janet
+++ b/test/suite-cfuns.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-compile.janet
+++ b/test/suite-compile.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -30,7 +30,7 @@
 (defn myfun [x]
  (var a 10)
  (set a (do
-         (def _y x)
+         (def y x)
         (if x 8 9))))

 (assert (= (myfun true) 8) "check do form regression")
@@ -46,10 +46,8 @@
 # Edge case should cause old compilers to fail due to
 # if statement optimization
 # 17283241
-(setdyn *lint-warn* :relaxed)
 (var var-a 1)
 (var var-b (if false 2 (string "hello")))
-(setdyn *lint-warn* nil)

 (assert (= var-b "hello") "regression 1")

@@ -75,80 +73,5 @@
  (foo 0)
  10)

-# Issue #1699 - fuzz case with bad def
-(def result
-  (compile '(defn sum3
-              "Solve the 3SUM problem in O(n^2) time."
-              [s]
-              (def)tab @{})))
-(assert (get result :error) "bad sum3 fuzz issue valgrind")
-
-# Issue #1700
-(def result
-  (compile
-    '(defn fuzz-case-1
-      [start end &]
-      (if end
-        (if e start (lazy-range (+ 1 start) end)))
-      1)))
-(assert (get result :error) "fuzz case issue #1700")
-
-# Issue #1702 - fuzz case with upvalues
-(def result
-  (compile
-  '(each item [1 2 3]
-    # Generate a lot of upvalues (more than 224)
-    (def ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;out-buf @"")
-    (with-dyns [:out out-buf] 1))))
-(assert result "bad upvalues fuzz case")
-
-# Named argument linting
-# Enhancement for #1654
-
-(defn fnamed [&named x y z] [x y z])
-(defn fkeys [&keys ks] ks)
-(defn fnamed2 [_a _b _c &named x y z] [x y z])
-(defn fkeys2 [_a _b _c &keys ks] ks)
-(defn fnamed3 [{:x x} &named a b c] [x a b c])
-(defn fnamed4 [_y &opt _z &named a b c] [a b c])
-(defn fnamed5 [&opt _z &named a b c] [a b c])
-(defn g [x &opt y &named z] [x y z])
-
-(defn check-good-compile
-  [code msg]
-  (def lints @[])
-  (def result (compile code (curenv) "suite-compile.janet" lints))
-  (assert (and (function? result) (empty? lints)) msg))
-
-(defn check-lint-compile
-  [code msg]
-  (def lints @[])
-  (def result (compile code (curenv) "suite-compile.janet" lints))
-  (assert (and (function? result) (next lints)) msg))
-
-(check-good-compile '(fnamed) "named no args")
-(check-good-compile '(fnamed :x 1 :y 2 :z 3) "named full args")
-(check-lint-compile '(fnamed :x) "named odd args")
-(check-lint-compile '(fnamed :w 0) "named wrong key args")
-(check-good-compile '(fkeys :a 1) "keys even args")
-(check-lint-compile '(fkeys :a 1 :b) "keys odd args")
-(check-good-compile '(fnamed2 nil nil nil) "named 2 no args")
-(check-good-compile '(fnamed2 nil nil nil :x 1 :y 2 :z 3) "named 2 full args")
-(check-lint-compile '(fnamed2 nil nil nil :x) "named 2 odd args")
-(check-lint-compile '(fnamed2 nil nil nil :w 0) "named 2 wrong key args")
-(check-good-compile '(fkeys2 nil nil nil :a 1) "keys 2 even args")
-(check-lint-compile '(fkeys2 nil nil nil :a 1 :b) "keys 2 odd args")
-(check-good-compile '(fnamed3 {:x 1} :a 1 :b 2 :c 3) "named 3 good")
-(check-lint-compile '(fnamed3 {:x 1} :a 1 :b 2 :d 3) "named 3 lint")
-(check-good-compile '(fnamed4 10 20 :a 1 :b 2 :c 3) "named 4 good")
-(check-lint-compile '(fnamed4 10 20 :a 1 :b 2 :d 3) "named 4 lint")
-(check-good-compile '(fnamed5 10 :a 1 :b 2 :c 3) "named 5 good")
-(check-lint-compile '(fnamed5 10 :a 1 :b 2 :d 3) "named 5 lint")
-(check-good-compile '(g 1) "g good 1")
-(check-good-compile '(g 1 2) "g good 2")
-(check-good-compile '(g 1 2 :z 10) "g good 3")
-(check-lint-compile '(g 1 2 :z) "g lint 1")
-(check-lint-compile '(g 1 2 :z 4 5) "g lint 2")
-
 (end-suite)

--- a/test/suite-corelib.janet
+++ b/test/suite-corelib.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -185,26 +185,5 @@
 (assert-no-error "iterate over coro 2" (keys (generate [x :range [0 10]] x)))
 (assert-no-error "iterate over coro 3" (pairs (generate [x :range [0 10]] x)))

-# thaw
-(def ds1 [1 2 3 {:a 2} {:b 3} 4 5 6])
-(def ds2 [1 2 3 {:a 2 {:c :d} {:e :f}} {:b 3} 4 5 6])
-(assert (deep= (thaw ds1) (thaw-keep-keys ds1)) "thaw vs. thaw-keep-keys 1")
-(assert (deep-not= (thaw ds2) (thaw-keep-keys ds2)) "thaw vs. thaw-keep-keys 2")
-
-# match
-(setdyn *lint-warn* :none)
-(assert (= :yes (match [1 2 3] [x y z w] :no1 [x y $] :no2 [x y z] :yes)) "match dollar suffix 1")
-(assert (= :yes (match [1 2 3] [x y z w] :no1 [x y z $] :yes [x y z] :no2)) "match dollar suffix 2")
-(setdyn *lint-warn* nil)
-
-# Issue #1687
-(assert-no-error "def destructure splice works 1" (do (def [a] [;[1]]) a))
-(assert-no-error "def destructure splice works 2" (do (def (n) [(splice [])]) n))
-(assert-no-error "var destructure splice works" (do (var [a] [;[1]]) a))
-
-# Issue #1709
-(assert (= (macex1 '|(set (my-table [2 1]) 'foo))
-           '(fn :short-fn [] (set (my-table [2 1]) (quote foo))))
-        "Macro expand inside set preserves tuple type correctly")
-
 (end-suite)
+
--- a/test/suite-debug.janet
+++ b/test/suite-debug.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-ev.janet
+++ b/test/suite-ev.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose & contributors
+# Copyright (c) 2025 Calvin Rose & contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -21,8 +21,6 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)

-(setdyn *lint-warn* :none)
-
 (def test-port (os/getenv "JANET_TEST_PORT" "8761"))
 (def test-host (os/getenv "JANET_TEST_HOST" "127.0.0.1"))

@@ -108,8 +106,6 @@
      (calc-2 "(+ 9 10 11 12)"))
    @[10 26 42]) "parallel subprocesses 2")

-# (print "file piping")
-
 # File piping
 # a1cc5ca04
 (assert-no-error "file writing 1"
@@ -229,8 +225,6 @@
    (++ iterations)
    (ev/write stream " ")))

-# (print "local name / peer name testing")
-
 # Test localname and peername
 # 077bf5eba
 (repeat 10
@@ -413,8 +407,6 @@
        (while (def msg (ev/read connection 100))
          (broadcast name (string msg)))))))

-# (print "chat app testing")
-
 # Now launch the chat server
 (def chat-server (net/listen test-host test-port))
 (ev/spawn
@@ -508,8 +500,6 @@
                       (let [s (net/listen :unix uds-path :stream)]
                         (:close s))))))

-# (print "accept loop testing")
-
 # net/accept-loop level triggering
 (gccollect)
 (def maxconn 50)
@@ -532,8 +522,6 @@
 (assert (= maxconn connect-count))
 (:close s)

-# (print "running deadline tests...")
-
 # Cancel os/proc-wait with ev/deadline
 (let [p (os/spawn [;run janet "-e" "(os/sleep 4)"] :p)]
  (var terminated-normally false)
@@ -558,35 +546,9 @@
  (ev/sleep 0.15)
  (assert (not terminated-normally) "early termination failure 3"))

-# Deadline with interrupt
-(defmacro with-deadline2
-  ``
-  Create a fiber to execute `body`, schedule the event loop to cancel
-  the task (root fiber) associated with `body`'s fiber, and start
-  `body`'s fiber by resuming it.
-
-  The event loop will try to cancel the root fiber if `body`'s fiber
-  has not completed after at least `sec` seconds.
-
-  `sec` is a number that can have a fractional part.
-  ``
-  [sec & body]
-  (with-syms [f]
-    ~(let [,f (coro ,;body)]
-       (,ev/deadline ,sec nil ,f true)
-       (,resume ,f))))
-
-(for i 0 10
-  # (print "deadline 1 iteration " i)
-  (assert (= :done (with-deadline2 10
-                     (ev/sleep 0.01)
-                     :done)) "deadline with interrupt exits normally"))
-
-(for i 0 10
-  # (print "deadline 2 iteration " i)
-  (let [f (coro (forever :foo))]
-    (ev/deadline 0.01 nil f true)
-    (assert-error "deadline expired" (resume f))))
+(let [f (coro (forever :foo))]
+  (ev/deadline 0.01 nil f true)
+  (assert-error "deadline expired" (resume f)))

 # Use :err :stdout
 (def- subproc-code '(do (eprint "hi") (eflush) (print "there") (flush)))
--- a/test/suite-ev2.janet
+++ b/test/suite-ev2.janet
@@ -1,87 +0,0 @@
-# Copyright (c) 2026 Calvin Rose & contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-(import ./helper :prefix "" :exit true)
-(start-suite)
-
-# Issue #1629
-(def thread-channel (ev/thread-chan 100))
-(def super (ev/thread-chan 10))
-(defn worker []
-  (while true
-    (def item (ev/take thread-channel))
-    (when (= item :deadline)
-      (ev/deadline 0.1 nil (fiber/current) true))))
-(ev/thread worker nil :n super)
-(ev/give thread-channel :item)
-(ev/sleep 0.05)
-(ev/give thread-channel :item)
-(ev/sleep 0.05)
-(ev/give thread-channel :deadline)
-(ev/sleep 0.05)
-(ev/give thread-channel :item)
-(ev/sleep 0.05)
-(ev/give thread-channel :item)
-(ev/sleep 0.15)
-(assert (deep= '(:error "deadline expired" nil) (ev/take super)) "deadline expirataion")
-
-# Another variant
-(def thread-channel (ev/thread-chan 100))
-(def super (ev/thread-chan 10))
-(defn worker []
-  (while true
-    (def item (ev/take thread-channel))
-    (when (= item :deadline)
-      (ev/deadline 0.1))))
-(ev/thread worker nil :n super)
-(ev/give thread-channel :deadline)
-(ev/sleep 0.2)
-(assert (deep= '(:error "deadline expired" nil) (ev/take super)) "deadline expirataion")
-
-# Issue #1705 - ev select
-(def supervisor (ev/chan 10))
-
-(def ch (ev/chan))
-(def ch2 (ev/chan))
-
-(ev/go |(do
-          (ev/select ch ch2)
-          (:close ch)
-          "close ch...")
-       nil supervisor)
-
-(ev/go |(do
-          (ev/sleep 0.05)
-          (:close ch2)
-          "close ch2...")
-       nil supervisor)
-
-(assert (let [[status] (ev/take supervisor)] (= status :ok)) "status 1 ev/select")
-(assert (let [[status] (ev/take supervisor)] (= status :ok)) "status 2 ev/select")
-(ev/sleep 0.1) # can we do better?
-(assert (= 0 (ev/count supervisor)) "empty supervisor")
-
-# Issue #1707
-(def f (coro (repeat 10 (yield 1))))
-(resume f)
-(assert-error "cannot schedule non-new fiber"
-              (ev/go f))
-
-(end-suite)
--- a/test/suite-ffi.janet
+++ b/test/suite-ffi.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose & contributors
+# Copyright (c) 2025 Calvin Rose & contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)

-(var has-ffi (dyn 'ffi/native))
+(def has-ffi (dyn 'ffi/native))
 (def has-full-ffi
  (and has-ffi
       (when-let [entry (dyn 'ffi/calling-conventions)]
--- a/test/suite-filewatch.janet
+++ b/test/suite-filewatch.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose & contributors
+# Copyright (c) 2025 Calvin Rose & contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,8 +24,8 @@
 (assert true)

 (def chan (ev/chan 1000))
-(var is-win (or (= :mingw (os/which)) (= :windows (os/which))))
-(var is-linux (= :linux (os/which)))
+(def is-win (or (= :mingw (os/which)) (= :windows (os/which))))
+(def is-linux (= :linux (os/which)))

 # If not supported, exit early
 (def [supported msg] (protect (filewatch/new chan)))
--- a/test/suite-inttypes.janet
+++ b/test/suite-inttypes.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose & contributors
+# Copyright (c) 2025 Calvin Rose & contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -21,9 +21,6 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)

-# Disable linting warnings
-(setdyn *lint-warn* :none)
-
 # some tests for bigint
 # 319575c
 (def i64 int/s64)
--- a/test/suite-io.janet
+++ b/test/suite-io.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose & contributors
+# Copyright (c) 2025 Calvin Rose & contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
--- a/test/suite-marsh.janet
+++ b/test/suite-marsh.janet
@@ -1,4 +1,4 @@
-# Copyright (c) 2026 Calvin Rose
+# Copyright (c) 2025 Calvin Rose
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -81,12 +81,10 @@
             "marshal nested fibers")

 # issue #53 - f4908ebc4
-(setdyn *lint-warn* :none)
 (def issue-53-x
  (fiber/new
    (fn []
      (var y (fiber/new (fn [] (print "1") (yield) (print "2")))))))
-(setdyn *lint-warn* nil)

 (check-image issue-53-x "issue 53 regression")

--- a/Show More
+++ b/Show More