Update more stuff to Rust 0.6 syntax.

I missed a few of these in the tests.