Some refactoring around lists/zippers