Update for language changes (Rust RFC 49)