Some more if let conversion