- Unbundle zlib (but see changes/patches)?