Progress on a better test harness
Various neurotic cleanup in zlib sources, nothing semantic