Upgrade rust and some clean-ups.

See individual commits.