Updated for Rust 0.9-1324-g52755b7