Minor updates to command-line validator.