Updates to rivets 0.6.