diff --git a/test/ikc3/facts_with_tags.out.expected b/test/ikc3/facts_with_tags.out.expected
index 6805aa5..11bdfbc 100644
--- a/test/ikc3/facts_with_tags.out.expected
+++ b/test/ikc3/facts_with_tags.out.expected
@@ -1,100 +1,100 @@
Facts.with_tags(Facts.env_facts(), KC3, :operator, ?, fn (fact) { puts(fact.object); 1 })
-operator_eq
-operator_gt
-operator_lt
-operator_or
operator_add
+operator_addi
operator_and
+operator_assign
+operator_band
+operator_bnot
operator_bor
+operator_brackets
+operator_bxor
+operator_defstruct
operator_div
+operator_eq
+operator_equal
+operator_gt
operator_gte
+operator_lt
operator_lte
operator_mod
operator_mul
operator_neg
operator_not
-operator_pin
-operator_sub
-operator_addi
-operator_band
-operator_bnot
-operator_bxor
-operator_equal
-operator_paren
-operator_assign
operator_not_eq
+operator_or
+operator_paren
+operator_pin
operator_require
-operator_brackets
-operator_defstruct
operator_semicolumn
operator_shift_left
operator_shift_right
+operator_sub
1
Facts.with_tags(Facts.env_facts(), KC3, :operator, op = ?, fn (fact) { puts(op); 2 })
-operator_eq
-operator_gt
-operator_lt
-operator_or
operator_add
+operator_addi
operator_and
+operator_assign
+operator_band
+operator_bnot
operator_bor
+operator_brackets
+operator_bxor
+operator_defstruct
operator_div
+operator_eq
+operator_equal
+operator_gt
operator_gte
+operator_lt
operator_lte
operator_mod
operator_mul
operator_neg
operator_not
-operator_pin
-operator_sub
-operator_addi
-operator_band
-operator_bnot
-operator_bxor
-operator_equal
-operator_paren
-operator_assign
operator_not_eq
+operator_or
+operator_paren
+operator_pin
operator_require
-operator_brackets
-operator_defstruct
operator_semicolumn
operator_shift_left
operator_shift_right
+operator_sub
2
op = ? ; void
void
Facts.with_tags(Facts.env_facts(), KC3, :operator, op, fn (fact) { puts(op); 3 })
-operator_eq
-operator_gt
-operator_lt
-operator_or
operator_add
+operator_addi
operator_and
+operator_assign
+operator_band
+operator_bnot
operator_bor
+operator_brackets
+operator_bxor
+operator_defstruct
operator_div
+operator_eq
+operator_equal
+operator_gt
operator_gte
+operator_lt
operator_lte
operator_mod
operator_mul
operator_neg
operator_not
-operator_pin
-operator_sub
-operator_addi
-operator_band
-operator_bnot
-operator_bxor
-operator_equal
-operator_paren
-operator_assign
operator_not_eq
+operator_or
+operator_paren
+operator_pin
operator_require
-operator_brackets
-operator_defstruct
operator_semicolumn
operator_shift_left
operator_shift_right
+operator_sub
3
type(op)
Var
diff --git a/test/ikc3/facts_with_tuple.out.expected b/test/ikc3/facts_with_tuple.out.expected
index cee9922..6a0701f 100644
--- a/test/ikc3/facts_with_tuple.out.expected
+++ b/test/ikc3/facts_with_tuple.out.expected
@@ -1,32 +1,32 @@
Facts.with_tuple(Facts.env_facts(), {KC3, :operator, ?}, fn (fact) { puts(fact.object); void })
-operator_eq
-operator_gt
-operator_lt
-operator_or
operator_add
+operator_addi
operator_and
+operator_assign
+operator_band
+operator_bnot
operator_bor
+operator_brackets
+operator_bxor
+operator_defstruct
operator_div
+operator_eq
+operator_equal
+operator_gt
operator_gte
+operator_lt
operator_lte
operator_mod
operator_mul
operator_neg
operator_not
-operator_pin
-operator_sub
-operator_addi
-operator_band
-operator_bnot
-operator_bxor
-operator_equal
-operator_paren
-operator_assign
operator_not_eq
+operator_or
+operator_paren
+operator_pin
operator_require
-operator_brackets
-operator_defstruct
operator_semicolumn
operator_shift_left
operator_shift_right
+operator_sub
void