clippy: fix `unnecessary-map-or` lints


Also fixes the audit failure that's been here for a few weeks.

Merge request reports

Loading