not sure what you are trying to convey here... that Option isn't needed?

refactored a little in a62103e, avoids the unwrap.