Remove MaybeOwned and Equiv for the latest rust.