Some more cleanup now that we don't have to wrap things in zk.close