Clean up some uses of `Option::map` only for its side effects

This reduces syntactic noise and is a good use case for `if let`, which I turned on.