style: Avoid calling unwrap() when we don't have to (#2519)

style: Avoid calling unwrap() when we don't have to (#2519) #205