Use `if let` or `match` where possible instead of `unwrap`.

[reitermarkus]

Clean up some code which uses e.g. .is_some() followed by .unwrap().