Reverting zlist changes, other cleanups