Minor cleanup to use is_some_and(...) instead of map_or(false, ...)

Minor cleanup to use is_some_and(...) instead of map_or(false, ...) #1831