Tidied up existing options to make --batch and --fetch options simpler.