Remap non-clonable move-passed optional fn args into Option<&Type>