More rustc warning wrangling

say THAT ten times fast