Update for language changes

Tested with Rust revision 2562f48