small refactor with `then_some` #4667

Job	Run time
doctest	1m 39s
test ubuntu-latest stable --no-default-features	1m 53s
test ubuntu-latest stable	1m 32s
test ubuntu-latest stable --all-features	2m 39s
check no_std	24s
test ubuntu-latest nightly --no-default-features	1m 40s
test ubuntu-latest nightly	1m 41s
clippy	57s
test ubuntu-latest nightly --all-features	2m 13s
test ubuntu-latest 1.79 --no-default-features	48s
test ubuntu-latest 1.79	1m 0s
feature-checks	3m 48s
test windows-latest stable --no-default-features	4m 55s
wasm-unknown	53s
test windows-latest stable	4m 45s
wasm-wasi	1m 13s
test windows-latest stable --all-features	6m 34s
cfg-check	31s
test windows-latest nightly --no-default-features	4m 13s
docs	1m 5s
fmt	13s
test windows-latest nightly	4m 2s
test windows-latest nightly --all-features	5m 22s
test windows-latest 1.79 --no-default-features	2m 14s
test windows-latest 1.79	2m 32s
	58m 46s

Provide feedback