Tiny tweaks: fix zip, less globals (CLEvent.waitFor now in Context)
Drop useless common name aliases
nit: added spaces between cases