More unwrap refactions, even more