[Committed] Simplify code and build now that zlib support is no longer optional.