Rust 0.8 pre 20130920

Updated to compile with rust 0.8-pre nightly build 20130920, based on changes by Erick Tryzelaar (@erickt).