From 91406d878a665c00064c03b523aaa1350e7515ed Mon Sep 17 00:00:00 2001
From: Omar Rizwan <omar@omar.website>
Date: Fri, 29 May 2026 16:22:38 -0400
Subject: [PATCH 1/3] WIP: Add /./ support to QueryOne; remove lindex-Query!
 mess

---
 builtin-programs/calibrate/calibrate-page.folk | 7 ++-----
 builtin-programs/calibrate/calibrate.folk      | 4 ++--
 builtin-programs/web/new.folk                  | 6 +++---
 lib/folk.js                                    | 6 +++---
 prelude.tcl                                    | 4 +++-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/builtin-programs/calibrate/calibrate-page.folk b/builtin-programs/calibrate/calibrate-page.folk
index d882e0b7..e3ce77f9 100644
--- a/builtin-programs/calibrate/calibrate-page.folk
+++ b/builtin-programs/calibrate/calibrate-page.folk
@@ -5,9 +5,6 @@ fn codeToPostScript
 Wish the web server handles route "/calibrate" with hidden true handler {
     package require base64
 
-    set defaultGeom [dict get [lindex [Query! /someone/ claims the default program geometry is /defaultGeom/] 0] defaultGeom]
-    fn defaultGeomGet {key} { return [string map {mm ""} [dict get $defaultGeom $key]] }
-
     set camera $QUERY(camera)
     set display $QUERY(display)
 
@@ -120,7 +117,7 @@ Wish the web server handles route "/calibrate" with hidden true handler {
             <script>
               boardPrintThroughFolk.addEventListener('click', (e) => {
                 folk.run(`
-                  set maker [dict get [lindex [Query! /someone/ claims the makeCalibrationBoardPdf is /maker/] 0] maker]
+                  set maker [QueryOne! the makeCalibrationBoardPdf is /./]
                   set boardPdf [{*}\$maker]
                   set boardPdfFile [file tempfile /tmp/folk-calibration-board-XXXXXX].pdf
                   set fd [open \$boardPdfFile wb]; puts \$fd \$boardPdf; close \$fd
@@ -180,7 +177,7 @@ Wish the web server handles route "/calibrate" with hidden true handler {
               document.getElementById('projected-tag-slider').addEventListener('input', (e) => {
                 const scale = e.target.value / 100.0;
                 folk.run(tcl`
-                  set HoldDefaultModel! [dict get [lindex [Query! /someone/ claims the calibration HoldDefaultModel! is /hdm/] 0] hdm]
+                  set HoldDefaultModel! [QueryOne! the calibration HoldDefaultModel! is /./]
                   {*}[set HoldDefaultModel!] \${scale}
                 `);
               });
diff --git a/builtin-programs/calibrate/calibrate.folk b/builtin-programs/calibrate/calibrate.folk
index b8293ddc..3438c25c 100644
--- a/builtin-programs/calibrate/calibrate.folk
+++ b/builtin-programs/calibrate/calibrate.folk
@@ -333,7 +333,7 @@ When camera /camera/ has width /cameraWidth/ height /cameraHeight/ &\
                       rmse $poseRmse \
                       tags [dict merge $printedTags $projectedTags]]
 
-        set seenPoses [dict get [lindex [Query! the calibration last-seen poses are /seenPoses/] 0] seenPoses]
+        set seenPoses [QueryOne! the calibration last-seen poses are /./]
         lappend seenPoses $pose
         if {[llength $seenPoses] > $SEEN_POSES_MAX} {
             set seenPoses [lreplace $seenPoses 0 0]
@@ -365,7 +365,7 @@ When camera /camera/ has width /cameraWidth/ height /cameraHeight/ &\
         # If the corners have _not_ moved a lot since last _saved_
         # calibration pose, this isn't different enough to be a good
         # calibration pose to save.
-        set calibrationPoses [dict get [lindex [Query! the calibration poses from camera $camera to display $display are /calibrationPoses/] 0] calibrationPoses]
+        set calibrationPoses [QueryOne! the calibration poses from camera $camera to display $display are /./]
         if {[llength $calibrationPoses] > 0} {
             set prevCalibrationPose [lindex $calibrationPoses end]
             if {[$modelLib meanTagsDifference $pose(tags) $prevCalibrationPose(tags)] < 50} {
diff --git a/builtin-programs/web/new.folk b/builtin-programs/web/new.folk
index 2294956b..f199e10a 100644
--- a/builtin-programs/web/new.folk
+++ b/builtin-programs/web/new.folk
@@ -170,9 +170,9 @@ Wish the web server handles route "/new" with nav "<button>New program</button>"
       namespace import ::math::linearalgebra::matmul
       namespace import ::math::linearalgebra::scale
 
-      set quadLib [dict get [lindex [Query! the quad library is /quadLib/] 0] quadLib]
+      set quadLib [QueryOne! the quad library is /./]
 
-      set dims [lindex [Query! display /disp/ has width /displayWidth/ height /displayHeight/] 0]
+      set dims [QueryOne! display /disp/ has width /displayWidth/ height /displayHeight/]
       set disp [dict get $dims disp]
       set displayWidth [dict get $dims displayWidth]; set displayHeight [dict get $dims displayHeight]
 
@@ -183,7 +183,7 @@ Wish the web server handles route "/new" with nav "<button>New program</button>"
       # Create 3D vertices in meters that will project to the desired pixel coordinates
       # Using a depth of 1.5 meters from the projector center
       set depth 1.5
-      set displayIntrinsics [dict get [lindex [Query! display $disp has intrinsics /displayIntrinsics/] 0] displayIntrinsics]
+      set displayIntrinsics [QueryOne! display $disp has intrinsics /./]
       
       # Convert pixel coordinates to 3D coordinates in projector space
       set fx [dict get $displayIntrinsics fx]
diff --git a/lib/folk.js b/lib/folk.js
index 07f220de..01bc45a4 100644
--- a/lib/folk.js
+++ b/lib/folk.js
@@ -337,7 +337,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     console.log('watchCollected', statement);
 
     const retractKey = await this.send(tcl`Say when the collected results for ${statement} are /result/ {
-      if {![info exists ::wsLib]} { set ::wsLib [dict get [lindex [Query! /someone/ claims the websocket library is /wsLib/] 0] wsLib] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
       $::wsLib wsEmitMsg $__ctx [list ${channel.prefix} $result]
     } with environment [list [list this $this __ctx $__ctx]]`);
     channel.retractKey = retractKey;
@@ -352,7 +352,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     });
 
     const retractKey = await this.send(tcl`
-      if {![info exists ::wsLib]} { set ::wsLib [dict get [lindex [Query! /someone/ claims the websocket library is /wsLib/] 0] wsLib] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
       set statement ${statement}
 
       # enumerate variable names this statement uses
@@ -393,7 +393,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     });
 
     const retractKey = await this.send(tcl`
-      if {![info exists ::wsLib]} { set ::wsLib [dict get [lindex [Query! /someone/ claims the websocket library is /wsLib/] 0] wsLib] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
       set pattern ${statement}
 
       set body {
diff --git a/prelude.tcl b/prelude.tcl
index f208fb0c..3c6312aa 100644
--- a/prelude.tcl
+++ b/prelude.tcl
@@ -702,11 +702,13 @@ proc Query! {args} {
 }
 proc QueryOne! {args} {
     set results [Query! {*}$args]
-
     if {[llength $results] != 1} {
         error "QueryOne! of ($args) had [llength $results] results. Should be one result!"
     }
 
+    if {{/./} in $args} {
+        return [dict get [lindex $results 0] .]
+    }
     return [lindex $results 0]
 }
 proc ForEach! {args} {

From a2040f9c335f104a2dd14c6a0895f035c753e32a Mon Sep 17 00:00:00 2001
From: Omar Rizwan <omar@omar.website>
Date: Fri, 29 May 2026 16:52:30 -0400
Subject: [PATCH 2/3] Add -default to QueryOne!; use -default and /./ to save
 lots of code

on queries where we only expect one result and immediately extract one
value from it.
---
 .../calibrate/calibration-board.folk          | 10 ++-----
 builtin-programs/editor/print-editor.folk     | 30 ++++++++-----------
 builtin-programs/esc-pos.folk                 | 11 ++-----
 builtin-programs/keyboard.folk                |  5 ++--
 builtin-programs/print/print.folk             | 26 +++++++---------
 builtin-programs/web/index.folk               |  2 +-
 builtin-programs/web/page.folk                |  2 +-
 builtin-programs/web/printed-programs.folk    |  2 +-
 prelude.tcl                                   | 14 +++++++++
 9 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/builtin-programs/calibrate/calibration-board.folk b/builtin-programs/calibrate/calibration-board.folk
index e3547dfb..f1266dcc 100644
--- a/builtin-programs/calibrate/calibration-board.folk
+++ b/builtin-programs/calibrate/calibration-board.folk
@@ -53,13 +53,9 @@ fn makeCalibrationBoardPs {} {
     package require linalg
     namespace import ::math::linearalgebra::add
 
-    set formats [dict get [QueryOne! the paper formats are /formats/] formats]
-    set formatName letter
-    set defaultFormatMatches [Query! paper format /format/ is the default paper format]
-    if {[llength $defaultFormatMatches] > 0} {
-        set candidate [dict get [lindex $defaultFormatMatches 0] format]
-        if {[dict exists $formats $candidate]} { set formatName $candidate }
-    }
+    set formats [QueryOne! the paper formats are /./]
+    set formatName [QueryOne! paper format /./ is the default paper format \
+                       -default letter]
     lassign [dict get $formats($formatName) pageSize] PageWidth PageHeight
 
     set innerToOuter 0.333333
diff --git a/builtin-programs/editor/print-editor.folk b/builtin-programs/editor/print-editor.folk
index 448d65e9..0a121d1e 100644
--- a/builtin-programs/editor/print-editor.folk
+++ b/builtin-programs/editor/print-editor.folk
@@ -1,18 +1,14 @@
 fn editorToPrintOptions {editor} {
-    set program [dict get [QueryOne! editor $editor has selected program /program/] program]
-    set code [dict get [QueryOne! editor buffer for $program is /code/] code]
+    set program [QueryOne! editor $editor has selected program /./]
+    set code [QueryOne! editor buffer for $program is /./]
 
-    set fontOptions [dict get [QueryOne! editor $editor on program $program has font options with /...opts/] opts]
+    set fontOptions [QueryOne! editor $editor on program $program has font options with /...opts/] opts]
     set textScale $fontOptions(scale)
-    set margin [dict get [QueryOne! editor $editor has margin /margin/] margin]
+    set margin [QueryOne! editor $editor has margin /./]
 
-    set formats [dict get [QueryOne! the paper formats are /formats/] formats]
-    set formatName letter
-    set defaultFormatMatches [Query! paper format /format/ is the default paper format]
-    if {[llength $defaultFormatMatches] > 0} {
-        set candidate [dict get [lindex $defaultFormatMatches 0] format]
-        if {[dict exists $formats $candidate]} { set formatName $candidate }
-    }
+    set formats [QueryOne! the paper formats are /./]
+    set formatName [QueryOne! paper format /./ is the default paper format \
+                       -default letter]
     set fmt $formats($formatName)
     set mToPt 2834.646
     return [dict merge $fmt \
@@ -35,14 +31,12 @@ When the codeToPostScript is /codeToPostScript/ &\
 
     set preview [list $editor preview]
     Wish $preview has a canvas
-    set formats [dict get [QueryOne! the paper formats are /formats/] formats]
-    set formatName letter
-    set defaultFormatMatches [Query! paper format /format/ is the default paper format]
-    if {[llength $defaultFormatMatches] > 0} {
-        set candidate [dict get [lindex $defaultFormatMatches 0] format]
-        if {[dict exists $formats $candidate]} { set formatName $candidate }
-    }
+
+    set formats [QueryOne! the paper formats are /./]
+    set formatName [QueryOne! paper format /./ is the default paper format \
+                       -default letter]
     set fmt $formats($formatName)
+
     set mToPt 2834.646
     set previewGeom [list width [/ [lindex $fmt(pageSize) 0] $mToPt] \
                          height [/ [lindex $fmt(pageSize) 1] $mToPt]]
diff --git a/builtin-programs/esc-pos.folk b/builtin-programs/esc-pos.folk
index 513a4252..afcca66d 100644
--- a/builtin-programs/esc-pos.folk
+++ b/builtin-programs/esc-pos.folk
@@ -9,11 +9,7 @@ When the print library is /printLib/ &\
         writeFolkFile $id $code
         writeMetaFile $printer $id
 
-        set matches [Query! /someone/ claims $printer is at /address/]
-        set matchDict [lindex $matches 0]
-        if {![dict exists $matchDict address]} { return }
-        set address [dict get $matchDict address]
-
+        set address [QueryOne! $printer is at /./]
         set printerSocket [socket stream ${address}:9100]
 
         fconfigure $printerSocket -translation binary -buffering none
@@ -44,10 +40,7 @@ When the print library is /printLib/ &\
     }
 
     fn writeMetaFile {printer id} {
-        set matches [Query! /someone/ claims $printer has tag geometry /geometry/]
-        set matchDict [lindex $matches 0]
-        if {![dict exists $matchDict geometry]} { return }
-        set geometry [dict get $matchDict geometry]
+        set geometry [QueryOne! $printer has tag geometry /./]
         set metaFile [open "$saveDir/$id.meta.folk" w]
         puts $metaFile [subst {Claim tag \$this has geometry {$geometry}}]
         close $metaFile
diff --git a/builtin-programs/keyboard.folk b/builtin-programs/keyboard.folk
index 5c676b1d..33d45947 100644
--- a/builtin-programs/keyboard.folk
+++ b/builtin-programs/keyboard.folk
@@ -84,7 +84,7 @@ When /keyboard/ is a keyboard device {
         Claim $keyboard has keymaps [dict create]
 
     When /page/ is a keyboard with path $keyboard locale /locale/ {
-        set localKeymaps [dict getdef [lindex [Query! $keyboard has keymaps /localKeymaps/] 0] localKeymaps {}]
+        set localKeymaps [QueryOne! $keyboard has keymaps /./ -default {}]
         if {[dict exists $localKeymaps $locale]} {
             return
         }
@@ -126,8 +126,7 @@ When /keyboard/ is a keyboard device {
             tvSec tvUsec type code value
 
         if {$type == 0x01} { ;# EV_KEY
-            set localKeymaps [dict getdef [lindex [Query! /someone/ claims $keyboard has keymaps /localKeymaps/] \
-                                               0] localKeymaps {}]
+            set localKeymaps [QueryOne! $keyboard has keymaps /./ -default {}]
 
             lassign [dict values $localKeymaps] activeKeymap
             if {$activeKeymap eq ""} {
diff --git a/builtin-programs/print/print.folk b/builtin-programs/print/print.folk
index 6cc3c6f6..bffee78b 100644
--- a/builtin-programs/print/print.folk
+++ b/builtin-programs/print/print.folk
@@ -221,13 +221,9 @@ When $::thisNode claims printer /name/ is a cups printer with /...options/ {
 }
 
 Subscribe: print code /code/ {
-    set formats [dict get [QueryOne! the paper formats are /formats/] formats]
-    set formatName letter
-    set defaultFormatMatches [Query! paper format /format/ is the default paper format]
-    if {[llength $defaultFormatMatches] > 0} {
-        set candidate [dict get [lindex $defaultFormatMatches 0] format]
-        if {[dict exists $formats $candidate]} { set formatName $candidate }
-    }
+    set formats [QueryOne! the paper formats are /./]
+    set formatName [QueryOne! paper format /./ is the default paper format \
+                       -default letter]
     set fmt $formats($formatName)
 
     set mToPt 2834.646
@@ -345,20 +341,20 @@ Subscribe: print pdf /pdfPath/ with /...options/ {
     set args [list]
 
     if {![dict exists $options printer]} {
-        set defaultPrinterMatches [Query! printer /printer/ is the default printer]
-        if {[llength $defaultPrinterMatches] > 0} {
-            dict set options printer [dict get [lindex $defaultPrinterMatches 0] printer]
-        }
+        try {
+            dict set options printer \
+                [QueryOne! printer /./ is the default printer]
+        } on error e {}
     }
     if {[dict exists $options printer]} {
         lappend args -P $options(printer)
     }
 
     if {![dict exists $options format]} {
-        set defaultFormatMatches [Query! paper format /format/ is the default paper format]
-        if {[llength $defaultFormatMatches] > 0} {
-            dict set options format [dict get [lindex $defaultFormatMatches 0] format]
-        }
+        try {
+            dict set options format \
+                [QueryOne! paper format /./ is the default paper format]
+        } on error e {}
     }
     if {[dict exists $options format]} {
         lappend args -o media=$options(format)
diff --git a/builtin-programs/web/index.folk b/builtin-programs/web/index.folk
index 97508165..61209764 100644
--- a/builtin-programs/web/index.folk
+++ b/builtin-programs/web/index.folk
@@ -102,7 +102,7 @@ Wish the web server handles route "/" with handler {
             </script>
         </head>
         <body>
-        [dict get [QueryOne! the web navigation HTML is /nav/] nav]
+        [QueryOne! the web navigation HTML is /./]
         [HtmlWhen the collected results for [list /programName/ has program code /programCode/] are /programs/ {
             emitHtmlForPrograms $programs
 
diff --git a/builtin-programs/web/page.folk b/builtin-programs/web/page.folk
index 506e45bf..8c84feaf 100644
--- a/builtin-programs/web/page.folk
+++ b/builtin-programs/web/page.folk
@@ -1,5 +1,5 @@
 Wish the web server handles route {/page/(.*)$} with handler {
-    set programDir [dict get [QueryOne! the program save directory is /saveDir/] saveDir]
+    set programDir [QueryOne! the program save directory is /./]
     set program_id $1
     set filenames [list \
         "$programDir/$program_id.folk" \
diff --git a/builtin-programs/web/printed-programs.folk b/builtin-programs/web/printed-programs.folk
index e66550bf..41264c92 100644
--- a/builtin-programs/web/printed-programs.folk
+++ b/builtin-programs/web/printed-programs.folk
@@ -1,5 +1,5 @@
 Wish the web server handles route {/printed-programs/([^/]+)\.folk$} with handler {
-    set programDir [dict get [QueryOne! the program save directory is /programDir/] programDir]
+    set programDir [QueryOne! the program save directory is /./]
     set filename "$programDir/$1.folk"
     set fp [open $filename r]
     set data [read $fp]
diff --git a/prelude.tcl b/prelude.tcl
index 3c6312aa..15e27ad1 100644
--- a/prelude.tcl
+++ b/prelude.tcl
@@ -701,7 +701,21 @@ proc Query! {args} {
     return $results
 }
 proc QueryOne! {args} {
+    set pattern [list]
+    for {set i 0} {$i < [llength $args]} {incr i} {
+        set arg [lindex $args $i]
+        if {$arg eq "-default"} {
+            incr i
+            set default [lindex $args $i]
+        } else {
+            lappend pattern $arg
+        }
+    }
+
     set results [Query! {*}$args]
+    if {[llength $results] == 0 && [info exists default]} {
+        return $default
+    }
     if {[llength $results] != 1} {
         error "QueryOne! of ($args) had [llength $results] results. Should be one result!"
     }

From 620fd796cb13ab258a0f8afd2fd5cacedd40d7b7 Mon Sep 17 00:00:00 2001
From: Omar Rizwan <omar@omar.website>
Date: Sat, 30 May 2026 15:50:13 -0400
Subject: [PATCH 3/3] Add Expect! and use everywhere we can. Thanks to s-ol

for the suggestion. We can use it almost anywhere that we don't have a
default, and it reads a lot cleaner.
---
 .../calibrate/calibrate-page.folk             |  8 +++---
 builtin-programs/calibrate/calibrate.folk     |  4 +--
 .../calibrate/calibration-board.folk          |  2 +-
 builtin-programs/editor/print-editor.folk     | 12 ++++-----
 builtin-programs/esc-pos.folk                 |  4 +--
 builtin-programs/print/print.folk             |  2 +-
 builtin-programs/web/new.folk                 |  9 +++----
 builtin-programs/web/page.folk                |  2 +-
 builtin-programs/web/printed-programs.folk    |  2 +-
 builtin-programs/web/program.folk             |  2 +-
 lib/folk.js                                   |  6 ++---
 prelude.tcl                                   | 27 +++++++++++++++++++
 12 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/builtin-programs/calibrate/calibrate-page.folk b/builtin-programs/calibrate/calibrate-page.folk
index e3ce77f9..4fb0cb37 100644
--- a/builtin-programs/calibrate/calibrate-page.folk
+++ b/builtin-programs/calibrate/calibrate-page.folk
@@ -9,9 +9,7 @@ Wish the web server handles route "/calibrate" with hidden true handler {
     set display $QUERY(display)
 
     # Query the camera resolution for proper aspect ratio in preview (defaults to 1920x1080)
-    set cameraOpts [QueryOne! camera $camera has width /width/ height /height/]
-    set cameraWidth [dict get $cameraOpts width]
-    set cameraHeight [dict get $cameraOpts height]
+    Expect! camera $camera has width /cameraWidth/ height /cameraHeight/
 
     upvar ^html ^html
     html [csubst {
@@ -117,7 +115,7 @@ Wish the web server handles route "/calibrate" with hidden true handler {
             <script>
               boardPrintThroughFolk.addEventListener('click', (e) => {
                 folk.run(`
-                  set maker [QueryOne! the makeCalibrationBoardPdf is /./]
+                  Expect! the makeCalibrationBoardPdf is /maker/
                   set boardPdf [{*}\$maker]
                   set boardPdfFile [file tempfile /tmp/folk-calibration-board-XXXXXX].pdf
                   set fd [open \$boardPdfFile wb]; puts \$fd \$boardPdf; close \$fd
@@ -177,7 +175,7 @@ Wish the web server handles route "/calibrate" with hidden true handler {
               document.getElementById('projected-tag-slider').addEventListener('input', (e) => {
                 const scale = e.target.value / 100.0;
                 folk.run(tcl`
-                  set HoldDefaultModel! [QueryOne! the calibration HoldDefaultModel! is /./]
+                  Expect! the calibration HoldDefaultModel! is /HoldDefaultModel!/
                   {*}[set HoldDefaultModel!] \${scale}
                 `);
               });
diff --git a/builtin-programs/calibrate/calibrate.folk b/builtin-programs/calibrate/calibrate.folk
index 3438c25c..04579c44 100644
--- a/builtin-programs/calibrate/calibrate.folk
+++ b/builtin-programs/calibrate/calibrate.folk
@@ -333,7 +333,7 @@ When camera /camera/ has width /cameraWidth/ height /cameraHeight/ &\
                       rmse $poseRmse \
                       tags [dict merge $printedTags $projectedTags]]
 
-        set seenPoses [QueryOne! the calibration last-seen poses are /./]
+        Expect! the calibration last-seen poses are /seenPoses/
         lappend seenPoses $pose
         if {[llength $seenPoses] > $SEEN_POSES_MAX} {
             set seenPoses [lreplace $seenPoses 0 0]
@@ -365,7 +365,7 @@ When camera /camera/ has width /cameraWidth/ height /cameraHeight/ &\
         # If the corners have _not_ moved a lot since last _saved_
         # calibration pose, this isn't different enough to be a good
         # calibration pose to save.
-        set calibrationPoses [QueryOne! the calibration poses from camera $camera to display $display are /./]
+        Expect! the calibration poses from camera $camera to display $display are /calibrationPoses/
         if {[llength $calibrationPoses] > 0} {
             set prevCalibrationPose [lindex $calibrationPoses end]
             if {[$modelLib meanTagsDifference $pose(tags) $prevCalibrationPose(tags)] < 50} {
diff --git a/builtin-programs/calibrate/calibration-board.folk b/builtin-programs/calibrate/calibration-board.folk
index f1266dcc..789a45f5 100644
--- a/builtin-programs/calibrate/calibration-board.folk
+++ b/builtin-programs/calibrate/calibration-board.folk
@@ -53,7 +53,7 @@ fn makeCalibrationBoardPs {} {
     package require linalg
     namespace import ::math::linearalgebra::add
 
-    set formats [QueryOne! the paper formats are /./]
+    Expect! the paper formats are /formats/
     set formatName [QueryOne! paper format /./ is the default paper format \
                        -default letter]
     lassign [dict get $formats($formatName) pageSize] PageWidth PageHeight
diff --git a/builtin-programs/editor/print-editor.folk b/builtin-programs/editor/print-editor.folk
index 0a121d1e..5815eb84 100644
--- a/builtin-programs/editor/print-editor.folk
+++ b/builtin-programs/editor/print-editor.folk
@@ -1,12 +1,12 @@
 fn editorToPrintOptions {editor} {
-    set program [QueryOne! editor $editor has selected program /./]
-    set code [QueryOne! editor buffer for $program is /./]
+    Expect! editor $editor has selected program /program/
+    Expect! editor buffer for $program is /code/
 
-    set fontOptions [QueryOne! editor $editor on program $program has font options with /...opts/] opts]
+    Expect! editor $editor on program $program has font options with /...fontOptions/
     set textScale $fontOptions(scale)
-    set margin [QueryOne! editor $editor has margin /./]
+    Expect! editor $editor has margin /margin/
 
-    set formats [QueryOne! the paper formats are /./]
+    Expect! the paper formats are /formats/
     set formatName [QueryOne! paper format /./ is the default paper format \
                        -default letter]
     set fmt $formats($formatName)
@@ -32,7 +32,7 @@ When the codeToPostScript is /codeToPostScript/ &\
     set preview [list $editor preview]
     Wish $preview has a canvas
 
-    set formats [QueryOne! the paper formats are /./]
+    Expect! the paper formats are /formats/
     set formatName [QueryOne! paper format /./ is the default paper format \
                        -default letter]
     set fmt $formats($formatName)
diff --git a/builtin-programs/esc-pos.folk b/builtin-programs/esc-pos.folk
index afcca66d..37a02241 100644
--- a/builtin-programs/esc-pos.folk
+++ b/builtin-programs/esc-pos.folk
@@ -9,7 +9,7 @@ When the print library is /printLib/ &\
         writeFolkFile $id $code
         writeMetaFile $printer $id
 
-        set address [QueryOne! $printer is at /./]
+        Expect! $printer is at /address/
         set printerSocket [socket stream ${address}:9100]
 
         fconfigure $printerSocket -translation binary -buffering none
@@ -40,7 +40,7 @@ When the print library is /printLib/ &\
     }
 
     fn writeMetaFile {printer id} {
-        set geometry [QueryOne! $printer has tag geometry /./]
+        Expect! $printer has tag geometry /geometry/
         set metaFile [open "$saveDir/$id.meta.folk" w]
         puts $metaFile [subst {Claim tag \$this has geometry {$geometry}}]
         close $metaFile
diff --git a/builtin-programs/print/print.folk b/builtin-programs/print/print.folk
index bffee78b..621214de 100644
--- a/builtin-programs/print/print.folk
+++ b/builtin-programs/print/print.folk
@@ -221,7 +221,7 @@ When $::thisNode claims printer /name/ is a cups printer with /...options/ {
 }
 
 Subscribe: print code /code/ {
-    set formats [QueryOne! the paper formats are /./]
+    Expect! the paper formats are /formats/
     set formatName [QueryOne! paper format /./ is the default paper format \
                        -default letter]
     set fmt $formats($formatName)
diff --git a/builtin-programs/web/new.folk b/builtin-programs/web/new.folk
index f199e10a..c8309d97 100644
--- a/builtin-programs/web/new.folk
+++ b/builtin-programs/web/new.folk
@@ -170,11 +170,8 @@ Wish the web server handles route "/new" with nav "<button>New program</button>"
       namespace import ::math::linearalgebra::matmul
       namespace import ::math::linearalgebra::scale
 
-      set quadLib [QueryOne! the quad library is /./]
-
-      set dims [QueryOne! display /disp/ has width /displayWidth/ height /displayHeight/]
-      set disp [dict get $dims disp]
-      set displayWidth [dict get $dims displayWidth]; set displayHeight [dict get $dims displayHeight]
+      Expect! the quad library is /quadLib/
+      Expect! display /disp/ has width /displayWidth/ height /displayHeight/
 
       set x [expr {int(double(${(left + (left/window.innerWidth) * w)}) * (double($displayWidth) / ${window.innerWidth}))}]
       set y [expr {int(double(${(top + (top/window.innerHeight) * h)}) * (double($displayHeight) / ${window.innerHeight}))}]
@@ -183,7 +180,7 @@ Wish the web server handles route "/new" with nav "<button>New program</button>"
       # Create 3D vertices in meters that will project to the desired pixel coordinates
       # Using a depth of 1.5 meters from the projector center
       set depth 1.5
-      set displayIntrinsics [QueryOne! display $disp has intrinsics /./]
+      Expect! display $disp has intrinsics /displayIntrinsics/
       
       # Convert pixel coordinates to 3D coordinates in projector space
       set fx [dict get $displayIntrinsics fx]
diff --git a/builtin-programs/web/page.folk b/builtin-programs/web/page.folk
index 8c84feaf..7bf186dc 100644
--- a/builtin-programs/web/page.folk
+++ b/builtin-programs/web/page.folk
@@ -1,5 +1,5 @@
 Wish the web server handles route {/page/(.*)$} with handler {
-    set programDir [QueryOne! the program save directory is /./]
+    Expect! the program save directory is /programDir/
     set program_id $1
     set filenames [list \
         "$programDir/$program_id.folk" \
diff --git a/builtin-programs/web/printed-programs.folk b/builtin-programs/web/printed-programs.folk
index 41264c92..cc661a1e 100644
--- a/builtin-programs/web/printed-programs.folk
+++ b/builtin-programs/web/printed-programs.folk
@@ -1,5 +1,5 @@
 Wish the web server handles route {/printed-programs/([^/]+)\.folk$} with handler {
-    set programDir [QueryOne! the program save directory is /./]
+    Expect! the program save directory is /programDir/
     set filename "$programDir/$1.folk"
     set fp [open $filename r]
     set data [read $fp]
diff --git a/builtin-programs/web/program.folk b/builtin-programs/web/program.folk
index 11780baa..84d0de0f 100644
--- a/builtin-programs/web/program.folk
+++ b/builtin-programs/web/program.folk
@@ -1,6 +1,6 @@
 Wish the web server handles route {/program/(.*)$} with handler {
     set programName $1
-    set match [QueryOne! $programName has program code /programCode/]
+    Expect! $programName has program code /programCode/]
     if {$match eq ""} {
         html "<html><body>Program not found: [htmlEscape $programName]</body></html>"
         return
diff --git a/lib/folk.js b/lib/folk.js
index 01bc45a4..6ea6dbb8 100644
--- a/lib/folk.js
+++ b/lib/folk.js
@@ -337,7 +337,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     console.log('watchCollected', statement);
 
     const retractKey = await this.send(tcl`Say when the collected results for ${statement} are /result/ {
-      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! the websocket library is /./] }
       $::wsLib wsEmitMsg $__ctx [list ${channel.prefix} $result]
     } with environment [list [list this $this __ctx $__ctx]]`);
     channel.retractKey = retractKey;
@@ -352,7 +352,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     });
 
     const retractKey = await this.send(tcl`
-      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! the websocket library is /./] }
       set statement ${statement}
 
       # enumerate variable names this statement uses
@@ -393,7 +393,7 @@ ${message} with environment [list [list this $chan __ctx $ctx __seq ${seqNumber}
     });
 
     const retractKey = await this.send(tcl`
-      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! /someone/ claims the websocket library is /./] }
+      if {![info exists ::wsLib]} { set ::wsLib [QueryOne! the websocket library is /./] }
       set pattern ${statement}
 
       set body {
diff --git a/prelude.tcl b/prelude.tcl
index 15e27ad1..30276580 100644
--- a/prelude.tcl
+++ b/prelude.tcl
@@ -612,6 +612,9 @@ proc On {event args} {
     }
 }
 
+# Synchronous, sampling query of the db. Returns a list of dicts where
+# each dict is a statement matching the pattern.
+#
 # Query! is like QuerySimple! but with added support for & joins, and
 # it'll automatically also query the claimized pattern (the pattern
 # with `/someone/ claims` prepended).
@@ -700,6 +703,18 @@ proc Query! {args} {
     }
     return $results
 }
+
+# Synchronous, sampling query of the db. Throws unless there is
+# exactly 1 statement result. Returns a dict whose keys are bound keys
+# from the pattern and whose values are corresponding terms from the
+# statement.
+#
+# Use like this:
+#
+#    Claim the dog is cool
+#    sleep 0.5
+#    puts [dict get [QueryOne! the dog is /val/] val] ;# -> cool
+#
 proc QueryOne! {args} {
     set pattern [list]
     for {set i 0} {$i < [llength $args]} {incr i} {
@@ -725,6 +740,18 @@ proc QueryOne! {args} {
     }
     return [lindex $results 0]
 }
+
+# Like QueryOne!, but introduces the bindings directly into caller
+# scope.
+#
+#     Expect! the dog is /val/
+#     puts $val ;# -> cool
+#
+proc Expect! {args} {
+    dict for {k v} [QueryOne! {*}$args] {
+        uplevel [list set $k $v]
+    }
+}
 proc ForEach! {args} {
     set body [lindex $args end]
     set pattern [lreplace $args end end]