Updated code to build with a more recent rustc.