More changes for new rust.

r? @kmcallister