This will make it easier to validate error improvements I'm working on as well as make it easier to update from rust-lang/rust