diff --git a/build.xcvb b/build.xcvb
index 33dddc66df5acffe8e0510733f48eacf5d542ef9..5eed1755e6e8acf6ef10298e74bc9408deb66174 100644
--- a/build.xcvb
+++ b/build.xcvb
@@ -20,7 +20,7 @@ deterministic separate compilation and enforced locally-declared dependencies."
    (:asdf "closer-mop")
    (:build "command-line-arguments")
    (:build "fare-utils") ;; utilities and data structures.
-   (:build "fare-matcher") ;; fare-matcher and fare-quasiquote-readtable
+   (:build "fare-quasiquote") ;; fare-quasiquote-readtable and fare-quasiquote-optima
    (:build "fare-mop")
    (:build "inferior-shell")
    (:when (:featurep :xcvb-farmer)
diff --git a/driver.lisp b/driver.lisp
index 08a32a30b4dc35520601a8857b4444043c81827f..1f425f3e8e0b974db054228178ac7543b81ff928 100644
--- a/driver.lisp
+++ b/driver.lisp
@@ -874,8 +874,8 @@ This is designed to abstract away the implementation specific quit forms."
     (ignore-errors
      (format! *stderr* "~&")
      (apply #'format! *stderr* format arguments)
-     (format! *stderr* "~&"))
-    (quit 99)))
+     (format! *stderr* "~&")))
+  (quit 99))
 
 (defun bork (condition)
   "Depending on whether *DEBUGGING* is set, enter debugger or die"
diff --git a/grain-sets.lisp b/grain-sets.lisp
index 69db361570c931168ca8d7eb65ad568ce7564b85..c82e231fab075feedf294a67585a97fa928f6e4b 100644
--- a/grain-sets.lisp
+++ b/grain-sets.lisp
@@ -21,6 +21,7 @@ mapping back to this array...")
   (check-grain-ordinal ordinal)
   (aref *ordered-grains* ordinal))
 
+#|
 (define-interface <grain-map>
     (<encoded-key-map>
      <map-empty-is-nil>
@@ -40,3 +41,4 @@ mapping back to this array...")
     (ordinal-grain ordinal)))
 
 (defparameter <gm> <grain-map>)
+|#
\ No newline at end of file
diff --git a/pkgdcl.lisp b/pkgdcl.lisp
index d1571333526dde9dc83bddb12ace56f341b3ffae..0611eebb9e01ea83117b0f9c4bb09c9767512f24 100644
--- a/pkgdcl.lisp
+++ b/pkgdcl.lisp
@@ -14,7 +14,7 @@
 (defpackage :xcvb
   (:use :closer-common-lisp
         :xcvb-utils :command-line-arguments :lisp-invocation
-        :fare-matcher :interface :pure :fare-mop
+        :optima :interface :pure :fare-mop
         :fare-memoization :inferior-shell
         #+xcvb-farmer :quux-iolib #+xcvb-farmer :iolib.os)
 
diff --git a/xcvb.asd b/xcvb.asd
index 080e576f9b2f2f1da9170c265e5ca67a9de6186c..0644ab128519ec639ef2d9ea5f8bf628349d278b 100644
--- a/xcvb.asd
+++ b/xcvb.asd
@@ -42,7 +42,7 @@ deterministic separate compilation and enforced locally-declared dependencies."
                  :fare-mop :fare-memoization
                  :command-line-arguments
                  :asdf-dependency-grovel
-                 :fare-matcher :fare-quasiquote-readtable
+                 :fare-quasiquote-extras
                  :ironclad :binascii :babel
 		 :inferior-shell
                  :lisp-interface-library