Switch to rustc_serialize