Cosmetical changes to ZIP source from merging changes to OpenCL.
ZIP-opencl: implement Jim's changes from CPU format.