apply clippy::question_mark lint

[cyrgani]

Just another small code cleanup to replace

if foo.is_none() {
    return None;
}
foo.unwrap()

with

foo?

in several places.

[not-fl3]

I would rather not touch anything under /experimental, but if helps somehow - I can merge it, np!