Fixed inconsistent variable naming. "help_regex_s" now "help_regex".
Fixed command line option processing to take the possibility of hyphens
into account.