Remove unused Option.or_{default,zero} and a minor cleanup

`Some(5).or_{default,zero}` can be easily replaced with `Some(Some(5).unwrap_or_default())`.