Remove Zlib.Portable dependency, more use of TAP