From 9c72eeb9f642b33cab0502f74d4b495c4a784725 Mon Sep 17 00:00:00 2001
From: Andrew Davison <andrew.davison@gmail.com>
Date: Tue, 10 Oct 2023 08:46:50 +1000
Subject: [PATCH] WIP, re issue #361

---
 src/module.c | 5 -----
 src/query.c  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/module.c b/src/module.c
index 621f45dae..cf17fd0de 100644
--- a/src/module.c
+++ b/src/module.c
@@ -706,11 +706,6 @@ bool do_use_module_1(module *curr_m, cell *p)
 		// There's a TCO bug manifesting with clpb:sat_rewite
 		// so this is a temporary fix...
 
-		if (!strcmp(name, "clpb"))
-			curr_m->pl->opt = false;
-		else if (!strcmp(name, "clpz"))
-			curr_m->pl->opt = false;
-
 		if (!strcmp(name, "between")
 		    || !strcmp(name, "samsort")
 		    || !strcmp(name, "terms")
diff --git a/src/query.c b/src/query.c
index 04f77bf66..1cad073d9 100644
--- a/src/query.c
+++ b/src/query.c
@@ -874,7 +874,7 @@ static bool are_slots_ok(const query *q, const frame *f)
 
 		if (is_empty(c))
 			return false;
-		else if (is_indirect(c) && !is_evaluable(c->val_ptr))
+		else if (is_indirect(c) /*&& !is_evaluable(c->val_ptr)*/)
 			return false;
 		else if (is_cstring(c) && (c->flags & FLAG_CSTR_QUANTUM_ERASER))
 			return false;