Cleanups to containers

* Several cleanups to zlistx
* Reverted zhash to simpler, more innocent state