Move to rustc-serialize (and adjust for some other Rust changes)