diff --git a/mats/hash.ms b/mats/hash.ms
index af49b5c9a1..a6240b5f38 100644
--- a/mats/hash.ms
+++ b/mats/hash.ms
@@ -1013,7 +1013,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1041,7 +1041,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#(a b c))
   (same-elements? (hashtable-values h) '#(bval cval aval))
-  (equal-entries? (hashtable-entries h) '#(b c a) '#(bval cval aval))
+  (equal-entries? h '#(b c a) '#(bval cval aval))
   (same-elements? (hashtable-cells h) '#((b . bval) (c . cval) (a . aval)))
   (same-elements? (hashtable-cells h (expt 2 100)) '#((b . bval) (c . cval) (a . aval)))
   (let ([cells (hashtable-cells h 2)])
@@ -1158,7 +1158,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1186,7 +1186,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#((a) (b) (c)))
   (same-elements? (hashtable-values h) '#(bval cval aval))
-  (equal-entries? (hashtable-entries h) '#((a) (b) (c)) '#(aval bval cval))
+  (equal-entries? h '#((a) (b) (c)) '#(aval bval cval))
   (same-elements? (hashtable-cells h) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (same-elements? (hashtable-cells h (expt 2 100)) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (let ([cells (hashtable-cells h 2)])
@@ -1261,7 +1261,7 @@
     0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1388,7 +1388,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1416,7 +1416,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#((a) (b) (c)))
   (same-elements? (hashtable-values h) '#((a) (b) (c)))
-  (equal-entries? (hashtable-entries h) '#((a) (b) (c)) '#((a) (c) (b)))
+  (equal-entries? h '#((a) (b) (c)) '#((a) (c) (b)))
   (same-elements? (hashtable-cells h) (vector (cons ka ka) (cons kb kc) (cons kc kb)))
   (same-elements? (hashtable-cells h (expt 2 100)) (vector (cons ka ka) (cons kb kc) (cons kc kb)))
   (let ([cells (hashtable-cells h 2)])
@@ -1708,7 +1708,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1736,7 +1736,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#(a b c))
   (same-elements? (hashtable-values h) '#(bval cval aval))
-  (equal-entries? (hashtable-entries h) '#(b c a) '#(bval cval aval))
+  (equal-entries? h '#(b c a) '#(bval cval aval))
   (same-elements? (hashtable-cells h) '#((a . aval) (b . bval) (c . cval)))
   (same-elements? (hashtable-cells h (expt 2 100)) '#((a . aval) (b . bval) (c . cval)))
   (let ([cells (hashtable-cells h 2)])
@@ -1853,7 +1853,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -1881,7 +1881,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#((a) (b) (c)))
   (same-elements? (hashtable-values h) '#(aval bval cval))
-  (equal-entries? (hashtable-entries h) '#((a) (b) (c)) '#(aval bval cval))
+  (equal-entries? h '#((a) (b) (c)) '#(aval bval cval))
   (same-elements? (hashtable-cells h) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (same-elements? (hashtable-cells h (expt 2 100)) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (let ([cells (hashtable-cells h 2)])
@@ -2032,7 +2032,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -2060,7 +2060,7 @@
   (equal? (hashtable-size h) 3)
   (same-elements? (hashtable-keys h) '#((a) (b) (c)))
   (same-elements? (hashtable-values h) '#(aval bval cval))
-  (equal-entries? (hashtable-entries h) '#((a) (b) (c)) '#(aval bval cval))
+  (equal-entries? h '#((a) (b) (c)) '#(aval bval cval))
   (same-elements? (hashtable-cells h) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (same-elements? (hashtable-cells h (expt 2 100)) (vector (cons ka 'aval) (cons kb 'bval) (cons kc 'cval)))
   (let ([cells (hashtable-cells h 2)])
@@ -2365,7 +2365,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -2506,7 +2506,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -2741,7 +2741,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -3243,7 +3243,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -3371,7 +3371,7 @@
   (equal? (hashtable-size h) 0)
   (same-elements? (hashtable-keys h) '#())
   (same-elements? (hashtable-values h) '#())
-  (equal-entries? (hashtable-entries h) '#() '#())
+  (equal-entries? h '#() '#())
   (same-elements? (hashtable-cells h) '#())
   (same-elements? (hashtable-cells h 0) '#())
   (same-elements? (hashtable-cells h 10) '#())
@@ -3548,7 +3548,7 @@
   (eqv? (#%$hashtable-veclen $ght) 8)
   (same-elements? (hashtable-keys $ght) $ght-keys1)
   (same-elements? (hashtable-values $ght) $ght-vals1)
-  (equal-entries? (hashtable-entries $ght) $ght-keys1 $ght-vals1)
+  (equal-entries? $ght $ght-keys1 $ght-vals1)
   (same-elements? (hashtable-cells $ght) (vector-map cons $ght-keys1 $ght-vals1))
   (begin
     (define $ght-keys2 '#((a . b) (1 . 2) 3/4 3.4 3.5 1e23 #e1e50 1+1i 3+3.2i -15 #e1e-50 #1=(a . #1#) (#2=(#2# b c))))