These showed up today, so just applied the simplifications, which were
mostly switching matches to if let

Release Notes:

- N/A