Minor changes to CLI to use izip.