Use the unwrap API per Brett's suggestion