Options no longer needs deep-copy semantics

Follow-up to 23d90a6a187a57fbdf4eeac146993e3b37c3d4d9.