Basic updates for Rust 0.10-pre compatibility

Tested with rustc compiled from revision 42fc32f