diff --git a/src/comp/middle/kind.rs b/src/comp/middle/kind.rs
index d899f3f50a39..ab6c4bcf9807 100644
--- a/src/comp/middle/kind.rs
+++ b/src/comp/middle/kind.rs
@@ -72,7 +72,7 @@
 
 
 import syntax::ast;
-import syntax::walk;
+import syntax::visit;
 
 import ast::kind;
 import ast::kind_unique;
@@ -143,10 +143,10 @@ fn check_expr(tcx: &ty::ctxt, e: &@ast::expr) {
 }
 
 fn check_crate(tcx: &ty::ctxt, crate: &@ast::crate) {
-    let visit =
-        {visit_expr_pre: bind check_expr(tcx, _)
-         with walk::default_visitor()};
-    walk::walk_crate(visit, *crate);
+    let visit = visit::mk_simple_visitor
+        (@{visit_expr: bind check_expr(tcx, _)
+           with *visit::default_simple_visitor()});
+    visit::visit_crate(*crate, (), visit);
     tcx.sess.abort_if_errors();
 }
 
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 2ec020fdb876..f3172939aabf 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -1187,7 +1187,7 @@ mod writeback {
              visit_block_pre: bind visit_block_pre(wbcx, _),
              visit_pat_pre: bind visit_pat_pre(wbcx, _),
              visit_local_pre: bind visit_local_pre(wbcx, _)
-                with walk::default_visitor()};
+             with walk::default_visitor()};
         walk::walk_block(visit, blk);
         ret wbcx.success;
     }