Replace some verbose match statements with their `if let` equivalent.

No semantic changes, no enabling `if let` where it wasn't already enabled.
Yep, plus a few other little spots I missed.  Thanks!