Updating to rivets 0.7.1, all tests pass.
A littl emore cleanup.