Why the unnecessary wrapping of Option around some return types?

[flauntingspade4]

I couldn't see a previous issue about it, and there are a few files with unnecessary Option wrappers around their return types, for example here. I can't see if this was used by a previous version, and not updated yet, or if I'm missing something obvious

[flauntingspade4]

I looked further into it, and it seems that the clippy warnings could be solved, and the code made slightly more consise (But with some extra syntax) by a change like this