Avoid Option::take() when we use ZeroizeOnDrop

The Option's contents won't ever get zeroed,
instead we make a copy (or use a reference) and set Option to
None, forcing the drop.