Rollup merge of #147031 - joshtriplett:mbe-opt-collect, r=lcnr

mbe: Simplify check_redundant_vis_repetition

Eliminate a use of `map_or` in favor of a match.

Inline some variable definitions that don't add clarity, and that
prevent short-circuiting.

Author: matthiaskrgr