extract pup-owned helpers out of the generator-owned client.rs/util.rs

extract pup-owned helpers out of the generator-owned client.rs/util.rs #1537