diff --git a/benches/bench_enum.rs b/benches/bench_enum.rs
index d76dae15..62e02e42 100644
--- a/benches/bench_enum.rs
+++ b/benches/bench_enum.rs
@@ -150,12 +150,13 @@ mod decoder {
                                 _f: |&mut AnimalDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
 
-        fn read_tuple<T>(&mut self, _f: |&mut AnimalDecoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple<T>(&mut self, _len: uint, _f: |&mut AnimalDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut AnimalDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
 
         fn read_tuple_struct<T>(&mut self,
                                 _s_name: &str,
-                                _f: |&mut AnimalDecoder, uint| -> Result<T, Error>)
+                                _len: uint,
+                                _f: |&mut AnimalDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_struct_arg<T>(&mut self,
                                     _a_idx: uint,
diff --git a/benches/bench_map.rs b/benches/bench_map.rs
index 7e84e3b0..82143989 100644
--- a/benches/bench_map.rs
+++ b/benches/bench_map.rs
@@ -28,7 +28,7 @@ pub enum Error {
 
 mod decoder {
     use std::collections::HashMap;
-    use std::collections::hashmap::MoveEntries;
+    use std::collections::hash_map::MoveEntries;
     use serialize;
 
     use super::{Error, EndOfStream, SyntaxError, OtherError};
@@ -122,12 +122,13 @@ mod decoder {
                                 _f: |&mut IntDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
 
-        fn read_tuple<T>(&mut self, _f: |&mut IntDecoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple<T>(&mut self, _len: uint, _f: |&mut IntDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut IntDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
 
         fn read_tuple_struct<T>(&mut self,
                                 _s_name: &str,
-                                _f: |&mut IntDecoder, uint| -> Result<T, Error>)
+                                _len: uint,
+                                _f: |&mut IntDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_struct_arg<T>(&mut self,
                                     _a_idx: uint,
@@ -169,7 +170,7 @@ mod decoder {
 
 mod deserializer {
     use std::collections::HashMap;
-    use std::collections::hashmap::MoveEntries;
+    use std::collections::hash_map::MoveEntries;
 
     use super::{Error, EndOfStream, SyntaxError};
 
diff --git a/benches/bench_struct.rs b/benches/bench_struct.rs
index 4632e0e3..24a80412 100644
--- a/benches/bench_struct.rs
+++ b/benches/bench_struct.rs
@@ -191,12 +191,13 @@ mod decoder {
             }
         }
 
-        fn read_tuple<T>(&mut self, _f: |&mut OuterDecoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError("".to_string())) }
+        fn read_tuple<T>(&mut self, _len: uint, _f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError("".to_string())) }
         fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut OuterDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError("".to_string())) }
 
         fn read_tuple_struct<T>(&mut self,
                                 _s_name: &str,
-                                _f: |&mut OuterDecoder, uint| -> Result<T, Error>)
+                                _len: uint,
+                                _f: |&mut OuterDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError("".to_string())) }
         fn read_tuple_struct_arg<T>(&mut self,
                                     _a_idx: uint,
diff --git a/benches/bench_vec.rs b/benches/bench_vec.rs
index d447450d..f063c446 100644
--- a/benches/bench_vec.rs
+++ b/benches/bench_vec.rs
@@ -105,12 +105,13 @@ mod decoder {
                                 _f: |&mut IntDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
 
-        fn read_tuple<T>(&mut self, _f: |&mut IntDecoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple<T>(&mut self, _len: uint, _f: |&mut IntDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut IntDecoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
 
         fn read_tuple_struct<T>(&mut self,
                                 _s_name: &str,
-                                _f: |&mut IntDecoder, uint| -> Result<T, Error>)
+                                _len: uint,
+                                _f: |&mut IntDecoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_struct_arg<T>(&mut self,
                                     _a_idx: uint,
@@ -211,12 +212,13 @@ mod decoder {
                                 _f: |&mut U8Decoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
 
-        fn read_tuple<T>(&mut self, _f: |&mut U8Decoder, uint| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
+        fn read_tuple<T>(&mut self, _len: uint, _f: |&mut U8Decoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_arg<T>(&mut self, _a_idx: uint, _f: |&mut U8Decoder| -> Result<T, Error>) -> Result<T, Error> { Err(SyntaxError) }
 
         fn read_tuple_struct<T>(&mut self,
                                 _s_name: &str,
-                                _f: |&mut U8Decoder, uint| -> Result<T, Error>)
+                                _len: uint,
+                                _f: |&mut U8Decoder| -> Result<T, Error>)
                                 -> Result<T, Error> { Err(SyntaxError) }
         fn read_tuple_struct_arg<T>(&mut self,
                                     _a_idx: uint,