Continuing with cleaning up of ZLIB library.