Fix HWM handling in libzmq2.

Also de-gbjk the indentation.