Parquet vtab.

2026-01-15 15:19:13 +00:00 · 2025-01-07 16:33:01 +00:00
173 changed files with 2358 additions and 7662 deletions
--- a/.github/actions/vmactions/template.yml
+++ b/.github/actions/vmactions/template.yml
@@ -1,6 +1,11 @@
 name: VM Actions matrix
 description: VM Actions matrix template

+inputs:
+  run:
+    description: The CI command to run
+    required: true
+
 runs:
  using: composite
  steps:
@@ -8,4 +13,4 @@ runs:
      with:
        usesh: true
        copyback: false
-        run: . ./test.sh
+        run: ${{inputs.run}}
--- a/.github/workflows/libc.yml
+++ b/.github/workflows/libc.yml
@@ -1,23 +0,0 @@
-name: Benchmark libc
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-15]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Benchmark
-      shell: bash
-      run: sqlite3/libc/benchmark.sh
--- a/.github/workflows/repro.sh
+++ b/.github/workflows/repro.sh
@@ -1,9 +1,28 @@
 #!/usr/bin/env bash
 set -euo pipefail

+if [[ "$OSTYPE" == "linux"* ]]; then
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.tar.gz"
+  BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-linux.tar.gz"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-macos.tar.gz"
+  BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-arm64-macos.tar.gz"
+elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
+  WASI_SDK="https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-windows.tar.gz"
+  BINARYEN="https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-windows.tar.gz"
+fi
+
+# Download tools
+mkdir -p tools/
+[ -d "tools/wasi-sdk" ] || curl -#L "$WASI_SDK" | tar xzC tools &
+[ -d "tools/binaryen" ] || curl -#L "$BINARYEN" | tar xzC tools &
+wait
+
+[ -d "tools/wasi-sdk" ] || mv "tools/wasi-sdk"* "tools/wasi-sdk"
+[ -d "tools/binaryen" ] || mv "tools/binaryen"* "tools/binaryen"
+
 # Download and build SQLite
 sqlite3/download.sh
-sqlite3/tools.sh
 embed/build.sh
 embed/bcw2/build.sh

--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,27 +7,20 @@ on:
      - '**.go'
      - '**.mod'
      - '**.wasm'
-      - '**.yml'
  pull_request:
    branches: [ 'main' ]
    paths:
      - '**.go'
      - '**.mod'
      - '**.wasm'
-      - '**.yml'
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  test:
    strategy:
      matrix:
        os: [macos-latest, ubuntu-latest, windows-latest]
    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: write

    steps:
    - uses: actions/checkout@v4
@@ -64,22 +57,16 @@ jobs:
      run: go test -v -tags sqlite3_dotlk ./...
      if: matrix.os != 'windows-latest'

-    - name: Test modules
-      shell: bash
-      run: |
-        go work init .
-        go work use -r embed gormlite
-        go test -v ./embed/bcw2/...
-
    - name: Test GORM
      shell: bash
      run: gormlite/test.sh
-      if: matrix.os != 'windows-latest'
+
+    - name: Test modules
+      shell: bash
+      run: go test -v ./embed/bcw2/...

    - name: Collect coverage
-      run: |
-        go get -tool github.com/dave/courtney@v0.4.4
-        go tool courtney
+      run: go run github.com/dave/courtney@latest
      if: |
        github.event_name == 'push' &&
        matrix.os == 'ubuntu-latest'
@@ -101,7 +88,7 @@ jobs:
            version: '14.2'
            flags: '-test.v'
          - name: netbsd
-            version: '10.1'
+            version: '10.0'
            flags: '-test.v'
          - name: freebsd
            arch: arm64
@@ -109,7 +96,7 @@ jobs:
            flags: '-test.v -test.short'
          - name: netbsd
            arch: arm64
-            version: '10.1'
+            version: '10.0'
            flags: '-test.v -test.short'
          - name: openbsd
            version: '7.6'
@@ -128,7 +115,7 @@ jobs:
      run: .github/workflows/build-test.sh

    - name: Test
-      uses: cross-platform-actions/action@v0.27.0
+      uses: cross-platform-actions/action@v0.26.0
      with:
        operating_system: ${{ matrix.os.name }}
        architecture: ${{ matrix.os.arch }}
@@ -167,6 +154,10 @@ jobs:

    - name: Test
      uses: ./.github/actions/vmactions
+      with:
+        usesh: true
+        copyback: false
+        run: . ./test.sh

  test-wasip1:
    runs-on: ubuntu-latest
@@ -179,7 +170,7 @@ jobs:
      with: { go-version: stable }

    - name: Set path
-      run: echo "$(go env GOROOT)/lib/wasm" >> "$GITHUB_PATH"
+      run: echo "$(go env GOROOT)/misc/wasm" >> "$GITHUB_PATH"

    - name: Test wasmtime
      env:
@@ -202,6 +193,9 @@ jobs:
    - name: Test 386 (32-bit)
      run: GOARCH=386 go test -v -short ./...

+    - name: Test arm64 (compiler)
+      run: GOARCH=arm64 go test -v -short ./...
+
    - name: Test riscv64 (interpreter)
      run: GOARCH=riscv64 go test -v -short ./...

@@ -211,18 +205,6 @@ jobs:
    - name: Test s390x (big-endian)
      run: GOARCH=s390x go test -v -short -tags sqlite3_dotlk ./...

-  test-linuxarm:
-    runs-on: ubuntu-24.04-arm
-    needs: test
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with: { go-version: stable }
-
-    - name: Test
-      run: go test -v ./...
-
  test-macintel:
    runs-on: macos-13
    needs: test
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,4 @@

 # Dependency directories (remove the comment below to include it)
 # vendor/
-tools
-
-# Go workspace file
-go.work
-go.work.sum
-
-# env file
-.env
+tools
--- a/README.md
+++ b/README.md
@@ -65,21 +65,18 @@ db.QueryRow(`SELECT sqlite_version()`).Scan(&version)
 This module replaces the SQLite [OS Interface](https://sqlite.org/vfs.html)
 (aka VFS) with a [pure Go](vfs/) implementation,
 which has advantages and disadvantages.
-Read more about the Go VFS design [here](vfs/README.md).

-Because each database connection executes within a Wasm sandboxed environment,
-memory usage will be higher than alternatives.
+Read more about the Go VFS design [here](vfs/README.md).

 ### Testing

 This project aims for [high test coverage](https://github.com/ncruces/go-sqlite3/wiki/Test-coverage-report).
 It also benefits greatly from [SQLite's](https://sqlite.org/testing.html) and
-[wazero's](https://tetrate.io/blog/introducing-wazero-from-tetrate/#:~:text=Rock%2Dsolid%20test%20approach)
-thorough testing.
+[wazero's](https://tetrate.io/blog/introducing-wazero-from-tetrate/#:~:text=Rock%2Dsolid%20test%20approach) thorough testing.

 Every commit is [tested](https://github.com/ncruces/go-sqlite3/wiki/Support-matrix) on
-Linux (amd64/arm64/386/riscv64/ppc64le/s390x), macOS (arm64/amd64),
-Windows (amd64), FreeBSD (amd64/arm64), OpenBSD (amd64), NetBSD (amd64/arm64),
+Linux (amd64/arm64/386/riscv64/ppc64le/s390x), macOS (amd64/arm64),
+Windows (amd64), FreeBSD (amd64), OpenBSD (amd64), NetBSD (amd64),
 DragonFly BSD (amd64), illumos (amd64), and Solaris (amd64).

 The Go VFS is tested by running SQLite's
@@ -87,21 +84,12 @@ The Go VFS is tested by running SQLite's

 ### Performance

-Performance of the [`database/sql`](https://pkg.go.dev/database/sql) driver is
+Perfomance of the [`database/sql`](https://pkg.go.dev/database/sql) driver is
 [competitive](https://github.com/cvilsmeier/go-sqlite-bench) with alternatives.

-The Wasm and VFS layers are also benchmarked by running SQLite's
+The Wasm and VFS layers are also tested by running SQLite's
 [speedtest1](https://github.com/sqlite/sqlite/blob/master/test/speedtest1.c).

-### Concurrency
-
-This module behaves similarly to SQLite in [multi-thread](https://sqlite.org/threadsafe.html) mode:
-it is goroutine-safe, provided that no single database connection, or object derived from it,
-is used concurrently by multiple goroutines.
-
-The [`database/sql`](https://pkg.go.dev/database/sql) API is safe to use concurrently,
-according to its documentation.
-
 ### FAQ, issues, new features

 For questions, please see [Discussions](https://github.com/ncruces/go-sqlite3/discussions/categories/q-a).
@@ -110,7 +98,7 @@ Also, post there if you used this driver for something interesting
 ([_"Show and tell"_](https://github.com/ncruces/go-sqlite3/discussions/categories/show-and-tell)),
 have an [idea](https://github.com/ncruces/go-sqlite3/discussions/categories/ideas)…

-The [Issue](https://github.com/ncruces/go-sqlite3/issues) tracker is for bugs,
+The [Issue](https://github.com/ncruces/go-sqlite3/issues) tracker is for bugs we want fixed,
 and features we're working on, planning to work on, or asking for help with.

 ### Alternatives
@@ -118,4 +106,4 @@ and features we're working on, planning to work on, or asking for help with.
 - [`modernc.org/sqlite`](https://pkg.go.dev/modernc.org/sqlite)
 - [`crawshaw.io/sqlite`](https://pkg.go.dev/crawshaw.io/sqlite)
 - [`github.com/mattn/go-sqlite3`](https://pkg.go.dev/github.com/mattn/go-sqlite3)
- [`github.com/zombiezen/go-sqlite`](https://pkg.go.dev/github.com/zombiezen/go-sqlite)
+- [`github.com/zombiezen/go-sqlite`](https://pkg.go.dev/github.com/zombiezen/go-sqlite)
--- a/backup.go
+++ b/backup.go
@@ -5,8 +5,8 @@ package sqlite3
 // https://sqlite.org/c3ref/backup.html
 type Backup struct {
 	c      *Conn
-	handle ptr_t
-	otherc ptr_t
+	handle uint32
+	otherc uint32
 }

 // Backup backs up srcDB on the src connection to the "main" database in dstURI.
@@ -61,7 +61,7 @@ func (src *Conn) BackupInit(srcDB, dstURI string) (*Backup, error) {
 	return src.backupInit(dst, "main", src.handle, srcDB)
 }

-func (c *Conn) backupInit(dst ptr_t, dstName string, src ptr_t, srcName string) (*Backup, error) {
+func (c *Conn) backupInit(dst uint32, dstName string, src uint32, srcName string) (*Backup, error) {
 	defer c.arena.mark()()
 	dstPtr := c.arena.string(dstName)
 	srcPtr := c.arena.string(srcName)
@@ -71,19 +71,19 @@ func (c *Conn) backupInit(dst ptr_t, dstName string, src ptr_t, srcName string)
 		other = src
 	}

-	ptr := ptr_t(c.call("sqlite3_backup_init",
-		stk_t(dst), stk_t(dstPtr),
-		stk_t(src), stk_t(srcPtr)))
-	if ptr == 0 {
+	r := c.call("sqlite3_backup_init",
+		uint64(dst), uint64(dstPtr),
+		uint64(src), uint64(srcPtr))
+	if r == 0 {
 		defer c.closeDB(other)
-		rc := res_t(c.call("sqlite3_errcode", stk_t(dst)))
-		return nil, c.sqlite.error(rc, dst)
+		r = c.call("sqlite3_errcode", uint64(dst))
+		return nil, c.sqlite.error(r, dst)
 	}

 	return &Backup{
 		c:      c,
 		otherc: other,
-		handle: ptr,
+		handle: uint32(r),
 	}, nil
 }

@@ -97,10 +97,10 @@ func (b *Backup) Close() error {
 		return nil
 	}

-	rc := res_t(b.c.call("sqlite3_backup_finish", stk_t(b.handle)))
+	r := b.c.call("sqlite3_backup_finish", uint64(b.handle))
 	b.c.closeDB(b.otherc)
 	b.handle = 0
-	return b.c.error(rc)
+	return b.c.error(r)
 }

 // Step copies up to nPage pages between the source and destination databases.
@@ -108,11 +108,11 @@ func (b *Backup) Close() error {
 //
 // https://sqlite.org/c3ref/backup_finish.html#sqlite3backupstep
 func (b *Backup) Step(nPage int) (done bool, err error) {
-	rc := res_t(b.c.call("sqlite3_backup_step", stk_t(b.handle), stk_t(nPage)))
-	if rc == _DONE {
+	r := b.c.call("sqlite3_backup_step", uint64(b.handle), uint64(nPage))
+	if r == _DONE {
 		return true, nil
 	}
-	return false, b.c.error(rc)
+	return false, b.c.error(r)
 }

 // Remaining returns the number of pages still to be backed up
@@ -120,8 +120,8 @@ func (b *Backup) Step(nPage int) (done bool, err error) {
 //
 // https://sqlite.org/c3ref/backup_finish.html#sqlite3backupremaining
 func (b *Backup) Remaining() int {
-	n := int32(b.c.call("sqlite3_backup_remaining", stk_t(b.handle)))
-	return int(n)
+	r := b.c.call("sqlite3_backup_remaining", uint64(b.handle))
+	return int(int32(r))
 }

 // PageCount returns the total number of pages in the source database
@@ -129,6 +129,6 @@ func (b *Backup) Remaining() int {
 //
 // https://sqlite.org/c3ref/backup_finish.html#sqlite3backuppagecount
 func (b *Backup) PageCount() int {
-	n := int32(b.c.call("sqlite3_backup_pagecount", stk_t(b.handle)))
-	return int(n)
+	r := b.c.call("sqlite3_backup_pagecount", uint64(b.handle))
+	return int(int32(r))
 }
--- a/blob.go
+++ b/blob.go
@@ -20,8 +20,8 @@ type Blob struct {
 	c      *Conn
 	bytes  int64
 	offset int64
-	handle ptr_t
-	bufptr ptr_t
+	handle uint32
+	bufptr uint32
 	buflen int64
 }

@@ -31,32 +31,29 @@ var _ io.ReadWriteSeeker = &Blob{}
 //
 // https://sqlite.org/c3ref/blob_open.html
 func (c *Conn) OpenBlob(db, table, column string, row int64, write bool) (*Blob, error) {
-	if c.interrupt.Err() != nil {
-		return nil, INTERRUPT
-	}
-
 	defer c.arena.mark()()
 	blobPtr := c.arena.new(ptrlen)
 	dbPtr := c.arena.string(db)
 	tablePtr := c.arena.string(table)
 	columnPtr := c.arena.string(column)

-	var flags int32
+	var flags uint64
 	if write {
 		flags = 1
 	}

-	rc := res_t(c.call("sqlite3_blob_open", stk_t(c.handle),
-		stk_t(dbPtr), stk_t(tablePtr), stk_t(columnPtr),
-		stk_t(row), stk_t(flags), stk_t(blobPtr)))
+	c.checkInterrupt(c.handle)
+	r := c.call("sqlite3_blob_open", uint64(c.handle),
+		uint64(dbPtr), uint64(tablePtr), uint64(columnPtr),
+		uint64(row), flags, uint64(blobPtr))

-	if err := c.error(rc); err != nil {
+	if err := c.error(r); err != nil {
 		return nil, err
 	}

 	blob := Blob{c: c}
-	blob.handle = util.Read32[ptr_t](c.mod, blobPtr)
-	blob.bytes = int64(int32(c.call("sqlite3_blob_bytes", stk_t(blob.handle))))
+	blob.handle = util.ReadUint32(c.mod, blobPtr)
+	blob.bytes = int64(c.call("sqlite3_blob_bytes", uint64(blob.handle)))
 	return &blob, nil
 }

@@ -70,10 +67,10 @@ func (b *Blob) Close() error {
 		return nil
 	}

-	rc := res_t(b.c.call("sqlite3_blob_close", stk_t(b.handle)))
+	r := b.c.call("sqlite3_blob_close", uint64(b.handle))
 	b.c.free(b.bufptr)
 	b.handle = 0
-	return b.c.error(rc)
+	return b.c.error(r)
 }

 // Size returns the size of the BLOB in bytes.
@@ -97,13 +94,13 @@ func (b *Blob) Read(p []byte) (n int, err error) {
 		want = avail
 	}
 	if want > b.buflen {
-		b.bufptr = b.c.realloc(b.bufptr, want)
+		b.bufptr = b.c.realloc(b.bufptr, uint64(want))
 		b.buflen = want
 	}

-	rc := res_t(b.c.call("sqlite3_blob_read", stk_t(b.handle),
-		stk_t(b.bufptr), stk_t(want), stk_t(b.offset)))
-	err = b.c.error(rc)
+	r := b.c.call("sqlite3_blob_read", uint64(b.handle),
+		uint64(b.bufptr), uint64(want), uint64(b.offset))
+	err = b.c.error(r)
 	if err != nil {
 		return 0, err
 	}
@@ -112,7 +109,7 @@ func (b *Blob) Read(p []byte) (n int, err error) {
 		err = io.EOF
 	}

-	copy(p, util.View(b.c.mod, b.bufptr, want))
+	copy(p, util.View(b.c.mod, b.bufptr, uint64(want)))
 	return int(want), err
 }

@@ -130,19 +127,19 @@ func (b *Blob) WriteTo(w io.Writer) (n int64, err error) {
 		want = avail
 	}
 	if want > b.buflen {
-		b.bufptr = b.c.realloc(b.bufptr, want)
+		b.bufptr = b.c.realloc(b.bufptr, uint64(want))
 		b.buflen = want
 	}

 	for want > 0 {
-		rc := res_t(b.c.call("sqlite3_blob_read", stk_t(b.handle),
-			stk_t(b.bufptr), stk_t(want), stk_t(b.offset)))
-		err = b.c.error(rc)
+		r := b.c.call("sqlite3_blob_read", uint64(b.handle),
+			uint64(b.bufptr), uint64(want), uint64(b.offset))
+		err = b.c.error(r)
 		if err != nil {
 			return n, err
 		}

-		mem := util.View(b.c.mod, b.bufptr, want)
+		mem := util.View(b.c.mod, b.bufptr, uint64(want))
 		m, err := w.Write(mem[:want])
 		b.offset += int64(m)
 		n += int64(m)
@@ -168,14 +165,14 @@ func (b *Blob) WriteTo(w io.Writer) (n int64, err error) {
 func (b *Blob) Write(p []byte) (n int, err error) {
 	want := int64(len(p))
 	if want > b.buflen {
-		b.bufptr = b.c.realloc(b.bufptr, want)
+		b.bufptr = b.c.realloc(b.bufptr, uint64(want))
 		b.buflen = want
 	}
 	util.WriteBytes(b.c.mod, b.bufptr, p)

-	rc := res_t(b.c.call("sqlite3_blob_write", stk_t(b.handle),
-		stk_t(b.bufptr), stk_t(want), stk_t(b.offset)))
-	err = b.c.error(rc)
+	r := b.c.call("sqlite3_blob_write", uint64(b.handle),
+		uint64(b.bufptr), uint64(want), uint64(b.offset))
+	err = b.c.error(r)
 	if err != nil {
 		return 0, err
 	}
@@ -199,17 +196,17 @@ func (b *Blob) ReadFrom(r io.Reader) (n int64, err error) {
 		want = 1
 	}
 	if want > b.buflen {
-		b.bufptr = b.c.realloc(b.bufptr, want)
+		b.bufptr = b.c.realloc(b.bufptr, uint64(want))
 		b.buflen = want
 	}

 	for {
-		mem := util.View(b.c.mod, b.bufptr, want)
+		mem := util.View(b.c.mod, b.bufptr, uint64(want))
 		m, err := r.Read(mem[:want])
 		if m > 0 {
-			rc := res_t(b.c.call("sqlite3_blob_write", stk_t(b.handle),
-				stk_t(b.bufptr), stk_t(m), stk_t(b.offset)))
-			err := b.c.error(rc)
+			r := b.c.call("sqlite3_blob_write", uint64(b.handle),
+				uint64(b.bufptr), uint64(m), uint64(b.offset))
+			err := b.c.error(r)
 			if err != nil {
 				return n, err
 			}
@@ -256,11 +253,9 @@ func (b *Blob) Seek(offset int64, whence int) (int64, error) {
 //
 // https://sqlite.org/c3ref/blob_reopen.html
 func (b *Blob) Reopen(row int64) error {
-	if b.c.interrupt.Err() != nil {
-		return INTERRUPT
-	}
-	err := b.c.error(res_t(b.c.call("sqlite3_blob_reopen", stk_t(b.handle), stk_t(row))))
-	b.bytes = int64(int32(b.c.call("sqlite3_blob_bytes", stk_t(b.handle))))
+	b.c.checkInterrupt(b.c.handle)
+	err := b.c.error(b.c.call("sqlite3_blob_reopen", uint64(b.handle), uint64(row)))
+	b.bytes = int64(b.c.call("sqlite3_blob_bytes", uint64(b.handle)))
 	b.offset = 0
 	return err
 }
--- a/config.go
+++ b/config.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"sync/atomic"

 	"github.com/tetratelabs/wazero/api"

@@ -33,7 +32,7 @@ func (c *Conn) Config(op DBConfig, arg ...bool) (bool, error) {
 	defer c.arena.mark()()
 	argsPtr := c.arena.new(intlen + ptrlen)

-	var flag int32
+	var flag int
 	switch {
 	case len(arg) == 0:
 		flag = -1
@@ -41,40 +40,31 @@ func (c *Conn) Config(op DBConfig, arg ...bool) (bool, error) {
 		flag = 1
 	}

-	util.Write32(c.mod, argsPtr+0*ptrlen, flag)
-	util.Write32(c.mod, argsPtr+1*ptrlen, argsPtr)
+	util.WriteUint32(c.mod, argsPtr+0*ptrlen, uint32(flag))
+	util.WriteUint32(c.mod, argsPtr+1*ptrlen, argsPtr)

-	rc := res_t(c.call("sqlite3_db_config", stk_t(c.handle),
-		stk_t(op), stk_t(argsPtr)))
-	return util.ReadBool(c.mod, argsPtr), c.error(rc)
-}
-
-var defaultLogger atomic.Pointer[func(code ExtendedErrorCode, msg string)]
-
-// ConfigLog sets up the default error logging callback for new connections.
-//
-// https://sqlite.org/errlog.html
-func ConfigLog(cb func(code ExtendedErrorCode, msg string)) {
-	defaultLogger.Store(&cb)
+	r := c.call("sqlite3_db_config", uint64(c.handle),
+		uint64(op), uint64(argsPtr))
+	return util.ReadUint32(c.mod, argsPtr) != 0, c.error(r)
 }

 // ConfigLog sets up the error logging callback for the connection.
 //
 // https://sqlite.org/errlog.html
 func (c *Conn) ConfigLog(cb func(code ExtendedErrorCode, msg string)) error {
-	var enable int32
+	var enable uint64
 	if cb != nil {
 		enable = 1
 	}
-	rc := res_t(c.call("sqlite3_config_log_go", stk_t(enable)))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_config_log_go", enable)
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.log = cb
 	return nil
 }

-func logCallback(ctx context.Context, mod api.Module, _ ptr_t, iCode res_t, zMsg ptr_t) {
+func logCallback(ctx context.Context, mod api.Module, _, iCode, zMsg uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.log != nil {
 		msg := util.ReadString(mod, zMsg, _MAX_LENGTH)
 		c.log(xErrorCode(iCode), msg)
@@ -98,93 +88,93 @@ func (c *Conn) FileControl(schema string, op FcntlOpcode, arg ...any) (any, erro
 	defer c.arena.mark()()
 	ptr := c.arena.new(max(ptrlen, intlen))

-	var schemaPtr ptr_t
+	var schemaPtr uint32
 	if schema != "" {
 		schemaPtr = c.arena.string(schema)
 	}

-	var rc res_t
-	var ret any
+	var rc uint64
+	var res any
 	switch op {
 	default:
 		return nil, MISUSE

 	case FCNTL_RESET_CACHE:
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), 0))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), 0)

 	case FCNTL_PERSIST_WAL, FCNTL_POWERSAFE_OVERWRITE:
-		var flag int32
+		var flag int
 		switch {
 		case len(arg) == 0:
 			flag = -1
 		case arg[0]:
 			flag = 1
 		}
-		util.Write32(c.mod, ptr, flag)
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
-		ret = util.ReadBool(c.mod, ptr)
+		util.WriteUint32(c.mod, ptr, uint32(flag))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
+		res = util.ReadUint32(c.mod, ptr) != 0

 	case FCNTL_CHUNK_SIZE:
-		util.Write32(c.mod, ptr, int32(arg[0].(int)))
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
+		util.WriteUint32(c.mod, ptr, uint32(arg[0].(int)))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))

 	case FCNTL_RESERVE_BYTES:
 		bytes := -1
 		if len(arg) > 0 {
 			bytes = arg[0].(int)
 		}
-		util.Write32(c.mod, ptr, int32(bytes))
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
-		ret = int(util.Read32[int32](c.mod, ptr))
+		util.WriteUint32(c.mod, ptr, uint32(bytes))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
+		res = int(util.ReadUint32(c.mod, ptr))

 	case FCNTL_DATA_VERSION:
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
-		ret = util.Read32[uint32](c.mod, ptr)
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
+		res = util.ReadUint32(c.mod, ptr)

 	case FCNTL_LOCKSTATE:
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
-		ret = util.Read32[vfs.LockLevel](c.mod, ptr)
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
+		res = vfs.LockLevel(util.ReadUint32(c.mod, ptr))

 	case FCNTL_VFS_POINTER:
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
 		if rc == _OK {
 			const zNameOffset = 16
-			ptr = util.Read32[ptr_t](c.mod, ptr)
-			ptr = util.Read32[ptr_t](c.mod, ptr+zNameOffset)
+			ptr = util.ReadUint32(c.mod, ptr)
+			ptr = util.ReadUint32(c.mod, ptr+zNameOffset)
 			name := util.ReadString(c.mod, ptr, _MAX_NAME)
-			ret = vfs.Find(name)
+			res = vfs.Find(name)
 		}

 	case FCNTL_FILE_POINTER, FCNTL_JOURNAL_POINTER:
-		rc = res_t(c.call("sqlite3_file_control",
-			stk_t(c.handle), stk_t(schemaPtr),
-			stk_t(op), stk_t(ptr)))
+		rc = c.call("sqlite3_file_control",
+			uint64(c.handle), uint64(schemaPtr),
+			uint64(op), uint64(ptr))
 		if rc == _OK {
 			const fileHandleOffset = 4
-			ptr = util.Read32[ptr_t](c.mod, ptr)
-			ptr = util.Read32[ptr_t](c.mod, ptr+fileHandleOffset)
-			ret = util.GetHandle(c.ctx, ptr)
+			ptr = util.ReadUint32(c.mod, ptr)
+			ptr = util.ReadUint32(c.mod, ptr+fileHandleOffset)
+			res = util.GetHandle(c.ctx, ptr)
 		}
 	}

 	if err := c.error(rc); err != nil {
 		return nil, err
 	}
-	return ret, nil
+	return res, nil
 }

 // Limit allows the size of various constructs to be
@@ -192,20 +182,20 @@ func (c *Conn) FileControl(schema string, op FcntlOpcode, arg ...any) (any, erro
 //
 // https://sqlite.org/c3ref/limit.html
 func (c *Conn) Limit(id LimitCategory, value int) int {
-	v := int32(c.call("sqlite3_limit", stk_t(c.handle), stk_t(id), stk_t(value)))
-	return int(v)
+	r := c.call("sqlite3_limit", uint64(c.handle), uint64(id), uint64(value))
+	return int(int32(r))
 }

 // SetAuthorizer registers an authorizer callback with the database connection.
 //
 // https://sqlite.org/c3ref/set_authorizer.html
 func (c *Conn) SetAuthorizer(cb func(action AuthorizerActionCode, name3rd, name4th, schema, inner string) AuthorizerReturnCode) error {
-	var enable int32
+	var enable uint64
 	if cb != nil {
 		enable = 1
 	}
-	rc := res_t(c.call("sqlite3_set_authorizer_go", stk_t(c.handle), stk_t(enable)))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_set_authorizer_go", uint64(c.handle), enable)
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.authorizer = cb
@@ -213,7 +203,7 @@ func (c *Conn) SetAuthorizer(cb func(action AuthorizerActionCode, name3rd, name4

 }

-func authorizerCallback(ctx context.Context, mod api.Module, pDB ptr_t, action AuthorizerActionCode, zName3rd, zName4th, zSchema, zInner ptr_t) (rc AuthorizerReturnCode) {
+func authorizerCallback(ctx context.Context, mod api.Module, pDB uint32, action AuthorizerActionCode, zName3rd, zName4th, zSchema, zInner uint32) (rc AuthorizerReturnCode) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.authorizer != nil {
 		var name3rd, name4th, schema, inner string
 		if zName3rd != 0 {
@@ -237,15 +227,15 @@ func authorizerCallback(ctx context.Context, mod api.Module, pDB ptr_t, action A
 //
 // https://sqlite.org/c3ref/trace_v2.html
 func (c *Conn) Trace(mask TraceEvent, cb func(evt TraceEvent, arg1 any, arg2 any) error) error {
-	rc := res_t(c.call("sqlite3_trace_go", stk_t(c.handle), stk_t(mask)))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_trace_go", uint64(c.handle), uint64(mask))
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.trace = cb
 	return nil
 }

-func traceCallback(ctx context.Context, mod api.Module, evt TraceEvent, pDB, pArg1, pArg2 ptr_t) (rc res_t) {
+func traceCallback(ctx context.Context, mod api.Module, evt TraceEvent, pDB, pArg1, pArg2 uint32) (rc uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.trace != nil {
 		var arg1, arg2 any
 		if evt == TRACE_CLOSE {
@@ -258,7 +248,7 @@ func traceCallback(ctx context.Context, mod api.Module, evt TraceEvent, pDB, pAr
 					case TRACE_STMT:
 						arg2 = s.SQL()
 					case TRACE_PROFILE:
-						arg2 = util.Read64[int64](mod, pArg2)
+						arg2 = int64(util.ReadUint64(mod, pArg2))
 					}
 					break
 				}
@@ -275,28 +265,24 @@ func traceCallback(ctx context.Context, mod api.Module, evt TraceEvent, pDB, pAr
 //
 // https://sqlite.org/c3ref/wal_checkpoint_v2.html
 func (c *Conn) WALCheckpoint(schema string, mode CheckpointMode) (nLog, nCkpt int, err error) {
-	if c.interrupt.Err() != nil {
-		return 0, 0, INTERRUPT
-	}
-
 	defer c.arena.mark()()
 	nLogPtr := c.arena.new(ptrlen)
 	nCkptPtr := c.arena.new(ptrlen)
 	schemaPtr := c.arena.string(schema)
-	rc := res_t(c.call("sqlite3_wal_checkpoint_v2",
-		stk_t(c.handle), stk_t(schemaPtr), stk_t(mode),
-		stk_t(nLogPtr), stk_t(nCkptPtr)))
-	nLog = int(util.Read32[int32](c.mod, nLogPtr))
-	nCkpt = int(util.Read32[int32](c.mod, nCkptPtr))
-	return nLog, nCkpt, c.error(rc)
+	r := c.call("sqlite3_wal_checkpoint_v2",
+		uint64(c.handle), uint64(schemaPtr), uint64(mode),
+		uint64(nLogPtr), uint64(nCkptPtr))
+	nLog = int(int32(util.ReadUint32(c.mod, nLogPtr)))
+	nCkpt = int(int32(util.ReadUint32(c.mod, nCkptPtr)))
+	return nLog, nCkpt, c.error(r)
 }

 // WALAutoCheckpoint configures WAL auto-checkpoints.
 //
 // https://sqlite.org/c3ref/wal_autocheckpoint.html
 func (c *Conn) WALAutoCheckpoint(pages int) error {
-	rc := res_t(c.call("sqlite3_wal_autocheckpoint", stk_t(c.handle), stk_t(pages)))
-	return c.error(rc)
+	r := c.call("sqlite3_wal_autocheckpoint", uint64(c.handle), uint64(pages))
+	return c.error(r)
 }

 // WALHook registers a callback function to be invoked
@@ -304,15 +290,15 @@ func (c *Conn) WALAutoCheckpoint(pages int) error {
 //
 // https://sqlite.org/c3ref/wal_hook.html
 func (c *Conn) WALHook(cb func(db *Conn, schema string, pages int) error) {
-	var enable int32
+	var enable uint64
 	if cb != nil {
 		enable = 1
 	}
-	c.call("sqlite3_wal_hook_go", stk_t(c.handle), stk_t(enable))
+	c.call("sqlite3_wal_hook_go", uint64(c.handle), enable)
 	c.wal = cb
 }

-func walCallback(ctx context.Context, mod api.Module, _, pDB, zSchema ptr_t, pages int32) (rc res_t) {
+func walCallback(ctx context.Context, mod api.Module, _, pDB, zSchema uint32, pages int32) (rc uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.wal != nil {
 		schema := util.ReadString(mod, zSchema, _MAX_NAME)
 		err := c.wal(c, schema, int(pages))
@@ -325,15 +311,15 @@ func walCallback(ctx context.Context, mod api.Module, _, pDB, zSchema ptr_t, pag
 //
 // https://sqlite.org/c3ref/autovacuum_pages.html
 func (c *Conn) AutoVacuumPages(cb func(schema string, dbPages, freePages, bytesPerPage uint) uint) error {
-	var funcPtr ptr_t
+	var funcPtr uint32
 	if cb != nil {
 		funcPtr = util.AddHandle(c.ctx, cb)
 	}
-	rc := res_t(c.call("sqlite3_autovacuum_pages_go", stk_t(c.handle), stk_t(funcPtr)))
-	return c.error(rc)
+	r := c.call("sqlite3_autovacuum_pages_go", uint64(c.handle), uint64(funcPtr))
+	return c.error(r)
 }

-func autoVacuumCallback(ctx context.Context, mod api.Module, pApp, zSchema ptr_t, nDbPage, nFreePage, nBytePerPage uint32) uint32 {
+func autoVacuumCallback(ctx context.Context, mod api.Module, pApp, zSchema, nDbPage, nFreePage, nBytePerPage uint32) uint32 {
 	fn := util.GetHandle(ctx, pApp).(func(schema string, dbPages, freePages, bytesPerPage uint) uint)
 	schema := util.ReadString(mod, zSchema, _MAX_NAME)
 	return uint32(fn(schema, uint(nDbPage), uint(nFreePage), uint(nBytePerPage)))
@@ -343,14 +329,14 @@ func autoVacuumCallback(ctx context.Context, mod api.Module, pApp, zSchema ptr_t
 //
 // https://sqlite.org/c3ref/hard_heap_limit64.html
 func (c *Conn) SoftHeapLimit(n int64) int64 {
-	return int64(c.call("sqlite3_soft_heap_limit64", stk_t(n)))
+	return int64(c.call("sqlite3_soft_heap_limit64", uint64(n)))
 }

 // HardHeapLimit imposes a hard limit on heap size.
 //
 // https://sqlite.org/c3ref/hard_heap_limit64.html
 func (c *Conn) HardHeapLimit(n int64) int64 {
-	return int64(c.call("sqlite3_hard_heap_limit64", stk_t(n)))
+	return int64(c.call("sqlite3_hard_heap_limit64", uint64(n)))
 }

 // EnableChecksums enables checksums on a database.
@@ -392,6 +378,6 @@ func (c *Conn) EnableChecksums(schema string) error {
 	}

 	// Checkpoint the WAL.
-	_, _, err = c.WALCheckpoint(schema, CHECKPOINT_FULL)
+	_, _, err = c.WALCheckpoint(schema, CHECKPOINT_RESTART)
 	return err
 }
--- a/conn.go
+++ b/conn.go
@@ -3,7 +3,6 @@ package sqlite3
 import (
 	"context"
 	"fmt"
-	"iter"
 	"math"
 	"math/rand"
 	"net/url"
@@ -25,6 +24,7 @@ type Conn struct {
 	*sqlite

 	interrupt  context.Context
+	pending    *Stmt
 	stmts      []*Stmt
 	busy       func(context.Context, int) bool
 	log        func(xErrorCode, string)
@@ -35,12 +35,11 @@ type Conn struct {
 	update     func(AuthorizerActionCode, string, string, int64)
 	commit     func() bool
 	rollback   func()
+	arena      arena

 	busy1st time.Time
 	busylst time.Time
-	arena   arena
-	handle  ptr_t
-	gosched uint8
+	handle  uint32
 }

 // Open calls [OpenFlags] with [OPEN_READWRITE], [OPEN_CREATE] and [OPEN_URI].
@@ -49,7 +48,7 @@ func Open(filename string) (*Conn, error) {
 }

 // OpenContext is like [Open] but includes a context,
-// which is used to interrupt the process of opening the connection.
+// which is used to interrupt the process of opening the connectiton.
 func OpenContext(ctx context.Context, filename string) (*Conn, error) {
 	return newConn(ctx, filename, OPEN_READWRITE|OPEN_CREATE|OPEN_URI)
 }
@@ -69,9 +68,9 @@ func OpenFlags(filename string, flags OpenFlag) (*Conn, error) {
 	return newConn(context.Background(), filename, flags)
 }

-type connKey = util.ConnKey
+type connKey struct{}

-func newConn(ctx context.Context, filename string, flags OpenFlag) (ret *Conn, _ error) {
+func newConn(ctx context.Context, filename string, flags OpenFlag) (res *Conn, _ error) {
 	err := ctx.Err()
 	if err != nil {
 		return nil, err
@@ -83,7 +82,7 @@ func newConn(ctx context.Context, filename string, flags OpenFlag) (ret *Conn, _
 		return nil, err
 	}
 	defer func() {
-		if ret == nil {
+		if res == nil {
 			c.Close()
 			c.sqlite.close()
 		} else {
@@ -92,10 +91,7 @@ func newConn(ctx context.Context, filename string, flags OpenFlag) (ret *Conn, _
 	}()

 	c.ctx = context.WithValue(c.ctx, connKey{}, c)
-	if logger := defaultLogger.Load(); logger != nil {
-		c.ConfigLog(*logger)
-	}
-	c.arena = c.newArena()
+	c.arena = c.newArena(1024)
 	c.handle, err = c.openDB(filename, flags)
 	if err == nil {
 		err = initExtensions(c)
@@ -106,21 +102,21 @@ func newConn(ctx context.Context, filename string, flags OpenFlag) (ret *Conn, _
 	return c, nil
 }

-func (c *Conn) openDB(filename string, flags OpenFlag) (ptr_t, error) {
+func (c *Conn) openDB(filename string, flags OpenFlag) (uint32, error) {
 	defer c.arena.mark()()
 	connPtr := c.arena.new(ptrlen)
 	namePtr := c.arena.string(filename)

 	flags |= OPEN_EXRESCODE
-	rc := res_t(c.call("sqlite3_open_v2", stk_t(namePtr), stk_t(connPtr), stk_t(flags), 0))
+	r := c.call("sqlite3_open_v2", uint64(namePtr), uint64(connPtr), uint64(flags), 0)

-	handle := util.Read32[ptr_t](c.mod, connPtr)
-	if err := c.sqlite.error(rc, handle); err != nil {
+	handle := util.ReadUint32(c.mod, connPtr)
+	if err := c.sqlite.error(r, handle); err != nil {
 		c.closeDB(handle)
 		return 0, err
 	}

-	c.call("sqlite3_progress_handler_go", stk_t(handle), 1000)
+	c.call("sqlite3_progress_handler_go", uint64(handle), 100)
 	if flags|OPEN_URI != 0 && strings.HasPrefix(filename, "file:") {
 		var pragmas strings.Builder
 		if _, after, ok := strings.Cut(filename, "?"); ok {
@@ -132,9 +128,10 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (ptr_t, error) {
 			}
 		}
 		if pragmas.Len() != 0 {
+			c.checkInterrupt(handle)
 			pragmaPtr := c.arena.string(pragmas.String())
-			rc := res_t(c.call("sqlite3_exec", stk_t(handle), stk_t(pragmaPtr), 0, 0, 0))
-			if err := c.sqlite.error(rc, handle, pragmas.String()); err != nil {
+			r := c.call("sqlite3_exec", uint64(handle), uint64(pragmaPtr), 0, 0, 0)
+			if err := c.sqlite.error(r, handle, pragmas.String()); err != nil {
 				err = fmt.Errorf("sqlite3: invalid _pragma: %w", err)
 				c.closeDB(handle)
 				return 0, err
@@ -144,9 +141,9 @@ func (c *Conn) openDB(filename string, flags OpenFlag) (ptr_t, error) {
 	return handle, nil
 }

-func (c *Conn) closeDB(handle ptr_t) {
-	rc := res_t(c.call("sqlite3_close_v2", stk_t(handle)))
-	if err := c.sqlite.error(rc, handle); err != nil {
+func (c *Conn) closeDB(handle uint32) {
+	r := c.call("sqlite3_close_v2", uint64(handle))
+	if err := c.sqlite.error(r, handle); err != nil {
 		panic(err)
 	}
 }
@@ -165,8 +162,11 @@ func (c *Conn) Close() error {
 		return nil
 	}

-	rc := res_t(c.call("sqlite3_close", stk_t(c.handle)))
-	if err := c.error(rc); err != nil {
+	c.pending.Close()
+	c.pending = nil
+
+	r := c.call("sqlite3_close", uint64(c.handle))
+	if err := c.error(r); err != nil {
 		return err
 	}

@@ -179,17 +179,12 @@ func (c *Conn) Close() error {
 //
 // https://sqlite.org/c3ref/exec.html
 func (c *Conn) Exec(sql string) error {
-	if c.interrupt.Err() != nil {
-		return INTERRUPT
-	}
-	return c.exec(sql)
-}
-
-func (c *Conn) exec(sql string) error {
 	defer c.arena.mark()()
-	textPtr := c.arena.string(sql)
-	rc := res_t(c.call("sqlite3_exec", stk_t(c.handle), stk_t(textPtr), 0, 0, 0))
-	return c.error(rc, sql)
+	sqlPtr := c.arena.string(sql)
+
+	c.checkInterrupt(c.handle)
+	r := c.call("sqlite3_exec", uint64(c.handle), uint64(sqlPtr), 0, 0, 0)
+	return c.error(r, sql)
 }

 // Prepare calls [Conn.PrepareFlags] with no flags.
@@ -207,26 +202,24 @@ func (c *Conn) PrepareFlags(sql string, flags PrepareFlag) (stmt *Stmt, tail str
 	if len(sql) > _MAX_SQL_LENGTH {
 		return nil, "", TOOBIG
 	}
-	if c.interrupt.Err() != nil {
-		return nil, "", INTERRUPT
-	}

 	defer c.arena.mark()()
 	stmtPtr := c.arena.new(ptrlen)
 	tailPtr := c.arena.new(ptrlen)
-	textPtr := c.arena.string(sql)
+	sqlPtr := c.arena.string(sql)

-	rc := res_t(c.call("sqlite3_prepare_v3", stk_t(c.handle),
-		stk_t(textPtr), stk_t(len(sql)+1), stk_t(flags),
-		stk_t(stmtPtr), stk_t(tailPtr)))
+	c.checkInterrupt(c.handle)
+	r := c.call("sqlite3_prepare_v3", uint64(c.handle),
+		uint64(sqlPtr), uint64(len(sql)+1), uint64(flags),
+		uint64(stmtPtr), uint64(tailPtr))

-	stmt = &Stmt{c: c, sql: sql}
-	stmt.handle = util.Read32[ptr_t](c.mod, stmtPtr)
-	if sql := sql[util.Read32[ptr_t](c.mod, tailPtr)-textPtr:]; sql != "" {
+	stmt = &Stmt{c: c}
+	stmt.handle = util.ReadUint32(c.mod, stmtPtr)
+	if sql := sql[util.ReadUint32(c.mod, tailPtr)-sqlPtr:]; sql != "" {
 		tail = sql
 	}

-	if err := c.error(rc, sql); err != nil {
+	if err := c.error(r, sql); err != nil {
 		return nil, "", err
 	}
 	if stmt.handle == 0 {
@@ -240,7 +233,9 @@ func (c *Conn) PrepareFlags(sql string, flags PrepareFlag) (stmt *Stmt, tail str
 //
 // https://sqlite.org/c3ref/db_name.html
 func (c *Conn) DBName(n int) string {
-	ptr := ptr_t(c.call("sqlite3_db_name", stk_t(c.handle), stk_t(n)))
+	r := c.call("sqlite3_db_name", uint64(c.handle), uint64(n))
+
+	ptr := uint32(r)
 	if ptr == 0 {
 		return ""
 	}
@@ -251,34 +246,34 @@ func (c *Conn) DBName(n int) string {
 //
 // https://sqlite.org/c3ref/db_filename.html
 func (c *Conn) Filename(schema string) *vfs.Filename {
-	var ptr ptr_t
+	var ptr uint32
 	if schema != "" {
 		defer c.arena.mark()()
 		ptr = c.arena.string(schema)
 	}
-	ptr = ptr_t(c.call("sqlite3_db_filename", stk_t(c.handle), stk_t(ptr)))
-	return vfs.GetFilename(c.ctx, c.mod, ptr, vfs.OPEN_MAIN_DB)
+	r := c.call("sqlite3_db_filename", uint64(c.handle), uint64(ptr))
+	return vfs.GetFilename(c.ctx, c.mod, uint32(r), vfs.OPEN_MAIN_DB)
 }

 // ReadOnly determines if a database is read-only.
 //
 // https://sqlite.org/c3ref/db_readonly.html
 func (c *Conn) ReadOnly(schema string) (ro bool, ok bool) {
-	var ptr ptr_t
+	var ptr uint32
 	if schema != "" {
 		defer c.arena.mark()()
 		ptr = c.arena.string(schema)
 	}
-	b := int32(c.call("sqlite3_db_readonly", stk_t(c.handle), stk_t(ptr)))
-	return b > 0, b < 0
+	r := c.call("sqlite3_db_readonly", uint64(c.handle), uint64(ptr))
+	return int32(r) > 0, int32(r) < 0
 }

 // GetAutocommit tests the connection for auto-commit mode.
 //
 // https://sqlite.org/c3ref/get_autocommit.html
 func (c *Conn) GetAutocommit() bool {
-	b := int32(c.call("sqlite3_get_autocommit", stk_t(c.handle)))
-	return b != 0
+	r := c.call("sqlite3_get_autocommit", uint64(c.handle))
+	return r != 0
 }

 // LastInsertRowID returns the rowid of the most recent successful INSERT
@@ -286,7 +281,8 @@ func (c *Conn) GetAutocommit() bool {
 //
 // https://sqlite.org/c3ref/last_insert_rowid.html
 func (c *Conn) LastInsertRowID() int64 {
-	return int64(c.call("sqlite3_last_insert_rowid", stk_t(c.handle)))
+	r := c.call("sqlite3_last_insert_rowid", uint64(c.handle))
+	return int64(r)
 }

 // SetLastInsertRowID allows the application to set the value returned by
@@ -294,7 +290,7 @@ func (c *Conn) LastInsertRowID() int64 {
 //
 // https://sqlite.org/c3ref/set_last_insert_rowid.html
 func (c *Conn) SetLastInsertRowID(id int64) {
-	c.call("sqlite3_set_last_insert_rowid", stk_t(c.handle), stk_t(id))
+	c.call("sqlite3_set_last_insert_rowid", uint64(c.handle), uint64(id))
 }

 // Changes returns the number of rows modified, inserted or deleted
@@ -303,7 +299,8 @@ func (c *Conn) SetLastInsertRowID(id int64) {
 //
 // https://sqlite.org/c3ref/changes.html
 func (c *Conn) Changes() int64 {
-	return int64(c.call("sqlite3_changes64", stk_t(c.handle)))
+	r := c.call("sqlite3_changes64", uint64(c.handle))
+	return int64(r)
 }

 // TotalChanges returns the number of rows modified, inserted or deleted
@@ -312,15 +309,16 @@ func (c *Conn) Changes() int64 {
 //
 // https://sqlite.org/c3ref/total_changes.html
 func (c *Conn) TotalChanges() int64 {
-	return int64(c.call("sqlite3_total_changes64", stk_t(c.handle)))
+	r := c.call("sqlite3_total_changes64", uint64(c.handle))
+	return int64(r)
 }

 // ReleaseMemory frees memory used by a database connection.
 //
 // https://sqlite.org/c3ref/db_release_memory.html
 func (c *Conn) ReleaseMemory() error {
-	rc := res_t(c.call("sqlite3_db_release_memory", stk_t(c.handle)))
-	return c.error(rc)
+	r := c.call("sqlite3_db_release_memory", uint64(c.handle))
+	return c.error(r)
 }

 // GetInterrupt gets the context set with [Conn.SetInterrupt].
@@ -343,17 +341,43 @@ func (c *Conn) GetInterrupt() context.Context {
 //
 // https://sqlite.org/c3ref/interrupt.html
 func (c *Conn) SetInterrupt(ctx context.Context) (old context.Context) {
-	if ctx == nil {
-		panic("nil Context")
-	}
 	old = c.interrupt
 	c.interrupt = ctx
+
+	if ctx == old || ctx.Done() == old.Done() {
+		return old
+	}
+
+	// A busy SQL statement prevents SQLite from ignoring an interrupt
+	// that comes before any other statements are started.
+	if c.pending == nil {
+		defer c.arena.mark()()
+		stmtPtr := c.arena.new(ptrlen)
+		loopPtr := c.arena.string(`WITH RECURSIVE c(x) AS (VALUES(0) UNION ALL SELECT x FROM c) SELECT x FROM c`)
+		c.call("sqlite3_prepare_v3", uint64(c.handle), uint64(loopPtr), math.MaxUint64,
+			uint64(PREPARE_PERSISTENT), uint64(stmtPtr), 0)
+		c.pending = &Stmt{c: c}
+		c.pending.handle = util.ReadUint32(c.mod, stmtPtr)
+	}
+
+	if old.Done() != nil && ctx.Err() == nil {
+		c.pending.Reset()
+	}
+	if ctx.Done() != nil {
+		c.pending.Step()
+	}
 	return old
 }

-func progressCallback(ctx context.Context, mod api.Module, _ ptr_t) (interrupt int32) {
+func (c *Conn) checkInterrupt(handle uint32) {
+	if c.interrupt.Err() != nil {
+		c.call("sqlite3_interrupt", uint64(handle))
+	}
+}
+
+func progressCallback(ctx context.Context, mod api.Module, _ uint32) (interrupt uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok {
-		if c.gosched++; c.gosched%16 == 0 {
+		if c.interrupt.Done() != nil {
 			runtime.Gosched()
 		}
 		if c.interrupt.Err() != nil {
@@ -368,11 +392,11 @@ func progressCallback(ctx context.Context, mod api.Module, _ ptr_t) (interrupt i
 // https://sqlite.org/c3ref/busy_timeout.html
 func (c *Conn) BusyTimeout(timeout time.Duration) error {
 	ms := min((timeout+time.Millisecond-1)/time.Millisecond, math.MaxInt32)
-	rc := res_t(c.call("sqlite3_busy_timeout", stk_t(c.handle), stk_t(ms)))
-	return c.error(rc)
+	r := c.call("sqlite3_busy_timeout", uint64(c.handle), uint64(ms))
+	return c.error(r)
 }

-func timeoutCallback(ctx context.Context, mod api.Module, count, tmout int32) (retry int32) {
+func timeoutCallback(ctx context.Context, mod api.Module, count, tmout int32) (retry uint32) {
 	// https://fractaledmind.github.io/2024/04/15/sqlite-on-rails-the-how-and-why-of-optimal-performance/
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.interrupt.Err() == nil {
 		switch {
@@ -395,22 +419,25 @@ func timeoutCallback(ctx context.Context, mod api.Module, count, tmout int32) (r
 //
 // https://sqlite.org/c3ref/busy_handler.html
 func (c *Conn) BusyHandler(cb func(ctx context.Context, count int) (retry bool)) error {
-	var enable int32
+	var enable uint64
 	if cb != nil {
 		enable = 1
 	}
-	rc := res_t(c.call("sqlite3_busy_handler_go", stk_t(c.handle), stk_t(enable)))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_busy_handler_go", uint64(c.handle), enable)
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.busy = cb
 	return nil
 }

-func busyCallback(ctx context.Context, mod api.Module, pDB ptr_t, count int32) (retry int32) {
+func busyCallback(ctx context.Context, mod api.Module, pDB uint32, count int32) (retry uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.busy != nil {
-		if interrupt := c.interrupt; interrupt.Err() == nil &&
-			c.busy(interrupt, int(count)) {
+		interrupt := c.interrupt
+		if interrupt == nil {
+			interrupt = context.Background()
+		}
+		if interrupt.Err() == nil && c.busy(interrupt, int(count)) {
 			retry = 1
 		}
 	}
@@ -425,16 +452,16 @@ func (c *Conn) Status(op DBStatus, reset bool) (current, highwater int, err erro
 	hiPtr := c.arena.new(intlen)
 	curPtr := c.arena.new(intlen)

-	var i int32
+	var i uint64
 	if reset {
 		i = 1
 	}

-	rc := res_t(c.call("sqlite3_db_status", stk_t(c.handle),
-		stk_t(op), stk_t(curPtr), stk_t(hiPtr), stk_t(i)))
-	if err = c.error(rc); err == nil {
-		current = int(util.Read32[int32](c.mod, curPtr))
-		highwater = int(util.Read32[int32](c.mod, hiPtr))
+	r := c.call("sqlite3_db_status", uint64(c.handle),
+		uint64(op), uint64(curPtr), uint64(hiPtr), i)
+	if err = c.error(r); err == nil {
+		current = int(util.ReadUint32(c.mod, curPtr))
+		highwater = int(util.ReadUint32(c.mod, hiPtr))
 	}
 	return
 }
@@ -445,7 +472,7 @@ func (c *Conn) Status(op DBStatus, reset bool) (current, highwater int, err erro
 func (c *Conn) TableColumnMetadata(schema, table, column string) (declType, collSeq string, notNull, primaryKey, autoInc bool, err error) {
 	defer c.arena.mark()()

-	var schemaPtr, columnPtr ptr_t
+	var schemaPtr, columnPtr uint32
 	declTypePtr := c.arena.new(ptrlen)
 	collSeqPtr := c.arena.new(ptrlen)
 	notNullPtr := c.arena.new(ptrlen)
@@ -459,38 +486,32 @@ func (c *Conn) TableColumnMetadata(schema, table, column string) (declType, coll
 		columnPtr = c.arena.string(column)
 	}

-	rc := res_t(c.call("sqlite3_table_column_metadata", stk_t(c.handle),
-		stk_t(schemaPtr), stk_t(tablePtr), stk_t(columnPtr),
-		stk_t(declTypePtr), stk_t(collSeqPtr),
-		stk_t(notNullPtr), stk_t(primaryKeyPtr), stk_t(autoIncPtr)))
-	if err = c.error(rc); err == nil && column != "" {
-		if ptr := util.Read32[ptr_t](c.mod, declTypePtr); ptr != 0 {
+	r := c.call("sqlite3_table_column_metadata", uint64(c.handle),
+		uint64(schemaPtr), uint64(tablePtr), uint64(columnPtr),
+		uint64(declTypePtr), uint64(collSeqPtr),
+		uint64(notNullPtr), uint64(primaryKeyPtr), uint64(autoIncPtr))
+	if err = c.error(r); err == nil && column != "" {
+		if ptr := util.ReadUint32(c.mod, declTypePtr); ptr != 0 {
 			declType = util.ReadString(c.mod, ptr, _MAX_NAME)
 		}
-		if ptr := util.Read32[ptr_t](c.mod, collSeqPtr); ptr != 0 {
+		if ptr := util.ReadUint32(c.mod, collSeqPtr); ptr != 0 {
 			collSeq = util.ReadString(c.mod, ptr, _MAX_NAME)
 		}
-		notNull = util.ReadBool(c.mod, notNullPtr)
-		autoInc = util.ReadBool(c.mod, autoIncPtr)
-		primaryKey = util.ReadBool(c.mod, primaryKeyPtr)
+		notNull = util.ReadUint32(c.mod, notNullPtr) != 0
+		autoInc = util.ReadUint32(c.mod, autoIncPtr) != 0
+		primaryKey = util.ReadUint32(c.mod, primaryKeyPtr) != 0
 	}
 	return
 }

-func (c *Conn) error(rc res_t, sql ...string) error {
+func (c *Conn) error(rc uint64, sql ...string) error {
 	return c.sqlite.error(rc, c.handle, sql...)
 }

-// Stmts returns an iterator for the prepared statements
-// associated with the database connection.
-//
-// https://sqlite.org/c3ref/next_stmt.html
-func (c *Conn) Stmts() iter.Seq[*Stmt] {
-	return func(yield func(*Stmt) bool) {
-		for _, s := range c.stmts {
-			if !yield(s) {
-				break
-			}
+func (c *Conn) stmtsIter(yield func(*Stmt) bool) {
+	for _, s := range c.stmts {
+		if !yield(s) {
+			break
 		}
 	}
 }
--- a/conn_iter.go
+++ b/conn_iter.go
@@ -0,0 +1,11 @@
+//go:build go1.23
+
+package sqlite3
+
+import "iter"
+
+// Stmts returns an iterator for the prepared statements
+// associated with the database connection.
+//
+// https://sqlite.org/c3ref/next_stmt.html
+func (c *Conn) Stmts() iter.Seq[*Stmt] { return c.stmtsIter }
--- a/conn_old.go
+++ b/conn_old.go
@@ -0,0 +1,9 @@
+//go:build !go1.23
+
+package sqlite3
+
+// Stmts returns an iterator for the prepared statements
+// associated with the database connection.
+//
+// https://sqlite.org/c3ref/next_stmt.html
+func (c *Conn) Stmts() func(func(*Stmt) bool) { return c.stmtsIter }
--- a/const.go
+++ b/const.go
@@ -1,28 +1,19 @@
 package sqlite3

-import (
-	"strconv"
-
-	"github.com/ncruces/go-sqlite3/internal/util"
-)
+import "strconv"

 const (
 	_OK   = 0   /* Successful result */
 	_ROW  = 100 /* sqlite3_step() has another row ready */
 	_DONE = 101 /* sqlite3_step() has finished executing */

-	_MAX_NAME       = 1e6 // Self-imposed limit for most NUL terminated strings.
-	_MAX_LENGTH     = 1e9
-	_MAX_SQL_LENGTH = 1e9
+	_MAX_NAME         = 1e6 // Self-imposed limit for most NUL terminated strings.
+	_MAX_LENGTH       = 1e9
+	_MAX_SQL_LENGTH   = 1e9
+	_MAX_FUNCTION_ARG = 100

-	ptrlen = util.PtrLen
-	intlen = util.IntLen
-)
-
-type (
-	stk_t = util.Stk_t
-	ptr_t = util.Ptr_t
-	res_t = util.Res_t
+	ptrlen = 4
+	intlen = 4
 )

 // ErrorCode is a result code that [Error.Code] might return.
@@ -175,7 +166,6 @@ const (
 	PREPARE_PERSISTENT PrepareFlag = 0x01
 	PREPARE_NORMALIZE  PrepareFlag = 0x02
 	PREPARE_NO_VTAB    PrepareFlag = 0x04
-	PREPARE_DONT_LOG   PrepareFlag = 0x10
 )

 // FunctionFlag is a flag that can be passed to
@@ -229,7 +219,6 @@ const (
 	DBSTATUS_DEFERRED_FKS        DBStatus = 10
 	DBSTATUS_CACHE_USED_SHARED   DBStatus = 11
 	DBSTATUS_CACHE_SPILL         DBStatus = 12
-	// DBSTATUS_MAX              DBStatus = 12
 )

 // DBConfig are the available database connection configuration options.
@@ -258,10 +247,7 @@ const (
 	DBCONFIG_TRUSTED_SCHEMA        DBConfig = 1017
 	DBCONFIG_STMT_SCANSTATUS       DBConfig = 1018
 	DBCONFIG_REVERSE_SCANORDER     DBConfig = 1019
-	DBCONFIG_ENABLE_ATTACH_CREATE  DBConfig = 1020
-	DBCONFIG_ENABLE_ATTACH_WRITE   DBConfig = 1021
-	DBCONFIG_ENABLE_COMMENTS       DBConfig = 1022
-	// DBCONFIG_MAX                DBConfig = 1022
+	// DBCONFIG_MAX                DBConfig = 1019
 )

 // FcntlOpcode are the available opcodes for [Conn.FileControl].
--- a/context.go
+++ b/context.go
@@ -15,7 +15,7 @@ import (
 // https://sqlite.org/c3ref/context.html
 type Context struct {
 	c      *Conn
-	handle ptr_t
+	handle uint32
 }

 // Conn returns the database connection of the
@@ -32,14 +32,14 @@ func (ctx Context) Conn() *Conn {
 // https://sqlite.org/c3ref/get_auxdata.html
 func (ctx Context) SetAuxData(n int, data any) {
 	ptr := util.AddHandle(ctx.c.ctx, data)
-	ctx.c.call("sqlite3_set_auxdata_go", stk_t(ctx.handle), stk_t(n), stk_t(ptr))
+	ctx.c.call("sqlite3_set_auxdata_go", uint64(ctx.handle), uint64(n), uint64(ptr))
 }

 // GetAuxData returns metadata for argument n of the function.
 //
 // https://sqlite.org/c3ref/get_auxdata.html
 func (ctx Context) GetAuxData(n int) any {
-	ptr := ptr_t(ctx.c.call("sqlite3_get_auxdata", stk_t(ctx.handle), stk_t(n)))
+	ptr := uint32(ctx.c.call("sqlite3_get_auxdata", uint64(ctx.handle), uint64(n)))
 	return util.GetHandle(ctx.c.ctx, ptr)
 }

@@ -68,7 +68,7 @@ func (ctx Context) ResultInt(value int) {
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultInt64(value int64) {
 	ctx.c.call("sqlite3_result_int64",
-		stk_t(ctx.handle), stk_t(value))
+		uint64(ctx.handle), uint64(value))
 }

 // ResultFloat sets the result of the function to a float64.
@@ -76,7 +76,7 @@ func (ctx Context) ResultInt64(value int64) {
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultFloat(value float64) {
 	ctx.c.call("sqlite3_result_double",
-		stk_t(ctx.handle), stk_t(math.Float64bits(value)))
+		uint64(ctx.handle), math.Float64bits(value))
 }

 // ResultText sets the result of the function to a string.
@@ -85,33 +85,27 @@ func (ctx Context) ResultFloat(value float64) {
 func (ctx Context) ResultText(value string) {
 	ptr := ctx.c.newString(value)
 	ctx.c.call("sqlite3_result_text_go",
-		stk_t(ctx.handle), stk_t(ptr), stk_t(len(value)))
+		uint64(ctx.handle), uint64(ptr), uint64(len(value)))
 }

 // ResultRawText sets the text result of the function to a []byte.
+// Returning a nil slice is the same as calling [Context.ResultNull].
 //
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultRawText(value []byte) {
-	if len(value) == 0 {
-		ctx.ResultText("")
-		return
-	}
 	ptr := ctx.c.newBytes(value)
 	ctx.c.call("sqlite3_result_text_go",
-		stk_t(ctx.handle), stk_t(ptr), stk_t(len(value)))
+		uint64(ctx.handle), uint64(ptr), uint64(len(value)))
 }

 // ResultBlob sets the result of the function to a []byte.
+// Returning a nil slice is the same as calling [Context.ResultNull].
 //
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultBlob(value []byte) {
-	if len(value) == 0 {
-		ctx.ResultZeroBlob(0)
-		return
-	}
 	ptr := ctx.c.newBytes(value)
 	ctx.c.call("sqlite3_result_blob_go",
-		stk_t(ctx.handle), stk_t(ptr), stk_t(len(value)))
+		uint64(ctx.handle), uint64(ptr), uint64(len(value)))
 }

 // ResultZeroBlob sets the result of the function to a zero-filled, length n BLOB.
@@ -119,7 +113,7 @@ func (ctx Context) ResultBlob(value []byte) {
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultZeroBlob(n int64) {
 	ctx.c.call("sqlite3_result_zeroblob64",
-		stk_t(ctx.handle), stk_t(n))
+		uint64(ctx.handle), uint64(n))
 }

 // ResultNull sets the result of the function to NULL.
@@ -127,7 +121,7 @@ func (ctx Context) ResultZeroBlob(n int64) {
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultNull() {
 	ctx.c.call("sqlite3_result_null",
-		stk_t(ctx.handle))
+		uint64(ctx.handle))
 }

 // ResultTime sets the result of the function to a [time.Time].
@@ -152,14 +146,14 @@ func (ctx Context) ResultTime(value time.Time, format TimeFormat) {
 }

 func (ctx Context) resultRFC3339Nano(value time.Time) {
-	const maxlen = int64(len(time.RFC3339Nano)) + 5
+	const maxlen = uint64(len(time.RFC3339Nano)) + 5

 	ptr := ctx.c.new(maxlen)
 	buf := util.View(ctx.c.mod, ptr, maxlen)
 	buf = value.AppendFormat(buf[:0], time.RFC3339Nano)

 	ctx.c.call("sqlite3_result_text_go",
-		stk_t(ctx.handle), stk_t(ptr), stk_t(len(buf)))
+		uint64(ctx.handle), uint64(ptr), uint64(len(buf)))
 }

 // ResultPointer sets the result of the function to NULL, just like [Context.ResultNull],
@@ -170,7 +164,7 @@ func (ctx Context) resultRFC3339Nano(value time.Time) {
 func (ctx Context) ResultPointer(ptr any) {
 	valPtr := util.AddHandle(ctx.c.ctx, ptr)
 	ctx.c.call("sqlite3_result_pointer_go",
-		stk_t(ctx.handle), stk_t(valPtr))
+		uint64(ctx.handle), uint64(valPtr))
 }

 // ResultJSON sets the result of the function to the JSON encoding of value.
@@ -194,7 +188,7 @@ func (ctx Context) ResultValue(value Value) {
 		return
 	}
 	ctx.c.call("sqlite3_result_value",
-		stk_t(ctx.handle), stk_t(value.handle))
+		uint64(ctx.handle), uint64(value.handle))
 }

 // ResultError sets the result of the function an error.
@@ -202,12 +196,12 @@ func (ctx Context) ResultValue(value Value) {
 // https://sqlite.org/c3ref/result_blob.html
 func (ctx Context) ResultError(err error) {
 	if errors.Is(err, NOMEM) {
-		ctx.c.call("sqlite3_result_error_nomem", stk_t(ctx.handle))
+		ctx.c.call("sqlite3_result_error_nomem", uint64(ctx.handle))
 		return
 	}

 	if errors.Is(err, TOOBIG) {
-		ctx.c.call("sqlite3_result_error_toobig", stk_t(ctx.handle))
+		ctx.c.call("sqlite3_result_error_toobig", uint64(ctx.handle))
 		return
 	}

@@ -216,11 +210,11 @@ func (ctx Context) ResultError(err error) {
 		defer ctx.c.arena.mark()()
 		ptr := ctx.c.arena.string(msg)
 		ctx.c.call("sqlite3_result_error",
-			stk_t(ctx.handle), stk_t(ptr), stk_t(len(msg)))
+			uint64(ctx.handle), uint64(ptr), uint64(len(msg)))
 	}
 	if code != _OK {
 		ctx.c.call("sqlite3_result_error_code",
-			stk_t(ctx.handle), stk_t(code))
+			uint64(ctx.handle), uint64(code))
 	}
 }

@@ -229,6 +223,6 @@ func (ctx Context) ResultError(err error) {
 //
 // https://sqlite.org/c3ref/vtab_nochange.html
 func (ctx Context) VTabNoChange() bool {
-	b := int32(ctx.c.call("sqlite3_vtab_nochange", stk_t(ctx.handle)))
-	return b != 0
+	r := ctx.c.call("sqlite3_vtab_nochange", uint64(ctx.handle))
+	return r != 0
 }
--- a/driver/driver.go
+++ b/driver/driver.go
@@ -20,45 +20,22 @@
 //   - a [serializable] transaction is always "immediate";
 //   - a [read-only] transaction is always "deferred".
 //
-// # Datatypes In SQLite
-//
-// SQLite is dynamically typed.
-// Columns can mostly hold any value regardless of their declared type.
-// SQLite supports most [driver.Value] types out of the box,
-// but bool and [time.Time] require special care.
-//
-// Booleans can be stored on any column type and scanned back to a *bool.
-// However, if scanned to a *any, booleans may either become an
-// int64, string or bool, depending on the declared type of the column.
-// If you use BOOLEAN for your column type,
-// 1 and 0 will always scan as true and false.
-//
 // # Working with time
 //
-// Time values can similarly be stored on any column type.
 // The time encoding/decoding format can be specified using "_timefmt":
 //
 //	sql.Open("sqlite3", "file:demo.db?_timefmt=sqlite")
 //
-// Special values are: "auto" (the default), "sqlite", "rfc3339";
+// Possible values are: "auto" (the default), "sqlite", "rfc3339";
 //   - "auto" encodes as RFC 3339 and decodes any [format] supported by SQLite;
 //   - "sqlite" encodes as SQLite and decodes any [format] supported by SQLite;
 //   - "rfc3339" encodes and decodes RFC 3339 only.
 //
-// You can also set "_timefmt" to an arbitrary [sqlite3.TimeFormat] or [time.Layout].
-//
 // If you encode as RFC 3339 (the default),
-// consider using the TIME [collating sequence] to produce time-ordered sequences.
+// consider using the TIME [collating sequence] to produce a time-ordered sequence.
 //
-// If you encode as RFC 3339 (the default),
-// time values will scan back to a *time.Time unless your column type is TEXT.
-// Otherwise, if scanned to a *any, time values may either become an
-// int64, float64 or string, depending on the time format and declared type of the column.
-// If you use DATE, TIME, DATETIME, or TIMESTAMP for your column type,
-// "_timefmt" will be used to decode values.
-//
-// To scan values in custom formats, [sqlite3.TimeFormat.Scanner] may be helpful.
-// To bind values in custom formats, [sqlite3.TimeFormat.Encode] them before binding.
+// To scan values in other formats, [sqlite3.TimeFormat.Scanner] may be helpful.
+// To bind values in other formats, [sqlite3.TimeFormat.Encode] them before binding.
 //
 // When using a custom time struct, you'll have to implement
 // [database/sql/driver.Valuer] and [database/sql.Scanner].
@@ -71,7 +48,7 @@
 // The Scan method needs to take into account that the value it receives can be of differing types.
 // It can already be a [time.Time], if the driver decoded the value according to "_timefmt" rules.
 // Or it can be a: string, int64, float64, []byte, or nil,
-// depending on the column type and whoever wrote the value.
+// depending on the column type and what whoever wrote the value.
 // [sqlite3.TimeFormat.Decode] may help.
 //
 // # Setting PRAGMAs
@@ -224,7 +201,7 @@ func (n *connector) Driver() driver.Driver {
 	return &SQLite{}
 }

-func (n *connector) Connect(ctx context.Context) (ret driver.Conn, err error) {
+func (n *connector) Connect(ctx context.Context) (res driver.Conn, err error) {
 	c := &conn{
 		txLock:  n.txLock,
 		tmRead:  n.tmRead,
@@ -236,14 +213,13 @@ func (n *connector) Connect(ctx context.Context) (ret driver.Conn, err error) {
 		return nil, err
 	}
 	defer func() {
-		if ret == nil {
+		if res == nil {
 			c.Close()
 		}
 	}()

-	if old := c.Conn.SetInterrupt(ctx); old != ctx {
-		defer c.Conn.SetInterrupt(old)
-	}
+	old := c.Conn.SetInterrupt(ctx)
+	defer c.Conn.SetInterrupt(old)

 	if !n.pragmas {
 		err = c.Conn.BusyTimeout(time.Minute)
@@ -363,9 +339,8 @@ func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, e
 		c.txReset = `; PRAGMA query_only=` + string(c.readOnly)
 	}

-	if old := c.Conn.SetInterrupt(ctx); old != ctx {
-		defer c.Conn.SetInterrupt(old)
-	}
+	old := c.Conn.SetInterrupt(ctx)
+	defer c.Conn.SetInterrupt(old)

 	err := c.Conn.Exec(txBegin)
 	if err != nil {
@@ -383,12 +358,13 @@ func (c *conn) Commit() error {
 }

 func (c *conn) Rollback() error {
-	// ROLLBACK even if interrupted.
-	ctx := context.Background()
-	if old := c.Conn.SetInterrupt(ctx); old != ctx {
+	err := c.Conn.Exec(`ROLLBACK` + c.txReset)
+	if errors.Is(err, sqlite3.INTERRUPT) {
+		old := c.Conn.SetInterrupt(context.Background())
 		defer c.Conn.SetInterrupt(old)
+		err = c.Conn.Exec(`ROLLBACK` + c.txReset)
 	}
-	return c.Conn.Exec(`ROLLBACK` + c.txReset)
+	return err
 }

 func (c *conn) Prepare(query string) (driver.Stmt, error) {
@@ -397,9 +373,8 @@ func (c *conn) Prepare(query string) (driver.Stmt, error) {
 }

 func (c *conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
-	if old := c.Conn.SetInterrupt(ctx); old != ctx {
-		defer c.Conn.SetInterrupt(old)
-	}
+	old := c.Conn.SetInterrupt(ctx)
+	defer c.Conn.SetInterrupt(old)

 	s, tail, err := c.Conn.Prepare(query)
 	if err != nil {
@@ -424,9 +399,8 @@ func (c *conn) ExecContext(ctx context.Context, query string, args []driver.Name
 		return resultRowsAffected(0), nil
 	}

-	if old := c.Conn.SetInterrupt(ctx); old != ctx {
-		defer c.Conn.SetInterrupt(old)
-	}
+	old := c.Conn.SetInterrupt(ctx)
+	defer c.Conn.SetInterrupt(old)

 	err := c.Conn.Exec(query)
 	if err != nil {
@@ -489,19 +463,16 @@ func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (drive
 		return nil, err
 	}

-	c := s.Stmt.Conn()
-	if old := c.SetInterrupt(ctx); old != ctx {
-		defer c.SetInterrupt(old)
-	}
+	old := s.Stmt.Conn().SetInterrupt(ctx)
+	defer s.Stmt.Conn().SetInterrupt(old)

-	err = errors.Join(
-		s.Stmt.Exec(),
-		s.Stmt.ClearBindings())
+	err = s.Stmt.Exec()
+	s.Stmt.ClearBindings()
 	if err != nil {
 		return nil, err
 	}

-	return newResult(c), nil
+	return newResult(s.Stmt.Conn()), nil
 }

 func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
@@ -626,28 +597,6 @@ const (
 	_TIME
 )

-func scanFromDecl(decl string) scantype {
-	// These types are only used before we have rows,
-	// and otherwise as type hints.
-	// The first few ensure STRICT tables are strictly typed.
-	// The other two are type hints for booleans and time.
-	switch decl {
-	case "INT", "INTEGER":
-		return _INT
-	case "REAL":
-		return _REAL
-	case "TEXT":
-		return _TEXT
-	case "BLOB":
-		return _BLOB
-	case "BOOLEAN":
-		return _BOOL
-	case "DATE", "TIME", "DATETIME", "TIMESTAMP":
-		return _TIME
-	}
-	return _ANY
-}
-
 var (
 	// Ensure these interfaces are implemented:
 	_ driver.RowsColumnTypeDatabaseTypeName = &rows{}
@@ -655,9 +604,8 @@ var (
 )

 func (r *rows) Close() error {
-	return errors.Join(
-		r.Stmt.Reset(),
-		r.Stmt.ClearBindings())
+	r.Stmt.ClearBindings()
+	return r.Stmt.Reset()
 }

 func (r *rows) Columns() []string {
@@ -672,33 +620,37 @@ func (r *rows) Columns() []string {
 	return r.names
 }

-func (r *rows) scanType(index int) scantype {
-	if r.scans == nil {
-		count := r.Stmt.ColumnCount()
-		scans := make([]scantype, count)
-		for i := range scans {
-			scans[i] = scanFromDecl(strings.ToUpper(r.Stmt.ColumnDeclType(i)))
-		}
-		r.scans = scans
-	}
-	return r.scans[index]
-}
-
 func (r *rows) loadColumnMetadata() {
 	if r.nulls == nil {
-		c := r.Stmt.Conn()
 		count := r.Stmt.ColumnCount()
 		nulls := make([]bool, count)
 		types := make([]string, count)
 		scans := make([]scantype, count)
 		for i := range nulls {
 			if col := r.Stmt.ColumnOriginName(i); col != "" {
-				types[i], _, nulls[i], _, _, _ = c.TableColumnMetadata(
+				types[i], _, nulls[i], _, _, _ = r.Stmt.Conn().TableColumnMetadata(
 					r.Stmt.ColumnDatabaseName(i),
 					r.Stmt.ColumnTableName(i),
 					col)
 				types[i] = strings.ToUpper(types[i])
-				scans[i] = scanFromDecl(types[i])
+				// These types are only used before we have rows,
+				// and otherwise as type hints.
+				// The first few ensure STRICT tables are strictly typed.
+				// The other two are type hints for booleans and time.
+				switch types[i] {
+				case "INT", "INTEGER":
+					scans[i] = _INT
+				case "REAL":
+					scans[i] = _REAL
+				case "TEXT":
+					scans[i] = _TEXT
+				case "BLOB":
+					scans[i] = _BLOB
+				case "BOOLEAN":
+					scans[i] = _BOOL
+				case "DATE", "TIME", "DATETIME", "TIMESTAMP":
+					scans[i] = _TIME
+				}
 			}
 		}
 		r.nulls = nulls
@@ -707,15 +659,27 @@ func (r *rows) loadColumnMetadata() {
 	}
 }

+func (r *rows) declType(index int) string {
+	if r.types == nil {
+		count := r.Stmt.ColumnCount()
+		types := make([]string, count)
+		for i := range types {
+			types[i] = strings.ToUpper(r.Stmt.ColumnDeclType(i))
+		}
+		r.types = types
+	}
+	return r.types[index]
+}
+
 func (r *rows) ColumnTypeDatabaseTypeName(index int) string {
 	r.loadColumnMetadata()
-	decl := r.types[index]
-	if len := len(decl); len > 0 && decl[len-1] == ')' {
-		if i := strings.LastIndexByte(decl, '('); i >= 0 {
-			decl = decl[:i]
+	decltype := r.types[index]
+	if len := len(decltype); len > 0 && decltype[len-1] == ')' {
+		if i := strings.LastIndexByte(decltype, '('); i >= 0 {
+			decltype = decltype[:i]
 		}
 	}
-	return strings.TrimSpace(decl)
+	return strings.TrimSpace(decltype)
 }

 func (r *rows) ColumnTypeNullable(index int) (nullable, ok bool) {
@@ -754,27 +718,25 @@ func (r *rows) ColumnTypeScanType(index int) (typ reflect.Type) {

 	switch scan {
 	case _INT:
-		return reflect.TypeFor[int64]()
+		return reflect.TypeOf(int64(0))
 	case _REAL:
-		return reflect.TypeFor[float64]()
+		return reflect.TypeOf(float64(0))
 	case _TEXT:
-		return reflect.TypeFor[string]()
+		return reflect.TypeOf("")
 	case _BLOB:
-		return reflect.TypeFor[[]byte]()
+		return reflect.TypeOf([]byte{})
 	case _BOOL:
-		return reflect.TypeFor[bool]()
+		return reflect.TypeOf(false)
 	case _TIME:
-		return reflect.TypeFor[time.Time]()
+		return reflect.TypeOf(time.Time{})
 	default:
-		return reflect.TypeFor[any]()
+		return reflect.TypeOf((*any)(nil)).Elem()
 	}
 }

 func (r *rows) Next(dest []driver.Value) error {
-	c := r.Stmt.Conn()
-	if old := c.SetInterrupt(r.ctx); old != r.ctx {
-		defer c.SetInterrupt(old)
-	}
+	old := r.Stmt.Conn().SetInterrupt(r.ctx)
+	defer r.Stmt.Conn().SetInterrupt(old)

 	if !r.Stmt.Step() {
 		if err := r.Stmt.Err(); err != nil {
@@ -784,49 +746,36 @@ func (r *rows) Next(dest []driver.Value) error {
 	}

 	data := unsafe.Slice((*any)(unsafe.SliceData(dest)), len(dest))
-	if err := r.Stmt.ColumnsRaw(data...); err != nil {
-		return err
-	}
+	err := r.Stmt.Columns(data...)
 	for i := range dest {
-		scan := r.scanType(i)
-		switch v := dest[i].(type) {
-		case int64:
-			if scan == _BOOL {
-				switch v {
-				case 1:
-					dest[i] = true
-				case 0:
-					dest[i] = false
-				}
-				continue
-			}
-		case []byte:
-			if len(v) == cap(v) { // a BLOB
-				continue
-			}
-			if scan != _TEXT {
-				switch r.tmWrite {
-				case "", time.RFC3339, time.RFC3339Nano:
-					t, ok := maybeTime(v)
-					if ok {
-						dest[i] = t
-						continue
-					}
-				}
-			}
-			dest[i] = string(v)
-		case float64:
-			break
-		default:
-			continue
-		}
-		if scan == _TIME {
-			t, err := r.tmRead.Decode(dest[i])
-			if err == nil {
-				dest[i] = t
-				continue
-			}
+		if t, ok := r.decodeTime(i, dest[i]); ok {
+			dest[i] = t
 		}
 	}
-	return nil
+	return err
+}
+
+func (r *rows) decodeTime(i int, v any) (_ time.Time, ok bool) {
+	switch v := v.(type) {
+	case int64, float64:
+		// could be a time value
+	case string:
+		if r.tmWrite != "" && r.tmWrite != time.RFC3339 && r.tmWrite != time.RFC3339Nano {
+			break
+		}
+		t, ok := maybeTime(v)
+		if ok {
+			return t, true
+		}
+	default:
+		return
+	}
+	switch r.declType(i) {
+	case "DATE", "TIME", "DATETIME", "TIMESTAMP":
+		// could be a time value
+	default:
+		return
+	}
+	t, err := r.tmRead.Decode(v)
+	return t, err == nil
 }
--- a/driver/driver_test.go
+++ b/driver/driver_test.go
@@ -199,64 +199,6 @@ func Test_BeginTx(t *testing.T) {
 	}
 }

-func Test_nested_context(t *testing.T) {
-	t.Parallel()
-	tmp := memdb.TestDB(t)
-
-	db, err := sql.Open("sqlite3", tmp)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	tx, err := db.Begin()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer tx.Rollback()
-
-	outer, err := tx.Query(`SELECT value FROM generate_series(0)`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer outer.Close()
-
-	want := func(rows *sql.Rows, want int) {
-		t.Helper()
-
-		var got int
-		rows.Next()
-		if err := rows.Scan(&got); err != nil {
-			t.Fatal(err)
-		}
-		if got != want {
-			t.Errorf("got %d, want %d", got, want)
-		}
-	}
-
-	want(outer, 0)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	inner, err := tx.QueryContext(ctx, `SELECT value FROM generate_series(0)`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer inner.Close()
-
-	want(inner, 0)
-	cancel()
-
-	var terr interface{ Temporary() bool }
-	if inner.Next() || !errors.Is(inner.Err(), context.Canceled) &&
-		(!errors.As(inner.Err(), &terr) || !terr.Temporary()) {
-		t.Fatalf("got %v, want cancellation", inner.Err())
-	}
-
-	want(outer, 1)
-}
-
 func Test_Prepare(t *testing.T) {
 	t.Parallel()
 	tmp := memdb.TestDB(t)
@@ -427,13 +369,13 @@ func Test_time(t *testing.T) {

 func Test_ColumnType_ScanType(t *testing.T) {
 	var (
-		INT  = reflect.TypeFor[int64]()
-		REAL = reflect.TypeFor[float64]()
-		TEXT = reflect.TypeFor[string]()
-		BLOB = reflect.TypeFor[[]byte]()
-		BOOL = reflect.TypeFor[bool]()
-		TIME = reflect.TypeFor[time.Time]()
-		ANY  = reflect.TypeFor[any]()
+		INT  = reflect.TypeOf(int64(0))
+		REAL = reflect.TypeOf(float64(0))
+		TEXT = reflect.TypeOf("")
+		BLOB = reflect.TypeOf([]byte{})
+		BOOL = reflect.TypeOf(false)
+		TIME = reflect.TypeOf(time.Time{})
+		ANY  = reflect.TypeOf((*any)(nil)).Elem()
 	)

 	t.Parallel()
@@ -525,29 +467,3 @@ func Test_ColumnType_ScanType(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func Benchmark_loop(b *testing.B) {
-	db, err := Open(":memory:")
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer db.Close()
-
-	var version string
-	err = db.QueryRow(`SELECT sqlite_version();`).Scan(&version)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	b.Cleanup(cancel)
-
-	b.ResetTimer()
-	for range b.N {
-		_, err := db.ExecContext(ctx,
-			`WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x < 1000000) SELECT x FROM c;`)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
--- a/driver/example2_test.go
+++ b/driver/example2_test.go
@@ -1,5 +1,9 @@
+//go:build linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock || sqlite3_dotlk
+
 package driver_test

+// Adapted from: https://go.dev/doc/tutorial/database-access
+
 import (
 	"database/sql"
 	"database/sql/driver"
@@ -23,7 +27,7 @@ func Example_customTime() {
 	_, err = db.Exec(`
 		CREATE TABLE data (
 			id INTEGER PRIMARY KEY,
-			date_time ANY
+			date_time TEXT
 		) STRICT;
 	`)
 	if err != nil {
--- a/driver/time.go
+++ b/driver/time.go
@@ -1,15 +1,12 @@
 package driver

-import (
-	"bytes"
-	"time"
-)
+import "time"

 // Convert a string in [time.RFC3339Nano] format into a [time.Time]
 // if it roundtrips back to the same string.
 // This way times can be persisted to, and recovered from, the database,
 // but if a string is needed, [database/sql] will recover the same string.
-func maybeTime(text []byte) (_ time.Time, _ bool) {
+func maybeTime(text string) (_ time.Time, _ bool) {
 	// Weed out (some) values that can't possibly be
 	// [time.RFC3339Nano] timestamps.
 	if len(text) < len("2006-01-02T15:04:05Z") {
@@ -24,8 +21,8 @@ func maybeTime(text []byte) (_ time.Time, _ bool) {

 	// Slow path.
 	var buf [len(time.RFC3339Nano)]byte
-	date, err := time.Parse(time.RFC3339Nano, string(text))
-	if err == nil && bytes.Equal(text, date.AppendFormat(buf[:0], time.RFC3339Nano)) {
+	date, err := time.Parse(time.RFC3339Nano, text)
+	if err == nil && text == string(date.AppendFormat(buf[:0], time.RFC3339Nano)) {
 		return date, true
 	}
 	return
--- a/driver/time_test.go
+++ b/driver/time_test.go
@@ -22,7 +22,7 @@ func Fuzz_stringOrTime_1(f *testing.F) {
 	f.Add("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")

 	f.Fuzz(func(t *testing.T, str string) {
-		v, ok := maybeTime([]byte(str))
+		v, ok := maybeTime(str)
 		if ok {
 			// Make sure times round-trip to the same string:
 			// https://pkg.go.dev/database/sql#Rows.Scan
@@ -51,7 +51,7 @@ func Fuzz_stringOrTime_2(f *testing.F) {
 	f.Add(int64(-763421161058), int64(222_222_222)) // twosday, year 22222BC

 	checkTime := func(t testing.TB, date time.Time) {
-		v, ok := maybeTime(date.AppendFormat(nil, time.RFC3339Nano))
+		v, ok := maybeTime(date.Format(time.RFC3339Nano))
 		if ok {
 			// Make sure times round-trip to the same time:
 			if !v.Equal(date) {
--- a/driver/util_test.go
+++ b/driver/util_test.go
@@ -3,7 +3,7 @@ package driver
 import (
 	"context"
 	"database/sql/driver"
-	"slices"
+	"reflect"
 	"testing"

 	_ "github.com/ncruces/go-sqlite3/embed"
@@ -16,7 +16,7 @@ func Test_namedValues(t *testing.T) {
 		{Ordinal: 2, Value: false},
 	}
 	got := namedValues([]driver.Value{true, false})
-	if !slices.Equal(got, want) {
+	if !reflect.DeepEqual(got, want) {
 		t.Errorf("got %v, want %v", got, want)
 	}
 }
--- a/embed/README.md
+++ b/embed/README.md
@@ -1,6 +1,6 @@
 # Embeddable Wasm build of SQLite

-This folder includes an embeddable Wasm build of SQLite 3.49.2 for use with
+This folder includes an embeddable Wasm build of SQLite 3.47.2 for use with
 [`github.com/ncruces/go-sqlite3`](https://pkg.go.dev/github.com/ncruces/go-sqlite3).

 The following optional features are compiled in:
--- a/embed/bcw2/README.md
+++ b/embed/bcw2/README.md
@@ -1,19 +1,13 @@
 # Embeddable Wasm build of SQLite

-This folder includes an alternative embeddable Wasm build of SQLite,
-which includes the experimental
+This folder includes an embeddable Wasm build of SQLite, including the experimental
 [`BEGIN CONCURRENT`](https://sqlite.org/src/doc/begin-concurrent/doc/begin_concurrent.md) and
 [Wal2](https://sqlite.org/cgi/src/doc/wal2/doc/wal2.md) patches.

-It also enables the optional
-[`UPDATE … ORDER BY … LIMIT`](https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses) and
-[`DELETE … ORDER BY … LIMIT`](https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses) clauses,
-and the [`WITHIN GROUP ORDER BY`](https://sqlite.org/compile.html#enable_ordered_set_aggregates) aggregate syntax.
-
 > [!IMPORTANT]  
 > This package is experimental.
 > It is built from the `bedrock` branch of SQLite,
-> since that is _currently_ the most stable, maintained branch to include these features.
+> since that is _currently_ the most stable, maintained branch to include both features.

 > [!CAUTION]
 > The Wal2 journaling mode creates databases that other versions of SQLite cannot access.
--- a/embed/bcw2/bcw2.wasm
+++ b/embed/bcw2/bcw2.wasm
--- a/embed/bcw2/bcw2_test.go
+++ b/embed/bcw2/bcw2_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"

 	"github.com/ncruces/go-sqlite3/driver"
-	"github.com/ncruces/go-sqlite3/ext/stats"
 	"github.com/ncruces/go-sqlite3/vfs"
 )

@@ -16,7 +15,7 @@ func Test_bcw2(t *testing.T) {

 	tmp := filepath.ToSlash(filepath.Join(t.TempDir(), "test.db"))

-	db, err := driver.Open("file:"+tmp+"?_pragma=journal_mode(wal2)&_txlock=concurrent", stats.Register)
+	db, err := driver.Open("file:" + tmp + "?_pragma=journal_mode(wal2)&_txlock=concurrent")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -38,11 +37,6 @@ func Test_bcw2(t *testing.T) {
 		t.Fatal(err)
 	}

-	_, err = tx.Exec(`SELECT median() WITHIN GROUP (ORDER BY col) FROM test`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	err = tx.Commit()
 	if err != nil {
 		t.Fatal(err)
@@ -53,7 +47,7 @@ func Test_bcw2(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if version != "3.50.0" {
+	if version != "3.48.0" {
 		t.Error(version)
 	}
 }
--- a/embed/bcw2/build.sh
+++ b/embed/bcw2/build.sh
@@ -13,15 +13,14 @@ mkdir -p build/ext/
 cp "$ROOT"/sqlite3/*.[ch] build/
 cp "$ROOT"/sqlite3/*.patch build/

-# https://sqlite.org/src/info/9d6517e7cc8bf175
-curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=9d6517e7 | tar xz
+# https://sqlite.org/src/info/ec5d7025cba9f4ac
+curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=ec5d7025 | tar xz

 cd sqlite
 if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
-	MSYS_NO_PATHCONV=1 nmake /f makefile.msc sqlite3.c "OPTS=-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES"
+	MSYS_NO_PATHCONV=1 nmake /f makefile.msc sqlite3.c OPTS=-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
 else
-	sh configure --enable-update-limit
-	OPTS=-DSQLITE_ENABLE_ORDERED_SET_AGGREGATES make sqlite3.c
+	sh configure --enable-update-limit && make sqlite3.c
 fi
 cd ~-

@@ -38,13 +37,13 @@ mv sqlite/ext/misc/spellfix.c   build/ext/
 mv sqlite/ext/misc/uint.c       build/ext/

 cd build
-cat *.patch | patch -p0 --no-backup-if-mismatch
+cat *.patch | patch --no-backup-if-mismatch
 cd ~-

 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -g0 -O2 \
 	-Wall -Wextra -Wno-unused-parameter -Wno-unused-function \
-	-o bcw2.wasm build/main.c \
-	-I"$ROOT/sqlite3/libc" -I"build" \
+	-o bcw2.wasm "build/main.c" \
+	-I"build" \
 	-mexec-model=reactor \
 	-msimd128 -mmutable-globals -mmultivalue \
 	-mbulk-memory -mreference-types \
@@ -60,7 +59,7 @@ cd ~-

 "$BINARYEN/wasm-ctor-eval" -g -c _initialize bcw2.wasm -o bcw2.tmp
 "$BINARYEN/wasm-opt" -g --strip --strip-producers -c -O3 \
-	bcw2.tmp -o bcw2.wasm --low-memory-unused \
+	bcw2.tmp -o bcw2.wasm \
 	--enable-simd --enable-mutable-globals --enable-multivalue \
 	--enable-bulk-memory --enable-reference-types \
 	--enable-nontrapping-float-to-int --enable-sign-ext
--- a/embed/bcw2/go.mod
+++ b/embed/bcw2/go.mod
@@ -1,14 +1,13 @@
 module github.com/ncruces/go-sqlite3/embed/bcw2

-go 1.23.0
+go 1.21

-toolchain go1.24.0
+toolchain go1.23.0

-require github.com/ncruces/go-sqlite3 v0.25.0
+require github.com/ncruces/go-sqlite3 v0.21.3

 require (
 	github.com/ncruces/julianday v1.0.0 // indirect
-	github.com/ncruces/sort v0.1.5 // indirect
-	github.com/tetratelabs/wazero v1.9.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	github.com/tetratelabs/wazero v1.8.2 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 )
--- a/embed/bcw2/go.sum
+++ b/embed/bcw2/go.sum
@@ -1,12 +1,10 @@
-github.com/ncruces/go-sqlite3 v0.25.0 h1:trugKUs98Zwy9KwRr/EUxZHL92LYt7UqcKqAfpGpK+I=
-github.com/ncruces/go-sqlite3 v0.25.0/go.mod h1:n6Z7036yFilJx04yV0mi5JWaF66rUmXn1It9Ux8dx68=
+github.com/ncruces/go-sqlite3 v0.21.3 h1:hHkfNQLcbnxPJZhC/RGw9SwP3bfkv/Y0xUHWsr1CdMQ=
+github.com/ncruces/go-sqlite3 v0.21.3/go.mod h1:zxMOaSG5kFYVFK4xQa0pdwIszqxqJ0W0BxBgwdrNjuA=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
-github.com/ncruces/sort v0.1.5 h1:fiFWXXAqKI8QckPf/6hu/bGFwcEPrirIOFaJqWujs4k=
-github.com/ncruces/sort v0.1.5/go.mod h1:obJToO4rYr6VWP0Uw5FYymgYGt3Br4RXcs/JdKaXAPk=
-github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
-github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
+github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
--- a/embed/bcw2/init.go
+++ b/embed/bcw2/init.go
@@ -11,14 +11,13 @@ package bcw2

 import (
 	_ "embed"
-	"unsafe"

 	"github.com/ncruces/go-sqlite3"
 )

 //go:embed bcw2.wasm
-var binary string
+var binary []byte

 func init() {
-	sqlite3.Binary = unsafe.Slice(unsafe.StringData(binary), len(binary))
+	sqlite3.Binary = binary
 }
--- a/embed/build.sh
+++ b/embed/build.sh
@@ -12,7 +12,7 @@ trap 'rm -f sqlite3.tmp' EXIT
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -g0 -O2 \
 	-Wall -Wextra -Wno-unused-parameter -Wno-unused-function \
 	-o sqlite3.wasm "$ROOT/sqlite3/main.c" \
-	-I"$ROOT/sqlite3/libc" -I"$ROOT/sqlite3" \
+	-I"$ROOT/sqlite3" \
 	-mexec-model=reactor \
 	-msimd128 -mmutable-globals -mmultivalue \
 	-mbulk-memory -mreference-types \
@@ -27,7 +27,7 @@ trap 'rm -f sqlite3.tmp' EXIT

 "$BINARYEN/wasm-ctor-eval" -g -c _initialize sqlite3.wasm -o sqlite3.tmp
 "$BINARYEN/wasm-opt" -g --strip --strip-producers -c -O3 \
-	sqlite3.tmp -o sqlite3.wasm --low-memory-unused \
+	sqlite3.tmp -o sqlite3.wasm \
 	--enable-simd --enable-mutable-globals --enable-multivalue \
 	--enable-bulk-memory --enable-reference-types \
 	--enable-nontrapping-float-to-int --enable-sign-ext
--- a/embed/exports.txt
+++ b/embed/exports.txt
@@ -66,7 +66,6 @@ sqlite3_errmsg
 sqlite3_error_offset
 sqlite3_errstr
 sqlite3_exec
-sqlite3_exec_go
 sqlite3_expanded_sql
 sqlite3_file_control
 sqlite3_filename_database
@@ -78,10 +77,8 @@ sqlite3_get_autocommit
 sqlite3_get_auxdata
 sqlite3_hard_heap_limit64
 sqlite3_interrupt
-sqlite3_invoke_busy_handler_go
 sqlite3_last_insert_rowid
 sqlite3_limit
-sqlite3_log_go
 sqlite3_malloc64
 sqlite3_open_v2
 sqlite3_overload_function
--- a/embed/init.go
+++ b/embed/init.go
@@ -8,14 +8,13 @@ package embed

 import (
 	_ "embed"
-	"unsafe"

 	"github.com/ncruces/go-sqlite3"
 )

 //go:embed sqlite3.wasm
-var binary string
+var binary []byte

 func init() {
-	sqlite3.Binary = unsafe.Slice(unsafe.StringData(binary), len(binary))
+	sqlite3.Binary = binary
 }
--- a/embed/init_test.go
+++ b/embed/init_test.go
@@ -19,7 +19,7 @@ func Test_init(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if version != "3.49.2" {
+	if version != "3.47.2" {
 		t.Error(version)
 	}
 }
--- a/embed/sqlite3.wasm
+++ b/embed/sqlite3.wasm
--- a/error.go
+++ b/error.go
@@ -2,6 +2,7 @@ package sqlite3

 import (
 	"errors"
+	"strconv"
 	"strings"

 	"github.com/ncruces/go-sqlite3/internal/util"
@@ -11,9 +12,10 @@ import (
 //
 // https://sqlite.org/c3ref/errcode.html
 type Error struct {
+	str  string
 	msg  string
 	sql  string
-	code res_t
+	code uint64
 }

 // Code returns the primary error code for this error.
@@ -27,13 +29,19 @@ func (e *Error) Code() ErrorCode {
 //
 // https://sqlite.org/rescode.html
 func (e *Error) ExtendedCode() ExtendedErrorCode {
-	return xErrorCode(e.code)
+	return ExtendedErrorCode(e.code)
 }

 // Error implements the error interface.
 func (e *Error) Error() string {
 	var b strings.Builder
-	b.WriteString(util.ErrorCodeString(uint32(e.code)))
+	b.WriteString("sqlite3: ")
+
+	if e.str != "" {
+		b.WriteString(e.str)
+	} else {
+		b.WriteString(strconv.Itoa(int(e.code)))
+	}

 	if e.msg != "" {
 		b.WriteString(": ")
@@ -75,7 +83,7 @@ func (e *Error) As(err any) bool {

 // Temporary returns true for [BUSY] errors.
 func (e *Error) Temporary() bool {
-	return e.Code() == BUSY || e.Code() == INTERRUPT
+	return e.Code() == BUSY
 }

 // Timeout returns true for [BUSY_TIMEOUT] errors.
@@ -95,12 +103,12 @@ func (e ErrorCode) Error() string {

 // Temporary returns true for [BUSY] errors.
 func (e ErrorCode) Temporary() bool {
-	return e == BUSY || e == INTERRUPT
+	return e == BUSY
 }

 // ExtendedCode returns the extended error code for this error.
 func (e ErrorCode) ExtendedCode() ExtendedErrorCode {
-	return xErrorCode(e)
+	return ExtendedErrorCode(e)
 }

 // Error implements the error interface.
@@ -125,7 +133,7 @@ func (e ExtendedErrorCode) As(err any) bool {

 // Temporary returns true for [BUSY] errors.
 func (e ExtendedErrorCode) Temporary() bool {
-	return ErrorCode(e) == BUSY || ErrorCode(e) == INTERRUPT
+	return ErrorCode(e) == BUSY
 }

 // Timeout returns true for [BUSY_TIMEOUT] errors.
@@ -138,27 +146,27 @@ func (e ExtendedErrorCode) Code() ErrorCode {
 	return ErrorCode(e)
 }

-func errorCode(err error, def ErrorCode) (msg string, code res_t) {
+func errorCode(err error, def ErrorCode) (msg string, code uint32) {
 	switch code := err.(type) {
 	case nil:
 		return "", _OK
 	case ErrorCode:
-		return "", res_t(code)
+		return "", uint32(code)
 	case xErrorCode:
-		return "", res_t(code)
+		return "", uint32(code)
 	case *Error:
-		return code.msg, res_t(code.code)
+		return code.msg, uint32(code.code)
 	}

 	var ecode ErrorCode
 	var xcode xErrorCode
 	switch {
 	case errors.As(err, &xcode):
-		code = res_t(xcode)
+		code = uint32(xcode)
 	case errors.As(err, &ecode):
-		code = res_t(ecode)
+		code = uint32(ecode)
 	default:
-		code = res_t(def)
+		code = uint32(def)
 	}
 	return err.Error(), code
 }
--- a/error_test.go
+++ b/error_test.go
@@ -43,7 +43,7 @@ func TestError(t *testing.T) {
 	if !errors.Is(err, xErrorCode(0x8080)) {
 		t.Errorf("want true")
 	}
-	if s := err.Error(); s != "sqlite3: unknown error" {
+	if s := err.Error(); s != "sqlite3: 32896" {
 		t.Errorf("got %q", s)
 	}
 	if ok := errors.As(err.ExtendedCode(), &ecode); !ok || ecode != ErrorCode(0x80) {
@@ -59,14 +59,14 @@ func TestError_Temporary(t *testing.T) {

 	tests := []struct {
 		name string
-		code res_t
+		code uint64
 		want bool
 	}{
-		{"ERROR", res_t(ERROR), false},
-		{"BUSY", res_t(BUSY), true},
-		{"BUSY_RECOVERY", res_t(BUSY_RECOVERY), true},
-		{"BUSY_SNAPSHOT", res_t(BUSY_SNAPSHOT), true},
-		{"BUSY_TIMEOUT", res_t(BUSY_TIMEOUT), true},
+		{"ERROR", uint64(ERROR), false},
+		{"BUSY", uint64(BUSY), true},
+		{"BUSY_RECOVERY", uint64(BUSY_RECOVERY), true},
+		{"BUSY_SNAPSHOT", uint64(BUSY_SNAPSHOT), true},
+		{"BUSY_TIMEOUT", uint64(BUSY_TIMEOUT), true},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -83,7 +83,7 @@ func TestError_Temporary(t *testing.T) {
 				}
 			}
 			{
-				err := xErrorCode(tt.code)
+				err := ExtendedErrorCode(tt.code)
 				if got := err.Temporary(); got != tt.want {
 					t.Errorf("ExtendedErrorCode.Temporary(%d) = %v, want %v", tt.code, got, tt.want)
 				}
@@ -97,14 +97,14 @@ func TestError_Timeout(t *testing.T) {

 	tests := []struct {
 		name string
-		code res_t
+		code uint64
 		want bool
 	}{
-		{"ERROR", res_t(ERROR), false},
-		{"BUSY", res_t(BUSY), false},
-		{"BUSY_RECOVERY", res_t(BUSY_RECOVERY), false},
-		{"BUSY_SNAPSHOT", res_t(BUSY_SNAPSHOT), false},
-		{"BUSY_TIMEOUT", res_t(BUSY_TIMEOUT), true},
+		{"ERROR", uint64(ERROR), false},
+		{"BUSY", uint64(BUSY), false},
+		{"BUSY_RECOVERY", uint64(BUSY_RECOVERY), false},
+		{"BUSY_SNAPSHOT", uint64(BUSY_SNAPSHOT), false},
+		{"BUSY_TIMEOUT", uint64(BUSY_TIMEOUT), true},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -115,7 +115,7 @@ func TestError_Timeout(t *testing.T) {
 				}
 			}
 			{
-				err := xErrorCode(tt.code)
+				err := ExtendedErrorCode(tt.code)
 				if got := err.Timeout(); got != tt.want {
 					t.Errorf("Error.Timeout(%d) = %v, want %v", tt.code, got, tt.want)
 				}
@@ -136,8 +136,8 @@ func Test_ErrorCode_Error(t *testing.T) {
 	// Test all error codes.
 	for i := 0; i == int(ErrorCode(i)); i++ {
 		want := "sqlite3: "
-		ptr := ptr_t(db.call("sqlite3_errstr", stk_t(i)))
-		want += util.ReadString(db.mod, ptr, _MAX_NAME)
+		r := db.call("sqlite3_errstr", uint64(i))
+		want += util.ReadString(db.mod, uint32(r), _MAX_NAME)

 		got := ErrorCode(i).Error()
 		if got != want {
@@ -156,12 +156,12 @@ func Test_ExtendedErrorCode_Error(t *testing.T) {
 	defer db.Close()

 	// Test all extended error codes.
-	for i := 0; i == int(xErrorCode(i)); i++ {
+	for i := 0; i == int(ExtendedErrorCode(i)); i++ {
 		want := "sqlite3: "
-		ptr := ptr_t(db.call("sqlite3_errstr", stk_t(i)))
-		want += util.ReadString(db.mod, ptr, _MAX_NAME)
+		r := db.call("sqlite3_errstr", uint64(i))
+		want += util.ReadString(db.mod, uint32(r), _MAX_NAME)

-		got := xErrorCode(i).Error()
+		got := ExtendedErrorCode(i).Error()
 		if got != want {
 			t.Fatalf("got %q, want %q, with %d", got, want, i)
 		}
@@ -172,7 +172,7 @@ func Test_errorCode(t *testing.T) {
 	tests := []struct {
 		arg      error
 		wantMsg  string
-		wantCode res_t
+		wantCode uint32
 	}{
 		{nil, "", _OK},
 		{ERROR, "", util.ERROR},
@@ -190,7 +190,7 @@ func Test_errorCode(t *testing.T) {
 			if gotMsg != tt.wantMsg {
 				t.Errorf("errorCode() gotMsg = %q, want %q", gotMsg, tt.wantMsg)
 			}
-			if gotCode != tt.wantCode {
+			if gotCode != uint32(tt.wantCode) {
 				t.Errorf("errorCode() gotCode = %d, want %d", gotCode, tt.wantCode)
 			}
 		})
--- a/ext/README.md
+++ b/ext/README.md
@@ -25,8 +25,6 @@ you can load into your database connections.
  creates [pivot tables](https://github.com/jakethaw/pivot_vtab).
 - [`github.com/ncruces/go-sqlite3/ext/regexp`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/regexp)
  provides regular expression functions.
- [`github.com/ncruces/go-sqlite3/ext/serdes`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/serdes)
-  (de)serializes databases.
 - [`github.com/ncruces/go-sqlite3/ext/statement`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/statement)
  creates [parameterized views](https://github.com/0x09/sqlite-statement-vtab).
 - [`github.com/ncruces/go-sqlite3/ext/stats`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/stats)
@@ -36,13 +34,4 @@ you can load into your database connections.
 - [`github.com/ncruces/go-sqlite3/ext/uuid`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/uuid)
  generates [UUIDs](https://en.wikipedia.org/wiki/Universally_unique_identifier).
 - [`github.com/ncruces/go-sqlite3/ext/zorder`](https://pkg.go.dev/github.com/ncruces/go-sqlite3/ext/zorder)
-  maps multidimensional data to one dimension.
-
-### Pakages
-
-These packages may also be useful to work with SQLite:
-
- [`github.com/ncruces/decimal`](https://pkg.go.dev/github.com/ncruces/decimal)
-  decimal arithmetic.
- [`github.com/ncruces/julianday`](https://pkg.go.dev/github.com/ncruces/julianday)
-  Julian day math.
+  maps multidimensional data to one dimension.
--- a/ext/blobio/blob_test.go
+++ b/ext/blobio/blob_test.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"log"
 	"os"
-	"slices"
+	"reflect"
 	"strings"
 	"testing"

@@ -64,7 +64,7 @@ func Example() {
 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(blobio.Register)
 	sqlite3.AutoExtension(array.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func Test_readblob(t *testing.T) {
@@ -278,7 +278,7 @@ func Test_openblob(t *testing.T) {
 	}

 	want := []string{"\xca\xfe", "\xba\xbe"}
-	if !slices.Equal(got, want) {
+	if !reflect.DeepEqual(got, want) {
 		t.Errorf("got %v, want %v", got, want)
 	}
 }
--- a/ext/bloom/bloom.go
+++ b/ext/bloom/bloom.go
@@ -232,7 +232,7 @@ func (b *bloom) Update(arg ...sqlite3.Value) (rowid int64, err error) {
 	}
 	defer f.Close()

-	for n := range b.hashes {
+	for n := 0; n < b.hashes; n++ {
 		hash := calcHash(n, blob)
 		hash %= uint64(b.bytes * 8)
 		bitpos := byte(hash % 8)
@@ -268,13 +268,13 @@ func (b *bloom) Open() (sqlite3.VTabCursor, error) {

 type cursor struct {
 	*bloom
-	arg sqlite3.Value
+	arg *sqlite3.Value
 	eof bool
 }

 func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 	c.eof = false
-	c.arg = arg[0]
+	c.arg = &arg[0]
 	blob := arg[0].RawBlob()

 	f, err := c.db.OpenBlob(c.schema, c.storage, "data", 1, false)
@@ -312,7 +312,7 @@ func (c *cursor) Column(ctx sqlite3.Context, n int) error {
 	case 0:
 		ctx.ResultBool(true)
 	case 1:
-		ctx.ResultValue(c.arg)
+		ctx.ResultValue(*c.arg)
 	}
 	return nil
 }
--- a/ext/bloom/bloom_test.go
+++ b/ext/bloom/bloom_test.go
@@ -14,7 +14,7 @@ import (

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(bloom.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func TestRegister(t *testing.T) {
--- a/ext/closure/closure.go
+++ b/ext/closure/closure.go
@@ -210,14 +210,12 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 	c.nodes = []node{{root, 0}}
 	set := util.Set[int64]{}
 	set.Add(root)
-	for i := range c.nodes {
+	for i := 0; i < len(c.nodes); i++ {
 		curr := c.nodes[i]
 		if curr.depth >= maxDepth {
 			continue
 		}
-		if err := stmt.BindInt64(1, curr.id); err != nil {
-			return err
-		}
+		stmt.BindInt64(1, curr.id)
 		for stmt.Step() {
 			if stmt.ColumnType(0) == sqlite3.INTEGER {
 				next := stmt.ColumnInt64(0)
@@ -227,9 +225,7 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 				}
 			}
 		}
-		if err := stmt.Reset(); err != nil {
-			return err
-		}
+		stmt.Reset()
 	}
 	return nil
 }
--- a/ext/closure/closure_test.go
+++ b/ext/closure/closure_test.go
@@ -4,7 +4,6 @@ import (
 	_ "embed"
 	"fmt"
 	"log"
-	"os"
 	"testing"

 	"github.com/ncruces/go-sqlite3"
@@ -15,7 +14,7 @@ import (

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(closure.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func Example() {
--- a/ext/csv/csv.go
+++ b/ext/csv/csv.go
@@ -30,7 +30,7 @@ func Register(db *sqlite3.Conn) error {
 // RegisterFS registers the CSV virtual table.
 // If a filename is specified, fsys is used to open the file.
 func RegisterFS(db *sqlite3.Conn, fsys fs.FS) error {
-	declare := func(db *sqlite3.Conn, _, _, _ string, arg ...string) (_ *table, err error) {
+	declare := func(db *sqlite3.Conn, _, _, _ string, arg ...string) (res *table, err error) {
 		var (
 			filename string
 			data     string
@@ -214,10 +214,7 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 		return err
 	}
 	if c.table.header {
-		err = c.Next() // skip header
-		if err != nil {
-			return err
-		}
+		c.Next() // skip header
 	}
 	c.rowID = 0
 	return c.Next()
--- a/ext/csv/csv_test.go
+++ b/ext/csv/csv_test.go
@@ -3,7 +3,6 @@ package csv_test
 import (
 	"fmt"
 	"log"
-	"os"
 	"testing"

 	"github.com/ncruces/go-sqlite3"
@@ -57,7 +56,7 @@ func Example() {

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(csv.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func TestRegister(t *testing.T) {
--- a/ext/fileio/coro.go
+++ b/ext/fileio/coro.go
@@ -0,0 +1,70 @@
+//go:build !go1.23
+
+package fileio
+
+import (
+	"fmt"
+
+	"github.com/ncruces/go-sqlite3/internal/util"
+)
+
+// Adapted from: https://research.swtch.com/coro
+
+const errCoroCanceled = util.ErrorString("coroutine canceled")
+
+func coroNew[In, Out any](f func(In, func(Out) In) Out) (resume func(In) (Out, bool), cancel func()) {
+	type msg[T any] struct {
+		panic any
+		val   T
+	}
+
+	cin := make(chan msg[In])
+	cout := make(chan msg[Out])
+	running := true
+	resume = func(in In) (out Out, ok bool) {
+		if !running {
+			return
+		}
+		cin <- msg[In]{val: in}
+		m := <-cout
+		if m.panic != nil {
+			panic(m.panic)
+		}
+		return m.val, running
+	}
+	cancel = func() {
+		if !running {
+			return
+		}
+		e := fmt.Errorf("%w", errCoroCanceled)
+		cin <- msg[In]{panic: e}
+		m := <-cout
+		if m.panic != nil && m.panic != e {
+			panic(m.panic)
+		}
+	}
+	yield := func(out Out) In {
+		cout <- msg[Out]{val: out}
+		m := <-cin
+		if m.panic != nil {
+			panic(m.panic)
+		}
+		return m.val
+	}
+	go func() {
+		defer func() {
+			if running {
+				running = false
+				cout <- msg[Out]{panic: recover()}
+			}
+		}()
+		var out Out
+		m := <-cin
+		if m.panic == nil {
+			out = f(m.val, yield)
+		}
+		running = false
+		cout <- msg[Out]{val: out}
+	}()
+	return resume, cancel
+}
--- a/ext/fileio/fileio.go
+++ b/ext/fileio/fileio.go
@@ -42,7 +42,7 @@ func lsmode(ctx sqlite3.Context, arg ...sqlite3.Value) {
 	ctx.ResultText(fs.FileMode(arg[0].Int()).String())
 }

-func readfile(fsys fs.FS) sqlite3.ScalarFunction {
+func readfile(fsys fs.FS) func(ctx sqlite3.Context, arg ...sqlite3.Value) {
 	return func(ctx sqlite3.Context, arg ...sqlite3.Value) {
 		var err error
 		var data []byte
--- a/ext/fileio/fsdir.go
+++ b/ext/fileio/fsdir.go
@@ -2,7 +2,6 @@ package fileio

 import (
 	"io/fs"
-	"iter"
 	"os"
 	"path"
 	"path/filepath"
@@ -63,12 +62,12 @@ func (d fsdir) Open() (sqlite3.VTabCursor, error) {

 type cursor struct {
 	fsdir
-	base  string
-	next  func() (entry, bool)
-	stop  func()
-	curr  entry
-	eof   bool
-	rowID int64
+	base   string
+	resume resume
+	cancel func()
+	curr   entry
+	eof    bool
+	rowID  int64
 }

 type entry struct {
@@ -78,8 +77,8 @@ type entry struct {
 }

 func (c *cursor) Close() error {
-	if c.stop != nil {
-		c.stop()
+	if c.cancel != nil {
+		c.cancel()
 	}
 	return nil
 }
@@ -102,26 +101,14 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 		c.base = base
 	}

-	c.next, c.stop = iter.Pull(func(yield func(entry) bool) {
-		walkDir := func(path string, d fs.DirEntry, err error) error {
-			if yield(entry{d, err, path}) {
-				return nil
-			}
-			return fs.SkipAll
-		}
-		if c.fsys != nil {
-			fs.WalkDir(c.fsys, root, walkDir)
-		} else {
-			filepath.WalkDir(root, walkDir)
-		}
-	})
+	c.resume, c.cancel = pull(c, root)
 	c.eof = false
 	c.rowID = 0
 	return c.Next()
 }

 func (c *cursor) Next() error {
-	curr, ok := c.next()
+	curr, ok := next(c)
 	c.curr = curr
 	c.eof = !ok
 	c.rowID++
--- a/ext/fileio/fsdir_coro.go
+++ b/ext/fileio/fsdir_coro.go
@@ -0,0 +1,29 @@
+//go:build !go1.23
+
+package fileio
+
+import (
+	"io/fs"
+	"path/filepath"
+)
+
+type resume = func(struct{}) (entry, bool)
+
+func next(c *cursor) (entry, bool) {
+	return c.resume(struct{}{})
+}
+
+func pull(c *cursor, root string) (resume, func()) {
+	return coroNew(func(_ struct{}, yield func(entry) struct{}) entry {
+		walkDir := func(path string, d fs.DirEntry, err error) error {
+			yield(entry{d, err, path})
+			return nil
+		}
+		if c.fsys != nil {
+			fs.WalkDir(c.fsys, root, walkDir)
+		} else {
+			filepath.WalkDir(root, walkDir)
+		}
+		return entry{}
+	})
+}
--- a/ext/fileio/fsdir_iter.go
+++ b/ext/fileio/fsdir_iter.go
@@ -0,0 +1,31 @@
+//go:build go1.23
+
+package fileio
+
+import (
+	"io/fs"
+	"iter"
+	"path/filepath"
+)
+
+type resume = func() (entry, bool)
+
+func next(c *cursor) (entry, bool) {
+	return c.resume()
+}
+
+func pull(c *cursor, root string) (resume, func()) {
+	return iter.Pull(func(yield func(entry) bool) {
+		walkDir := func(path string, d fs.DirEntry, err error) error {
+			if yield(entry{d, err, path}) {
+				return nil
+			}
+			return fs.SkipAll
+		}
+		if c.fsys != nil {
+			fs.WalkDir(c.fsys, root, walkDir)
+		} else {
+			filepath.WalkDir(root, walkDir)
+		}
+	})
+}
--- a/ext/ipaddr/ipaddr.go
+++ b/ext/ipaddr/ipaddr.go
@@ -1,113 +0,0 @@
-// Package ipaddr provides functions to manipulate IPs and CIDRs.
-//
-// It provides the following functions:
-//   - ipcontains(prefix, ip)
-//   - ipoverlaps(prefix1, prefix2)
-//   - ipfamily(ip/prefix)
-//   - iphost(ip/prefix)
-//   - ipmasklen(prefix)
-//   - ipnetwork(prefix)
-package ipaddr
-
-import (
-	"errors"
-	"net/netip"
-
-	"github.com/ncruces/go-sqlite3"
-)
-
-// Register IP/CIDR functions for a database connection.
-func Register(db *sqlite3.Conn) error {
-	const flags = sqlite3.DETERMINISTIC | sqlite3.INNOCUOUS
-	return errors.Join(
-		db.CreateFunction("ipcontains", 2, flags, contains),
-		db.CreateFunction("ipoverlaps", 2, flags, overlaps),
-		db.CreateFunction("ipfamily", 1, flags, family),
-		db.CreateFunction("iphost", 1, flags, host),
-		db.CreateFunction("ipmasklen", 1, flags, masklen),
-		db.CreateFunction("ipnetwork", 1, flags, network))
-}
-
-func contains(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	prefix, err := netip.ParsePrefix(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	addr, err := netip.ParseAddr(arg[1].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	ctx.ResultBool(prefix.Contains(addr))
-}
-
-func overlaps(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	prefix1, err := netip.ParsePrefix(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	prefix2, err := netip.ParsePrefix(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	ctx.ResultBool(prefix1.Overlaps(prefix2))
-}
-
-func family(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	addr, err := addr(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	switch {
-	case addr.Is4():
-		ctx.ResultInt(4)
-	case addr.Is6():
-		ctx.ResultInt(6)
-	}
-}
-
-func host(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	addr, err := addr(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	buf, _ := addr.MarshalText()
-	ctx.ResultRawText(buf)
-}
-
-func masklen(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	prefix, err := netip.ParsePrefix(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	ctx.ResultInt(prefix.Bits())
-}
-
-func network(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	prefix, err := netip.ParsePrefix(arg[0].Text())
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	buf, _ := prefix.Masked().MarshalText()
-	ctx.ResultRawText(buf)
-}
-
-func addr(text string) (netip.Addr, error) {
-	addr, err := netip.ParseAddr(text)
-	if err != nil {
-		if prefix, err := netip.ParsePrefix(text); err == nil {
-			return prefix.Addr(), nil
-		}
-		if addrpt, err := netip.ParseAddrPort(text); err == nil {
-			return addrpt.Addr(), nil
-		}
-	}
-	return addr, err
-}
--- a/ext/ipaddr/ipaddr_test.go
+++ b/ext/ipaddr/ipaddr_test.go
@@ -1,88 +0,0 @@
-package ipaddr_test
-
-import (
-	"testing"
-
-	"github.com/ncruces/go-sqlite3/driver"
-	_ "github.com/ncruces/go-sqlite3/embed"
-	"github.com/ncruces/go-sqlite3/ext/ipaddr"
-	_ "github.com/ncruces/go-sqlite3/internal/testcfg"
-	"github.com/ncruces/go-sqlite3/vfs/memdb"
-)
-
-func TestRegister(t *testing.T) {
-	t.Parallel()
-	tmp := memdb.TestDB(t)
-
-	db, err := driver.Open(tmp, ipaddr.Register)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	var got string
-
-	err = db.QueryRow(`SELECT ipfamily('::1')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "6" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipfamily('[::1]:80')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "6" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipfamily('192.168.1.5/24')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "4" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT iphost('192.168.1.5/24')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "192.168.1.5" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipmasklen('192.168.1.5/24')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "24" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipnetwork('192.168.1.5/24')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "192.168.1.0/24" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipcontains('192.168.1.0/24', '192.168.1.5')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "1" {
-		t.Fatalf("got %s", got)
-	}
-
-	err = db.QueryRow(`SELECT ipoverlaps('192.168.1.0/24', '192.168.1.5/32')`).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != "1" {
-		t.Fatalf("got %s", got)
-	}
-}
--- a/ext/parquet/go.mod
+++ b/ext/parquet/go.mod
@@ -0,0 +1,23 @@
+module github.com/ncruces/go-sqlite3/ext/parquet
+
+go 1.22
+
+toolchain go1.23.0
+
+require (
+	github.com/ncruces/go-sqlite3 v0.21.0
+	github.com/parquet-go/parquet-go v0.24.0
+)
+
+require (
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/ncruces/julianday v1.0.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/tetratelabs/wazero v1.8.2 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+)
--- a/ext/parquet/go.sum
+++ b/ext/parquet/go.sum
@@ -0,0 +1,32 @@
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/ncruces/go-sqlite3 v0.21.0 h1:EwKFoy1hHEopN4sFZarmi+McXdbCcbTuLixhEayXVbQ=
+github.com/ncruces/go-sqlite3 v0.21.0/go.mod h1:zxMOaSG5kFYVFK4xQa0pdwIszqxqJ0W0BxBgwdrNjuA=
+github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
+github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/parquet-go/parquet-go v0.24.0 h1:VrsifmLPDnas8zpoHmYiWDZ1YHzLmc7NmNwPGkI2JM4=
+github.com/parquet-go/parquet-go v0.24.0/go.mod h1:OqBBRGBl7+llplCvDMql8dEKaDqjaFA/VAPw+OJiNiw=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
+github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
--- a/ext/parquet/parquet.go
+++ b/ext/parquet/parquet.go
@@ -0,0 +1,62 @@
+package parquet
+
+import (
+	"os"
+	"strings"
+
+	"github.com/ncruces/go-sqlite3"
+	"github.com/ncruces/go-sqlite3/internal/util"
+	"github.com/ncruces/go-sqlite3/util/osutil"
+	"github.com/ncruces/go-sqlite3/util/sql3util"
+	"github.com/parquet-go/parquet-go"
+)
+
+func Register(db *sqlite3.Conn) error {
+	declare := func(db *sqlite3.Conn, _, _, _ string, arg ...string) (_ *table, err error) {
+		if len(arg) == 0 {
+			return nil, util.ErrorString(`parquet: must specify a filename`)
+		}
+
+		file, err := osutil.OpenFile(sql3util.Unquote(arg[0]), os.O_RDONLY, 0)
+		if err != nil {
+			return nil, err
+		}
+
+		reader := parquet.NewReader(file)
+
+		column := make(map[int]string)
+
+		var schema strings.Builder
+		schema.WriteString("CREATE TABLE x(")
+		for i, field := range reader.Schema().Fields() {
+			if i > 0 {
+				schema.WriteByte(',')
+			}
+			schema.WriteString(sqlite3.QuoteIdentifier(field.Name()))
+			schema.WriteByte(' ')
+			switch field.Type().Kind() {
+			case parquet.Boolean:
+				schema.WriteString("BOOLEAN")
+			case parquet.Int32, parquet.Int64, parquet.Int96:
+				schema.WriteString("INTEGER")
+			case parquet.Float, parquet.Double:
+				schema.WriteString("REAL")
+			case parquet.ByteArray, parquet.FixedLenByteArray:
+				schema.WriteString("TEXT")
+			}
+			// Save the column name
+			column[i] = field.Name()
+		}
+		schema.WriteString(");")
+		err = db.DeclareVTab(schema.String())
+		if err != nil {
+			return nil, err
+		}
+		return &table{}, nil
+	}
+
+	return sqlite3.CreateModule(db, "parquet", declare, declare)
+}
+
+type table struct {
+}
--- a/ext/pivot/pivot.go
+++ b/ext/pivot/pivot.go
@@ -25,14 +25,14 @@ type table struct {
 	cols []*sqlite3.Value
 }

-func declare(db *sqlite3.Conn, _, _, _ string, arg ...string) (ret *table, err error) {
+func declare(db *sqlite3.Conn, _, _, _ string, arg ...string) (res *table, err error) {
 	if len(arg) != 3 {
 		return nil, fmt.Errorf("pivot: wrong number of arguments")
 	}

 	t := &table{db: db}
 	defer func() {
-		if ret == nil {
+		if res == nil {
 			t.Close()
 		}
 	}()
@@ -99,11 +99,10 @@ func declare(db *sqlite3.Conn, _, _, _ string, arg ...string) (ret *table, err e
 }

 func (t *table) Close() error {
-	var errs []error
 	for _, c := range t.cols {
-		errs = append(errs, c.Close())
+		c.Close()
 	}
-	return errors.Join(errs...)
+	return nil
 }

 func (t *table) BestIndex(idx *sqlite3.IndexInfo) error {
@@ -207,7 +206,7 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 func (c *cursor) Next() error {
 	if c.scan.Step() {
 		count := c.scan.ColumnCount()
-		for i := range count {
+		for i := 0; i < count; i++ {
 			err := c.cell.BindValue(i+1, c.scan.ColumnValue(i))
 			if err != nil {
 				return err
--- a/ext/pivot/pivot_test.go
+++ b/ext/pivot/pivot_test.go
@@ -3,7 +3,6 @@ package pivot_test
 import (
 	"fmt"
 	"log"
-	"os"
 	"strings"
 	"testing"

@@ -86,7 +85,7 @@ func Example() {

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(pivot.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func TestRegister(t *testing.T) {
--- a/ext/regexp/regexp.go
+++ b/ext/regexp/regexp.go
@@ -16,9 +16,7 @@ package regexp
 import (
 	"errors"
 	"regexp"
-	"regexp/syntax"
 	"strings"
-	"unicode/utf8"

 	"github.com/ncruces/go-sqlite3"
 )
@@ -52,83 +50,34 @@ func Register(db *sqlite3.Conn) error {
 //	SELECT column WHERE column GLOB :glob_prefix AND column REGEXP :regexp
 //
 // [LIKE optimization]: https://sqlite.org/optoverview.html#the_like_optimization
-func GlobPrefix(expr string) string {
-	re, err := syntax.Parse(expr, syntax.Perl)
-	if err != nil {
-		return "" // no match possible
-	}
-	prog, err := syntax.Compile(re.Simplify())
-	if err != nil {
-		return "" // notest
-	}
-
-	i := &prog.Inst[prog.Start]
-
-	var empty syntax.EmptyOp
-loop1:
-	for {
-		switch i.Op {
-		case syntax.InstFail:
-			return "" // notest
-		case syntax.InstCapture, syntax.InstNop:
-			// skip
-		case syntax.InstEmptyWidth:
-			empty |= syntax.EmptyOp(i.Arg)
-		default:
-			break loop1
+func GlobPrefix(re *regexp.Regexp) string {
+	prefix, complete := re.LiteralPrefix()
+	i := strings.IndexAny(prefix, "*?[")
+	if i < 0 {
+		if complete {
+			return prefix
 		}
-		i = &prog.Inst[i.Out]
+		i = len(prefix)
 	}
-	if empty&syntax.EmptyBeginText == 0 {
-		return "*" // not anchored
-	}
-
-	var glob strings.Builder
-loop2:
-	for {
-		switch i.Op {
-		case syntax.InstFail:
-			return "" // notest
-		case syntax.InstCapture, syntax.InstEmptyWidth, syntax.InstNop:
-			// skip
-		case syntax.InstRune, syntax.InstRune1:
-			if len(i.Rune) != 1 || syntax.Flags(i.Arg)&syntax.FoldCase != 0 {
-				break loop2
-			}
-			switch r := i.Rune[0]; r {
-			case '*', '?', '[', utf8.RuneError:
-				break loop2
-			default:
-				glob.WriteRune(r)
-			}
-		default:
-			break loop2
-		}
-		i = &prog.Inst[i.Out]
-	}
-
-	glob.WriteByte('*')
-	return glob.String()
+	return prefix[:i] + "*"
 }

-func load(ctx sqlite3.Context, arg []sqlite3.Value, i int) (*regexp.Regexp, error) {
+func load(ctx sqlite3.Context, i int, expr string) (*regexp.Regexp, error) {
 	re, ok := ctx.GetAuxData(i).(*regexp.Regexp)
 	if !ok {
-		re, ok = arg[i].Pointer().(*regexp.Regexp)
-		if !ok {
-			r, err := regexp.Compile(arg[i].Text())
-			if err != nil {
-				return nil, err
-			}
-			re = r
+		r, err := regexp.Compile(expr)
+		if err != nil {
+			return nil, err
 		}
-		ctx.SetAuxData(i, re)
+		re = r
+		ctx.SetAuxData(0, r)
 	}
 	return re, nil
 }

 func regex(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 0)
+	_ = arg[1] // bounds check
+	re, err := load(ctx, 0, arg[0].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
@@ -138,17 +87,18 @@ func regex(ctx sqlite3.Context, arg ...sqlite3.Value) {
 }

 func regexLike(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 1)
+	re, err := load(ctx, 1, arg[1].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
 	}
+
 	text := arg[0].RawText()
 	ctx.ResultBool(re.Match(text))
 }

 func regexCount(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 1)
+	re, err := load(ctx, 1, arg[1].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
@@ -163,7 +113,7 @@ func regexCount(ctx sqlite3.Context, arg ...sqlite3.Value) {
 }

 func regexSubstr(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 1)
+	re, err := load(ctx, 1, arg[1].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
@@ -188,7 +138,7 @@ func regexSubstr(ctx sqlite3.Context, arg ...sqlite3.Value) {
 }

 func regexInstr(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 1)
+	re, err := load(ctx, 1, arg[1].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
@@ -216,14 +166,16 @@ func regexInstr(ctx sqlite3.Context, arg ...sqlite3.Value) {
 }

 func regexReplace(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	re, err := load(ctx, arg, 1)
+	_ = arg[2] // bounds check
+
+	re, err := load(ctx, 1, arg[1].Text())
 	if err != nil {
 		ctx.ResultError(err)
 		return // notest
 	}

-	repl := arg[2].RawText()
 	text := arg[0].RawText()
+	repl := arg[2].RawText()
 	var pos, n int
 	if len(arg) > 3 {
 		pos = arg[3].Int()
--- a/ext/regexp/regexp_test.go
+++ b/ext/regexp/regexp_test.go
@@ -3,10 +3,8 @@ package regexp
 import (
 	"database/sql"
 	"regexp"
-	"strings"
 	"testing"

-	"github.com/ncruces/go-sqlite3"
 	"github.com/ncruces/go-sqlite3/driver"
 	_ "github.com/ncruces/go-sqlite3/embed"
 	_ "github.com/ncruces/go-sqlite3/internal/testcfg"
@@ -105,81 +103,24 @@ func TestRegister_errors(t *testing.T) {
 	}
 }

-func TestRegister_pointer(t *testing.T) {
-	t.Parallel()
-	tmp := memdb.TestDB(t)
-
-	db, err := driver.Open(tmp, Register)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	var got int
-	err = db.QueryRow(`SELECT regexp_count('ABCABCAXYaxy', ?, 1)`,
-		sqlite3.Pointer(regexp.MustCompile(`(?i)A.`))).Scan(&got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != 4 {
-		t.Errorf("got %d, want %d", got, 4)
-	}
-}
-
 func TestGlobPrefix(t *testing.T) {
 	tests := []struct {
 		re   string
 		want string
 	}{
-		{`[`, ""},
-		{``, "*"},
-		{`^`, "*"},
-		{`a`, "*"},
-		{`ab`, "*"},
-		{`^a`, "a*"},
-		{`^a*`, "*"},
-		{`^a+`, "a*"},
-		{`^ab*`, "a*"},
-		{`^ab+`, "ab*"},
-		{`^a\?b`, "a*"},
-		{`^[a-z]`, "*"},
+		{``, ""},
+		{`a`, "a"},
+		{`a*`, "*"},
+		{`a+`, "a*"},
+		{`ab*`, "a*"},
+		{`ab+`, "ab*"},
+		{`a\?b`, "a*"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.re, func(t *testing.T) {
-			if got := GlobPrefix(tt.re); got != tt.want {
-				t.Errorf("GlobPrefix(%v) = %v, want %v", tt.re, got, tt.want)
+			if got := GlobPrefix(regexp.MustCompile(tt.re)); got != tt.want {
+				t.Errorf("GlobPrefix() = %v, want %v", got, tt.want)
 			}
 		})
 	}
 }
-
-func FuzzGlobPrefix(f *testing.F) {
-	f.Add(``, ``)
-	f.Add(`[`, ``)
-	f.Add(`^`, ``)
-	f.Add(`a`, `a`)
-	f.Add(`ab`, `b`)
-	f.Add(`^a`, `a`)
-	f.Add(`^a*`, `ab`)
-	f.Add(`^a+`, `ab`)
-	f.Add(`^ab*`, `ab`)
-	f.Add(`^ab+`, `ab`)
-	f.Add(`^a\?b`, `ab`)
-	f.Add(`^[a-z]`, `ab`)
-
-	f.Fuzz(func(t *testing.T, lit, str string) {
-		re, err := regexp.Compile(lit)
-		if err != nil {
-			t.SkipNow()
-		}
-		if re.MatchString(str) {
-			prefix, ok := strings.CutSuffix(GlobPrefix(lit), "*")
-			if !ok {
-				t.Fatalf("missing * after %q for %q with %q", prefix, lit, str)
-			}
-			if !strings.HasPrefix(str, prefix) {
-				t.Fatalf("missing prefix %q for %q with %q", prefix, lit, str)
-			}
-		}
-	})
-}
--- a/ext/serdes/serdes.go
+++ b/ext/serdes/serdes.go
@@ -1,140 +0,0 @@
-// Package serdes provides functions to (de)serialize databases.
-package serdes
-
-import (
-	"io"
-
-	"github.com/ncruces/go-sqlite3"
-	"github.com/ncruces/go-sqlite3/vfs"
-)
-
-const vfsName = "github.com/ncruces/go-sqlite3/ext/serdes.sliceVFS"
-
-func init() {
-	vfs.Register(vfsName, sliceVFS{})
-}
-
-var fileToOpen = make(chan *sliceFile, 1)
-
-// Serialize backs up a database into a byte slice.
-//
-// https://sqlite.org/c3ref/serialize.html
-func Serialize(db *sqlite3.Conn, schema string) ([]byte, error) {
-	var file sliceFile
-	fileToOpen <- &file
-	err := db.Backup(schema, "file:serdes.db?vfs="+vfsName)
-	return file.data, err
-}
-
-// Deserialize restores a database from a byte slice,
-// DESTROYING any contents previously stored in schema.
-//
-// To non-destructively open a database from a byte slice,
-// consider alternatives like the ["reader"] or ["memdb"] VFSes.
-//
-// This differs from the similarly named SQLite API
-// in that it DOES NOT disconnect from schema
-// to reopen as an in-memory database.
-//
-// https://sqlite.org/c3ref/deserialize.html
-//
-// ["memdb"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/memdb
-// ["reader"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/readervfs
-func Deserialize(db *sqlite3.Conn, schema string, data []byte) error {
-	fileToOpen <- &sliceFile{data}
-	return db.Restore(schema, "file:serdes.db?vfs="+vfsName)
-}
-
-type sliceVFS struct{}
-
-func (sliceVFS) Open(name string, flags vfs.OpenFlag) (vfs.File, vfs.OpenFlag, error) {
-	if flags&vfs.OPEN_MAIN_DB == 0 || name != "serdes.db" {
-		return nil, flags, sqlite3.CANTOPEN
-	}
-	select {
-	case file := <-fileToOpen:
-		return file, flags | vfs.OPEN_MEMORY, nil
-	default:
-		return nil, flags, sqlite3.MISUSE
-	}
-}
-
-func (sliceVFS) Delete(name string, dirSync bool) error {
-	// notest // OPEN_MEMORY
-	return sqlite3.IOERR_DELETE
-}
-
-func (sliceVFS) Access(name string, flag vfs.AccessFlag) (bool, error) {
-	return name == "serdes.db", nil
-}
-
-func (sliceVFS) FullPathname(name string) (string, error) {
-	return name, nil
-}
-
-type sliceFile struct{ data []byte }
-
-func (f *sliceFile) ReadAt(b []byte, off int64) (n int, err error) {
-	if d := f.data; off < int64(len(d)) {
-		n = copy(b, d[off:])
-	}
-	if n == 0 {
-		err = io.EOF
-	}
-	return
-}
-
-func (f *sliceFile) WriteAt(b []byte, off int64) (n int, err error) {
-	if d := f.data; off > int64(len(d)) {
-		f.data = append(d, make([]byte, off-int64(len(d)))...)
-	}
-	d := append(f.data[:off], b...)
-	if len(d) > len(f.data) {
-		f.data = d
-	}
-	return len(b), nil
-}
-
-func (f *sliceFile) Size() (int64, error) {
-	return int64(len(f.data)), nil
-}
-
-func (f *sliceFile) Truncate(size int64) error {
-	if d := f.data; size < int64(len(d)) {
-		f.data = d[:size]
-	}
-	return nil
-}
-
-func (f *sliceFile) SizeHint(size int64) error {
-	if d := f.data; size > int64(len(d)) {
-		f.data = append(d, make([]byte, size-int64(len(d)))...)
-	}
-	return nil
-}
-
-func (*sliceFile) Close() error { return nil }
-
-func (*sliceFile) Sync(flag vfs.SyncFlag) error { return nil }
-
-func (*sliceFile) Lock(lock vfs.LockLevel) error { return nil }
-
-func (*sliceFile) Unlock(lock vfs.LockLevel) error { return nil }
-
-func (*sliceFile) CheckReservedLock() (bool, error) {
-	// notest // OPEN_MEMORY
-	return false, nil
-}
-
-func (*sliceFile) SectorSize() int {
-	// notest // IOCAP_POWERSAFE_OVERWRITE
-	return 0
-}
-
-func (*sliceFile) DeviceCharacteristics() vfs.DeviceCharacteristic {
-	return vfs.IOCAP_ATOMIC |
-		vfs.IOCAP_SAFE_APPEND |
-		vfs.IOCAP_SEQUENTIAL |
-		vfs.IOCAP_POWERSAFE_OVERWRITE |
-		vfs.IOCAP_SUBPAGE_READ
-}
--- a/ext/serdes/serdes_test.go
+++ b/ext/serdes/serdes_test.go
@@ -1,87 +0,0 @@
-package serdes_test
-
-import (
-	"errors"
-	"io"
-	"net/http"
-	"testing"
-
-	"github.com/ncruces/go-sqlite3"
-	_ "github.com/ncruces/go-sqlite3/embed"
-	"github.com/ncruces/go-sqlite3/ext/serdes"
-)
-
-func TestDeserialize(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-
-	input, err := httpGet()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	db, err := sqlite3.Open(":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	err = serdes.Deserialize(db, "temp", input)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	output, err := serdes.Serialize(db, "temp")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(input) != len(output) {
-		t.Fatal("lengths are different")
-	}
-	for i := range input {
-		// These may be different.
-		switch {
-		case 24 <= i && i < 28:
-			// File change counter.
-			continue
-		case 40 <= i && i < 44:
-			// Schema cookie.
-			continue
-		case 92 <= i && i < 100:
-			// SQLite version that wrote the file.
-			continue
-		}
-		if input[i] != output[i] {
-			t.Errorf("difference at %d: %d %d", i, input[i], output[i])
-		}
-	}
-}
-
-func httpGet() ([]byte, error) {
-	res, err := http.Get("https://raw.githubusercontent.com/jpwhite3/northwind-SQLite3/refs/heads/main/dist/northwind.db")
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	return io.ReadAll(res.Body)
-}
-
-func TestOpen_errors(t *testing.T) {
-	_, err := sqlite3.Open("file:test.db?vfs=github.com/ncruces/go-sqlite3/ext/serdes.sliceVFS")
-	if err == nil {
-		t.Error("want error")
-	}
-	if !errors.Is(err, sqlite3.CANTOPEN) {
-		t.Errorf("got %v, want sqlite3.CANTOPEN", err)
-	}
-
-	_, err = sqlite3.Open("file:serdes.db?vfs=github.com/ncruces/go-sqlite3/ext/serdes.sliceVFS")
-	if err == nil {
-		t.Error("want error")
-	}
-	if !errors.Is(err, sqlite3.MISUSE) {
-		t.Errorf("got %v, want sqlite3.MISUSE", err)
-	}
-}
--- a/ext/statement/stmt.go
+++ b/ext/statement/stmt.go
@@ -8,7 +8,6 @@ package statement

 import (
 	"encoding/json"
-	"errors"
 	"strconv"
 	"strings"
 	"unsafe"
@@ -44,7 +43,7 @@ func declare(db *sqlite3.Conn, _, _, _ string, arg ...string) (*table, error) {
 	var str strings.Builder
 	str.WriteString("CREATE TABLE x(")
 	outputs := stmt.ColumnCount()
-	for i := range outputs {
+	for i := 0; i < outputs; i++ {
 		name := sqlite3.QuoteIdentifier(stmt.ColumnName(i))
 		str.WriteString(sep)
 		str.WriteString(name)
@@ -151,18 +150,17 @@ type cursor struct {
 func (c *cursor) Close() error {
 	if c.stmt == c.table.stmt {
 		c.table.inuse = false
-		return errors.Join(
-			c.stmt.Reset(),
-			c.stmt.ClearBindings())
+		c.stmt.ClearBindings()
+		return c.stmt.Reset()
 	}
 	return c.stmt.Close()
 }

 func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
-	err := errors.Join(
-		c.stmt.Reset(),
-		c.stmt.ClearBindings())
-	if err != nil {
+	c.arg = arg
+	c.rowID = 0
+	c.stmt.ClearBindings()
+	if err := c.stmt.Reset(); err != nil {
 		return err
 	}

@@ -185,8 +183,6 @@ func (c *cursor) Filter(idxNum int, idxStr string, arg ...sqlite3.Value) error {
 			return err
 		}
 	}
-	c.arg = append(c.arg[:0], arg...)
-	c.rowID = 0
 	return c.Next()
 }

--- a/ext/statement/stmt_test.go
+++ b/ext/statement/stmt_test.go
@@ -3,7 +3,6 @@ package statement_test
 import (
 	"fmt"
 	"log"
-	"os"
 	"testing"

 	"github.com/ncruces/go-sqlite3"
@@ -51,7 +50,7 @@ func Example() {

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(statement.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func TestRegister(t *testing.T) {
--- a/ext/stats/boolean.go
+++ b/ext/stats/boolean.go
@@ -7,7 +7,7 @@ const (
 	some
 )

-func newBoolean(kind int) sqlite3.AggregateConstructor {
+func newBoolean(kind int) func() sqlite3.AggregateFunction {
 	return func() sqlite3.AggregateFunction { return &boolean{kind: kind} }
 }

--- a/ext/stats/kahan.go
+++ b/ext/stats/kahan.go
@@ -1,19 +0,0 @@
-package stats
-
-// https://en.wikipedia.org/wiki/Kahan_summation_algorithm
-
-type kahan struct{ hi, lo float64 }
-
-func (k *kahan) add(x float64) {
-	y := k.lo + x
-	t := k.hi + y
-	k.lo = y - (t - k.hi)
-	k.hi = t
-}
-
-func (k *kahan) sub(x float64) {
-	y := k.lo - x
-	t := k.hi + y
-	k.lo = y - (t - k.hi)
-	k.hi = t
-}
--- a/ext/stats/mode.go
+++ b/ext/stats/mode.go
@@ -1,112 +0,0 @@
-package stats
-
-import (
-	"unsafe"
-
-	"github.com/ncruces/go-sqlite3"
-)
-
-func newMode() sqlite3.AggregateFunction {
-	return &mode{}
-}
-
-type mode struct {
-	ints  counter[int64]
-	reals counter[float64]
-	texts counter[string]
-	blobs counter[string]
-}
-
-func (m mode) Value(ctx sqlite3.Context) {
-	var (
-		max = 0
-		typ = sqlite3.NULL
-		i64 int64
-		f64 float64
-		str string
-	)
-	for k, v := range m.ints {
-		if v > max || v == max && k < i64 {
-			typ = sqlite3.INTEGER
-			max = v
-			i64 = k
-		}
-	}
-	f64 = float64(i64)
-	for k, v := range m.reals {
-		if v > max || v == max && k < f64 {
-			typ = sqlite3.FLOAT
-			max = v
-			f64 = k
-		}
-	}
-	for k, v := range m.texts {
-		if v > max || v == max && typ == sqlite3.TEXT && k < str {
-			typ = sqlite3.TEXT
-			max = v
-			str = k
-		}
-	}
-	for k, v := range m.blobs {
-		if v > max || v == max && typ == sqlite3.BLOB && k < str {
-			typ = sqlite3.BLOB
-			max = v
-			str = k
-		}
-	}
-	switch typ {
-	case sqlite3.INTEGER:
-		ctx.ResultInt64(i64)
-	case sqlite3.FLOAT:
-		ctx.ResultFloat(f64)
-	case sqlite3.TEXT:
-		ctx.ResultText(str)
-	case sqlite3.BLOB:
-		ctx.ResultBlob(unsafe.Slice(unsafe.StringData(str), len(str)))
-	}
-}
-
-func (b *mode) Step(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	switch arg[0].Type() {
-	case sqlite3.INTEGER:
-		b.ints.add(arg[0].Int64())
-	case sqlite3.FLOAT:
-		b.reals.add(arg[0].Float())
-	case sqlite3.TEXT:
-		b.texts.add(arg[0].Text())
-	case sqlite3.BLOB:
-		b.blobs.add(string(arg[0].RawBlob()))
-	}
-}
-
-func (b *mode) Inverse(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	switch arg[0].Type() {
-	case sqlite3.INTEGER:
-		b.ints.del(arg[0].Int64())
-	case sqlite3.FLOAT:
-		b.reals.del(arg[0].Float())
-	case sqlite3.TEXT:
-		b.texts.del(arg[0].Text())
-	case sqlite3.BLOB:
-		b.blobs.del(string(arg[0].RawBlob()))
-	}
-}
-
-type counter[T comparable] map[T]int
-
-func (c *counter[T]) add(k T) {
-	if (*c) == nil {
-		(*c) = make(counter[T])
-	}
-	(*c)[k]++
-}
-
-func (c counter[T]) del(k T) {
-	switch n := c[k]; n {
-	default:
-		c[k] = n - 1
-	case 1:
-		delete(c, k)
-	case 0:
-	}
-}
--- a/ext/stats/mode_test.go
+++ b/ext/stats/mode_test.go
@@ -1,85 +0,0 @@
-package stats_test
-
-import (
-	"testing"
-
-	"github.com/ncruces/go-sqlite3"
-	_ "github.com/ncruces/go-sqlite3/embed"
-	_ "github.com/ncruces/go-sqlite3/internal/testcfg"
-)
-
-func TestRegister_mode(t *testing.T) {
-	t.Parallel()
-
-	db, err := sqlite3.Open(":memory:")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	stmt, _, err := db.Prepare(`SELECT mode(column1) FROM (VALUES (NULL), (1), (NULL), (2), (NULL), (3), (3))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnInt(0); got != 3 {
-			t.Errorf("got %v, want 3", got)
-		}
-	}
-	stmt.Close()
-
-	stmt, _, err = db.Prepare(`SELECT mode(column1) FROM (VALUES (1), (1), (2), (2), (3))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnInt(0); got != 1 {
-			t.Errorf("got %v, want 1", got)
-		}
-	}
-	stmt.Close()
-
-	stmt, _, err = db.Prepare(`SELECT mode(column1) FROM (VALUES (0.5), (1), (2.5), (2), (2.5))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnFloat(0); got != 2.5 {
-			t.Errorf("got %v, want 2.5", got)
-		}
-	}
-	stmt.Close()
-
-	stmt, _, err = db.Prepare(`SELECT mode(column1) FROM (VALUES ('red'), ('green'), ('blue'), ('red'))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnText(0); got != "red" {
-			t.Errorf("got %q, want red", got)
-		}
-	}
-	stmt.Close()
-
-	stmt, _, err = db.Prepare(`SELECT mode(column1) FROM (VALUES (X'cafebabe'), ('green'), ('blue'), (X'cafebabe'))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnText(0); got != "\xca\xfe\xba\xbe" {
-			t.Errorf("got %q, want cafebabe", got)
-		}
-	}
-	stmt.Close()
-
-	stmt, _, err = db.Prepare(`
-		SELECT mode(column1) OVER (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING)
-		FROM (VALUES (1), (1), (2.5), ('blue'), (X'cafebabe'), (1), (1))
-	`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for stmt.Step() {
-	}
-	stmt.Close()
-}
--- a/ext/stats/moments.go
+++ b/ext/stats/moments.go
@@ -1,101 +0,0 @@
-package stats
-
-import "math"
-
-// Fisher–Pearson skewness and kurtosis using
-// Terriberry's algorithm with Kahan summation:
-// https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Higher-order_statistics
-
-type moments struct {
-	m1, m2, m3, m4 kahan
-	n              int64
-}
-
-func (m moments) mean() float64 {
-	return m.m1.hi
-}
-
-func (m moments) var_pop() float64 {
-	return m.m2.hi / float64(m.n)
-}
-
-func (m moments) var_samp() float64 {
-	return m.m2.hi / float64(m.n-1) // Bessel's correction
-}
-
-func (m moments) stddev_pop() float64 {
-	return math.Sqrt(m.var_pop())
-}
-
-func (m moments) stddev_samp() float64 {
-	return math.Sqrt(m.var_samp())
-}
-
-func (m moments) skewness_pop() float64 {
-	m2 := m.m2.hi
-	if div := m2 * m2 * m2; div != 0 {
-		return m.m3.hi * math.Sqrt(float64(m.n)/div)
-	}
-	return math.NaN()
-}
-
-func (m moments) skewness_samp() float64 {
-	n := m.n
-	// https://mathworks.com/help/stats/skewness.html#f1132178
-	return m.skewness_pop() * math.Sqrt(float64(n*(n-1))) / float64(n-2)
-}
-
-func (m moments) kurtosis_pop() float64 {
-	return m.raw_kurtosis_pop() - 3
-}
-
-func (m moments) raw_kurtosis_pop() float64 {
-	m2 := m.m2.hi
-	if div := m2 * m2; div != 0 {
-		return m.m4.hi * float64(m.n) / div
-	}
-	return math.NaN()
-}
-
-func (m moments) kurtosis_samp() float64 {
-	n := m.n
-	k := math.FMA(m.raw_kurtosis_pop(), float64(n+1), float64(3-3*n))
-	return k * float64(n-1) / float64((n-2)*(n-3))
-}
-
-func (m moments) raw_kurtosis_samp() float64 {
-	n := m.n
-	// https://mathworks.com/help/stats/kurtosis.html#f4975293
-	k := math.FMA(m.raw_kurtosis_pop(), float64(n+1), float64(3-3*n))
-	return math.FMA(k, float64(n-1)/float64((n-2)*(n-3)), 3)
-}
-
-func (m *moments) enqueue(x float64) {
-	n := m.n + 1
-	m.n = n
-	d1 := x - m.m1.hi - m.m1.lo
-	dn := d1 / float64(n)
-	d2 := dn * dn
-	t1 := d1 * dn * float64(n-1)
-	m.m4.add(t1*d2*float64(n*n-3*n+3) + 6*d2*m.m2.hi - 4*dn*m.m3.hi)
-	m.m3.add(t1*dn*float64(n-2) - 3*dn*m.m2.hi)
-	m.m2.add(t1)
-	m.m1.add(dn)
-}
-
-func (m *moments) dequeue(x float64) {
-	n := m.n - 1
-	if n <= 0 {
-		*m = moments{}
-		return
-	}
-	m.n = n
-	d1 := x - m.m1.hi - m.m1.lo
-	dn := d1 / float64(n)
-	d2 := dn * dn
-	t1 := d1 * dn * float64(n+1)
-	m.m4.sub(t1*d2*float64(n*n+3*n+3) - 6*d2*m.m2.hi - 4*dn*m.m3.hi)
-	m.m3.sub(t1*dn*float64(n+2) - 3*dn*m.m2.hi)
-	m.m2.sub(t1)
-	m.m1.sub(dn)
-}
--- a/ext/stats/moments_test.go
+++ b/ext/stats/moments_test.go
@@ -1,87 +0,0 @@
-package stats
-
-import (
-	"math"
-	"testing"
-)
-
-func Test_moments(t *testing.T) {
-	t.Parallel()
-
-	var s1 moments
-	s1.enqueue(1)
-	s1.dequeue(1)
-	if !math.IsNaN(s1.skewness_pop()) {
-		t.Errorf("want NaN")
-	}
-	if !math.IsNaN(s1.raw_kurtosis_pop()) {
-		t.Errorf("want NaN")
-	}
-
-	s1.enqueue(+0.5377)
-	s1.enqueue(+1.8339)
-	s1.enqueue(-2.2588)
-	s1.enqueue(+0.8622)
-	s1.enqueue(+0.3188)
-	s1.enqueue(-1.3077)
-	s1.enqueue(-0.4336)
-	s1.enqueue(+0.3426)
-	s1.enqueue(+3.5784)
-	s1.enqueue(+2.7694)
-
-	if got := s1.skewness_pop(); float32(got) != 0.106098293 {
-		t.Errorf("got %v, want 0.1061", got)
-	}
-	if got := s1.skewness_samp(); float32(got) != 0.1258171 {
-		t.Errorf("got %v, want 0.1258", got)
-	}
-	if got := s1.raw_kurtosis_pop(); float32(got) != 2.3121266 {
-		t.Errorf("got %v, want 2.3121", got)
-	}
-	if got := s1.raw_kurtosis_samp(); float32(got) != 2.7482237 {
-		t.Errorf("got %v, want 2.7483", got)
-	}
-
-	var s2 welford
-
-	s2.enqueue(+0.5377)
-	s2.enqueue(+1.8339)
-	s2.enqueue(-2.2588)
-	s2.enqueue(+0.8622)
-	s2.enqueue(+0.3188)
-	s2.enqueue(-1.3077)
-	s2.enqueue(-0.4336)
-	s2.enqueue(+0.3426)
-	s2.enqueue(+3.5784)
-	s2.enqueue(+2.7694)
-
-	if got, want := s1.mean(), s2.mean(); got != want {
-		t.Errorf("got %v, want %v", got, want)
-	}
-	if got, want := s1.stddev_pop(), s2.stddev_pop(); got != want {
-		t.Errorf("got %v, want %v", got, want)
-	}
-	if got, want := s1.stddev_samp(), s2.stddev_samp(); got != want {
-		t.Errorf("got %v, want %v", got, want)
-	}
-
-	s1.enqueue(math.Pi)
-	s1.enqueue(math.Sqrt2)
-	s1.enqueue(math.E)
-	s1.dequeue(math.Pi)
-	s1.dequeue(math.E)
-	s1.dequeue(math.Sqrt2)
-
-	if got := s1.skewness_pop(); float32(got) != 0.106098293 {
-		t.Errorf("got %v, want 0.1061", got)
-	}
-	if got := s1.skewness_samp(); float32(got) != 0.1258171 {
-		t.Errorf("got %v, want 0.1258", got)
-	}
-	if got := s1.raw_kurtosis_pop(); float32(got) != 2.3121266 {
-		t.Errorf("got %v, want 2.3121", got)
-	}
-	if got := s1.raw_kurtosis_samp(); float32(got) != 2.7482237 {
-		t.Errorf("got %v, want 2.7483", got)
-	}
-}
--- a/ext/stats/percentile.go
+++ b/ext/stats/percentile.go
@@ -11,9 +11,6 @@ import (
 	"github.com/ncruces/sort/quick"
 )

-// Compatible with:
-// https://sqlite.org/src/file/ext/misc/percentile.c
-
 const (
 	median = iota
 	percentile_100
@@ -21,7 +18,7 @@ const (
 	percentile_disc
 )

-func newPercentile(kind int) sqlite3.AggregateConstructor {
+func newPercentile(kind int) func() sqlite3.AggregateFunction {
 	return func() sqlite3.AggregateFunction { return &percentile{kind: kind} }
 }

--- a/ext/stats/stats.go
+++ b/ext/stats/stats.go
@@ -1,17 +1,13 @@
 // Package stats provides aggregate functions for statistics.
 //
 // Provided functions:
-//   - var_pop: population variance
-//   - var_samp: sample variance
 //   - stddev_pop: population standard deviation
 //   - stddev_samp: sample standard deviation
-//   - skewness_pop: Pearson population skewness
-//   - skewness_samp: Pearson sample skewness
-//   - kurtosis_pop: Fisher population excess kurtosis
-//   - kurtosis_samp: Fisher sample excess kurtosis
+//   - var_pop: population variance
+//   - var_samp: sample variance
 //   - covar_pop: population covariance
 //   - covar_samp: sample covariance
-//   - corr: Pearson correlation coefficient
+//   - corr: correlation coefficient
 //   - regr_r2: correlation coefficient squared
 //   - regr_avgx: average of the independent variable
 //   - regr_avgy: average of the dependent variable
@@ -21,12 +17,10 @@
 //   - regr_count: count non-null pairs of variables
 //   - regr_slope: slope of the least-squares-fit linear equation
 //   - regr_intercept: y-intercept of the least-squares-fit linear equation
-//   - regr_json: all regr stats as a JSON object
-//   - percentile_disc: discrete quantile
-//   - percentile_cont: continuous quantile
-//   - percentile: continuous percentile
-//   - median: middle value
-//   - mode: most frequent value
+//   - regr_json: all regr stats in a JSON object
+//   - percentile_disc: discrete percentile
+//   - percentile_cont: continuous percentile
+//   - median: median value
 //   - every: boolean and
 //   - some: boolean or
 //
@@ -65,10 +59,6 @@ func Register(db *sqlite3.Conn) error {
 		db.CreateWindowFunction("var_samp", 1, flags, newVariance(var_samp)),
 		db.CreateWindowFunction("stddev_pop", 1, flags, newVariance(stddev_pop)),
 		db.CreateWindowFunction("stddev_samp", 1, flags, newVariance(stddev_samp)),
-		db.CreateWindowFunction("skewness_pop", 1, flags, newMoments(skewness_pop)),
-		db.CreateWindowFunction("skewness_samp", 1, flags, newMoments(skewness_samp)),
-		db.CreateWindowFunction("kurtosis_pop", 1, flags, newMoments(kurtosis_pop)),
-		db.CreateWindowFunction("kurtosis_samp", 1, flags, newMoments(kurtosis_samp)),
 		db.CreateWindowFunction("covar_pop", 2, flags, newCovariance(var_pop)),
 		db.CreateWindowFunction("covar_samp", 2, flags, newCovariance(var_samp)),
 		db.CreateWindowFunction("corr", 2, flags, newCovariance(corr)),
@@ -87,8 +77,7 @@ func Register(db *sqlite3.Conn) error {
 		db.CreateWindowFunction("percentile_cont", 2, order, newPercentile(percentile_cont)),
 		db.CreateWindowFunction("percentile_disc", 2, order, newPercentile(percentile_disc)),
 		db.CreateWindowFunction("every", 1, flags, newBoolean(every)),
-		db.CreateWindowFunction("some", 1, flags, newBoolean(some)),
-		db.CreateWindowFunction("mode", 1, order, newMode))
+		db.CreateWindowFunction("some", 1, flags, newBoolean(some)))
 }

 const (
@@ -96,10 +85,6 @@ const (
 	var_samp
 	stddev_pop
 	stddev_samp
-	skewness_pop
-	skewness_samp
-	kurtosis_pop
-	kurtosis_samp
 	corr
 	regr_r2
 	regr_sxx
@@ -113,24 +98,7 @@ const (
 	regr_json
 )

-func special(kind int, n int64) (null, zero bool) {
-	switch kind {
-	case var_pop, stddev_pop, regr_sxx, regr_syy, regr_sxy:
-		return n <= 0, n == 1
-	case regr_avgx, regr_avgy:
-		return n <= 0, false
-	case kurtosis_samp:
-		return n <= 3, false
-	case skewness_samp:
-		return n <= 2, false
-	case skewness_pop:
-		return n <= 1, n == 2
-	default:
-		return n <= 1, false
-	}
-}
-
-func newVariance(kind int) sqlite3.AggregateConstructor {
+func newVariance(kind int) func() sqlite3.AggregateFunction {
 	return func() sqlite3.AggregateFunction { return &variance{kind: kind} }
 }

@@ -140,14 +108,6 @@ type variance struct {
 }

 func (fn *variance) Value(ctx sqlite3.Context) {
-	switch null, zero := special(fn.kind, fn.n); {
-	case zero:
-		ctx.ResultFloat(0)
-		return
-	case null:
-		return
-	}
-
 	var r float64
 	switch fn.kind {
 	case var_pop:
@@ -178,7 +138,7 @@ func (fn *variance) Inverse(ctx sqlite3.Context, arg ...sqlite3.Value) {
 	}
 }

-func newCovariance(kind int) sqlite3.AggregateConstructor {
+func newCovariance(kind int) func() sqlite3.AggregateFunction {
 	return func() sqlite3.AggregateFunction { return &covariance{kind: kind} }
 }

@@ -188,18 +148,6 @@ type covariance struct {
 }

 func (fn *covariance) Value(ctx sqlite3.Context) {
-	if fn.kind == regr_count {
-		ctx.ResultInt64(fn.regr_count())
-		return
-	}
-	switch null, zero := special(fn.kind, fn.n); {
-	case zero:
-		ctx.ResultFloat(0)
-		return
-	case null:
-		return
-	}
-
 	var r float64
 	switch fn.kind {
 	case var_pop:
@@ -224,9 +172,11 @@ func (fn *covariance) Value(ctx sqlite3.Context) {
 		r = fn.regr_slope()
 	case regr_intercept:
 		r = fn.regr_intercept()
+	case regr_count:
+		ctx.ResultInt64(fn.regr_count())
+		return
 	case regr_json:
-		var buf [128]byte
-		ctx.ResultRawText(fn.regr_json(buf[:0]))
+		ctx.ResultText(fn.regr_json())
 		return
 	}
 	ctx.ResultFloat(r)
@@ -253,51 +203,3 @@ func (fn *covariance) Inverse(ctx sqlite3.Context, arg ...sqlite3.Value) {
 		fn.dequeue(fa, fb)
 	}
 }
-
-func newMoments(kind int) sqlite3.AggregateConstructor {
-	return func() sqlite3.AggregateFunction { return &momentfn{kind: kind} }
-}
-
-type momentfn struct {
-	kind int
-	moments
-}
-
-func (fn *momentfn) Value(ctx sqlite3.Context) {
-	switch null, zero := special(fn.kind, fn.n); {
-	case zero:
-		ctx.ResultFloat(0)
-		return
-	case null:
-		return
-	}
-
-	var r float64
-	switch fn.kind {
-	case skewness_pop:
-		r = fn.skewness_pop()
-	case skewness_samp:
-		r = fn.skewness_samp()
-	case kurtosis_pop:
-		r = fn.kurtosis_pop()
-	case kurtosis_samp:
-		r = fn.kurtosis_samp()
-	}
-	ctx.ResultFloat(r)
-}
-
-func (fn *momentfn) Step(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	a := arg[0]
-	f := a.Float()
-	if f != 0.0 || a.NumericType() != sqlite3.NULL {
-		fn.enqueue(f)
-	}
-}
-
-func (fn *momentfn) Inverse(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	a := arg[0]
-	f := a.Float()
-	if f != 0.0 || a.NumericType() != sqlite3.NULL {
-		fn.dequeue(f)
-	}
-}
--- a/ext/stats/stats_test.go
+++ b/ext/stats/stats_test.go
@@ -2,7 +2,6 @@ package stats_test

 import (
 	"math"
-	"os"
 	"testing"

 	"github.com/ncruces/go-sqlite3"
@@ -13,7 +12,7 @@ import (

 func TestMain(m *testing.M) {
 	sqlite3.AutoExtension(stats.Register)
-	os.Exit(m.Run())
+	m.Run()
 }

 func TestRegister_variance(t *testing.T) {
@@ -30,29 +29,16 @@ func TestRegister_variance(t *testing.T) {
 		t.Fatal(err)
 	}

-	stmt, _, err := db.Prepare(`SELECT stddev_pop(x) FROM data`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnType(0); got != sqlite3.NULL {
-			t.Errorf("got %v, want NULL", got)
-		}
-	}
-	stmt.Close()
-
 	err = db.Exec(`INSERT INTO data (x) VALUES (4), (7.0), ('13'), (NULL), (16)`)
 	if err != nil {
 		t.Fatal(err)
 	}

-	stmt, _, err = db.Prepare(`
+	stmt, _, err := db.Prepare(`
 		SELECT
 			sum(x), avg(x),
 			var_samp(x), var_pop(x),
-			stddev_samp(x), stddev_pop(x),
-			skewness_samp(x), skewness_pop(x),
-			kurtosis_samp(x), kurtosis_pop(x)
+			stddev_samp(x), stddev_pop(x)
 		FROM data`)
 	if err != nil {
 		t.Fatal(err)
@@ -76,27 +62,10 @@ func TestRegister_variance(t *testing.T) {
 		if got := stmt.ColumnFloat(5); got != math.Sqrt(22.5) {
 			t.Errorf("got %v, want √22.5", got)
 		}
-		if got := stmt.ColumnFloat(6); got != 0 {
-			t.Errorf("got %v, want zero", got)
-		}
-		if got := stmt.ColumnFloat(7); got != 0 {
-			t.Errorf("got %v, want zero", got)
-		}
-		if got := stmt.ColumnFloat(8); float32(got) != -3.3 {
-			t.Errorf("got %v, want -3.3", got)
-		}
-		if got := stmt.ColumnFloat(9); got != -1.64 {
-			t.Errorf("got %v, want -1.64", got)
-		}
 	}
 	stmt.Close()

-	stmt, _, err = db.Prepare(`
-		SELECT
-	 		var_samp(x) OVER (ROWS 1 PRECEDING),
-			var_pop(x)  OVER (ROWS 1 PRECEDING),
-	 		skewness_pop(x) OVER (ROWS 1 PRECEDING)
-		FROM data`)
+	stmt, _, err = db.Prepare(`SELECT var_samp(x) OVER (ROWS 1 PRECEDING) FROM data`)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -127,26 +96,12 @@ func TestRegister_covariance(t *testing.T) {
 		t.Fatal(err)
 	}

-	stmt, _, err := db.Prepare(`SELECT regr_count(y, x), regr_json(y, x) FROM data`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stmt.Step() {
-		if got := stmt.ColumnInt(0); got != 0 {
-			t.Errorf("got %v, want 0", got)
-		}
-		if got := stmt.ColumnType(1); got != sqlite3.NULL {
-			t.Errorf("got %v, want NULL", got)
-		}
-	}
-	stmt.Close()
-
 	err = db.Exec(`INSERT INTO data (y, x) VALUES (3, 70), (5, 80), (2, 60), (7, 90), (4, 75)`)
 	if err != nil {
 		t.Fatal(err)
 	}

-	stmt, _, err = db.Prepare(`SELECT
+	stmt, _, err := db.Prepare(`SELECT
 		corr(y, x), covar_samp(y, x), covar_pop(y, x),
 		regr_avgy(y, x), regr_avgx(y, x),
 		regr_syy(y, x), regr_sxx(y, x), regr_sxy(y, x),
@@ -202,12 +157,7 @@ func TestRegister_covariance(t *testing.T) {
 	}
 	stmt.Close()

-	stmt, _, err = db.Prepare(`
-		SELECT
-	 		covar_samp(y, x) OVER (ROWS 1 PRECEDING),
-	 		covar_pop(y, x)  OVER (ROWS 1 PRECEDING),
-			regr_avgx(y, x)  OVER (ROWS 1 PRECEDING)
-		FROM data`)
+	stmt, _, err = db.Prepare(`SELECT covar_samp(y, x) OVER (ROWS 1 PRECEDING) FROM data`)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -221,9 +171,6 @@ func TestRegister_covariance(t *testing.T) {
 			t.Errorf("got %v, want %v", got, want[i])
 		}
 	}
-	if stmt.Err() != nil {
-		t.Fatal(stmt.Err())
-	}
 	stmt.Close()
 }

--- a/ext/stats/welford.go
+++ b/ext/stats/welford.go
@@ -3,20 +3,22 @@ package stats
 import (
 	"math"
 	"strconv"
-
-	"github.com/ncruces/go-sqlite3/internal/util"
+	"strings"
 )

 // Welford's algorithm with Kahan summation:
-// The effect of truncation in statistical computation [van Reeken, AJ 1970]
 // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm
+// https://en.wikipedia.org/wiki/Kahan_summation_algorithm
+
+// See also:
+// https://duckdb.org/docs/sql/aggregates.html#statistical-aggregates

 type welford struct {
 	m1, m2 kahan
 	n      int64
 }

-func (w welford) mean() float64 {
+func (w welford) average() float64 {
 	return w.m1.hi
 }

@@ -37,23 +39,17 @@ func (w welford) stddev_samp() float64 {
 }

 func (w *welford) enqueue(x float64) {
-	n := w.n + 1
-	w.n = n
+	w.n++
 	d1 := x - w.m1.hi - w.m1.lo
-	w.m1.add(d1 / float64(n))
+	w.m1.add(d1 / float64(w.n))
 	d2 := x - w.m1.hi - w.m1.lo
 	w.m2.add(d1 * d2)
 }

 func (w *welford) dequeue(x float64) {
-	n := w.n - 1
-	if n <= 0 {
-		*w = welford{}
-		return
-	}
-	w.n = n
+	w.n--
 	d1 := x - w.m1.hi - w.m1.lo
-	w.m1.sub(d1 / float64(n))
+	w.m1.sub(d1 / float64(w.n))
 	d2 := x - w.m1.hi - w.m1.lo
 	w.m2.sub(d1 * d2)
 }
@@ -116,35 +112,38 @@ func (w welford2) regr_r2() float64 {
 	return w.cov.hi * w.cov.hi / (w.m2y.hi * w.m2x.hi)
 }

-func (w welford2) regr_json(dst []byte) []byte {
-	dst = append(dst, `{"count":`...)
-	dst = strconv.AppendInt(dst, w.regr_count(), 10)
-	dst = append(dst, `,"avgy":`...)
-	dst = util.AppendNumber(dst, w.regr_avgy())
-	dst = append(dst, `,"avgx":`...)
-	dst = util.AppendNumber(dst, w.regr_avgx())
-	dst = append(dst, `,"syy":`...)
-	dst = util.AppendNumber(dst, w.regr_syy())
-	dst = append(dst, `,"sxx":`...)
-	dst = util.AppendNumber(dst, w.regr_sxx())
-	dst = append(dst, `,"sxy":`...)
-	dst = util.AppendNumber(dst, w.regr_sxy())
-	dst = append(dst, `,"slope":`...)
-	dst = util.AppendNumber(dst, w.regr_slope())
-	dst = append(dst, `,"intercept":`...)
-	dst = util.AppendNumber(dst, w.regr_intercept())
-	dst = append(dst, `,"r2":`...)
-	dst = util.AppendNumber(dst, w.regr_r2())
-	return append(dst, '}')
+func (w welford2) regr_json() string {
+	var json strings.Builder
+	var num [32]byte
+	json.Grow(128)
+	json.WriteString(`{"count":`)
+	json.Write(strconv.AppendInt(num[:0], w.regr_count(), 10))
+	json.WriteString(`,"avgy":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_avgy(), 'g', -1, 64))
+	json.WriteString(`,"avgx":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_avgx(), 'g', -1, 64))
+	json.WriteString(`,"syy":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_syy(), 'g', -1, 64))
+	json.WriteString(`,"sxx":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_sxx(), 'g', -1, 64))
+	json.WriteString(`,"sxy":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_sxy(), 'g', -1, 64))
+	json.WriteString(`,"slope":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_slope(), 'g', -1, 64))
+	json.WriteString(`,"intercept":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_intercept(), 'g', -1, 64))
+	json.WriteString(`,"r2":`)
+	json.Write(strconv.AppendFloat(num[:0], w.regr_r2(), 'g', -1, 64))
+	json.WriteByte('}')
+	return json.String()
 }

 func (w *welford2) enqueue(y, x float64) {
-	n := w.n + 1
-	w.n = n
+	w.n++
 	d1y := y - w.m1y.hi - w.m1y.lo
 	d1x := x - w.m1x.hi - w.m1x.lo
-	w.m1y.add(d1y / float64(n))
-	w.m1x.add(d1x / float64(n))
+	w.m1y.add(d1y / float64(w.n))
+	w.m1x.add(d1x / float64(w.n))
 	d2y := y - w.m1y.hi - w.m1y.lo
 	d2x := x - w.m1x.hi - w.m1x.lo
 	w.m2y.add(d1y * d2y)
@@ -153,19 +152,30 @@ func (w *welford2) enqueue(y, x float64) {
 }

 func (w *welford2) dequeue(y, x float64) {
-	n := w.n - 1
-	if n <= 0 {
-		*w = welford2{}
-		return
-	}
-	w.n = n
+	w.n--
 	d1y := y - w.m1y.hi - w.m1y.lo
 	d1x := x - w.m1x.hi - w.m1x.lo
-	w.m1y.sub(d1y / float64(n))
-	w.m1x.sub(d1x / float64(n))
+	w.m1y.sub(d1y / float64(w.n))
+	w.m1x.sub(d1x / float64(w.n))
 	d2y := y - w.m1y.hi - w.m1y.lo
 	d2x := x - w.m1x.hi - w.m1x.lo
 	w.m2y.sub(d1y * d2y)
 	w.m2x.sub(d1x * d2x)
 	w.cov.sub(d1y * d2x)
 }
+
+type kahan struct{ hi, lo float64 }
+
+func (k *kahan) add(x float64) {
+	y := k.lo + x
+	t := k.hi + y
+	k.lo = y - (t - k.hi)
+	k.hi = t
+}
+
+func (k *kahan) sub(x float64) {
+	y := k.lo - x
+	t := k.hi + y
+	k.lo = y - (t - k.hi)
+	k.hi = t
+}
--- a/ext/stats/welford_test.go
+++ b/ext/stats/welford_test.go
@@ -9,14 +9,12 @@ func Test_welford(t *testing.T) {
 	t.Parallel()

 	var s1, s2 welford
-	s1.enqueue(1)
-	s1.dequeue(1)

 	s1.enqueue(4)
 	s1.enqueue(7)
 	s1.enqueue(13)
 	s1.enqueue(16)
-	if got := s1.mean(); got != 10 {
+	if got := s1.average(); got != 10 {
 		t.Errorf("got %v, want 10", got)
 	}
 	if got := s1.var_samp(); got != 30 {
@@ -45,8 +43,6 @@ func Test_covar(t *testing.T) {
 	t.Parallel()

 	var c1, c2 welford2
-	c1.enqueue(1, 1)
-	c1.dequeue(1, 1)

 	c1.enqueue(3, 70)
 	c1.enqueue(5, 80)
--- a/ext/unicode/unicode.go
+++ b/ext/unicode/unicode.go
@@ -1,22 +1,19 @@
 // Package unicode provides an alternative to the SQLite ICU extension.
 //
 // Like the [ICU extension], it provides Unicode aware:
-//   - upper() and lower() functions
-//   - LIKE and REGEXP operators
-//   - collation sequences
+//   - upper() and lower() functions,
+//   - LIKE and REGEXP operators,
+//   - collation sequences.
 //
-// Like PostgreSQL, it also provides:
-//   - initcap()
-//   - casefold()
-//   - normalize()
-//   - unaccent()
+// It also provides, from PostgreSQL:
+//   - unaccent(),
+//   - initcap().
 //
-// The implementations are not 100% compatible:
-//   - upper(), lower(), initcap() casefold() use [strings.ToUpper], [strings.ToLower], [strings.Title] and [cases]
-//   - normalize(), unaccent() use [transform] and [unicode.Mn]
-//   - the LIKE operator follows [strings.EqualFold] rules
-//   - the REGEXP operator uses Go [regexp/syntax]
-//   - collation sequences use [collate]
+// The implementation is not 100% compatible with the [ICU extension]:
+//   - upper() and lower() use [strings.ToUpper], [strings.ToLower] and [cases];
+//   - the LIKE operator follows [strings.EqualFold] rules;
+//   - the REGEXP operator uses Go [regexp/syntax];
+//   - collation sequences use [collate].
 //
 // Expect subtle differences (e.g.) in the handling of Turkish case folding.
 //
@@ -28,7 +25,6 @@ import (
 	"errors"
 	"regexp"
 	"strings"
-	"sync"
 	"unicode"
 	"unicode/utf8"

@@ -52,13 +48,13 @@ var RegisterLike = true
 // Register registers Unicode aware functions for a database connection.
 func Register(db *sqlite3.Conn) error {
 	const flags = sqlite3.DETERMINISTIC | sqlite3.INNOCUOUS
-	var lkfn sqlite3.ScalarFunction
+	var errs util.ErrorJoiner
 	if RegisterLike {
-		lkfn = like
+		errs.Join(
+			db.CreateFunction("like", 2, flags, like),
+			db.CreateFunction("like", 3, flags, like))
 	}
-	return errors.Join(
-		db.CreateFunction("like", 2, flags, lkfn),
-		db.CreateFunction("like", 3, flags, lkfn),
+	errs.Join(
 		db.CreateFunction("upper", 1, flags, upper),
 		db.CreateFunction("upper", 2, flags, upper),
 		db.CreateFunction("lower", 1, flags, lower),
@@ -66,10 +62,7 @@ func Register(db *sqlite3.Conn) error {
 		db.CreateFunction("regexp", 2, flags, regex),
 		db.CreateFunction("initcap", 1, flags, initcap),
 		db.CreateFunction("initcap", 2, flags, initcap),
-		db.CreateFunction("casefold", 1, flags, casefold),
 		db.CreateFunction("unaccent", 1, flags, unaccent),
-		db.CreateFunction("normalize", 1, flags, normalize),
-		db.CreateFunction("normalize", 2, flags, normalize),
 		db.CreateFunction("icu_load_collation", 2, sqlite3.DIRECTONLY,
 			func(ctx sqlite3.Context, arg ...sqlite3.Value) {
 				name := arg[1].Text()
@@ -83,6 +76,7 @@ func Register(db *sqlite3.Conn) error {
 					return // notest
 				}
 			}))
+	return errors.Join(errs...)
 }

 // RegisterCollation registers a Unicode collation sequence for a database connection.
@@ -115,8 +109,9 @@ func upper(ctx sqlite3.Context, arg ...sqlite3.Value) {
 			ctx.ResultError(err)
 			return // notest
 		}
-		cs = cases.Upper(t)
-		ctx.SetAuxData(1, cs)
+		c := cases.Upper(t)
+		ctx.SetAuxData(1, c)
+		cs = c
 	}
 	ctx.ResultRawText(cs.Bytes(arg[0].RawText()))
 }
@@ -133,8 +128,9 @@ func lower(ctx sqlite3.Context, arg ...sqlite3.Value) {
 			ctx.ResultError(err)
 			return // notest
 		}
-		cs = cases.Lower(t)
-		ctx.SetAuxData(1, cs)
+		c := cases.Lower(t)
+		ctx.SetAuxData(1, c)
+		cs = c
 	}
 	ctx.ResultRawText(cs.Bytes(arg[0].RawText()))
 }
@@ -151,26 +147,15 @@ func initcap(ctx sqlite3.Context, arg ...sqlite3.Value) {
 			ctx.ResultError(err)
 			return // notest
 		}
-		cs = cases.Title(t)
-		ctx.SetAuxData(1, cs)
+		c := cases.Title(t)
+		ctx.SetAuxData(1, c)
+		cs = c
 	}
 	ctx.ResultRawText(cs.Bytes(arg[0].RawText()))
 }

-func casefold(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	ctx.ResultRawText(cases.Fold().Bytes(arg[0].RawText()))
-}
-
-var unaccentPool = sync.Pool{
-	New: func() any {
-		return transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
-	},
-}
-
 func unaccent(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	unaccent := unaccentPool.Get().(transform.Transformer)
-	defer unaccentPool.Put(unaccent)
-
+	unaccent := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
 	res, _, err := transform.Bytes(unaccent, arg[0].RawText())
 	if err != nil {
 		ctx.ResultError(err) // notest
@@ -179,44 +164,16 @@ func unaccent(ctx sqlite3.Context, arg ...sqlite3.Value) {
 	}
 }

-func normalize(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	form := norm.NFC
-	if len(arg) > 1 {
-		switch strings.ToUpper(arg[1].Text()) {
-		case "NFC":
-			//
-		case "NFD":
-			form = norm.NFD
-		case "NFKC":
-			form = norm.NFKC
-		case "NFKD":
-			form = norm.NFKD
-		default:
-			ctx.ResultError(util.ErrorString("unicode: invalid form"))
-			return
-		}
-	}
-	res, _, err := transform.Bytes(form, arg[0].RawText())
-	if err != nil {
-		ctx.ResultError(err) // notest
-	} else {
-		ctx.ResultRawText(res)
-	}
-}
-
 func regex(ctx sqlite3.Context, arg ...sqlite3.Value) {
 	re, ok := ctx.GetAuxData(0).(*regexp.Regexp)
 	if !ok {
-		re, ok = arg[0].Pointer().(*regexp.Regexp)
-		if !ok {
-			r, err := regexp.Compile(arg[0].Text())
-			if err != nil {
-				ctx.ResultError(err)
-				return // notest
-			}
-			re = r
+		r, err := regexp.Compile(arg[0].Text())
+		if err != nil {
+			ctx.ResultError(err)
+			return // notest
 		}
-		ctx.SetAuxData(0, re)
+		re = r
+		ctx.SetAuxData(0, r)
 	}
 	ctx.ResultBool(re.Match(arg[1].RawText()))
 }
--- a/ext/unicode/unicode_test.go
+++ b/ext/unicode/unicode_test.go
@@ -2,7 +2,7 @@ package unicode

 import (
 	"errors"
-	"slices"
+	"reflect"
 	"testing"

 	"github.com/ncruces/go-sqlite3"
@@ -49,12 +49,6 @@ func TestRegister(t *testing.T) {
 		{`upper('Dünyanın İlk Borsası', 'tr-TR')`, "DÜNYANIN İLK BORSASI"},
 		{`initcap('Kad je hladno Marko nosi džemper')`, "Kad Je Hladno Marko Nosi Džemper"},
 		{`initcap('Kad je hladno Marko nosi džemper', 'hr-HR')`, "Kad Je Hladno Marko Nosi Džemper"},
-		{`normalize(X'61cc88')`, "ä"},
-		{`normalize(X'61cc88', 'NFC' )`, "ä"},
-		{`normalize(X'61cc88', 'NFKC')`, "ä"},
-		{`normalize('ä', 'NFD' )`, "\x61\xcc\x88"},
-		{`normalize('ä', 'NFKD')`, "\x61\xcc\x88"},
-		{`casefold('Maße')`, "masse"},
 		{`unaccent('Hôtel')`, "Hotel"},
 		{`'Hello' REGEXP 'ell'`, "1"},
 		{`'Hello' REGEXP 'el.'`, "1"},
@@ -121,7 +115,7 @@ func TestRegister_collation(t *testing.T) {
 		t.Fatal(err)
 	}

-	if !slices.Equal(got, want) {
+	if !reflect.DeepEqual(got, want) {
 		t.Error("not equal")
 	}

@@ -172,7 +166,7 @@ func TestRegisterCollationsNeeded(t *testing.T) {
 		t.Fatal(err)
 	}

-	if !slices.Equal(got, want) {
+	if !reflect.DeepEqual(got, want) {
 		t.Error("not equal")
 	}

@@ -214,14 +208,6 @@ func TestRegister_error(t *testing.T) {
 		t.Errorf("got %v, want sqlite3.ERROR", err)
 	}

-	err = db.Exec(`SELECT normalize('', 'NF')`)
-	if err == nil {
-		t.Error("want error")
-	}
-	if !errors.Is(err, sqlite3.ERROR) {
-		t.Errorf("got %v, want sqlite3.ERROR", err)
-	}
-
 	err = db.Exec(`SELECT 'hello' REGEXP '\'`)
 	if err == nil {
 		t.Error("want error")
--- a/ext/uuid/uuid.go
+++ b/ext/uuid/uuid.go
@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"time"

 	"github.com/google/uuid"

@@ -17,18 +16,17 @@ import (

 // Register registers the SQL functions:
 //
-//   - uuid([ version [, domain/namespace, [ id/data ]]]):
-//     to generate a UUID as a string
-//   - uuid_str(u):
-//     to convert a UUID into a well-formed UUID string
-//   - uuid_blob(u):
-//     to convert a UUID into a 16-byte blob
-//   - uuid_extract_version(u):
-//     to extract the version of a RFC 4122 UUID
-//   - uuid_extract_timestamp(u):
-//     to extract the timestamp of a version 1/2/6/7 UUID
-//   - gen_random_uuid(u):
-//     to generate a version 4 (random) UUID
+//	uuid([version], [domain/namespace], [id/data])
+//
+// Generates a UUID as a string.
+//
+//	uuid_str(u)
+//
+// Converts a UUID into a well-formed UUID string.
+//
+//	uuid_blob(u)
+//
+// Converts a UUID into a 16-byte blob.
 func Register(db *sqlite3.Conn) error {
 	const flags = sqlite3.DETERMINISTIC | sqlite3.INNOCUOUS
 	return errors.Join(
@@ -37,10 +35,7 @@ func Register(db *sqlite3.Conn) error {
 		db.CreateFunction("uuid", 2, sqlite3.INNOCUOUS, generate),
 		db.CreateFunction("uuid", 3, sqlite3.INNOCUOUS, generate),
 		db.CreateFunction("uuid_str", 1, flags, toString),
-		db.CreateFunction("uuid_blob", 1, flags, toBlob),
-		db.CreateFunction("uuid_extract_version", 1, flags, version),
-		db.CreateFunction("uuid_extract_timestamp", 1, flags, timestamp),
-		db.CreateFunction("gen_random_uuid", 0, sqlite3.INNOCUOUS, generate))
+		db.CreateFunction("uuid_blob", 1, flags, toBlob))
 }

 func generate(ctx sqlite3.Context, arg ...sqlite3.Value) {
@@ -172,30 +167,3 @@ func toString(ctx sqlite3.Context, arg ...sqlite3.Value) {
 		ctx.ResultText(u.String())
 	}
 }
-
-func version(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	u, err := fromValue(arg[0])
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	if u.Variant() == uuid.RFC4122 {
-		ctx.ResultInt64(int64(u.Version()))
-	}
-}
-
-func timestamp(ctx sqlite3.Context, arg ...sqlite3.Value) {
-	u, err := fromValue(arg[0])
-	if err != nil {
-		ctx.ResultError(err)
-		return // notest
-	}
-	if u.Variant() == uuid.RFC4122 {
-		switch u.Version() {
-		case 1, 2, 6, 7:
-			ctx.ResultTime(
-				time.Unix(u.Time().UnixTime()),
-				sqlite3.TimeFormatDefault)
-		}
-	}
-}
--- a/ext/uuid/uuid_test.go
+++ b/ext/uuid/uuid_test.go
@@ -2,7 +2,6 @@ package uuid

 import (
 	"testing"
-	"time"

 	"github.com/google/uuid"

@@ -107,26 +106,7 @@ func Test_generate(t *testing.T) {
 		t.Error("want error")
 	}

-	var tstamp time.Time
-	var version uuid.Version
-	err = db.QueryRow(`
-		SELECT
-			column1,
-			uuid_extract_version(column1),
-			uuid_extract_timestamp(column1)
-		FROM (VALUES (uuid(7)))
-	`).Scan(&u, &version, &tstamp)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got := u.Version(); got != version {
-		t.Errorf("got %d, want %d", got, version)
-	}
-	if got := time.Unix(u.Time().UnixTime()); !got.Equal(tstamp) {
-		t.Errorf("got %v, want %v", got, tstamp)
-	}
-
-	tests := []struct {
+	hash := []struct {
 		ver  uuid.Version
 		ns   any
 		data string
@@ -140,7 +120,7 @@ func Test_generate(t *testing.T) {
 		{3, "url", "https://www.php.net", uuid.MustParse("3f703955-aaba-3e70-a3cb-baff6aa3b28f")},
 		{5, "url", "https://www.php.net", uuid.MustParse("a8f6ae40-d8a7-58f0-be05-a22f94eca9ec")},
 	}
-	for _, tt := range tests {
+	for _, tt := range hash {
 		err = db.QueryRow(`SELECT uuid(?, ?, ?)`, tt.ver, tt.ns, tt.data).Scan(&u)
 		if err != nil {
 			t.Fatal(err)
@@ -162,14 +142,14 @@ func Test_convert(t *testing.T) {
 	defer db.Close()

 	var u uuid.UUID
-	tests := []string{
+	lits := []string{
 		"'6ba7b8119dad11d180b400c04fd430c8'",
 		"'6ba7b811-9dad-11d1-80b4-00c04fd430c8'",
 		"'{6ba7b811-9dad-11d1-80b4-00c04fd430c8}'",
 		"X'6ba7b8119dad11d180b400c04fd430c8'",
 	}

-	for _, tt := range tests {
+	for _, tt := range lits {
 		err = db.QueryRow(`SELECT uuid_str(` + tt + `)`).Scan(&u)
 		if err != nil {
 			t.Fatal(err)
@@ -179,7 +159,7 @@ func Test_convert(t *testing.T) {
 		}
 	}

-	for _, tt := range tests {
+	for _, tt := range lits {
 		err = db.QueryRow(`SELECT uuid_blob(` + tt + `)`).Scan(&u)
 		if err != nil {
 			t.Fatal(err)
@@ -198,14 +178,4 @@ func Test_convert(t *testing.T) {
 	if err == nil {
 		t.Fatal("want error")
 	}
-
-	err = db.QueryRow(`SELECT uuid_extract_version(X'cafe')`).Scan(&u)
-	if err == nil {
-		t.Fatal("want error")
-	}
-
-	err = db.QueryRow(`SELECT uuid_extract_timestamp(X'cafe')`).Scan(&u)
-	if err == nil {
-		t.Fatal("want error")
-	}
 }
--- a/func.go
+++ b/func.go
@@ -2,10 +2,7 @@ package sqlite3

 import (
 	"context"
-	"io"
-	"iter"
 	"sync"
-	"sync/atomic"

 	"github.com/tetratelabs/wazero/api"

@@ -17,12 +14,12 @@ import (
 //
 // https://sqlite.org/c3ref/collation_needed.html
 func (c *Conn) CollationNeeded(cb func(db *Conn, name string)) error {
-	var enable int32
+	var enable uint64
 	if cb != nil {
 		enable = 1
 	}
-	rc := res_t(c.call("sqlite3_collation_needed_go", stk_t(c.handle), stk_t(enable)))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_collation_needed_go", uint64(c.handle), enable)
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.collation = cb
@@ -36,8 +33,8 @@ func (c *Conn) CollationNeeded(cb func(db *Conn, name string)) error {
 // This can be used to load schemas that contain
 // one or more unknown collating sequences.
 func (c Conn) AnyCollationNeeded() error {
-	rc := res_t(c.call("sqlite3_anycollseq_init", stk_t(c.handle), 0, 0))
-	if err := c.error(rc); err != nil {
+	r := c.call("sqlite3_anycollseq_init", uint64(c.handle), 0, 0)
+	if err := c.error(r); err != nil {
 		return err
 	}
 	c.collation = nil
@@ -47,103 +44,60 @@ func (c Conn) AnyCollationNeeded() error {
 // CreateCollation defines a new collating sequence.
 //
 // https://sqlite.org/c3ref/create_collation.html
-func (c *Conn) CreateCollation(name string, fn CollatingFunction) error {
-	var funcPtr ptr_t
+func (c *Conn) CreateCollation(name string, fn func(a, b []byte) int) error {
+	var funcPtr uint32
 	defer c.arena.mark()()
 	namePtr := c.arena.string(name)
 	if fn != nil {
 		funcPtr = util.AddHandle(c.ctx, fn)
 	}
-	rc := res_t(c.call("sqlite3_create_collation_go",
-		stk_t(c.handle), stk_t(namePtr), stk_t(funcPtr)))
-	return c.error(rc)
+	r := c.call("sqlite3_create_collation_go",
+		uint64(c.handle), uint64(namePtr), uint64(funcPtr))
+	return c.error(r)
 }

-// Collating function is the type of a collation callback.
-// Implementations must not retain a or b.
-type CollatingFunction func(a, b []byte) int
-
 // CreateFunction defines a new scalar SQL function.
 //
 // https://sqlite.org/c3ref/create_function.html
 func (c *Conn) CreateFunction(name string, nArg int, flag FunctionFlag, fn ScalarFunction) error {
-	var funcPtr ptr_t
+	var funcPtr uint32
 	defer c.arena.mark()()
 	namePtr := c.arena.string(name)
 	if fn != nil {
 		funcPtr = util.AddHandle(c.ctx, fn)
 	}
-	rc := res_t(c.call("sqlite3_create_function_go",
-		stk_t(c.handle), stk_t(namePtr), stk_t(nArg),
-		stk_t(flag), stk_t(funcPtr)))
-	return c.error(rc)
+	r := c.call("sqlite3_create_function_go",
+		uint64(c.handle), uint64(namePtr), uint64(nArg),
+		uint64(flag), uint64(funcPtr))
+	return c.error(r)
 }

 // ScalarFunction is the type of a scalar SQL function.
 // Implementations must not retain arg.
 type ScalarFunction func(ctx Context, arg ...Value)

-// CreateAggregateFunction defines a new aggregate SQL function.
-//
-// https://sqlite.org/c3ref/create_function.html
-func (c *Conn) CreateAggregateFunction(name string, nArg int, flag FunctionFlag, fn AggregateSeqFunction) error {
-	var funcPtr ptr_t
-	defer c.arena.mark()()
-	namePtr := c.arena.string(name)
-	if fn != nil {
-		funcPtr = util.AddHandle(c.ctx, AggregateConstructor(func() AggregateFunction {
-			var a aggregateFunc
-			coro := func(yieldCoro func(struct{}) bool) {
-				seq := func(yieldSeq func([]Value) bool) {
-					for yieldSeq(a.arg) {
-						if !yieldCoro(struct{}{}) {
-							break
-						}
-					}
-				}
-				fn(&a.ctx, seq)
-			}
-			a.next, a.stop = iter.Pull(coro)
-			return &a
-		}))
-	}
-	rc := res_t(c.call("sqlite3_create_aggregate_function_go",
-		stk_t(c.handle), stk_t(namePtr), stk_t(nArg),
-		stk_t(flag), stk_t(funcPtr)))
-	return c.error(rc)
-}
-
-// AggregateSeqFunction is the type of an aggregate SQL function.
-// Implementations must not retain the slices yielded by seq.
-type AggregateSeqFunction func(ctx *Context, seq iter.Seq[[]Value])
-
 // CreateWindowFunction defines a new aggregate or aggregate window SQL function.
-// If fn returns a [WindowFunction], an aggregate window function is created.
+// If fn returns a [WindowFunction], then an aggregate window function is created.
 // If fn returns an [io.Closer], it will be called to free resources.
 //
 // https://sqlite.org/c3ref/create_function.html
-func (c *Conn) CreateWindowFunction(name string, nArg int, flag FunctionFlag, fn AggregateConstructor) error {
-	var funcPtr ptr_t
+func (c *Conn) CreateWindowFunction(name string, nArg int, flag FunctionFlag, fn func() AggregateFunction) error {
+	var funcPtr uint32
 	defer c.arena.mark()()
 	namePtr := c.arena.string(name)
 	if fn != nil {
-		funcPtr = util.AddHandle(c.ctx, AggregateConstructor(func() AggregateFunction {
-			agg := fn()
-			if win, ok := agg.(WindowFunction); ok {
-				return win
-			}
-			return windowFunc{agg, name}
-		}))
+		funcPtr = util.AddHandle(c.ctx, fn)
 	}
-	rc := res_t(c.call("sqlite3_create_window_function_go",
-		stk_t(c.handle), stk_t(namePtr), stk_t(nArg),
-		stk_t(flag), stk_t(funcPtr)))
-	return c.error(rc)
+	call := "sqlite3_create_aggregate_function_go"
+	if _, ok := fn().(WindowFunction); ok {
+		call = "sqlite3_create_window_function_go"
+	}
+	r := c.call(call,
+		uint64(c.handle), uint64(namePtr), uint64(nArg),
+		uint64(flag), uint64(funcPtr))
+	return c.error(r)
 }

-// AggregateConstructor is a an [AggregateFunction] constructor.
-type AggregateConstructor func() AggregateFunction
-
 // AggregateFunction is the interface an aggregate function should implement.
 //
 // https://sqlite.org/appfunc.html
@@ -175,145 +129,102 @@ type WindowFunction interface {
 func (c *Conn) OverloadFunction(name string, nArg int) error {
 	defer c.arena.mark()()
 	namePtr := c.arena.string(name)
-	rc := res_t(c.call("sqlite3_overload_function",
-		stk_t(c.handle), stk_t(namePtr), stk_t(nArg)))
-	return c.error(rc)
+	r := c.call("sqlite3_overload_function",
+		uint64(c.handle), uint64(namePtr), uint64(nArg))
+	return c.error(r)
 }

-func destroyCallback(ctx context.Context, mod api.Module, pApp ptr_t) {
+func destroyCallback(ctx context.Context, mod api.Module, pApp uint32) {
 	util.DelHandle(ctx, pApp)
 }

-func collationCallback(ctx context.Context, mod api.Module, pArg, pDB ptr_t, eTextRep uint32, zName ptr_t) {
+func collationCallback(ctx context.Context, mod api.Module, pArg, pDB, eTextRep, zName uint32) {
 	if c, ok := ctx.Value(connKey{}).(*Conn); ok && c.handle == pDB && c.collation != nil {
 		name := util.ReadString(mod, zName, _MAX_NAME)
 		c.collation(c, name)
 	}
 }

-func compareCallback(ctx context.Context, mod api.Module, pApp ptr_t, nKey1 int32, pKey1 ptr_t, nKey2 int32, pKey2 ptr_t) uint32 {
-	fn := util.GetHandle(ctx, pApp).(CollatingFunction)
-	return uint32(fn(util.View(mod, pKey1, int64(nKey1)), util.View(mod, pKey2, int64(nKey2))))
+func compareCallback(ctx context.Context, mod api.Module, pApp, nKey1, pKey1, nKey2, pKey2 uint32) uint32 {
+	fn := util.GetHandle(ctx, pApp).(func(a, b []byte) int)
+	return uint32(fn(util.View(mod, pKey1, uint64(nKey1)), util.View(mod, pKey2, uint64(nKey2))))
 }

-func funcCallback(ctx context.Context, mod api.Module, pCtx, pApp ptr_t, nArg int32, pArg ptr_t) {
+func funcCallback(ctx context.Context, mod api.Module, pCtx, pApp, nArg, pArg uint32) {
+	args := getFuncArgs()
+	defer putFuncArgs(args)
 	db := ctx.Value(connKey{}).(*Conn)
-	args := callbackArgs(db, nArg, pArg)
-	defer returnArgs(args)
 	fn := util.GetHandle(db.ctx, pApp).(ScalarFunction)
-	fn(Context{db, pCtx}, *args...)
+	callbackArgs(db, args[:nArg], pArg)
+	fn(Context{db, pCtx}, args[:nArg]...)
 }

-func stepCallback(ctx context.Context, mod api.Module, pCtx, pAgg, pApp ptr_t, nArg int32, pArg ptr_t) {
+func stepCallback(ctx context.Context, mod api.Module, pCtx, pAgg, pApp, nArg, pArg uint32) {
+	args := getFuncArgs()
+	defer putFuncArgs(args)
 	db := ctx.Value(connKey{}).(*Conn)
-	args := callbackArgs(db, nArg, pArg)
-	defer returnArgs(args)
+	callbackArgs(db, args[:nArg], pArg)
 	fn, _ := callbackAggregate(db, pAgg, pApp)
-	fn.Step(Context{db, pCtx}, *args...)
+	fn.Step(Context{db, pCtx}, args[:nArg]...)
 }

-func valueCallback(ctx context.Context, mod api.Module, pCtx, pAgg, pApp ptr_t, final int32) {
+func finalCallback(ctx context.Context, mod api.Module, pCtx, pAgg, pApp uint32) {
 	db := ctx.Value(connKey{}).(*Conn)
 	fn, handle := callbackAggregate(db, pAgg, pApp)
 	fn.Value(Context{db, pCtx})
-
-	// Cleanup.
-	if final != 0 {
-		var err error
-		if handle != 0 {
-			err = util.DelHandle(ctx, handle)
-		} else if c, ok := fn.(io.Closer); ok {
-			err = c.Close()
-		}
-		if err != nil {
-			Context{db, pCtx}.ResultError(err)
-			return // notest
-		}
-	}
+	util.DelHandle(ctx, handle)
 }

-func inverseCallback(ctx context.Context, mod api.Module, pCtx, pAgg ptr_t, nArg int32, pArg ptr_t) {
+func valueCallback(ctx context.Context, mod api.Module, pCtx, pAgg uint32) {
 	db := ctx.Value(connKey{}).(*Conn)
-	args := callbackArgs(db, nArg, pArg)
-	defer returnArgs(args)
-	fn := util.GetHandle(db.ctx, pAgg).(WindowFunction)
-	fn.Inverse(Context{db, pCtx}, *args...)
+	fn := util.GetHandle(db.ctx, pAgg).(AggregateFunction)
+	fn.Value(Context{db, pCtx})
 }

-func callbackAggregate(db *Conn, pAgg, pApp ptr_t) (AggregateFunction, ptr_t) {
+func inverseCallback(ctx context.Context, mod api.Module, pCtx, pAgg, nArg, pArg uint32) {
+	args := getFuncArgs()
+	defer putFuncArgs(args)
+	db := ctx.Value(connKey{}).(*Conn)
+	callbackArgs(db, args[:nArg], pArg)
+	fn := util.GetHandle(db.ctx, pAgg).(WindowFunction)
+	fn.Inverse(Context{db, pCtx}, args[:nArg]...)
+}
+
+func callbackAggregate(db *Conn, pAgg, pApp uint32) (AggregateFunction, uint32) {
 	if pApp == 0 {
-		handle := util.Read32[ptr_t](db.mod, pAgg)
+		handle := util.ReadUint32(db.mod, pAgg)
 		return util.GetHandle(db.ctx, handle).(AggregateFunction), handle
 	}

 	// We need to create the aggregate.
-	fn := util.GetHandle(db.ctx, pApp).(AggregateConstructor)()
+	fn := util.GetHandle(db.ctx, pApp).(func() AggregateFunction)()
 	if pAgg != 0 {
 		handle := util.AddHandle(db.ctx, fn)
-		util.Write32(db.mod, pAgg, handle)
+		util.WriteUint32(db.mod, pAgg, handle)
 		return fn, handle
 	}
 	return fn, 0
 }

-var (
-	valueArgsPool sync.Pool
-	valueArgsLen  atomic.Int32
-)
-
-func callbackArgs(db *Conn, nArg int32, pArg ptr_t) *[]Value {
-	arg, ok := valueArgsPool.Get().(*[]Value)
-	if !ok || cap(*arg) < int(nArg) {
-		max := valueArgsLen.Or(nArg) | nArg
-		lst := make([]Value, max)
-		arg = &lst
-	}
-	lst := (*arg)[:nArg]
-	for i := range lst {
-		lst[i] = Value{
+func callbackArgs(db *Conn, arg []Value, pArg uint32) {
+	for i := range arg {
+		arg[i] = Value{
 			c:      db,
-			handle: util.Read32[ptr_t](db.mod, pArg+ptr_t(i)*ptrlen),
+			handle: util.ReadUint32(db.mod, pArg+ptrlen*uint32(i)),
 		}
 	}
-	*arg = lst
-	return arg
 }

-func returnArgs(p *[]Value) {
-	valueArgsPool.Put(p)
+var funcArgsPool sync.Pool
+
+func putFuncArgs(p *[_MAX_FUNCTION_ARG]Value) {
+	funcArgsPool.Put(p)
 }

-type aggregateFunc struct {
-	next func() (struct{}, bool)
-	stop func()
-	ctx  Context
-	arg  []Value
-}
-
-func (a *aggregateFunc) Step(ctx Context, arg ...Value) {
-	a.ctx = ctx
-	a.arg = append(a.arg[:0], arg...)
-	if _, more := a.next(); !more {
-		a.stop()
+func getFuncArgs() *[_MAX_FUNCTION_ARG]Value {
+	if p := funcArgsPool.Get(); p == nil {
+		return new([_MAX_FUNCTION_ARG]Value)
+	} else {
+		return p.(*[_MAX_FUNCTION_ARG]Value)
 	}
 }
-
-func (a *aggregateFunc) Value(ctx Context) {
-	a.ctx = ctx
-	a.stop()
-}
-
-func (a *aggregateFunc) Close() error {
-	a.stop()
-	return nil
-}
-
-type windowFunc struct {
-	AggregateFunction
-	name string
-}
-
-func (w windowFunc) Inverse(ctx Context, arg ...Value) {
-	// Implementing inverse allows certain queries that don't really need it to succeed.
-	ctx.ResultError(util.ErrorString(w.name + ": may not be used as a window function"))
-}
--- a/func_seq_test.go
+++ b/func_seq_test.go
@@ -1,57 +0,0 @@
-package sqlite3_test
-
-import (
-	"fmt"
-	"iter"
-	"log"
-
-	"github.com/ncruces/go-sqlite3"
-	_ "github.com/ncruces/go-sqlite3/embed"
-)
-
-func ExampleConn_CreateAggregateFunction() {
-	db, err := sqlite3.Open(":memory:")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	err = db.Exec(`CREATE TABLE test (col)`)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = db.Exec(`INSERT INTO test VALUES (1), (2), (3)`)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = db.CreateAggregateFunction("seq_avg", 1, sqlite3.DETERMINISTIC|sqlite3.INNOCUOUS,
-		func(ctx *sqlite3.Context, seq iter.Seq[[]sqlite3.Value]) {
-			count := 0
-			total := 0.0
-			for arg := range seq {
-				total += arg[0].Float()
-				count++
-			}
-			ctx.ResultFloat(total / float64(count))
-		})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stmt, _, err := db.Prepare(`SELECT seq_avg(col) FROM test`)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer stmt.Close()
-
-	for stmt.Step() {
-		fmt.Println(stmt.ColumnFloat(0))
-	}
-	if err := stmt.Err(); err != nil {
-		log.Fatal(err)
-	}
-	// Output:
-	// 2
-}
--- a/go.mod
+++ b/go.mod
@@ -1,27 +1,24 @@
 module github.com/ncruces/go-sqlite3

-go 1.23.0
+go 1.21

-toolchain go1.24.0
+toolchain go1.23.0

 require (
 	github.com/ncruces/julianday v1.0.0
-	github.com/ncruces/sort v0.1.5
-	github.com/tetratelabs/wazero v1.9.0
-	golang.org/x/crypto v0.38.0
-	golang.org/x/sys v0.33.0
+	github.com/ncruces/sort v0.1.2
+	github.com/tetratelabs/wazero v1.8.2
+	golang.org/x/crypto v0.32.0
+	golang.org/x/sys v0.29.0
 )

 require (
 	github.com/dchest/siphash v1.2.3 // ext/bloom
 	github.com/google/uuid v1.6.0 // ext/uuid
 	github.com/psanford/httpreadat v0.1.0 // example
-	golang.org/x/sync v0.14.0 // test
-	golang.org/x/text v0.25.0 // ext/unicode
+	golang.org/x/sync v0.10.0 // test
+	golang.org/x/text v0.21.0 // ext/unicode
 	lukechampine.com/adiantum v1.1.1 // vfs/adiantum
 )

-retract (
-	v0.23.2 // tagged from the wrong branch
-	v0.4.0 // tagged from the wrong branch
-)
+retract v0.4.0 // tagged from the wrong branch
--- a/go.sum
+++ b/go.sum
@@ -4,19 +4,19 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
-github.com/ncruces/sort v0.1.5 h1:fiFWXXAqKI8QckPf/6hu/bGFwcEPrirIOFaJqWujs4k=
-github.com/ncruces/sort v0.1.5/go.mod h1:obJToO4rYr6VWP0Uw5FYymgYGt3Br4RXcs/JdKaXAPk=
+github.com/ncruces/sort v0.1.2 h1:zKQ9CA4fpHPF6xsUhRTfi5EEryspuBpe/QA4VWQOV1U=
+github.com/ncruces/sort v0.1.2/go.mod h1:vEJUTBJtebIuCMmXD18GKo5GJGhsay+xZFOoBEIXFmE=
 github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE=
 github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE=
-github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
-github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
+github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 lukechampine.com/adiantum v1.1.1 h1:4fp6gTxWCqpEbLy40ExiYDDED3oUNWx5cTqBCtPdZqA=
 lukechampine.com/adiantum v1.1.1/go.mod h1:LrAYVnTYLnUtE/yMp5bQr0HstAf060YUF8nM0B6+rUw=
--- a/go.work
+++ b/go.work
@@ -0,0 +1,7 @@
+go 1.21
+
+use (
+	.
+	./gormlite
+	./embed/bcw2
+)
--- a/go.work.sum
+++ b/go.work.sum
@@ -0,0 +1,17 @@
+github.com/ncruces/go-sqlite3 v0.21.0/go.mod h1:zxMOaSG5kFYVFK4xQa0pdwIszqxqJ0W0BxBgwdrNjuA=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
+golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
--- a/gormlite/download.sh
+++ b/gormlite/download.sh
--- a/gormlite/go.mod
+++ b/gormlite/go.mod
@@ -1,11 +1,11 @@
 module github.com/ncruces/go-sqlite3/gormlite

-go 1.23.0
+go 1.21

-toolchain go1.24.0
+toolchain go1.23.0

 require (
-	github.com/ncruces/go-sqlite3 v0.25.0
+	github.com/ncruces/go-sqlite3 v0.21.3
 	gorm.io/gorm v1.25.12
 )

@@ -13,7 +13,7 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/ncruces/julianday v1.0.0 // indirect
-	github.com/tetratelabs/wazero v1.9.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	github.com/tetratelabs/wazero v1.8.2 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )
--- a/gormlite/go.sum
+++ b/gormlite/go.sum
@@ -2,15 +2,15 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/ncruces/go-sqlite3 v0.25.0 h1:trugKUs98Zwy9KwRr/EUxZHL92LYt7UqcKqAfpGpK+I=
-github.com/ncruces/go-sqlite3 v0.25.0/go.mod h1:n6Z7036yFilJx04yV0mi5JWaF66rUmXn1It9Ux8dx68=
+github.com/ncruces/go-sqlite3 v0.21.3 h1:hHkfNQLcbnxPJZhC/RGw9SwP3bfkv/Y0xUHWsr1CdMQ=
+github.com/ncruces/go-sqlite3 v0.21.3/go.mod h1:zxMOaSG5kFYVFK4xQa0pdwIszqxqJ0W0BxBgwdrNjuA=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
-github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
-github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4=
+github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
--- a/internal/testcfg/testcfg.go
+++ b/internal/testcfg/testcfg.go
@@ -7,12 +7,18 @@ import (
 	"github.com/tetratelabs/wazero"

 	"github.com/ncruces/go-sqlite3"
+	"github.com/ncruces/go-sqlite3/internal/util"
 )

 // notest

 func init() {
-	sqlite3.RuntimeConfig = wazero.NewRuntimeConfig().WithMemoryLimitPages(512)
+	if util.CompilerSupported() {
+		sqlite3.RuntimeConfig = wazero.NewRuntimeConfigCompiler()
+	} else {
+		sqlite3.RuntimeConfig = wazero.NewRuntimeConfigInterpreter()
+	}
+	sqlite3.RuntimeConfig = sqlite3.RuntimeConfig.WithMemoryLimitPages(512)
 	if os.Getenv("CI") != "" {
 		path := filepath.Join(os.TempDir(), "wazero")
 		if err := os.MkdirAll(path, 0777); err == nil {
--- a/internal/util/compiler.go
+++ b/internal/util/compiler.go
@@ -0,0 +1,27 @@
+package util
+
+import (
+	"runtime"
+
+	"golang.org/x/sys/cpu"
+)
+
+func CompilerSupported() bool {
+	switch runtime.GOOS {
+	case "linux", "android",
+		"windows", "darwin",
+		"freebsd", "netbsd", "dragonfly",
+		"solaris", "illumos":
+		break
+	default:
+		return false
+	}
+	switch runtime.GOARCH {
+	case "amd64":
+		return cpu.X86.HasSSE41
+	case "arm64":
+		return true
+	default:
+		return false
+	}
+}
--- a/internal/util/error.go
+++ b/internal/util/error.go
@@ -75,7 +75,7 @@ func ErrorCodeString(rc uint32) string {
 		return "sqlite3: unable to open database file"
 	case PROTOCOL:
 		return "sqlite3: locking protocol"
-	case EMPTY:
+	case FORMAT:
 		break
 	case SCHEMA:
 		return "sqlite3: database schema has changed"
@@ -91,7 +91,7 @@ func ErrorCodeString(rc uint32) string {
 		break
 	case AUTH:
 		return "sqlite3: authorization denied"
-	case FORMAT:
+	case EMPTY:
 		break
 	case RANGE:
 		return "sqlite3: column index out of range"
--- a/internal/util/func.go
+++ b/internal/util/func.go
@@ -7,6 +7,9 @@ import (
 	"github.com/tetratelabs/wazero/api"
 )

+type i32 interface{ ~int32 | ~uint32 }
+type i64 interface{ ~int64 | ~uint64 }
+
 type funcVI[T0 i32] func(context.Context, api.Module, T0)

 func (fn funcVI[T0]) Call(ctx context.Context, mod api.Module, stack []uint64) {
--- a/internal/util/handle.go
+++ b/internal/util/handle.go
@@ -20,7 +20,7 @@ func (s *handleState) CloseNotify(ctx context.Context, exitCode uint32) {
 	s.holes = 0
 }

-func GetHandle(ctx context.Context, id Ptr_t) any {
+func GetHandle(ctx context.Context, id uint32) any {
 	if id == 0 {
 		return nil
 	}
@@ -28,14 +28,14 @@ func GetHandle(ctx context.Context, id Ptr_t) any {
 	return s.handles[^id]
 }

-func DelHandle(ctx context.Context, id Ptr_t) error {
+func DelHandle(ctx context.Context, id uint32) error {
 	if id == 0 {
 		return nil
 	}
 	s := ctx.Value(moduleKey{}).(*moduleState)
 	a := s.handles[^id]
 	s.handles[^id] = nil
-	if l := Ptr_t(len(s.handles)); l == ^id {
+	if l := uint32(len(s.handles)); l == ^id {
 		s.handles = s.handles[:l-1]
 	} else {
 		s.holes++
@@ -46,7 +46,7 @@ func DelHandle(ctx context.Context, id Ptr_t) error {
 	return nil
 }

-func AddHandle(ctx context.Context, a any) Ptr_t {
+func AddHandle(ctx context.Context, a any) uint32 {
 	if a == nil {
 		panic(NilErr)
 	}
@@ -59,12 +59,12 @@ func AddHandle(ctx context.Context, a any) Ptr_t {
 			if h == nil {
 				s.holes--
 				s.handles[id] = a
-				return ^Ptr_t(id)
+				return ^uint32(id)
 			}
 		}
 	}

 	// Add a new slot.
 	s.handles = append(s.handles, a)
-	return -Ptr_t(len(s.handles))
+	return -uint32(len(s.handles))
 }
--- a/internal/util/json.go
+++ b/internal/util/json.go
@@ -2,7 +2,6 @@ package util

 import (
 	"encoding/json"
-	"math"
 	"strconv"
 	"time"
 	"unsafe"
@@ -21,7 +20,7 @@ func (j JSON) Scan(value any) error {
 	case int64:
 		buf = strconv.AppendInt(nil, v, 10)
 	case float64:
-		buf = AppendNumber(nil, v)
+		buf = strconv.AppendFloat(nil, v, 'g', -1, 64)
 	case time.Time:
 		buf = append(buf, '"')
 		buf = v.AppendFormat(buf, time.RFC3339Nano)
@@ -34,17 +33,3 @@ func (j JSON) Scan(value any) error {

 	return json.Unmarshal(buf, j.Value)
 }
-
-func AppendNumber(dst []byte, f float64) []byte {
-	switch {
-	case math.IsNaN(f):
-		dst = append(dst, "null"...)
-	case math.IsInf(f, 1):
-		dst = append(dst, "9.0e999"...)
-	case math.IsInf(f, -1):
-		dst = append(dst, "-9.0e999"...)
-	default:
-		return strconv.AppendFloat(dst, f, 'g', -1, 64)
-	}
-	return dst
-}
--- a/internal/util/mem.go
+++ b/internal/util/mem.go
@@ -7,147 +7,128 @@ import (
 	"github.com/tetratelabs/wazero/api"
 )

-const (
-	PtrLen = 4
-	IntLen = 4
-)
-
-type (
-	i8  interface{ ~int8 | ~uint8 }
-	i32 interface{ ~int32 | ~uint32 }
-	i64 interface{ ~int64 | ~uint64 }
-
-	Stk_t = uint64
-	Ptr_t uint32
-	Res_t int32
-)
-
-func View(mod api.Module, ptr Ptr_t, size int64) []byte {
+func View(mod api.Module, ptr uint32, size uint64) []byte {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	if uint64(size) > math.MaxUint32 {
+	if size > math.MaxUint32 {
 		panic(RangeErr)
 	}
-	buf, ok := mod.Memory().Read(uint32(ptr), uint32(size))
+	if size == 0 {
+		return nil
+	}
+	buf, ok := mod.Memory().Read(ptr, uint32(size))
 	if !ok {
 		panic(RangeErr)
 	}
 	return buf
 }

-func Read[T i8](mod api.Module, ptr Ptr_t) T {
+func ReadUint8(mod api.Module, ptr uint32) uint8 {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	v, ok := mod.Memory().ReadByte(uint32(ptr))
+	v, ok := mod.Memory().ReadByte(ptr)
 	if !ok {
 		panic(RangeErr)
 	}
-	return T(v)
+	return v
 }

-func Write[T i8](mod api.Module, ptr Ptr_t, v T) {
+func ReadUint32(mod api.Module, ptr uint32) uint32 {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	ok := mod.Memory().WriteByte(uint32(ptr), uint8(v))
+	v, ok := mod.Memory().ReadUint32Le(ptr)
+	if !ok {
+		panic(RangeErr)
+	}
+	return v
+}
+
+func WriteUint8(mod api.Module, ptr uint32, v uint8) {
+	if ptr == 0 {
+		panic(NilErr)
+	}
+	ok := mod.Memory().WriteByte(ptr, v)
 	if !ok {
 		panic(RangeErr)
 	}
 }

-func Read32[T i32](mod api.Module, ptr Ptr_t) T {
+func WriteUint32(mod api.Module, ptr uint32, v uint32) {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	v, ok := mod.Memory().ReadUint32Le(uint32(ptr))
-	if !ok {
-		panic(RangeErr)
-	}
-	return T(v)
-}
-
-func Write32[T i32](mod api.Module, ptr Ptr_t, v T) {
-	if ptr == 0 {
-		panic(NilErr)
-	}
-	ok := mod.Memory().WriteUint32Le(uint32(ptr), uint32(v))
+	ok := mod.Memory().WriteUint32Le(ptr, v)
 	if !ok {
 		panic(RangeErr)
 	}
 }

-func Read64[T i64](mod api.Module, ptr Ptr_t) T {
+func ReadUint64(mod api.Module, ptr uint32) uint64 {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	v, ok := mod.Memory().ReadUint64Le(uint32(ptr))
+	v, ok := mod.Memory().ReadUint64Le(ptr)
 	if !ok {
 		panic(RangeErr)
 	}
-	return T(v)
+	return v
 }

-func Write64[T i64](mod api.Module, ptr Ptr_t, v T) {
+func WriteUint64(mod api.Module, ptr uint32, v uint64) {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	ok := mod.Memory().WriteUint64Le(uint32(ptr), uint64(v))
+	ok := mod.Memory().WriteUint64Le(ptr, v)
 	if !ok {
 		panic(RangeErr)
 	}
 }

-func ReadFloat64(mod api.Module, ptr Ptr_t) float64 {
-	return math.Float64frombits(Read64[uint64](mod, ptr))
+func ReadFloat64(mod api.Module, ptr uint32) float64 {
+	return math.Float64frombits(ReadUint64(mod, ptr))
 }

-func WriteFloat64(mod api.Module, ptr Ptr_t, v float64) {
-	Write64(mod, ptr, math.Float64bits(v))
+func WriteFloat64(mod api.Module, ptr uint32, v float64) {
+	WriteUint64(mod, ptr, math.Float64bits(v))
 }

-func ReadBool(mod api.Module, ptr Ptr_t) bool {
-	return Read32[int32](mod, ptr) != 0
-}
-
-func WriteBool(mod api.Module, ptr Ptr_t, v bool) {
-	var i int32
-	if v {
-		i = 1
-	}
-	Write32(mod, ptr, i)
-}
-
-func ReadString(mod api.Module, ptr Ptr_t, maxlen int64) string {
+func ReadString(mod api.Module, ptr, maxlen uint32) string {
 	if ptr == 0 {
 		panic(NilErr)
 	}
-	if maxlen <= 0 {
+	switch maxlen {
+	case 0:
 		return ""
+	case math.MaxUint32:
+		// avoid overflow
+	default:
+		maxlen = maxlen + 1
 	}
 	mem := mod.Memory()
-	maxlen = min(maxlen, math.MaxInt32-1) + 1
-	buf, ok := mem.Read(uint32(ptr), uint32(maxlen))
+	buf, ok := mem.Read(ptr, maxlen)
 	if !ok {
-		buf, ok = mem.Read(uint32(ptr), mem.Size()-uint32(ptr))
+		buf, ok = mem.Read(ptr, mem.Size()-ptr)
 		if !ok {
 			panic(RangeErr)
 		}
 	}
-	if i := bytes.IndexByte(buf, 0); i >= 0 {
+	if i := bytes.IndexByte(buf, 0); i < 0 {
+		panic(NoNulErr)
+	} else {
 		return string(buf[:i])
 	}
-	panic(NoNulErr)
 }

-func WriteBytes(mod api.Module, ptr Ptr_t, b []byte) {
-	buf := View(mod, ptr, int64(len(b)))
+func WriteBytes(mod api.Module, ptr uint32, b []byte) {
+	buf := View(mod, ptr, uint64(len(b)))
 	copy(buf, b)
 }

-func WriteString(mod api.Module, ptr Ptr_t, s string) {
-	buf := View(mod, ptr, int64(len(s))+1)
+func WriteString(mod api.Module, ptr uint32, s string) {
+	buf := View(mod, ptr, uint64(len(s)+1))
 	buf[len(s)] = 0
 	copy(buf, s)
 }
--- a/internal/util/mem_test.go
+++ b/internal/util/mem_test.go
@@ -31,90 +31,90 @@ func TestView_overflow(t *testing.T) {
 func TestReadUint8_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read[byte](mock, 0)
+	ReadUint8(mock, 0)
 	t.Error("want panic")
 }

 func TestReadUint8_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read[byte](mock, wazerotest.PageSize)
+	ReadUint8(mock, wazerotest.PageSize)
 	t.Error("want panic")
 }

 func TestReadUint32_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read32[uint32](mock, 0)
+	ReadUint32(mock, 0)
 	t.Error("want panic")
 }

 func TestReadUint32_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read32[uint32](mock, wazerotest.PageSize-2)
+	ReadUint32(mock, wazerotest.PageSize-2)
 	t.Error("want panic")
 }

 func TestReadUint64_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read64[uint64](mock, 0)
+	ReadUint64(mock, 0)
 	t.Error("want panic")
 }

 func TestReadUint64_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Read64[uint64](mock, wazerotest.PageSize-2)
+	ReadUint64(mock, wazerotest.PageSize-2)
 	t.Error("want panic")
 }

 func TestWriteUint8_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write[byte](mock, 0, 1)
+	WriteUint8(mock, 0, 1)
 	t.Error("want panic")
 }

 func TestWriteUint8_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write[byte](mock, wazerotest.PageSize, 1)
+	WriteUint8(mock, wazerotest.PageSize, 1)
 	t.Error("want panic")
 }

 func TestWriteUint32_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write32[uint32](mock, 0, 1)
+	WriteUint32(mock, 0, 1)
 	t.Error("want panic")
 }

 func TestWriteUint32_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write32[uint32](mock, wazerotest.PageSize-2, 1)
+	WriteUint32(mock, wazerotest.PageSize-2, 1)
 	t.Error("want panic")
 }

 func TestWriteUint64_nil(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write64[uint64](mock, 0, 1)
+	WriteUint64(mock, 0, 1)
 	t.Error("want panic")
 }

 func TestWriteUint64_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	Write64[uint64](mock, wazerotest.PageSize-2, 1)
+	WriteUint64(mock, wazerotest.PageSize-2, 1)
 	t.Error("want panic")
 }

 func TestReadString_range(t *testing.T) {
 	defer func() { _ = recover() }()
 	mock := wazerotest.NewModule(wazerotest.NewFixedMemory(wazerotest.PageSize))
-	ReadString(mock, wazerotest.PageSize+2, math.MaxInt)
+	ReadString(mock, wazerotest.PageSize+2, math.MaxUint32)
 	t.Error("want panic")
 }
--- a/internal/util/mmap_unix.go
+++ b/internal/util/mmap_unix.go
@@ -25,9 +25,9 @@ func (s *mmapState) new(ctx context.Context, mod api.Module, size int32) *Mapped

 	// Allocate page aligned memmory.
 	alloc := mod.ExportedFunction("aligned_alloc")
-	stack := [...]Stk_t{
-		Stk_t(unix.Getpagesize()),
-		Stk_t(size),
+	stack := [...]uint64{
+		uint64(unix.Getpagesize()),
+		uint64(size),
 	}
 	if err := alloc.CallWithStack(ctx, stack[:]); err != nil {
 		panic(err)
@@ -37,20 +37,20 @@ func (s *mmapState) new(ctx context.Context, mod api.Module, size int32) *Mapped
 	}

 	// Save the newly allocated region.
-	ptr := Ptr_t(stack[0])
-	buf := View(mod, ptr, int64(size))
-	ret := &MappedRegion{
+	ptr := uint32(stack[0])
+	buf := View(mod, ptr, uint64(size))
+	res := &MappedRegion{
 		Ptr:  ptr,
 		size: size,
 		addr: unsafe.Pointer(&buf[0]),
 	}
-	s.regions = append(s.regions, ret)
-	return ret
+	s.regions = append(s.regions, res)
+	return res
 }

 type MappedRegion struct {
 	addr unsafe.Pointer
-	Ptr  Ptr_t
+	Ptr  uint32
 	size int32
 	used bool
 }
--- a/internal/util/mmap_windows.go
+++ b/internal/util/mmap_windows.go
@@ -29,13 +29,13 @@ func MapRegion(ctx context.Context, mod api.Module, f *os.File, offset int64, si
 		return nil, err
 	}

-	ret := &MappedRegion{Handle: h, addr: a}
+	res := &MappedRegion{Handle: h, addr: a}
 	// SliceHeader, although deprecated, avoids a go vet warning.
-	sh := (*reflect.SliceHeader)(unsafe.Pointer(&ret.Data))
+	sh := (*reflect.SliceHeader)(unsafe.Pointer(&res.Data))
 	sh.Len = int(size)
 	sh.Cap = int(size)
 	sh.Data = a
-	return ret, nil
+	return res, nil
 }

 func (r *MappedRegion) Unmap() error {
--- a/internal/util/module.go
+++ b/internal/util/module.go
@@ -8,8 +8,6 @@ import (
 	"github.com/ncruces/go-sqlite3/internal/alloc"
 )

-type ConnKey struct{}
-
 type moduleKey struct{}
 type moduleState struct {
 	mmapState
--- a/sqlite.go
+++ b/sqlite.go
@@ -3,6 +3,7 @@ package sqlite3

 import (
 	"context"
+	"math"
 	"math/bits"
 	"os"
 	"sync"
@@ -47,14 +48,18 @@ func compileSQLite() {
 	ctx := context.Background()
 	cfg := RuntimeConfig
 	if cfg == nil {
-		cfg = wazero.NewRuntimeConfig()
+		if util.CompilerSupported() {
+			cfg = wazero.NewRuntimeConfigCompiler()
+		} else {
+			cfg = wazero.NewRuntimeConfigInterpreter()
+		}
 		if bits.UintSize < 64 {
 			cfg = cfg.WithMemoryLimitPages(512) // 32MB
 		} else {
 			cfg = cfg.WithMemoryLimitPages(4096) // 256MB
 		}
-		cfg = cfg.WithCoreFeatures(api.CoreFeaturesV2)
 	}
+	cfg = cfg.WithCoreFeatures(api.CoreFeaturesV2)

 	instance.runtime = wazero.NewRuntimeWithConfig(ctx, cfg)

@@ -89,7 +94,7 @@ type sqlite struct {
 		id   [32]*byte
 		mask uint32
 	}
-	stack [9]stk_t
+	stack [9]uint64
 }

 func instantiateSQLite() (sqlt *sqlite, err error) {
@@ -115,38 +120,38 @@ func (sqlt *sqlite) close() error {
 	return sqlt.mod.Close(sqlt.ctx)
 }

-func (sqlt *sqlite) error(rc res_t, handle ptr_t, sql ...string) error {
+func (sqlt *sqlite) error(rc uint64, handle uint32, sql ...string) error {
 	if rc == _OK {
 		return nil
 	}

-	if ErrorCode(rc) == NOMEM || xErrorCode(rc) == IOERR_NOMEM {
+	err := Error{code: rc}
+
+	if err.Code() == NOMEM || err.ExtendedCode() == IOERR_NOMEM {
 		panic(util.OOMErr)
 	}

+	if r := sqlt.call("sqlite3_errstr", rc); r != 0 {
+		err.str = util.ReadString(sqlt.mod, uint32(r), _MAX_NAME)
+	}
+
 	if handle != 0 {
-		var msg, query string
-		if ptr := ptr_t(sqlt.call("sqlite3_errmsg", stk_t(handle))); ptr != 0 {
-			msg = util.ReadString(sqlt.mod, ptr, _MAX_LENGTH)
-			switch {
-			case msg == "not an error":
-				msg = ""
-			case msg == util.ErrorCodeString(uint32(rc))[len("sqlite3: "):]:
-				msg = ""
-			}
+		if r := sqlt.call("sqlite3_errmsg", uint64(handle)); r != 0 {
+			err.msg = util.ReadString(sqlt.mod, uint32(r), _MAX_LENGTH)
 		}

 		if len(sql) != 0 {
-			if i := int32(sqlt.call("sqlite3_error_offset", stk_t(handle))); i != -1 {
-				query = sql[0][i:]
+			if r := sqlt.call("sqlite3_error_offset", uint64(handle)); r != math.MaxUint32 {
+				err.sql = sql[0][r:]
 			}
 		}
-
-		if msg != "" || query != "" {
-			return &Error{code: rc, msg: msg, sql: query}
-		}
 	}
-	return xErrorCode(rc)
+
+	switch err.msg {
+	case err.str, "not an error":
+		err.msg = ""
+	}
+	return &err
 }

 func (sqlt *sqlite) getfn(name string) api.Function {
@@ -177,7 +182,7 @@ func (sqlt *sqlite) putfn(name string, fn api.Function) {
 	}
 }

-func (sqlt *sqlite) call(name string, params ...stk_t) stk_t {
+func (sqlt *sqlite) call(name string, params ...uint64) uint64 {
 	copy(sqlt.stack[:], params)
 	fn := sqlt.getfn(name)
 	err := fn.CallWithStack(sqlt.ctx, sqlt.stack[:])
@@ -185,61 +190,67 @@ func (sqlt *sqlite) call(name string, params ...stk_t) stk_t {
 		panic(err)
 	}
 	sqlt.putfn(name, fn)
-	return stk_t(sqlt.stack[0])
+	return sqlt.stack[0]
 }

-func (sqlt *sqlite) free(ptr ptr_t) {
+func (sqlt *sqlite) free(ptr uint32) {
 	if ptr == 0 {
 		return
 	}
-	sqlt.call("sqlite3_free", stk_t(ptr))
+	sqlt.call("sqlite3_free", uint64(ptr))
 }

-func (sqlt *sqlite) new(size int64) ptr_t {
-	ptr := ptr_t(sqlt.call("sqlite3_malloc64", stk_t(size)))
+func (sqlt *sqlite) new(size uint64) uint32 {
+	ptr := uint32(sqlt.call("sqlite3_malloc64", size))
 	if ptr == 0 && size != 0 {
 		panic(util.OOMErr)
 	}
 	return ptr
 }

-func (sqlt *sqlite) realloc(ptr ptr_t, size int64) ptr_t {
-	ptr = ptr_t(sqlt.call("sqlite3_realloc64", stk_t(ptr), stk_t(size)))
+func (sqlt *sqlite) realloc(ptr uint32, size uint64) uint32 {
+	ptr = uint32(sqlt.call("sqlite3_realloc64", uint64(ptr), size))
 	if ptr == 0 && size != 0 {
 		panic(util.OOMErr)
 	}
 	return ptr
 }

-func (sqlt *sqlite) newBytes(b []byte) ptr_t {
-	if len(b) == 0 {
+func (sqlt *sqlite) newBytes(b []byte) uint32 {
+	if (*[0]byte)(b) == nil {
 		return 0
 	}
-	ptr := sqlt.new(int64(len(b)))
+	size := len(b)
+	if size == 0 {
+		size = 1
+	}
+	ptr := sqlt.new(uint64(size))
 	util.WriteBytes(sqlt.mod, ptr, b)
 	return ptr
 }

-func (sqlt *sqlite) newString(s string) ptr_t {
-	ptr := sqlt.new(int64(len(s)) + 1)
+func (sqlt *sqlite) newString(s string) uint32 {
+	ptr := sqlt.new(uint64(len(s) + 1))
 	util.WriteString(sqlt.mod, ptr, s)
 	return ptr
 }

-const arenaSize = 4096
-
-func (sqlt *sqlite) newArena() arena {
+func (sqlt *sqlite) newArena(size uint64) arena {
+	// Ensure the arena's size is a multiple of 8.
+	size = (size + 7) &^ 7
 	return arena{
 		sqlt: sqlt,
-		base: sqlt.new(arenaSize),
+		size: uint32(size),
+		base: sqlt.new(size),
 	}
 }

 type arena struct {
 	sqlt *sqlite
-	ptrs []ptr_t
-	base ptr_t
-	next int32
+	ptrs []uint32
+	base uint32
+	next uint32
+	size uint32
 }

 func (a *arena) free() {
@@ -266,34 +277,34 @@ func (a *arena) mark() (reset func()) {
 	}
 }

-func (a *arena) new(size int64) ptr_t {
+func (a *arena) new(size uint64) uint32 {
 	// Align the next address, to 4 or 8 bytes.
 	if size&7 != 0 {
 		a.next = (a.next + 3) &^ 3
 	} else {
 		a.next = (a.next + 7) &^ 7
 	}
-	if size <= arenaSize-int64(a.next) {
-		ptr := a.base + ptr_t(a.next)
-		a.next += int32(size)
-		return ptr_t(ptr)
+	if size <= uint64(a.size-a.next) {
+		ptr := a.base + a.next
+		a.next += uint32(size)
+		return ptr
 	}
 	ptr := a.sqlt.new(size)
 	a.ptrs = append(a.ptrs, ptr)
-	return ptr_t(ptr)
+	return ptr
 }

-func (a *arena) bytes(b []byte) ptr_t {
-	if len(b) == 0 {
+func (a *arena) bytes(b []byte) uint32 {
+	if (*[0]byte)(b) == nil {
 		return 0
 	}
-	ptr := a.new(int64(len(b)))
+	ptr := a.new(uint64(len(b)))
 	util.WriteBytes(a.sqlt.mod, ptr, b)
 	return ptr
 }

-func (a *arena) string(s string) ptr_t {
-	ptr := a.new(int64(len(s)) + 1)
+func (a *arena) string(s string) uint32 {
+	ptr := a.new(uint64(len(s) + 1))
 	util.WriteString(a.sqlt.mod, ptr, s)
 	return ptr
 }
@@ -313,7 +324,8 @@ func exportCallbacks(env wazero.HostModuleBuilder) wazero.HostModuleBuilder {
 	util.ExportFuncVI(env, "go_destroy", destroyCallback)
 	util.ExportFuncVIIII(env, "go_func", funcCallback)
 	util.ExportFuncVIIIII(env, "go_step", stepCallback)
-	util.ExportFuncVIIII(env, "go_value", valueCallback)
+	util.ExportFuncVIII(env, "go_final", finalCallback)
+	util.ExportFuncVII(env, "go_value", valueCallback)
 	util.ExportFuncVIIII(env, "go_inverse", inverseCallback)
 	util.ExportFuncVIIII(env, "go_collation_needed", collationCallback)
 	util.ExportFuncIIIIII(env, "go_compare", compareCallback)
--- a/sqlite3/bind.c
+++ b/sqlite3/bind.c
@@ -10,14 +10,4 @@ int sqlite3_bind_text_go(sqlite3_stmt *stmt, int i, const char *zData,
 int sqlite3_bind_blob_go(sqlite3_stmt *stmt, int i, const char *zData,
                         sqlite3_uint64 nData) {
  return sqlite3_bind_blob64(stmt, i, zData, nData, &sqlite3_free);
-}
-
-void sqlite3_result_text_go(sqlite3_context *ctx, const char *zData,
-                            sqlite3_uint64 nData) {
-  sqlite3_result_text64(ctx, zData, nData, &sqlite3_free, SQLITE_UTF8);
-}
-
-void sqlite3_result_blob_go(sqlite3_context *ctx, const void *zData,
-                            sqlite3_uint64 nData) {
-  sqlite3_result_blob64(ctx, zData, nData, &sqlite3_free);
 }
--- a/sqlite3/busy_timeout.patch
+++ b/sqlite3/busy_timeout.patch
@@ -2,7 +2,7 @@
 # handle, and interrupt, sqlite3_busy_timeout.
 --- sqlite3.c.orig
 +++ sqlite3.c
-@@ -183355,7 +183355,7 @@
+@@ -182928,7 +182928,7 @@
   if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
 #endif
   if( ms>0 ){
--- a/sqlite3/column.c
+++ b/sqlite3/column.c
@@ -2,11 +2,6 @@

 #include "sqlite3.h"

-int sqlite3_exec_go(sqlite3_stmt *stmt) {
-  while (sqlite3_step(stmt) == SQLITE_ROW);
-  return sqlite3_reset(stmt);
-}
-
 union sqlite3_data {
  sqlite3_int64 i;
  double d;
@@ -21,7 +16,7 @@ int sqlite3_columns_go(sqlite3_stmt *stmt, int nCol, char *aType,
  if (nCol != sqlite3_column_count(stmt)) {
    return SQLITE_MISUSE;
  }
-  bool check = false;
+  int rc = SQLITE_OK;
  for (int i = 0; i < nCol; ++i) {
    const void *ptr = NULL;
    switch (aType[i] = sqlite3_column_type(stmt, i)) {
@@ -41,14 +36,16 @@ int sqlite3_columns_go(sqlite3_stmt *stmt, int nCol, char *aType,
        ptr = sqlite3_column_blob(stmt, i);
        break;
    }
+    if (ptr == NULL && rc == SQLITE_OK) {
+      rc = sqlite3_errcode(sqlite3_db_handle(stmt));
+      if (rc == SQLITE_ROW || rc == SQLITE_DONE) {
+        rc = SQLITE_OK;
+      }
+    }
    aData[i].ptr = ptr;
    aData[i].len = sqlite3_column_bytes(stmt, i);
-    if (ptr == NULL) check = true;
  }
-  if (check && SQLITE_NOMEM == sqlite3_errcode(sqlite3_db_handle(stmt))) {
-    return SQLITE_NOMEM;
-  }
-  return SQLITE_OK;
+  return rc;
 }

 static_assert(offsetof(union sqlite3_data, i) == 0, "Unexpected offset");
--- a/Show More
+++ b/Show More