Fix let? unwrap early return for option types

Fix let? unwrap early return for option types #9067