Bring up to date with current rust

It's probably for the best if you not ask why the hell I did this.