Refactor around zippers
Update rewrite-clj dependency to fix find-next issue