Updated to compile with latest version of Rustc