Update for recent (and not so recent) changes in Rust