Update for rust-lang changes. Fixes #5.