(zlib) Cleanups

24 jobs for master in 1 minute and 32 seconds (queued for 4 seconds)