Updates the code to compile sucessfully against mozilla/rust master!