More unwrap refactions