Syntax fixes for Rust 0.6