diff --git a/Changes b/Changes
index 88bcc769..634ab35f 100644
--- a/Changes
+++ b/Changes
@@ -884,3 +884,12 @@
 * 20191028 Fix bug setting filename in attachments when '@' prefix used
 * 20191028 Add deprecation warning system.  Warnings in code and a table
            of deprecated functionality and removal dates in documentation.
+* 20191111 Switch Getopt processing to an arbitrary list instead of  changing
+           ARGV for each call.
+* 20191111 Check to see if there are any entries left in the option list
+           after each stage of option processing and error if so.
+* 20191111 Rework the command line reconstruction so that options that
+           don't take an argument do not include one in the reconstuction.
+* 20191111 Unexpected argument format for --timeout now errors and exits
+           instead of silently using default timeout.
+* 20191111 Document that --timeout argument can use 'h' as a modifier.
diff --git a/doc/base.pod b/doc/base.pod
index c5435698..9ec4f484 100644
--- a/doc/base.pod
+++ b/doc/base.pod
@@ -111,6 +111,8 @@ A message's body is the portion of its DATA section following the first blank li
 
 To prevent potential confusion in this document a flag to Swaks is always referred to as an "option".  If the option takes additional data, that additional data is referred to as an argument to the option.  For example, "--from fred@example.com" might be provided to Swaks on the command line, with "--from" being the option and "fred@example.com" being --from's argument.
 
+Options arguments are the only way to provide information to Swaks.  If Swaks finds data during option processing that is neither an option nor an option's argument, it will error and exit.  For instance, if "--no-data-fixup 1" were found on the command line, this would result in an error because --no-data-fixup does not take an argument and therefore Swaks would no know what to do with '1'.
+
 Options can be given to Swaks in three ways.  They can be specified in a configuration file, in environment variables, and on the command line.  Depending on the specific option and whether an argument is given to it, Swaks may prompt the user for the argument.
 
 When Swaks evaluates its options, it first looks for a configuration file (either in a default location or specified with --config).  Then it evaluates any options in environment variables.  Finally, it evaluates command line options.  At each round of processing, any options set earlier will be overridden.  Additionally, any option can be prefixed with "no-" to cause Swaks to forget that the variable had previously been set (either in an earlier round, or earlier in the same round).  This capability is necessary because many options treat defined-but-no-argument differently than not-defined.
@@ -131,8 +133,11 @@ A set of "portable" defaults can also be created by adding options to the end of
 
 If configuration files have not been explicitly turned off, the __END__ config is always read.  Only one other configuration file will ever be used per single invocation of Swaks, even if multiple configuration files are specified.  If the __END__ config and another config are to be read, the __END__ config will be processed first.  Specifying the --config option with no argument turns off the processing of both the __END__ config and any actual config files.
 
-In a configuration file lines beginning with a hash (#) are ignored.  All other lines are assumed to be an option to Swaks, with the leading dash or dashes optional.  Everything after a option line's first space is assumed to be the option's argument and is not shell processed.  Therefore, quoting is usually unneeded and will be included literally in the argument.  Here is an example of the contents of a configuration file:
+In a configuration file lines beginning with a hash (#) are ignored.  All other lines are assumed to be an option to Swaks, with the leading dash or dashes optional.  Everything after a option line's first space is assumed to be the option's argument and is not shell processed.  Therefore, quoting is usually unneeded and will be included literally in the argument.
+
+There is a subtle difference between providing an option with no argument and providing an option with an empty argument.  If an option line does not have a space, the entire line is treated as an option and there is no argument.  If the line ends in a single space, it will be processed as an option with an empty argument.  So, "apt" will be treated as "--apt", but "apt " will be treated as "--apt ''".
 
+Here is an example of the contents of a configuration file:
 
     # always use this sender, no matter server or logged in user
     --from fred@example.com
@@ -326,7 +331,7 @@ This option is similar to --drop-after, but instead of dropping the connection a
 
 =item --timeout [time]
 
-Use argument as the SMTP transaction timeout, or prompt user if no argument given.  Argument can either be a pure digit, which will be interpreted as seconds, or can have a specifier s or m (5s = 5 seconds, 3m = 180 seconds).  As a special case, 0 means don't timeout the transactions.  Default value is 30s.
+Use argument as the SMTP transaction timeout, or prompt user if no argument given.  Argument can either be a pure digit, which will be interpreted as seconds, or can have a specifier s, m, or h (5s = 5 seconds, 3m = 180 seconds, 1h = 3600 seconds).  As a special case, 0 means don't timeout the transactions.  Default value is 30s.
 
 =item --protocol [protocol]
 
diff --git a/swaks b/swaks
index 75c25e8b..f163f4ca 100755
--- a/swaks
+++ b/swaks
@@ -1611,8 +1611,9 @@ sub test_support {
 sub time_to_seconds {
 	my $t = shift;
 
-	if ($t !~ /^(\d+)([hms])?/i) {
-		return(30); # error condition - just use default value
+	if ($t !~ /^(\d+)([hms])?$/i) {
+		ptrans(12, 'Unknown timeout format \'' . $t . '\'');
+		exit(1);
 	} else {
 		my $r = $1;
 		my $u = lc($2);
@@ -2118,17 +2119,12 @@ sub get_option_struct {
 }
 
 # returns %O, the large raw option hash
+# This sub is a jumping point.  We will construct an argv based on the different ways that options can be specified
+# and call GetOptions multiple times.  We are essentially "layering" options.  First we load from a config file (if
+# exists/specified), then from any environment variables, then the actual command line.
 sub load_args {
-	# this sub is a jumping point.  What we will do is repeatedly massage
-	# @ARGV and call GetOptions multiple times.  We are essentially "layering"
-	# options.  First we load from a config file (if exists/specified), then
-	# from any environment variables, then the actual command line.
-
-	# First, save a copy of the real @ARGV, because that's actually what
-	# gets processed last
-	my @real_ARGV = @ARGV;
-	my %ARGS      = ();
-	@ARGV         = ();
+	my %ARGS      = (); # this is the structure that gets returned
+	my @fakeARGV  = ();
 
 	# we load our options processing hash here.  We abstract it back from the
 	# native getopt-format because we need to be able to intercept "no-" options
@@ -2163,8 +2159,6 @@ sub load_args {
 		$ARGS{cfgs}{$e->{okey}} = $e;
 	}
 
-
-
 	# we want to process config files first.  There's a default config file in
 	# ~/.swaksrc, but it is possible for the user to override this with the
 	# --config options.  So, find the one and only file we will use here.
@@ -2191,12 +2185,12 @@ sub load_args {
 	}
 	# lastly go (backwards) through original command line looking for config file,
 	# choosing the first one found (meaning last one specified)
-	for (my $i = scalar(@real_ARGV) - 1; $i >= 0; $i--) {
-		if ($real_ARGV[$i] =~ /^-?-config$/) {
-			if ($i == scalar(@real_ARGV) - 1 || $real_ARGV[$i+1] =~ /^-/) {
+	for (my $i = scalar(@ARGV) - 1; $i >= 0; $i--) {
+		if ($ARGV[$i] =~ /^-?-config$/) {
+			if ($i == scalar(@ARGV) - 1 || $ARGV[$i+1] =~ /^-/) {
 				$skip_config = 1;
 			} else {
-				$config_file       = $real_ARGV[$i+1];
+				$config_file       = $ARGV[$i+1];
 				$config_is_default = 0;
 				$skip_config       = 0;
 			}
@@ -2210,13 +2204,14 @@ sub load_args {
 		my @configs = ('&DATA');
 		push(@configs, $config_file) if ($config_file);
 		foreach my $configf (@configs) {
+			my @fakeARGV = ();
 			if (open(C, '<' . $configf)) {
 				# "#" in col 0 is a comment
 				while (defined(my $m = <C>)) {
 					next if ($m =~ m|^#|);
 					chomp($m);
 					$m = '--' . $m if ($m !~ /^-/);
-					push(@ARGV, split(/\s/, $m, 2));
+					push(@fakeARGV, split(/\s/, $m, 2));
 				}
 				close(C);
 			} elsif (!$config_is_default && $configf eq $config_file) {
@@ -2225,71 +2220,90 @@ sub load_args {
 				exit(1);
 			}
 
-			# OK, all that work to load @ARGV with values from the config file.  Now
-			# we just need to process it.  (don't call if nothing set in @ARGV)
-			fetch_args(\%ARGS, $option_list) if (scalar(@ARGV));
+			# OK, all that work to load @fakeARGV with values from the config file.  Now
+			# we just need to process it.  (don't call if nothing set in @fakeARGV)
+			fetch_args(\%ARGS, $option_list, \@fakeARGV) if (scalar(@fakeARGV));
+			check_opt_processing(\@fakeARGV, 'Config file ' . $configf);
 		}
 	}
 
 	# OK, %ARGS contains all the settings from the config file.  Now do it again
 	# with SWAKS_OPT_* environment variables
-	@ARGV = ();
+	@fakeARGV = ();
 	foreach my $v (sort keys %ENV) {
 		if ($v =~ m|^SWAKS_OPT_(.*)$|) {
 			my $tv = $1; $tv =~ s|_|-|g;
-			push(@ARGV, '--' . $tv);
-			push(@ARGV, $ENV{$v}) if (length($ENV{$v}));
+			push(@fakeARGV, '--' . $tv);
+			push(@fakeARGV, $ENV{$v}) if (length($ENV{$v}));
 		}
 	}
-	fetch_args(\%ARGS, $option_list) if (scalar(@ARGV));
+	fetch_args(\%ARGS, $option_list, \@fakeARGV) if (scalar(@fakeARGV));
+	check_opt_processing(\@fakeARGV, 'environment');
 
 	# and now, after all of that, process the actual cmdline args
-	@ARGV = @real_ARGV;
-	fetch_args(\%ARGS, $option_list) if (scalar(@ARGV));
+	fetch_args(\%ARGS, $option_list, \@ARGV) if (scalar(@ARGV));
+	check_opt_processing(\@ARGV, 'command line');
 
 	return(\%ARGS);
 }
 
+# if there's anything left in the fake argv after Getopts processed it, it's an error.  There's nothing
+# that can be passed in to swaks that isn't an option or an argument to an option, all of which Getopt
+# should consume.  So if there's anything left, the user did something weird.  Just let them know and
+# error instead of letting them think their ignored stuff is working.
+sub check_opt_processing {
+	my $argv_local  = shift;
+	my $option_type = shift;
+
+	if (scalar(@$argv_local)) {
+		ptrans(12, 'Data left in option list when processing  ' . $option_type . ' (' .
+		           join(', ', map { "'$_'" } (@$argv_local)) .
+		           ').  Exiting');
+		exit(1);
+	}
+}
+
 sub fetch_args {
-	my $r = shift;
-	my $l = shift;
+	my $r          = shift;
+	my $l          = shift;
+	my $argv_local = shift;
 
 	my %to_delete = ();
 
 	# need to rewrite header-HEADER opts before std option parsing
 	# also see if there are any --no- options that need to be processed
 	RUNOPTS:
-	for (my $i = 0; $i < scalar(@ARGV); $i++) {
+	for (my $i = 0; $i < scalar(@$argv_local); $i++) {
 		# before doing any option processing, massage from the optional '--option=arg' format into '--option arg' format.
-		if ($ARGV[$i] =~ /^(-[^=]+)=(.*)$/) {
-			$ARGV[$i] = $1;
-			splice(@ARGV, $i+1, 0, $2);
+		if ($argv_local->[$i] =~ /^(-[^=]+)=(.*)$/) {
+			$argv_local->[$i] = $1;
+			splice(@$argv_local, $i+1, 0, $2);
 		}
 
 		# -g is not really necessary.  It is now deprecated. During the deprecation window, make
 		# it a straight-up alias to `--data -`.  If has already appeared, just ignore -g.  If
 		# --data has not appeared, change -g into `--data -`.
-		if ($ARGV[$i] =~ /^-?-g$/) {
+		if ($argv_local->[$i] =~ /^-?-g$/) {
 			deprecate('The -g option is deprecated and will be removed. Please use \'--data -\' instead.');
-			if (scalar(grep(/^-?-data$/, @ARGV)) || check_arg('mail_data', $r)) {
+			if (scalar(grep(/^-?-data$/, @$argv_local)) || check_arg('mail_data', $r)) {
 				# if --data appears in the current stream or has already appeared in a previous stream, ignore -g
-				splice(@ARGV, $i, 1); # remove the current index from @ARGV
+				splice(@$argv_local, $i, 1); # remove the current index from @$argv_local
 				redo(RUNOPTS);        # since there's now a new value at $i, redo this iteration of the loop
 			}
 			else {
 				# if we haven't seen --data yet, change -g into `--data -`
-				splice(@ARGV, $i, 1, '--data', '-');
+				splice(@$argv_local, $i, 1, '--data', '-');
 			}
 		}
 
-		if ($ARGV[$i] =~ /^-?-h(?:eader)?-([^:]+):?$/) {
+		if ($argv_local->[$i] =~ /^-?-h(?:eader)?-([^:]+):?$/) {
 			# rewrite '--header-Foo bar' into '--header "Foo: bar"'
-			$ARGV[$i]   = "--header";
-			$ARGV[$i+1] = $1 . ': ' . $ARGV[$i+1];
+			$argv_local->[$i]   = "--header";
+			$argv_local->[$i+1] = $1 . ': ' . $argv_local->[$i+1];
 		}
-		elsif ($ARGV[$i] =~ /^-?-no-h(?:eader)?-/) {
+		elsif ($argv_local->[$i] =~ /^-?-no-h(?:eader)?-/) {
 			# rewrite '--no-header-Foo' into '--no-header'
-			$ARGV[$i]   = "--no-header";
+			$argv_local->[$i]   = "--no-header";
 		}
 	}
 
@@ -2323,7 +2337,7 @@ sub fetch_args {
 	}
 
 	Getopt::Long::Configure("no_ignore_case");
-	GetOptions(%options) || exit(1);
+	Getopt::Long::GetOptionsFromArray($argv_local, %options) || exit(1);
 }
 
 sub store_option {
@@ -2392,7 +2406,7 @@ sub reconstruct_options {
 			my $lopt          = $o->{cfgs}{$okey}{opts}[0];
 
 			push(@c, '--'.$lopt);
-			if (length($optStruct->{arg})) {
+			if (length($optStruct->{arg}) && !($o->{cfgs}{$okey}{cfgs} & OP_ARG_NONE)) {
 				if ($okey eq 'auth_pass') {
 					push(@c, shquote('%RAW_PASSWORD_STRING%'));
 				}
diff --git a/testing/regressions/_exec-output-dump/0004.test b/testing/regressions/_exec-output-dump/0004.test
index 920d02cf..cfa924b7 100644
--- a/testing/regressions/_exec-output-dump/0004.test
+++ b/testing/regressions/_exec-output-dump/0004.test
@@ -1,3 +1,3 @@
 auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
-test action: CMD_CAPTURE %SWAKS% --dump --to user@host1.nodns.test.swaks.net --server ser.ver --helo host1.nodns.test.swaks.net --from from@host1.nodns.test.swaks.net --quit-after 'mail' --auth-user 'user' --auth-password 'pass' --tls '1' --hide-send '1' --dump --xclient-addr '192.168.0.4' --xclient-optional '1' --proxy-version '1' --proxy-family 'TCP4' --proxy-source '192.168.0.5' --proxy-source-port '111' --proxy-dest '1.1.1.1' --proxy-dest-port '26'
+test action: CMD_CAPTURE %SWAKS% --dump --to user@host1.nodns.test.swaks.net --server ser.ver --helo host1.nodns.test.swaks.net --from from@host1.nodns.test.swaks.net --quit-after 'mail' --auth-user 'user' --auth-password 'pass' --tls --hide-send --dump --xclient-addr '192.168.0.4' --xclient-optional --proxy-version '1' --proxy-family 'TCP4' --proxy-source '192.168.0.5' --proxy-source-port '111' --proxy-dest '1.1.1.1' --proxy-dest-port '26'
diff --git a/testing/regressions/_exec-output-dump/out-ref/0004.stdout b/testing/regressions/_exec-output-dump/out-ref/0004.stdout
index 2209ba24..6caccae3 100644
--- a/testing/regressions/_exec-output-dump/out-ref/0004.stdout
+++ b/testing/regressions/_exec-output-dump/out-ref/0004.stdout
@@ -15,7 +15,7 @@
 
 App Info:
   X-Mailer = swaks v99999999.9 jetmore.org/john/code/swaks/
-  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --quit-after 'mail' --auth-user 'user' --auth-password 'pass' --tls '1' --hide-send '1' --dump --xclient-addr '192.168.0.4' --xclient-optional '1' --proxy-version '1' --proxy-family 'TCP4' --proxy-source '192.168.0.5' --proxy-source-port '111' --proxy-dest '1.1.1.1' --proxy-dest-port '26'
+  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --quit-after 'mail' --auth-user 'user' --auth-password 'pass' --tls --hide-send --dump --xclient-addr '192.168.0.4' --xclient-optional --proxy-version '1' --proxy-family 'TCP4' --proxy-source '192.168.0.5' --proxy-source-port '111' --proxy-dest '1.1.1.1' --proxy-dest-port '26'
 
 Output Info:
   show_time_lapse    = FALSE
diff --git a/testing/regressions/_exec-output-dump/out-ref/0554.stdout b/testing/regressions/_exec-output-dump/out-ref/0554.stdout
index c3e677b9..1263d8ae 100644
--- a/testing/regressions/_exec-output-dump/out-ref/0554.stdout
+++ b/testing/regressions/_exec-output-dump/out-ref/0554.stdout
@@ -1,6 +1,6 @@
 App Info:
   X-Mailer = swaks v99999999.9 jetmore.org/john/code/swaks/
-  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --dump-as-body 'app,auth' --dump-as-body-shows-password '1' --auth-user 'TEST_USER' --auth-password 'TEST_PASS' --auth-hide-password 'CUSTOM_PASSWORD_REPLACEMENT' --dump 'app,auth,data'
+  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --dump-as-body 'app,auth' --dump-as-body-shows-password --auth-user 'TEST_USER' --auth-password 'TEST_PASS' --auth-hide-password 'CUSTOM_PASSWORD_REPLACEMENT' --dump 'app,auth,data'
 
 Authentication Info:
   auth           = required
@@ -28,7 +28,7 @@ X-Mailer: swaks v99999999.9 jetmore.org/john/code/swaks/
 
 App Info:
   X-Mailer = swaks v99999999.9 jetmore.org/john/code/swaks/
-  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --dump-as-body 'app,auth' --dump-as-body-shows-password '1' --auth-user 'TEST_USER' --auth-password 'TEST_PASS' --auth-hide-password 'CUSTOM_PASSWORD_REPLACEMENT' --dump 'app,auth,data'
+  Cmd Line = %SWAKS_COMMAND% --from 'from@host1.nodns.test.swaks.net' --to 'user@host1.nodns.test.swaks.net' --helo 'host1.nodns.test.swaks.net' --server 'ser.ver' --dump-as-body 'app,auth' --dump-as-body-shows-password --auth-user 'TEST_USER' --auth-password 'TEST_PASS' --auth-hide-password 'CUSTOM_PASSWORD_REPLACEMENT' --dump 'app,auth,data'
 
 Authentication Info:
   auth           = required
diff --git a/testing/regressions/_options-auth/00713.test b/testing/regressions/_options-auth/00713.test
index 7f2f7084..8bf3726e 100644
--- a/testing/regressions/_options-auth/00713.test
+++ b/testing/regressions/_options-auth/00713.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: apt, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'apt \nno-apt'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'apt\nno-apt'
 test action: CMD_CAPTURE %SWAKS% --dump AUTH --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au USER --ap PASS \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-auth/00763.test b/testing/regressions/_options-auth/00763.test
index 681f4dcd..93ea33e1 100644
--- a/testing/regressions/_options-auth/00763.test
+++ b/testing/regressions/_options-auth/00763.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: auth-plaintext, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'auth-plaintext \nno-auth-plaintext'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'auth-plaintext\nno-auth-plaintext'
 test action: CMD_CAPTURE %SWAKS% --dump AUTH --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au USER --ap PASS \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-data/00203.test b/testing/regressions/_options-data/00203.test
index 097fb00a..1704a106 100644
--- a/testing/regressions/_options-data/00203.test
+++ b/testing/regressions/_options-data/00203.test
@@ -5,4 +5,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 title: dabsp, command line, no-option
 
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au auth_user --ap auth_pass --dab AUTH \
-    --dabsp '' --no-dabsp
+    --dabsp --no-dabsp
diff --git a/testing/regressions/_options-data/00213.test b/testing/regressions/_options-data/00213.test
index a4f518a6..38eebe01 100644
--- a/testing/regressions/_options-data/00213.test
+++ b/testing/regressions/_options-data/00213.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: dabsp, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dabsp \nno-dabsp'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dabsp\nno-dabsp'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au auth_user --ap auth_pass --dab AUTH \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-data/00253.test b/testing/regressions/_options-data/00253.test
index 3f065337..e816e6cc 100644
--- a/testing/regressions/_options-data/00253.test
+++ b/testing/regressions/_options-data/00253.test
@@ -5,4 +5,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 title: dump-as-body-shows-password, command line, no-option
 
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au auth_user --ap auth_pass --dab AUTH \
-    --dump-as-body-shows-password '' --no-dump-as-body-shows-password
+    --dump-as-body-shows-password --no-dump-as-body-shows-password
diff --git a/testing/regressions/_options-data/00263.test b/testing/regressions/_options-data/00263.test
index d198d131..cab87572 100644
--- a/testing/regressions/_options-data/00263.test
+++ b/testing/regressions/_options-data/00263.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: dump-as-body-shows-password, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dump-as-body-shows-password \nno-dump-as-body-shows-password'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dump-as-body-shows-password\nno-dump-as-body-shows-password'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --au auth_user --ap auth_pass --dab AUTH \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-data/01203.test b/testing/regressions/_options-data/01203.test
index f0bf03ee..eb79bad4 100644
--- a/testing/regressions/_options-data/01203.test
+++ b/testing/regressions/_options-data/01203.test
@@ -4,4 +4,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: ndf, command line, no-option
 
-test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --ndf '' --no-ndf
+test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --ndf --no-ndf
diff --git a/testing/regressions/_options-data/01213.test b/testing/regressions/_options-data/01213.test
index a27a75c0..6147b0ca 100644
--- a/testing/regressions/_options-data/01213.test
+++ b/testing/regressions/_options-data/01213.test
@@ -4,5 +4,5 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: ndf, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'ndf \nno-ndf'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'ndf\nno-ndf'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-data/01253.test b/testing/regressions/_options-data/01253.test
index 6eaeb9ca..8a64374d 100644
--- a/testing/regressions/_options-data/01253.test
+++ b/testing/regressions/_options-data/01253.test
@@ -4,4 +4,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-data-fixup, command line, no-option
 
-test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --no-data-fixup '' --no-no-data-fixup
+test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --no-data-fixup --no-no-data-fixup
diff --git a/testing/regressions/_options-data/01263.test b/testing/regressions/_options-data/01263.test
index 26464e08..75507ff3 100644
--- a/testing/regressions/_options-data/01263.test
+++ b/testing/regressions/_options-data/01263.test
@@ -4,5 +4,5 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-data-fixup, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-data-fixup \nno-no-data-fixup'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-data-fixup\nno-no-data-fixup'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-data/01303.test b/testing/regressions/_options-data/01303.test
index 59dfd170..4bcacc09 100644
--- a/testing/regressions/_options-data/01303.test
+++ b/testing/regressions/_options-data/01303.test
@@ -4,4 +4,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nsf, command line, no-option
 
-test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --nsf '' --no-nsf --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
+test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --nsf --no-nsf --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
diff --git a/testing/regressions/_options-data/01313.test b/testing/regressions/_options-data/01313.test
index 6a1e406b..4a280ac1 100644
--- a/testing/regressions/_options-data/01313.test
+++ b/testing/regressions/_options-data/01313.test
@@ -4,5 +4,5 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nsf, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nsf \nno-nsf'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nsf\nno-nsf'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --config %OUTDIR%/swaksrc-%TESTID% --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
diff --git a/testing/regressions/_options-data/01353.test b/testing/regressions/_options-data/01353.test
index a3fbd06f..d1dd181b 100644
--- a/testing/regressions/_options-data/01353.test
+++ b/testing/regressions/_options-data/01353.test
@@ -4,4 +4,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-strip-from, command line, no-option
 
-test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --no-strip-from '' --no-no-strip-from --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
+test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --no-strip-from --no-no-strip-from --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
diff --git a/testing/regressions/_options-data/01363.test b/testing/regressions/_options-data/01363.test
index 1a0bc391..158ee85b 100644
--- a/testing/regressions/_options-data/01363.test
+++ b/testing/regressions/_options-data/01363.test
@@ -4,5 +4,5 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-strip-from, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-strip-from \nno-no-strip-from'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-strip-from\nno-no-strip-from'
 test action: CMD_CAPTURE %SWAKS% --dump DATA --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --config %OUTDIR%/swaksrc-%TESTID% --data "From example@host1.nodns.test.swaks.net Fri Jun 23 02:56:55 2000%NEWLINE%From: Foo%NEWLINE%Subject: Bar%NEWLINE%%NEWLINE%test body"
diff --git a/testing/regressions/_options-output/00013.test b/testing/regressions/_options-output/00013.test
index 70cbae55..c0eb852c 100644
--- a/testing/regressions/_options-output/00013.test
+++ b/testing/regressions/_options-output/00013.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: suppress-data, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'suppress-data \nno-suppress-data'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'suppress-data\nno-suppress-data'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00063.test b/testing/regressions/_options-output/00063.test
index 55786807..e03b30f5 100644
--- a/testing/regressions/_options-output/00063.test
+++ b/testing/regressions/_options-output/00063.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: n, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'n \nno-n'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'n\nno-n'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00213.test b/testing/regressions/_options-output/00213.test
index 425f69fd..ae90dd60 100644
--- a/testing/regressions/_options-output/00213.test
+++ b/testing/regressions/_options-output/00213.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-info-hints, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-info-hints \nno-no-info-hints'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-info-hints\nno-no-info-hints'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00263.test b/testing/regressions/_options-output/00263.test
index fe5720a0..44a6b5d2 100644
--- a/testing/regressions/_options-output/00263.test
+++ b/testing/regressions/_options-output/00263.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nih, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nih \nno-nih'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nih\nno-nih'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00313.test b/testing/regressions/_options-output/00313.test
index 815480cc..0ac7bba3 100644
--- a/testing/regressions/_options-output/00313.test
+++ b/testing/regressions/_options-output/00313.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-send-hints, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-send-hints \nno-no-send-hints'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-send-hints\nno-no-send-hints'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00363.test b/testing/regressions/_options-output/00363.test
index f50ae93a..786929f0 100644
--- a/testing/regressions/_options-output/00363.test
+++ b/testing/regressions/_options-output/00363.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nsh, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nsh \nno-nsh'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nsh\nno-nsh'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00413.test b/testing/regressions/_options-output/00413.test
index baf4bf91..c5034682 100644
--- a/testing/regressions/_options-output/00413.test
+++ b/testing/regressions/_options-output/00413.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-receive-hints, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-receive-hints \nno-no-receive-hints'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-receive-hints\nno-no-receive-hints'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00463.test b/testing/regressions/_options-output/00463.test
index 3be73058..e1c5c033 100644
--- a/testing/regressions/_options-output/00463.test
+++ b/testing/regressions/_options-output/00463.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nrh, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nrh \nno-nrh'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nrh\nno-nrh'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00513.test b/testing/regressions/_options-output/00513.test
index b332ef85..2cf05ef3 100644
--- a/testing/regressions/_options-output/00513.test
+++ b/testing/regressions/_options-output/00513.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: no-hints, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-hints \nno-no-hints'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-hints\nno-no-hints'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00563.test b/testing/regressions/_options-output/00563.test
index 70b915ba..cc9e7704 100644
--- a/testing/regressions/_options-output/00563.test
+++ b/testing/regressions/_options-output/00563.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: nth, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nth \nno-nth'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'nth\nno-nth'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00613.test b/testing/regressions/_options-output/00613.test
index 8a775568..8106847d 100644
--- a/testing/regressions/_options-output/00613.test
+++ b/testing/regressions/_options-output/00613.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: protect-prompt, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'protect-prompt \nno-protect-prompt'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'protect-prompt\nno-protect-prompt'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00663.test b/testing/regressions/_options-output/00663.test
index d4829e94..63b09ffb 100644
--- a/testing/regressions/_options-output/00663.test
+++ b/testing/regressions/_options-output/00663.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: pp, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'pp \nno-pp'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'pp\nno-pp'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00713.test b/testing/regressions/_options-output/00713.test
index 67ee9599..9d1800d1 100644
--- a/testing/regressions/_options-output/00713.test
+++ b/testing/regressions/_options-output/00713.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hide-receive, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-receive \nno-hide-receive'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-receive\nno-hide-receive'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00763.test b/testing/regressions/_options-output/00763.test
index 02e062b5..92410677 100644
--- a/testing/regressions/_options-output/00763.test
+++ b/testing/regressions/_options-output/00763.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hr, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hr \nno-hr'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hr\nno-hr'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00813.test b/testing/regressions/_options-output/00813.test
index f5780282..42bf682b 100644
--- a/testing/regressions/_options-output/00813.test
+++ b/testing/regressions/_options-output/00813.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hide-send, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-send \nno-hide-send'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-send\nno-hide-send'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00863.test b/testing/regressions/_options-output/00863.test
index 97095fbd..6a0de7d5 100644
--- a/testing/regressions/_options-output/00863.test
+++ b/testing/regressions/_options-output/00863.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hs, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hs \nno-hs'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hs\nno-hs'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00913.test b/testing/regressions/_options-output/00913.test
index 931c6d95..4822fe23 100644
--- a/testing/regressions/_options-output/00913.test
+++ b/testing/regressions/_options-output/00913.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hide-informational, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-informational \nno-hide-informational'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-informational\nno-hide-informational'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/00963.test b/testing/regressions/_options-output/00963.test
index 75e86745..a6e838a8 100644
--- a/testing/regressions/_options-output/00963.test
+++ b/testing/regressions/_options-output/00963.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hi, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hi \nno-hi'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hi\nno-hi'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01013.test b/testing/regressions/_options-output/01013.test
index 18e31d79..b7b08ded 100644
--- a/testing/regressions/_options-output/01013.test
+++ b/testing/regressions/_options-output/01013.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: hide-all, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-all \nno-hide-all'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'hide-all\nno-hide-all'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01063.test b/testing/regressions/_options-output/01063.test
index 138b5d8c..71bec36d 100644
--- a/testing/regressions/_options-output/01063.test
+++ b/testing/regressions/_options-output/01063.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: ha, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'ha \nno-ha'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'ha\nno-ha'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01213.test b/testing/regressions/_options-output/01213.test
index 904f6e6c..88861e39 100644
--- a/testing/regressions/_options-output/01213.test
+++ b/testing/regressions/_options-output/01213.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: support, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'support \nno-support'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'support\nno-support'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01263.test b/testing/regressions/_options-output/01263.test
index dd03eb27..0417b865 100644
--- a/testing/regressions/_options-output/01263.test
+++ b/testing/regressions/_options-output/01263.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: help, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'help \nno-help'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'help\nno-help'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01313.test b/testing/regressions/_options-output/01313.test
index 95fe3433..5b53cdef 100644
--- a/testing/regressions/_options-output/01313.test
+++ b/testing/regressions/_options-output/01313.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: version, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'version \nno-version'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'version\nno-version'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/01413.test b/testing/regressions/_options-output/01413.test
index 69b19cae..f7ef91db 100644
--- a/testing/regressions/_options-output/01413.test
+++ b/testing/regressions/_options-output/01413.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: dump-mail, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dump-mail \nno-dump-mail'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'dump-mail\nno-dump-mail'
 test action: CMD_CAPTURE %SWAKS% --dump OUTPUT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-output/out-ref/00002.stderr b/testing/regressions/_options-output/out-ref/00002.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00002.stderr
+++ b/testing/regressions/_options-output/out-ref/00002.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00002.stdout b/testing/regressions/_options-output/out-ref/00002.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00002.stdout
+++ b/testing/regressions/_options-output/out-ref/00002.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00012.stderr b/testing/regressions/_options-output/out-ref/00012.stderr
index e69de29b..69317bbf 100644
--- a/testing/regressions/_options-output/out-ref/00012.stderr
+++ b/testing/regressions/_options-output/out-ref/00012.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00012 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00012.stdout b/testing/regressions/_options-output/out-ref/00012.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00012.stdout
+++ b/testing/regressions/_options-output/out-ref/00012.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00022.stderr b/testing/regressions/_options-output/out-ref/00022.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00022.stderr
+++ b/testing/regressions/_options-output/out-ref/00022.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00022.stdout b/testing/regressions/_options-output/out-ref/00022.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00022.stdout
+++ b/testing/regressions/_options-output/out-ref/00022.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00052.stderr b/testing/regressions/_options-output/out-ref/00052.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00052.stderr
+++ b/testing/regressions/_options-output/out-ref/00052.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00052.stdout b/testing/regressions/_options-output/out-ref/00052.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00052.stdout
+++ b/testing/regressions/_options-output/out-ref/00052.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00062.stderr b/testing/regressions/_options-output/out-ref/00062.stderr
index e69de29b..84aa07b5 100644
--- a/testing/regressions/_options-output/out-ref/00062.stderr
+++ b/testing/regressions/_options-output/out-ref/00062.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00062 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00062.stdout b/testing/regressions/_options-output/out-ref/00062.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00062.stdout
+++ b/testing/regressions/_options-output/out-ref/00062.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00072.stderr b/testing/regressions/_options-output/out-ref/00072.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00072.stderr
+++ b/testing/regressions/_options-output/out-ref/00072.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00072.stdout b/testing/regressions/_options-output/out-ref/00072.stdout
index e8042f54..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00072.stdout
+++ b/testing/regressions/_options-output/out-ref/00072.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = TRUE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00202.stderr b/testing/regressions/_options-output/out-ref/00202.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00202.stderr
+++ b/testing/regressions/_options-output/out-ref/00202.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00202.stdout b/testing/regressions/_options-output/out-ref/00202.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00202.stdout
+++ b/testing/regressions/_options-output/out-ref/00202.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00212.stderr b/testing/regressions/_options-output/out-ref/00212.stderr
index e69de29b..b70774dd 100644
--- a/testing/regressions/_options-output/out-ref/00212.stderr
+++ b/testing/regressions/_options-output/out-ref/00212.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00212 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00212.stdout b/testing/regressions/_options-output/out-ref/00212.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00212.stdout
+++ b/testing/regressions/_options-output/out-ref/00212.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00222.stderr b/testing/regressions/_options-output/out-ref/00222.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00222.stderr
+++ b/testing/regressions/_options-output/out-ref/00222.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00222.stdout b/testing/regressions/_options-output/out-ref/00222.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00222.stdout
+++ b/testing/regressions/_options-output/out-ref/00222.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00252.stderr b/testing/regressions/_options-output/out-ref/00252.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00252.stderr
+++ b/testing/regressions/_options-output/out-ref/00252.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00252.stdout b/testing/regressions/_options-output/out-ref/00252.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00252.stdout
+++ b/testing/regressions/_options-output/out-ref/00252.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00262.stderr b/testing/regressions/_options-output/out-ref/00262.stderr
index e69de29b..9886556b 100644
--- a/testing/regressions/_options-output/out-ref/00262.stderr
+++ b/testing/regressions/_options-output/out-ref/00262.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00262 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00262.stdout b/testing/regressions/_options-output/out-ref/00262.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00262.stdout
+++ b/testing/regressions/_options-output/out-ref/00262.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00272.stderr b/testing/regressions/_options-output/out-ref/00272.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00272.stderr
+++ b/testing/regressions/_options-output/out-ref/00272.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00272.stdout b/testing/regressions/_options-output/out-ref/00272.stdout
index 5fe8a49a..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00272.stdout
+++ b/testing/regressions/_options-output/out-ref/00272.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = TRUE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00302.stderr b/testing/regressions/_options-output/out-ref/00302.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00302.stderr
+++ b/testing/regressions/_options-output/out-ref/00302.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00302.stdout b/testing/regressions/_options-output/out-ref/00302.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00302.stdout
+++ b/testing/regressions/_options-output/out-ref/00302.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00312.stderr b/testing/regressions/_options-output/out-ref/00312.stderr
index e69de29b..99fe3101 100644
--- a/testing/regressions/_options-output/out-ref/00312.stderr
+++ b/testing/regressions/_options-output/out-ref/00312.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00312 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00312.stdout b/testing/regressions/_options-output/out-ref/00312.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00312.stdout
+++ b/testing/regressions/_options-output/out-ref/00312.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00322.stderr b/testing/regressions/_options-output/out-ref/00322.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00322.stderr
+++ b/testing/regressions/_options-output/out-ref/00322.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00322.stdout b/testing/regressions/_options-output/out-ref/00322.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00322.stdout
+++ b/testing/regressions/_options-output/out-ref/00322.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00352.stderr b/testing/regressions/_options-output/out-ref/00352.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00352.stderr
+++ b/testing/regressions/_options-output/out-ref/00352.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00352.stdout b/testing/regressions/_options-output/out-ref/00352.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00352.stdout
+++ b/testing/regressions/_options-output/out-ref/00352.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00362.stderr b/testing/regressions/_options-output/out-ref/00362.stderr
index e69de29b..115d480f 100644
--- a/testing/regressions/_options-output/out-ref/00362.stderr
+++ b/testing/regressions/_options-output/out-ref/00362.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00362 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00362.stdout b/testing/regressions/_options-output/out-ref/00362.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00362.stdout
+++ b/testing/regressions/_options-output/out-ref/00362.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00372.stderr b/testing/regressions/_options-output/out-ref/00372.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00372.stderr
+++ b/testing/regressions/_options-output/out-ref/00372.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00372.stdout b/testing/regressions/_options-output/out-ref/00372.stdout
index f248ace6..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00372.stdout
+++ b/testing/regressions/_options-output/out-ref/00372.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00402.stderr b/testing/regressions/_options-output/out-ref/00402.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00402.stderr
+++ b/testing/regressions/_options-output/out-ref/00402.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00402.stdout b/testing/regressions/_options-output/out-ref/00402.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00402.stdout
+++ b/testing/regressions/_options-output/out-ref/00402.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00412.stderr b/testing/regressions/_options-output/out-ref/00412.stderr
index e69de29b..8ff0dce6 100644
--- a/testing/regressions/_options-output/out-ref/00412.stderr
+++ b/testing/regressions/_options-output/out-ref/00412.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00412 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00412.stdout b/testing/regressions/_options-output/out-ref/00412.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00412.stdout
+++ b/testing/regressions/_options-output/out-ref/00412.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00422.stderr b/testing/regressions/_options-output/out-ref/00422.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00422.stderr
+++ b/testing/regressions/_options-output/out-ref/00422.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00422.stdout b/testing/regressions/_options-output/out-ref/00422.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00422.stdout
+++ b/testing/regressions/_options-output/out-ref/00422.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00452.stderr b/testing/regressions/_options-output/out-ref/00452.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00452.stderr
+++ b/testing/regressions/_options-output/out-ref/00452.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00452.stdout b/testing/regressions/_options-output/out-ref/00452.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00452.stdout
+++ b/testing/regressions/_options-output/out-ref/00452.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00462.stderr b/testing/regressions/_options-output/out-ref/00462.stderr
index e69de29b..f3c5ecb2 100644
--- a/testing/regressions/_options-output/out-ref/00462.stderr
+++ b/testing/regressions/_options-output/out-ref/00462.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00462 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00462.stdout b/testing/regressions/_options-output/out-ref/00462.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00462.stdout
+++ b/testing/regressions/_options-output/out-ref/00462.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00472.stderr b/testing/regressions/_options-output/out-ref/00472.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00472.stderr
+++ b/testing/regressions/_options-output/out-ref/00472.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00472.stdout b/testing/regressions/_options-output/out-ref/00472.stdout
index 698e7e56..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00472.stdout
+++ b/testing/regressions/_options-output/out-ref/00472.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00502.stderr b/testing/regressions/_options-output/out-ref/00502.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00502.stderr
+++ b/testing/regressions/_options-output/out-ref/00502.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00502.stdout b/testing/regressions/_options-output/out-ref/00502.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00502.stdout
+++ b/testing/regressions/_options-output/out-ref/00502.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00512.stderr b/testing/regressions/_options-output/out-ref/00512.stderr
index e69de29b..7fa049b9 100644
--- a/testing/regressions/_options-output/out-ref/00512.stderr
+++ b/testing/regressions/_options-output/out-ref/00512.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00512 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00512.stdout b/testing/regressions/_options-output/out-ref/00512.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00512.stdout
+++ b/testing/regressions/_options-output/out-ref/00512.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00522.stderr b/testing/regressions/_options-output/out-ref/00522.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00522.stderr
+++ b/testing/regressions/_options-output/out-ref/00522.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00522.stdout b/testing/regressions/_options-output/out-ref/00522.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00522.stdout
+++ b/testing/regressions/_options-output/out-ref/00522.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00552.stderr b/testing/regressions/_options-output/out-ref/00552.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00552.stderr
+++ b/testing/regressions/_options-output/out-ref/00552.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00552.stdout b/testing/regressions/_options-output/out-ref/00552.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00552.stdout
+++ b/testing/regressions/_options-output/out-ref/00552.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00562.stderr b/testing/regressions/_options-output/out-ref/00562.stderr
index e69de29b..73a86cc7 100644
--- a/testing/regressions/_options-output/out-ref/00562.stderr
+++ b/testing/regressions/_options-output/out-ref/00562.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00562 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00562.stdout b/testing/regressions/_options-output/out-ref/00562.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00562.stdout
+++ b/testing/regressions/_options-output/out-ref/00562.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00572.stderr b/testing/regressions/_options-output/out-ref/00572.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00572.stderr
+++ b/testing/regressions/_options-output/out-ref/00572.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00572.stdout b/testing/regressions/_options-output/out-ref/00572.stdout
index f326abcd..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00572.stdout
+++ b/testing/regressions/_options-output/out-ref/00572.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = TRUE
-  no_hints_recv      = TRUE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00602.stderr b/testing/regressions/_options-output/out-ref/00602.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00602.stderr
+++ b/testing/regressions/_options-output/out-ref/00602.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00602.stdout b/testing/regressions/_options-output/out-ref/00602.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00602.stdout
+++ b/testing/regressions/_options-output/out-ref/00602.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00612.stderr b/testing/regressions/_options-output/out-ref/00612.stderr
index e69de29b..41d4e0cd 100644
--- a/testing/regressions/_options-output/out-ref/00612.stderr
+++ b/testing/regressions/_options-output/out-ref/00612.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00612 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00612.stdout b/testing/regressions/_options-output/out-ref/00612.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00612.stdout
+++ b/testing/regressions/_options-output/out-ref/00612.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00622.stderr b/testing/regressions/_options-output/out-ref/00622.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00622.stderr
+++ b/testing/regressions/_options-output/out-ref/00622.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00622.stdout b/testing/regressions/_options-output/out-ref/00622.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00622.stdout
+++ b/testing/regressions/_options-output/out-ref/00622.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00652.stderr b/testing/regressions/_options-output/out-ref/00652.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00652.stderr
+++ b/testing/regressions/_options-output/out-ref/00652.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00652.stdout b/testing/regressions/_options-output/out-ref/00652.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00652.stdout
+++ b/testing/regressions/_options-output/out-ref/00652.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00662.stderr b/testing/regressions/_options-output/out-ref/00662.stderr
index e69de29b..b37f7e59 100644
--- a/testing/regressions/_options-output/out-ref/00662.stderr
+++ b/testing/regressions/_options-output/out-ref/00662.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00662 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00662.stdout b/testing/regressions/_options-output/out-ref/00662.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00662.stdout
+++ b/testing/regressions/_options-output/out-ref/00662.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00672.stderr b/testing/regressions/_options-output/out-ref/00672.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00672.stderr
+++ b/testing/regressions/_options-output/out-ref/00672.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00672.stdout b/testing/regressions/_options-output/out-ref/00672.stdout
index 96fa921f..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00672.stdout
+++ b/testing/regressions/_options-output/out-ref/00672.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = TRUE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00702.stderr b/testing/regressions/_options-output/out-ref/00702.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00702.stderr
+++ b/testing/regressions/_options-output/out-ref/00702.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00702.stdout b/testing/regressions/_options-output/out-ref/00702.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00702.stdout
+++ b/testing/regressions/_options-output/out-ref/00702.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00712.stderr b/testing/regressions/_options-output/out-ref/00712.stderr
index e69de29b..18e5a43e 100644
--- a/testing/regressions/_options-output/out-ref/00712.stderr
+++ b/testing/regressions/_options-output/out-ref/00712.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00712 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00712.stdout b/testing/regressions/_options-output/out-ref/00712.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00712.stdout
+++ b/testing/regressions/_options-output/out-ref/00712.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00722.stderr b/testing/regressions/_options-output/out-ref/00722.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00722.stderr
+++ b/testing/regressions/_options-output/out-ref/00722.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00722.stdout b/testing/regressions/_options-output/out-ref/00722.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00722.stdout
+++ b/testing/regressions/_options-output/out-ref/00722.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00752.stderr b/testing/regressions/_options-output/out-ref/00752.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00752.stderr
+++ b/testing/regressions/_options-output/out-ref/00752.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00752.stdout b/testing/regressions/_options-output/out-ref/00752.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00752.stdout
+++ b/testing/regressions/_options-output/out-ref/00752.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00762.stderr b/testing/regressions/_options-output/out-ref/00762.stderr
index e69de29b..c092ffc2 100644
--- a/testing/regressions/_options-output/out-ref/00762.stderr
+++ b/testing/regressions/_options-output/out-ref/00762.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00762 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00762.stdout b/testing/regressions/_options-output/out-ref/00762.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00762.stdout
+++ b/testing/regressions/_options-output/out-ref/00762.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00772.stderr b/testing/regressions/_options-output/out-ref/00772.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00772.stderr
+++ b/testing/regressions/_options-output/out-ref/00772.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00772.stdout b/testing/regressions/_options-output/out-ref/00772.stdout
index 52d1f0b2..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00772.stdout
+++ b/testing/regressions/_options-output/out-ref/00772.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = TRUE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00802.stderr b/testing/regressions/_options-output/out-ref/00802.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00802.stderr
+++ b/testing/regressions/_options-output/out-ref/00802.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00802.stdout b/testing/regressions/_options-output/out-ref/00802.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00802.stdout
+++ b/testing/regressions/_options-output/out-ref/00802.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00812.stderr b/testing/regressions/_options-output/out-ref/00812.stderr
index e69de29b..a1ba1554 100644
--- a/testing/regressions/_options-output/out-ref/00812.stderr
+++ b/testing/regressions/_options-output/out-ref/00812.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00812 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00812.stdout b/testing/regressions/_options-output/out-ref/00812.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00812.stdout
+++ b/testing/regressions/_options-output/out-ref/00812.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00822.stderr b/testing/regressions/_options-output/out-ref/00822.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00822.stderr
+++ b/testing/regressions/_options-output/out-ref/00822.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00822.stdout b/testing/regressions/_options-output/out-ref/00822.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00822.stdout
+++ b/testing/regressions/_options-output/out-ref/00822.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00852.stderr b/testing/regressions/_options-output/out-ref/00852.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00852.stderr
+++ b/testing/regressions/_options-output/out-ref/00852.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00852.stdout b/testing/regressions/_options-output/out-ref/00852.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00852.stdout
+++ b/testing/regressions/_options-output/out-ref/00852.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00862.stderr b/testing/regressions/_options-output/out-ref/00862.stderr
index e69de29b..d9652f09 100644
--- a/testing/regressions/_options-output/out-ref/00862.stderr
+++ b/testing/regressions/_options-output/out-ref/00862.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00862 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00862.stdout b/testing/regressions/_options-output/out-ref/00862.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00862.stdout
+++ b/testing/regressions/_options-output/out-ref/00862.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00872.stderr b/testing/regressions/_options-output/out-ref/00872.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00872.stderr
+++ b/testing/regressions/_options-output/out-ref/00872.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00872.stdout b/testing/regressions/_options-output/out-ref/00872.stdout
index af3dff52..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00872.stdout
+++ b/testing/regressions/_options-output/out-ref/00872.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = TRUE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00902.stderr b/testing/regressions/_options-output/out-ref/00902.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00902.stderr
+++ b/testing/regressions/_options-output/out-ref/00902.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00902.stdout b/testing/regressions/_options-output/out-ref/00902.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00902.stdout
+++ b/testing/regressions/_options-output/out-ref/00902.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00912.stderr b/testing/regressions/_options-output/out-ref/00912.stderr
index e69de29b..4bc68f90 100644
--- a/testing/regressions/_options-output/out-ref/00912.stderr
+++ b/testing/regressions/_options-output/out-ref/00912.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00912 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00912.stdout b/testing/regressions/_options-output/out-ref/00912.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00912.stdout
+++ b/testing/regressions/_options-output/out-ref/00912.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00922.stderr b/testing/regressions/_options-output/out-ref/00922.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00922.stderr
+++ b/testing/regressions/_options-output/out-ref/00922.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00922.stdout b/testing/regressions/_options-output/out-ref/00922.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00922.stdout
+++ b/testing/regressions/_options-output/out-ref/00922.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00952.stderr b/testing/regressions/_options-output/out-ref/00952.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/00952.stderr
+++ b/testing/regressions/_options-output/out-ref/00952.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00952.stdout b/testing/regressions/_options-output/out-ref/00952.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00952.stdout
+++ b/testing/regressions/_options-output/out-ref/00952.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00962.stderr b/testing/regressions/_options-output/out-ref/00962.stderr
index e69de29b..1e425901 100644
--- a/testing/regressions/_options-output/out-ref/00962.stderr
+++ b/testing/regressions/_options-output/out-ref/00962.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00962 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00962.stdout b/testing/regressions/_options-output/out-ref/00962.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00962.stdout
+++ b/testing/regressions/_options-output/out-ref/00962.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/00972.stderr b/testing/regressions/_options-output/out-ref/00972.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/00972.stderr
+++ b/testing/regressions/_options-output/out-ref/00972.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/00972.stdout b/testing/regressions/_options-output/out-ref/00972.stdout
index 952b5981..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/00972.stdout
+++ b/testing/regressions/_options-output/out-ref/00972.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = TRUE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01002.stderr b/testing/regressions/_options-output/out-ref/01002.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01002.stderr
+++ b/testing/regressions/_options-output/out-ref/01002.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01002.stdout b/testing/regressions/_options-output/out-ref/01002.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01002.stdout
+++ b/testing/regressions/_options-output/out-ref/01002.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01012.stderr b/testing/regressions/_options-output/out-ref/01012.stderr
index e69de29b..02f08500 100644
--- a/testing/regressions/_options-output/out-ref/01012.stderr
+++ b/testing/regressions/_options-output/out-ref/01012.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01012 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01012.stdout b/testing/regressions/_options-output/out-ref/01012.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01012.stdout
+++ b/testing/regressions/_options-output/out-ref/01012.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01022.stderr b/testing/regressions/_options-output/out-ref/01022.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01022.stderr
+++ b/testing/regressions/_options-output/out-ref/01022.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01022.stdout b/testing/regressions/_options-output/out-ref/01022.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01022.stdout
+++ b/testing/regressions/_options-output/out-ref/01022.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01052.stderr b/testing/regressions/_options-output/out-ref/01052.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01052.stderr
+++ b/testing/regressions/_options-output/out-ref/01052.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01052.stdout b/testing/regressions/_options-output/out-ref/01052.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01052.stdout
+++ b/testing/regressions/_options-output/out-ref/01052.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01062.stderr b/testing/regressions/_options-output/out-ref/01062.stderr
index e69de29b..126fc5da 100644
--- a/testing/regressions/_options-output/out-ref/01062.stderr
+++ b/testing/regressions/_options-output/out-ref/01062.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01062 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01062.stdout b/testing/regressions/_options-output/out-ref/01062.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01062.stdout
+++ b/testing/regressions/_options-output/out-ref/01062.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01072.stderr b/testing/regressions/_options-output/out-ref/01072.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01072.stderr
+++ b/testing/regressions/_options-output/out-ref/01072.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01072.stdout b/testing/regressions/_options-output/out-ref/01072.stdout
index 52b826b4..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01072.stdout
+++ b/testing/regressions/_options-output/out-ref/01072.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = TRUE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01102.stderr b/testing/regressions/_options-output/out-ref/01102.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01102.stderr
+++ b/testing/regressions/_options-output/out-ref/01102.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01102.stdout b/testing/regressions/_options-output/out-ref/01102.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01102.stdout
+++ b/testing/regressions/_options-output/out-ref/01102.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01112.stderr b/testing/regressions/_options-output/out-ref/01112.stderr
index e69de29b..673ae1a0 100644
--- a/testing/regressions/_options-output/out-ref/01112.stderr
+++ b/testing/regressions/_options-output/out-ref/01112.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01112 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01112.stdout b/testing/regressions/_options-output/out-ref/01112.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01112.stdout
+++ b/testing/regressions/_options-output/out-ref/01112.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01122.stderr b/testing/regressions/_options-output/out-ref/01122.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01122.stderr
+++ b/testing/regressions/_options-output/out-ref/01122.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01122.stdout b/testing/regressions/_options-output/out-ref/01122.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01122.stdout
+++ b/testing/regressions/_options-output/out-ref/01122.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01152.stderr b/testing/regressions/_options-output/out-ref/01152.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01152.stderr
+++ b/testing/regressions/_options-output/out-ref/01152.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01152.stdout b/testing/regressions/_options-output/out-ref/01152.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01152.stdout
+++ b/testing/regressions/_options-output/out-ref/01152.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01162.stderr b/testing/regressions/_options-output/out-ref/01162.stderr
index e69de29b..35ebc6b1 100644
--- a/testing/regressions/_options-output/out-ref/01162.stderr
+++ b/testing/regressions/_options-output/out-ref/01162.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01162 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01162.stdout b/testing/regressions/_options-output/out-ref/01162.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01162.stdout
+++ b/testing/regressions/_options-output/out-ref/01162.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01172.stderr b/testing/regressions/_options-output/out-ref/01172.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01172.stderr
+++ b/testing/regressions/_options-output/out-ref/01172.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01172.stdout b/testing/regressions/_options-output/out-ref/01172.stdout
index 6f8466c0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01172.stdout
+++ b/testing/regressions/_options-output/out-ref/01172.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 1
-  dump_mail          = FALSE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01202.stderr b/testing/regressions/_options-output/out-ref/01202.stderr
index 161b8d9a..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01202.stderr
+++ b/testing/regressions/_options-output/out-ref/01202.stderr
@@ -1 +1 @@
-*** AUTH NTLM not available: requires Authen::NTLM
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01202.stdout b/testing/regressions/_options-output/out-ref/01202.stdout
index 8b2cb418..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01202.stdout
+++ b/testing/regressions/_options-output/out-ref/01202.stdout
@@ -1,13 +0,0 @@
-=== AUTH CRAM-MD5 supported
-=== AUTH CRAM-SHA1 supported
-=== AUTH DIGEST-MD5 supported
-=== Basic AUTH supported
-=== Date Manipulation supported
-=== High Resolution Timing supported
-=== IPv6 supported
-=== Local Hostname Detection supported
-=== MX Routing supported
-=== Netrc Credentials supported
-=== Pipe Transport supported
-=== Socket Transport supported
-=== TLS supported
diff --git a/testing/regressions/_options-output/out-ref/01212.stderr b/testing/regressions/_options-output/out-ref/01212.stderr
index 161b8d9a..3c5d83b1 100644
--- a/testing/regressions/_options-output/out-ref/01212.stderr
+++ b/testing/regressions/_options-output/out-ref/01212.stderr
@@ -1 +1 @@
-*** AUTH NTLM not available: requires Authen::NTLM
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01212 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01212.stdout b/testing/regressions/_options-output/out-ref/01212.stdout
index 8b2cb418..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01212.stdout
+++ b/testing/regressions/_options-output/out-ref/01212.stdout
@@ -1,13 +0,0 @@
-=== AUTH CRAM-MD5 supported
-=== AUTH CRAM-SHA1 supported
-=== AUTH DIGEST-MD5 supported
-=== Basic AUTH supported
-=== Date Manipulation supported
-=== High Resolution Timing supported
-=== IPv6 supported
-=== Local Hostname Detection supported
-=== MX Routing supported
-=== Netrc Credentials supported
-=== Pipe Transport supported
-=== Socket Transport supported
-=== TLS supported
diff --git a/testing/regressions/_options-output/out-ref/01222.stderr b/testing/regressions/_options-output/out-ref/01222.stderr
index 161b8d9a..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01222.stderr
+++ b/testing/regressions/_options-output/out-ref/01222.stderr
@@ -1 +1 @@
-*** AUTH NTLM not available: requires Authen::NTLM
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01222.stdout b/testing/regressions/_options-output/out-ref/01222.stdout
index 8b2cb418..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01222.stdout
+++ b/testing/regressions/_options-output/out-ref/01222.stdout
@@ -1,13 +0,0 @@
-=== AUTH CRAM-MD5 supported
-=== AUTH CRAM-SHA1 supported
-=== AUTH DIGEST-MD5 supported
-=== Basic AUTH supported
-=== Date Manipulation supported
-=== High Resolution Timing supported
-=== IPv6 supported
-=== Local Hostname Detection supported
-=== MX Routing supported
-=== Netrc Credentials supported
-=== Pipe Transport supported
-=== Socket Transport supported
-=== TLS supported
diff --git a/testing/regressions/_options-output/out-ref/01252.stderr b/testing/regressions/_options-output/out-ref/01252.stderr
index 4e775184..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01252.stderr
+++ b/testing/regressions/_options-output/out-ref/01252.stderr
@@ -1 +1 @@
-No documentation found for "%SWAKS_COMMAND%".
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01262.stderr b/testing/regressions/_options-output/out-ref/01262.stderr
index 4e775184..f1b6cc29 100644
--- a/testing/regressions/_options-output/out-ref/01262.stderr
+++ b/testing/regressions/_options-output/out-ref/01262.stderr
@@ -1 +1 @@
-No documentation found for "%SWAKS_COMMAND%".
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01262 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01272.stderr b/testing/regressions/_options-output/out-ref/01272.stderr
index 4e775184..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01272.stderr
+++ b/testing/regressions/_options-output/out-ref/01272.stderr
@@ -1 +1 @@
-No documentation found for "%SWAKS_COMMAND%".
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01302.stderr b/testing/regressions/_options-output/out-ref/01302.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01302.stderr
+++ b/testing/regressions/_options-output/out-ref/01302.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01302.stdout b/testing/regressions/_options-output/out-ref/01302.stdout
index 89a473e0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01302.stdout
+++ b/testing/regressions/_options-output/out-ref/01302.stdout
@@ -1,18 +0,0 @@
-swaks version DEVRELEASE
-
-        Copyright (c) 2003-2008,2010-2019 John Jetmore <jj33@pobox.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
diff --git a/testing/regressions/_options-output/out-ref/01312.stderr b/testing/regressions/_options-output/out-ref/01312.stderr
index e69de29b..ec3e5a48 100644
--- a/testing/regressions/_options-output/out-ref/01312.stderr
+++ b/testing/regressions/_options-output/out-ref/01312.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01312 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01312.stdout b/testing/regressions/_options-output/out-ref/01312.stdout
index 89a473e0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01312.stdout
+++ b/testing/regressions/_options-output/out-ref/01312.stdout
@@ -1,18 +0,0 @@
-swaks version DEVRELEASE
-
-        Copyright (c) 2003-2008,2010-2019 John Jetmore <jj33@pobox.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
diff --git a/testing/regressions/_options-output/out-ref/01322.stderr b/testing/regressions/_options-output/out-ref/01322.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01322.stderr
+++ b/testing/regressions/_options-output/out-ref/01322.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01322.stdout b/testing/regressions/_options-output/out-ref/01322.stdout
index 89a473e0..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01322.stdout
+++ b/testing/regressions/_options-output/out-ref/01322.stdout
@@ -1,18 +0,0 @@
-swaks version DEVRELEASE
-
-        Copyright (c) 2003-2008,2010-2019 John Jetmore <jj33@pobox.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
diff --git a/testing/regressions/_options-output/out-ref/01402.stderr b/testing/regressions/_options-output/out-ref/01402.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-output/out-ref/01402.stderr
+++ b/testing/regressions/_options-output/out-ref/01402.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01402.stdout b/testing/regressions/_options-output/out-ref/01402.stdout
index 051e1a73..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01402.stdout
+++ b/testing/regressions/_options-output/out-ref/01402.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = TRUE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01412.stderr b/testing/regressions/_options-output/out-ref/01412.stderr
index e69de29b..eb7042ef 100644
--- a/testing/regressions/_options-output/out-ref/01412.stderr
+++ b/testing/regressions/_options-output/out-ref/01412.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-01412 ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01412.stdout b/testing/regressions/_options-output/out-ref/01412.stdout
index 051e1a73..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01412.stdout
+++ b/testing/regressions/_options-output/out-ref/01412.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = TRUE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-output/out-ref/01422.stderr b/testing/regressions/_options-output/out-ref/01422.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-output/out-ref/01422.stderr
+++ b/testing/regressions/_options-output/out-ref/01422.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-output/out-ref/01422.stdout b/testing/regressions/_options-output/out-ref/01422.stdout
index 051e1a73..e69de29b 100644
--- a/testing/regressions/_options-output/out-ref/01422.stdout
+++ b/testing/regressions/_options-output/out-ref/01422.stdout
@@ -1,16 +0,0 @@
-Output Info:
-  show_time_lapse    = FALSE
-  show_raw_text      = FALSE
-  suppress_data      = FALSE
-  protect_prompt     = FALSE
-  no_hints_send      = FALSE
-  no_hints_recv      = FALSE
-  no_hints_info      = FALSE
-  silent             = 0
-  dump_mail          = TRUE
-  hide_send          = FALSE
-  hide_receive       = FALSE
-  hide_informational = FALSE
-  hide_all           = FALSE
-  trans_fh_of        = STDOUT (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
-  trans_fh_ef        = STDERR (GLOB(0xdeadbeef),GLOB(0xdeadbeef))
diff --git a/testing/regressions/_options-processing/0021.test b/testing/regressions/_options-processing/0021.test
new file mode 100644
index 00000000..06c16d92
--- /dev/null
+++ b/testing/regressions/_options-processing/0021.test
@@ -0,0 +1,6 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: no spaces equates to no argument
+
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-data-fixup\n'
+test action: CMD_CAPTURE %SWAKS% --dump APP,TRANSPORT --to user@host1.nodns.test.swaks.net --server ser.ver --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-processing/0022.test b/testing/regressions/_options-processing/0022.test
new file mode 100644
index 00000000..c6e46d8a
--- /dev/null
+++ b/testing/regressions/_options-processing/0022.test
@@ -0,0 +1,6 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: no spaces equates to no argument
+
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-data-fixup \n'
+test action: CMD_CAPTURE %SWAKS% --dump APP,TRANSPORT --to user@host1.nodns.test.swaks.net --server ser.ver --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-processing/0080.test b/testing/regressions/_options-processing/0080.test
new file mode 100644
index 00000000..2da41963
--- /dev/null
+++ b/testing/regressions/_options-processing/0080.test
@@ -0,0 +1,6 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: non-opt/arg data that looks like an argument to an option that doesn't take one is an error
+
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'no-data-fixup non-opt-arg-data\n'
+test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net --server ser.ver --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-processing/0278.test b/testing/regressions/_options-processing/0278.test
new file mode 100644
index 00000000..ca630844
--- /dev/null
+++ b/testing/regressions/_options-processing/0278.test
@@ -0,0 +1,5 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: non-opt/arg data is error (mid options)
+
+test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net non-opt-arg-data --server ser.ver
diff --git a/testing/regressions/_options-processing/0279.test b/testing/regressions/_options-processing/0279.test
new file mode 100644
index 00000000..0d0d58ba
--- /dev/null
+++ b/testing/regressions/_options-processing/0279.test
@@ -0,0 +1,5 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: non-opt/arg data is error (end of options)
+
+test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net --server ser.ver non-opt-arg-data
diff --git a/testing/regressions/_options-processing/0280.test b/testing/regressions/_options-processing/0280.test
new file mode 100644
index 00000000..f6446d89
--- /dev/null
+++ b/testing/regressions/_options-processing/0280.test
@@ -0,0 +1,5 @@
+auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
+
+title: non-opt/arg data that looks like an argument to an option that doesn't take one is an error
+
+test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net --no-data-fixup non-opt-arg-data --server ser.ver
diff --git a/testing/regressions/_options-processing/out-ref/0021.stderr b/testing/regressions/_options-processing/out-ref/0021.stderr
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/out-ref/0021.stdout b/testing/regressions/_options-processing/out-ref/0021.stdout
new file mode 100644
index 00000000..0a678290
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0021.stdout
@@ -0,0 +1,12 @@
+App Info:
+  X-Mailer = swaks v99999999.9 jetmore.org/john/code/swaks/
+  Cmd Line = %SWAKS_COMMAND% --config '/path/to/OUTDIR/swaksrc-0021' --to 'user@host1.nodns.test.swaks.net' --server 'ser.ver' --no-data-fixup --dump 'APP,TRANSPORT'
+
+Transport Info:
+  type            = socket-inet
+  inet protocol   = any
+  server          = ser.ver
+  port            = 25
+  local interface = 
+  local port      = 
+  copy routing    = FALSE
diff --git a/testing/regressions/_options-processing/out-ref/0022.stderr b/testing/regressions/_options-processing/out-ref/0022.stderr
new file mode 100644
index 00000000..faedf925
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0022.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-0022 ('').  Exiting
diff --git a/testing/regressions/_options-processing/out-ref/0022.stdout b/testing/regressions/_options-processing/out-ref/0022.stdout
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/out-ref/0080.stderr b/testing/regressions/_options-processing/out-ref/0080.stderr
new file mode 100644
index 00000000..fb17ec2f
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0080.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-0080 ('non-opt-arg-data').  Exiting
diff --git a/testing/regressions/_options-processing/out-ref/0080.stdout b/testing/regressions/_options-processing/out-ref/0080.stdout
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/out-ref/0278.stderr b/testing/regressions/_options-processing/out-ref/0278.stderr
new file mode 100644
index 00000000..ca76af8c
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0278.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('non-opt-arg-data').  Exiting
diff --git a/testing/regressions/_options-processing/out-ref/0278.stdout b/testing/regressions/_options-processing/out-ref/0278.stdout
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/out-ref/0279.stderr b/testing/regressions/_options-processing/out-ref/0279.stderr
new file mode 100644
index 00000000..ca76af8c
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0279.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('non-opt-arg-data').  Exiting
diff --git a/testing/regressions/_options-processing/out-ref/0279.stdout b/testing/regressions/_options-processing/out-ref/0279.stdout
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/out-ref/0280.stderr b/testing/regressions/_options-processing/out-ref/0280.stderr
new file mode 100644
index 00000000..ca76af8c
--- /dev/null
+++ b/testing/regressions/_options-processing/out-ref/0280.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('non-opt-arg-data').  Exiting
diff --git a/testing/regressions/_options-processing/out-ref/0280.stdout b/testing/regressions/_options-processing/out-ref/0280.stdout
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/regressions/_options-processing/test.txt b/testing/regressions/_options-processing/test.txt
index 323f1fca..92837a58 100644
--- a/testing/regressions/_options-processing/test.txt
+++ b/testing/regressions/_options-processing/test.txt
@@ -35,6 +35,8 @@ testing
  18 - DATA works when none of SWAKS_DIR/HOME/LOGDIR are defined
  19 - --config + DATA work when none of SWAKS_DIR/HOME/LOGDIR are defined
  20 - --config inside of a config file is a NOP
+ 21 - no spaces equates to no argument
+ 22 - trailing space equates to an empty argument
  50 - quoting is not required. If quoted, quotes will be taken as data. leading spaces (after first) are included
  51 - test "from"
  52 - test "-from"
@@ -58,6 +60,10 @@ testing
  75 - --local-port --no-local-port (confirm no- works w/ an option that sorts before "no-", with arg)
  76 - --no-info-hints --no-no-info-hints (no- works w/ no- arguments)
  77 - --6 --no-6 --6 (confirm that the no- can be overridden)
+ #78 - non-opt/arg data is error (mid options) (not valid with config files)
+ #79 - non-opt/arg data is error (end of options) (not valid with config files)
+ 80 - non-opt/arg data that looks like an argument to an option that doesn't take one is an error
+
 
 
 0100 - test environment variable processing
@@ -82,6 +88,9 @@ testing
  75 - --local-port --no-local-port (confirm no- works w/ an option that sorts before "no-", with arg)
  76 - --no-info-hints --no-no-info-hints (no- works w/ no- arguments)
  #77 - --6 --no-6 --6 (confirm that the no- can be overridden) (this can't be done w/ env vars, leaving off)
+ #78 - non-opt/arg data is error (mid options) (not relevant with environment variables)
+ #79 - non-opt/arg data is error (end of options) (not relevant with environment variables)
+ #80 - non-opt/arg data that looks like an argument to an option that doesn't take one is an error (not relevant with environment variables)
 
 
 0200 - test command line processing
@@ -105,6 +114,9 @@ testing
  75 - --local-port --no-local-port (confirm no- works w/ an option that sorts before "no-", with arg)
  76 - --no-info-hints --no-no-info-hints (no- works w/ no- arguments)
  77 - --6 --no-6 --6 (confirm that the no- can be overridden)
+ 78 - non-opt/arg data is error (mid options)
+ 79 - non-opt/arg data is error (end of options)
+ 80 - non-opt/arg data that looks like an argument to an option that doesn't take one is an error
 
 0300 - test option processing cross-type interactions
  0 - --config only honored first time it's seen across any config type (--config trumps (SWAKS_OPT_config + SWAKS_HOME/.swaksrc:config))
diff --git a/testing/regressions/_options-protocol/00863.test b/testing/regressions/_options-protocol/00863.test
index 4a858de9..588f7d7d 100644
--- a/testing/regressions/_options-protocol/00863.test
+++ b/testing/regressions/_options-protocol/00863.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: pipeline, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'pipeline \nno-pipeline'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'pipeline\nno-pipeline'
 test action: CMD_CAPTURE %SWAKS% --dump PROTOCOL --to recip@host1.nodns.test.swaks.net --from sender@host2.nodns.test.swaks.net --helo helo-string --server ser.ver \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-protocol/00913.test b/testing/regressions/_options-protocol/00913.test
index 028c44f3..bee74af1 100644
--- a/testing/regressions/_options-protocol/00913.test
+++ b/testing/regressions/_options-protocol/00913.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: prdr, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'prdr \nno-prdr'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'prdr\nno-prdr'
 test action: CMD_CAPTURE %SWAKS% --dump PROTOCOL --to recip@host1.nodns.test.swaks.net --from sender@host2.nodns.test.swaks.net --helo helo-string --server ser.ver \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-protocol/00963.test b/testing/regressions/_options-protocol/00963.test
index caf8200a..41dfaadf 100644
--- a/testing/regressions/_options-protocol/00963.test
+++ b/testing/regressions/_options-protocol/00963.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: force-getpwuid, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'force-getpwuid \nno-force-getpwuid'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'force-getpwuid\nno-force-getpwuid'
 test action: CMD_CAPTURE %SWAKS% --dump PROTOCOL --to recip@host1.nodns.test.swaks.net --from sender@host2.nodns.test.swaks.net --helo helo-string --server ser.ver \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-protocol/out-ref/00552.stderr b/testing/regressions/_options-protocol/out-ref/00552.stderr
index e69de29b..addc235e 100644
--- a/testing/regressions/_options-protocol/out-ref/00552.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00552.stderr
@@ -0,0 +1 @@
+*** Unknown timeout format 'tuesday'
diff --git a/testing/regressions/_options-protocol/out-ref/00552.stdout b/testing/regressions/_options-protocol/out-ref/00552.stdout
index f2cffb2e..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00552.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00552.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00562.stderr b/testing/regressions/_options-protocol/out-ref/00562.stderr
index e69de29b..addc235e 100644
--- a/testing/regressions/_options-protocol/out-ref/00562.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00562.stderr
@@ -0,0 +1 @@
+*** Unknown timeout format 'tuesday'
diff --git a/testing/regressions/_options-protocol/out-ref/00562.stdout b/testing/regressions/_options-protocol/out-ref/00562.stdout
index f2cffb2e..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00562.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00562.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00572.stderr b/testing/regressions/_options-protocol/out-ref/00572.stderr
index e69de29b..addc235e 100644
--- a/testing/regressions/_options-protocol/out-ref/00572.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00572.stderr
@@ -0,0 +1 @@
+*** Unknown timeout format 'tuesday'
diff --git a/testing/regressions/_options-protocol/out-ref/00572.stdout b/testing/regressions/_options-protocol/out-ref/00572.stdout
index f2cffb2e..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00572.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00572.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00852.stderr b/testing/regressions/_options-protocol/out-ref/00852.stderr
index e69de29b..eb3241f4 100644
--- a/testing/regressions/_options-protocol/out-ref/00852.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00852.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00852.stdout b/testing/regressions/_options-protocol/out-ref/00852.stdout
index c6b630fd..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00852.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00852.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = TRUE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00862.stderr b/testing/regressions/_options-protocol/out-ref/00862.stderr
index e69de29b..3aae1e3d 100644
--- a/testing/regressions/_options-protocol/out-ref/00862.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00862.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00862 ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00862.stdout b/testing/regressions/_options-protocol/out-ref/00862.stdout
index c6b630fd..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00862.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00862.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = TRUE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00872.stderr b/testing/regressions/_options-protocol/out-ref/00872.stderr
index e69de29b..cf09faef 100644
--- a/testing/regressions/_options-protocol/out-ref/00872.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00872.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00872.stdout b/testing/regressions/_options-protocol/out-ref/00872.stdout
index c6b630fd..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00872.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00872.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = TRUE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00902.stderr b/testing/regressions/_options-protocol/out-ref/00902.stderr
index e69de29b..eb3241f4 100644
--- a/testing/regressions/_options-protocol/out-ref/00902.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00902.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00902.stdout b/testing/regressions/_options-protocol/out-ref/00902.stdout
index 5a2045a7..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00902.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00902.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = TRUE
diff --git a/testing/regressions/_options-protocol/out-ref/00912.stderr b/testing/regressions/_options-protocol/out-ref/00912.stderr
index e69de29b..166edbf0 100644
--- a/testing/regressions/_options-protocol/out-ref/00912.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00912.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00912 ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00912.stdout b/testing/regressions/_options-protocol/out-ref/00912.stdout
index 5a2045a7..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00912.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00912.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = TRUE
diff --git a/testing/regressions/_options-protocol/out-ref/00922.stderr b/testing/regressions/_options-protocol/out-ref/00922.stderr
index e69de29b..cf09faef 100644
--- a/testing/regressions/_options-protocol/out-ref/00922.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00922.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00922.stdout b/testing/regressions/_options-protocol/out-ref/00922.stdout
index 5a2045a7..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00922.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00922.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = TRUE
diff --git a/testing/regressions/_options-protocol/out-ref/00952.stderr b/testing/regressions/_options-protocol/out-ref/00952.stderr
index e69de29b..eb3241f4 100644
--- a/testing/regressions/_options-protocol/out-ref/00952.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00952.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00952.stdout b/testing/regressions/_options-protocol/out-ref/00952.stdout
index 763dbf40..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00952.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00952.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = TRUE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00962.stderr b/testing/regressions/_options-protocol/out-ref/00962.stderr
index e69de29b..9a300699 100644
--- a/testing/regressions/_options-protocol/out-ref/00962.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00962.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00962 ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00962.stdout b/testing/regressions/_options-protocol/out-ref/00962.stdout
index 763dbf40..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00962.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00962.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = TRUE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/00972.stderr b/testing/regressions/_options-protocol/out-ref/00972.stderr
index e69de29b..cf09faef 100644
--- a/testing/regressions/_options-protocol/out-ref/00972.stderr
+++ b/testing/regressions/_options-protocol/out-ref/00972.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('invalid-option').  Exiting
diff --git a/testing/regressions/_options-protocol/out-ref/00972.stdout b/testing/regressions/_options-protocol/out-ref/00972.stdout
index 763dbf40..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/00972.stdout
+++ b/testing/regressions/_options-protocol/out-ref/00972.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = helo-string
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = TRUE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 30
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-protocol/out-ref/05509.stderr b/testing/regressions/_options-protocol/out-ref/05509.stderr
index e69de29b..c69dc2b4 100644
--- a/testing/regressions/_options-protocol/out-ref/05509.stderr
+++ b/testing/regressions/_options-protocol/out-ref/05509.stderr
@@ -0,0 +1 @@
+*** Unknown timeout format '2g'
diff --git a/testing/regressions/_options-protocol/out-ref/05509.stdout b/testing/regressions/_options-protocol/out-ref/05509.stdout
index 63a55e12..e69de29b 100644
--- a/testing/regressions/_options-protocol/out-ref/05509.stdout
+++ b/testing/regressions/_options-protocol/out-ref/05509.stdout
@@ -1,13 +0,0 @@
-Protocol Info:
-  protocol        = esmtp
-  helo            = hstring
-  from            = sender@host2.nodns.test.swaks.net
-  to              = recip@host1.nodns.test.swaks.net
-  force getpwuid  = FALSE
-  quit after      = 
-  drop after      = 
-  drop after send = 
-  server_only     = FALSE
-  timeout         = 2
-  pipeline        = FALSE
-  prdr            = FALSE
diff --git a/testing/regressions/_options-tls/00013.test b/testing/regressions/_options-tls/00013.test
index 1988bf9e..27a4c992 100644
--- a/testing/regressions/_options-tls/00013.test
+++ b/testing/regressions/_options-tls/00013.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tls, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls \nno-tls'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls\nno-tls'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00113.test b/testing/regressions/_options-tls/00113.test
index 23ff5c66..52a70c39 100644
--- a/testing/regressions/_options-tls/00113.test
+++ b/testing/regressions/_options-tls/00113.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tls-optional, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-optional \nno-tls-optional'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-optional\nno-tls-optional'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00163.test b/testing/regressions/_options-tls/00163.test
index 083be800..54df9944 100644
--- a/testing/regressions/_options-tls/00163.test
+++ b/testing/regressions/_options-tls/00163.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tlso, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlso \nno-tlso'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlso\nno-tlso'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00213.test b/testing/regressions/_options-tls/00213.test
index f169a8ad..6b738882 100644
--- a/testing/regressions/_options-tls/00213.test
+++ b/testing/regressions/_options-tls/00213.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tls-optional-strict, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-optional-strict \nno-tls-optional-strict'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-optional-strict\nno-tls-optional-strict'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00263.test b/testing/regressions/_options-tls/00263.test
index d79058ef..ad6ed5ce 100644
--- a/testing/regressions/_options-tls/00263.test
+++ b/testing/regressions/_options-tls/00263.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tlsos, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlsos \nno-tlsos'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlsos\nno-tlsos'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00313.test b/testing/regressions/_options-tls/00313.test
index fc55f081..40772238 100644
--- a/testing/regressions/_options-tls/00313.test
+++ b/testing/regressions/_options-tls/00313.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tls-on-connect, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-on-connect \nno-tls-on-connect'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-on-connect\nno-tls-on-connect'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00363.test b/testing/regressions/_options-tls/00363.test
index 91de6084..57f4e74c 100644
--- a/testing/regressions/_options-tls/00363.test
+++ b/testing/regressions/_options-tls/00363.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tlsc, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlsc \nno-tlsc'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tlsc\nno-tlsc'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/00563.test b/testing/regressions/_options-tls/00563.test
index 2f864edd..c7c68419 100644
--- a/testing/regressions/_options-tls/00563.test
+++ b/testing/regressions/_options-tls/00563.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: tls-verify, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-verify \nno-tls-verify'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'tls-verify\nno-tls-verify'
 test action: CMD_CAPTURE %SWAKS% --dump TLS --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --tls --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-tls/out-ref/00002.stderr b/testing/regressions/_options-tls/out-ref/00002.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00002.stderr
+++ b/testing/regressions/_options-tls/out-ref/00002.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00002.stdout b/testing/regressions/_options-tls/out-ref/00002.stdout
index 511cc13c..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00002.stdout
+++ b/testing/regressions/_options-tls/out-ref/00002.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00012.stderr b/testing/regressions/_options-tls/out-ref/00012.stderr
index e69de29b..69317bbf 100644
--- a/testing/regressions/_options-tls/out-ref/00012.stderr
+++ b/testing/regressions/_options-tls/out-ref/00012.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00012 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00012.stdout b/testing/regressions/_options-tls/out-ref/00012.stdout
index 511cc13c..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00012.stdout
+++ b/testing/regressions/_options-tls/out-ref/00012.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00022.stderr b/testing/regressions/_options-tls/out-ref/00022.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00022.stderr
+++ b/testing/regressions/_options-tls/out-ref/00022.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00022.stdout b/testing/regressions/_options-tls/out-ref/00022.stdout
index 511cc13c..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00022.stdout
+++ b/testing/regressions/_options-tls/out-ref/00022.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00102.stderr b/testing/regressions/_options-tls/out-ref/00102.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00102.stderr
+++ b/testing/regressions/_options-tls/out-ref/00102.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00102.stdout b/testing/regressions/_options-tls/out-ref/00102.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00102.stdout
+++ b/testing/regressions/_options-tls/out-ref/00102.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00112.stderr b/testing/regressions/_options-tls/out-ref/00112.stderr
index e69de29b..29a6d08f 100644
--- a/testing/regressions/_options-tls/out-ref/00112.stderr
+++ b/testing/regressions/_options-tls/out-ref/00112.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00112 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00112.stdout b/testing/regressions/_options-tls/out-ref/00112.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00112.stdout
+++ b/testing/regressions/_options-tls/out-ref/00112.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00122.stderr b/testing/regressions/_options-tls/out-ref/00122.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00122.stderr
+++ b/testing/regressions/_options-tls/out-ref/00122.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00122.stdout b/testing/regressions/_options-tls/out-ref/00122.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00122.stdout
+++ b/testing/regressions/_options-tls/out-ref/00122.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00152.stderr b/testing/regressions/_options-tls/out-ref/00152.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00152.stderr
+++ b/testing/regressions/_options-tls/out-ref/00152.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00152.stdout b/testing/regressions/_options-tls/out-ref/00152.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00152.stdout
+++ b/testing/regressions/_options-tls/out-ref/00152.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00162.stderr b/testing/regressions/_options-tls/out-ref/00162.stderr
index e69de29b..245e787e 100644
--- a/testing/regressions/_options-tls/out-ref/00162.stderr
+++ b/testing/regressions/_options-tls/out-ref/00162.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00162 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00162.stdout b/testing/regressions/_options-tls/out-ref/00162.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00162.stdout
+++ b/testing/regressions/_options-tls/out-ref/00162.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00172.stderr b/testing/regressions/_options-tls/out-ref/00172.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00172.stderr
+++ b/testing/regressions/_options-tls/out-ref/00172.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00172.stdout b/testing/regressions/_options-tls/out-ref/00172.stdout
index 76769c23..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00172.stdout
+++ b/testing/regressions/_options-tls/out-ref/00172.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00202.stderr b/testing/regressions/_options-tls/out-ref/00202.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00202.stderr
+++ b/testing/regressions/_options-tls/out-ref/00202.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00202.stdout b/testing/regressions/_options-tls/out-ref/00202.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00202.stdout
+++ b/testing/regressions/_options-tls/out-ref/00202.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00212.stderr b/testing/regressions/_options-tls/out-ref/00212.stderr
index e69de29b..b70774dd 100644
--- a/testing/regressions/_options-tls/out-ref/00212.stderr
+++ b/testing/regressions/_options-tls/out-ref/00212.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00212 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00212.stdout b/testing/regressions/_options-tls/out-ref/00212.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00212.stdout
+++ b/testing/regressions/_options-tls/out-ref/00212.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00222.stderr b/testing/regressions/_options-tls/out-ref/00222.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00222.stderr
+++ b/testing/regressions/_options-tls/out-ref/00222.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00222.stdout b/testing/regressions/_options-tls/out-ref/00222.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00222.stdout
+++ b/testing/regressions/_options-tls/out-ref/00222.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00252.stderr b/testing/regressions/_options-tls/out-ref/00252.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00252.stderr
+++ b/testing/regressions/_options-tls/out-ref/00252.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00252.stdout b/testing/regressions/_options-tls/out-ref/00252.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00252.stdout
+++ b/testing/regressions/_options-tls/out-ref/00252.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00262.stderr b/testing/regressions/_options-tls/out-ref/00262.stderr
index e69de29b..9886556b 100644
--- a/testing/regressions/_options-tls/out-ref/00262.stderr
+++ b/testing/regressions/_options-tls/out-ref/00262.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00262 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00262.stdout b/testing/regressions/_options-tls/out-ref/00262.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00262.stdout
+++ b/testing/regressions/_options-tls/out-ref/00262.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00272.stderr b/testing/regressions/_options-tls/out-ref/00272.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00272.stderr
+++ b/testing/regressions/_options-tls/out-ref/00272.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00272.stdout b/testing/regressions/_options-tls/out-ref/00272.stdout
index 9e4dd3fd..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00272.stdout
+++ b/testing/regressions/_options-tls/out-ref/00272.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (optional-strict)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00302.stderr b/testing/regressions/_options-tls/out-ref/00302.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00302.stderr
+++ b/testing/regressions/_options-tls/out-ref/00302.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00302.stdout b/testing/regressions/_options-tls/out-ref/00302.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00302.stdout
+++ b/testing/regressions/_options-tls/out-ref/00302.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00312.stderr b/testing/regressions/_options-tls/out-ref/00312.stderr
index e69de29b..99fe3101 100644
--- a/testing/regressions/_options-tls/out-ref/00312.stderr
+++ b/testing/regressions/_options-tls/out-ref/00312.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00312 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00312.stdout b/testing/regressions/_options-tls/out-ref/00312.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00312.stdout
+++ b/testing/regressions/_options-tls/out-ref/00312.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00322.stderr b/testing/regressions/_options-tls/out-ref/00322.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00322.stderr
+++ b/testing/regressions/_options-tls/out-ref/00322.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00322.stdout b/testing/regressions/_options-tls/out-ref/00322.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00322.stdout
+++ b/testing/regressions/_options-tls/out-ref/00322.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00352.stderr b/testing/regressions/_options-tls/out-ref/00352.stderr
index e69de29b..a8db0da4 100644
--- a/testing/regressions/_options-tls/out-ref/00352.stderr
+++ b/testing/regressions/_options-tls/out-ref/00352.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00352.stdout b/testing/regressions/_options-tls/out-ref/00352.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00352.stdout
+++ b/testing/regressions/_options-tls/out-ref/00352.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00362.stderr b/testing/regressions/_options-tls/out-ref/00362.stderr
index e69de29b..115d480f 100644
--- a/testing/regressions/_options-tls/out-ref/00362.stderr
+++ b/testing/regressions/_options-tls/out-ref/00362.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00362 ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00362.stdout b/testing/regressions/_options-tls/out-ref/00362.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00362.stdout
+++ b/testing/regressions/_options-tls/out-ref/00362.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00372.stderr b/testing/regressions/_options-tls/out-ref/00372.stderr
index e69de29b..e82eb8a1 100644
--- a/testing/regressions/_options-tls/out-ref/00372.stderr
+++ b/testing/regressions/_options-tls/out-ref/00372.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('asdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00372.stdout b/testing/regressions/_options-tls/out-ref/00372.stdout
index 35107449..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00372.stdout
+++ b/testing/regressions/_options-tls/out-ref/00372.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls on connect (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = FALSE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00552.stderr b/testing/regressions/_options-tls/out-ref/00552.stderr
index e69de29b..630546ef 100644
--- a/testing/regressions/_options-tls/out-ref/00552.stderr
+++ b/testing/regressions/_options-tls/out-ref/00552.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('sdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00552.stdout b/testing/regressions/_options-tls/out-ref/00552.stdout
index 7a24d050..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00552.stdout
+++ b/testing/regressions/_options-tls/out-ref/00552.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = TRUE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00562.stderr b/testing/regressions/_options-tls/out-ref/00562.stderr
index e69de29b..f56587fa 100644
--- a/testing/regressions/_options-tls/out-ref/00562.stderr
+++ b/testing/regressions/_options-tls/out-ref/00562.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00562 ('sdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00562.stdout b/testing/regressions/_options-tls/out-ref/00562.stdout
index 7a24d050..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00562.stdout
+++ b/testing/regressions/_options-tls/out-ref/00562.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = TRUE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-tls/out-ref/00572.stderr b/testing/regressions/_options-tls/out-ref/00572.stderr
index e69de29b..2c6f2566 100644
--- a/testing/regressions/_options-tls/out-ref/00572.stderr
+++ b/testing/regressions/_options-tls/out-ref/00572.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('sdf').  Exiting
diff --git a/testing/regressions/_options-tls/out-ref/00572.stdout b/testing/regressions/_options-tls/out-ref/00572.stdout
index 7a24d050..e69de29b 100644
--- a/testing/regressions/_options-tls/out-ref/00572.stdout
+++ b/testing/regressions/_options-tls/out-ref/00572.stdout
@@ -1,11 +0,0 @@
-TLS / Encryption Info:
-  tls                 = starttls (required)
-  peer cert           = 
-  local cert          = 
-  local key           = 
-  local cipher list   = 
-  ca path             = 
-  sni string          = 
-  verify server cert  = TRUE
-  available protocols = SSLv2, SSLv3, TLSv1, TLSv1_1, TLSv1_2
-  requested protocols = 
diff --git a/testing/regressions/_options-transport/00513.test b/testing/regressions/_options-transport/00513.test
index 20115966..4cb9b29d 100644
--- a/testing/regressions/_options-transport/00513.test
+++ b/testing/regressions/_options-transport/00513.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: 4, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'4 \nno-4'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'4\nno-4'
 test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-transport/00563.test b/testing/regressions/_options-transport/00563.test
index 5d3f044c..03f4b703 100644
--- a/testing/regressions/_options-transport/00563.test
+++ b/testing/regressions/_options-transport/00563.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: 6, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'6 \nno-6'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'6\nno-6'
 test action: CMD_CAPTURE %SWAKS% --dump TRANSPORT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --server "ser ver" \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-xclient/00453.test b/testing/regressions/_options-xclient/00453.test
index a4f59e70..73191093 100644
--- a/testing/regressions/_options-xclient/00453.test
+++ b/testing/regressions/_options-xclient/00453.test
@@ -5,4 +5,4 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 title: xclient, command line, no-option
 
 test action: CMD_CAPTURE %SWAKS% --dump XCLIENT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" \
-    --xclient REVERSE_NAME=testname PORT=25 --no-xclient
+    --xclient "REVERSE_NAME=testname PORT=25" --no-xclient
diff --git a/testing/regressions/_options-xclient/00513.test b/testing/regressions/_options-xclient/00513.test
index 9635ee30..a2318efe 100644
--- a/testing/regressions/_options-xclient/00513.test
+++ b/testing/regressions/_options-xclient/00513.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: xclient-no-verify, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-no-verify \nno-xclient-no-verify'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-no-verify\nno-xclient-no-verify'
 test action: CMD_CAPTURE %SWAKS% --dump XCLIENT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --xclient-port 26 \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-xclient/00563.test b/testing/regressions/_options-xclient/00563.test
index e1240c3b..5319d857 100644
--- a/testing/regressions/_options-xclient/00563.test
+++ b/testing/regressions/_options-xclient/00563.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: xclient-before-starttls, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-before-starttls \nno-xclient-before-starttls'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-before-starttls\nno-xclient-before-starttls'
 test action: CMD_CAPTURE %SWAKS% --dump XCLIENT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --xclient-port 26 \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-xclient/00613.test b/testing/regressions/_options-xclient/00613.test
index 58d499eb..b6667a08 100644
--- a/testing/regressions/_options-xclient/00613.test
+++ b/testing/regressions/_options-xclient/00613.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: xclient-optional, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-optional \nno-xclient-optional'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-optional\nno-xclient-optional'
 test action: CMD_CAPTURE %SWAKS% --dump XCLIENT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --xclient-port 26 \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-xclient/00663.test b/testing/regressions/_options-xclient/00663.test
index 683d85ef..95f609f8 100644
--- a/testing/regressions/_options-xclient/00663.test
+++ b/testing/regressions/_options-xclient/00663.test
@@ -4,6 +4,6 @@ auto: REMOVE_FILE,CREATE_FILE,MUNGE,COMPARE_FILE %TESTID%.stdout %TESTID%.stderr
 
 title: xclient-optional-strict, config, no-option
 
-pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-optional-strict \nno-xclient-optional-strict'
+pre action: MERGE %OUTDIR%/swaksrc-%TESTID% string:'xclient-optional-strict\nno-xclient-optional-strict'
 test action: CMD_CAPTURE %SWAKS% --dump XCLIENT --to user@host1.nodns.test.swaks.net --from recip@host1.nodns.test.swaks.net --helo hserver --server "ser.ver" --xclient-port 26 \
     --config %OUTDIR%/swaksrc-%TESTID%
diff --git a/testing/regressions/_options-xclient/out-ref/00502.stderr b/testing/regressions/_options-xclient/out-ref/00502.stderr
index e69de29b..150b34c1 100644
--- a/testing/regressions/_options-xclient/out-ref/00502.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00502.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00502.stdout b/testing/regressions/_options-xclient/out-ref/00502.stdout
index 4184c230..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00502.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00502.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = TRUE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00512.stderr b/testing/regressions/_options-xclient/out-ref/00512.stderr
index e69de29b..e2dd4e30 100644
--- a/testing/regressions/_options-xclient/out-ref/00512.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00512.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00512 ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00512.stdout b/testing/regressions/_options-xclient/out-ref/00512.stdout
index 4184c230..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00512.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00512.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = TRUE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00522.stderr b/testing/regressions/_options-xclient/out-ref/00522.stderr
index e69de29b..e91bf327 100644
--- a/testing/regressions/_options-xclient/out-ref/00522.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00522.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00522.stdout b/testing/regressions/_options-xclient/out-ref/00522.stdout
index 4184c230..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00522.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00522.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = TRUE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00552.stderr b/testing/regressions/_options-xclient/out-ref/00552.stderr
index e69de29b..150b34c1 100644
--- a/testing/regressions/_options-xclient/out-ref/00552.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00552.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00552.stdout b/testing/regressions/_options-xclient/out-ref/00552.stdout
index 06d19b14..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00552.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00552.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = FALSE
-  before starttls = TRUE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00562.stderr b/testing/regressions/_options-xclient/out-ref/00562.stderr
index e69de29b..0c1c9a67 100644
--- a/testing/regressions/_options-xclient/out-ref/00562.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00562.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00562 ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00562.stdout b/testing/regressions/_options-xclient/out-ref/00562.stdout
index 06d19b14..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00562.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00562.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = FALSE
-  before starttls = TRUE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00572.stderr b/testing/regressions/_options-xclient/out-ref/00572.stderr
index e69de29b..e91bf327 100644
--- a/testing/regressions/_options-xclient/out-ref/00572.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00572.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00572.stdout b/testing/regressions/_options-xclient/out-ref/00572.stdout
index 06d19b14..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00572.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00572.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = required
-  no_verify       = FALSE
-  before starttls = TRUE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00602.stderr b/testing/regressions/_options-xclient/out-ref/00602.stderr
index e69de29b..150b34c1 100644
--- a/testing/regressions/_options-xclient/out-ref/00602.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00602.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00602.stdout b/testing/regressions/_options-xclient/out-ref/00602.stdout
index 16a94417..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00602.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00602.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00612.stderr b/testing/regressions/_options-xclient/out-ref/00612.stderr
index e69de29b..47a467b5 100644
--- a/testing/regressions/_options-xclient/out-ref/00612.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00612.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00612 ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00612.stdout b/testing/regressions/_options-xclient/out-ref/00612.stdout
index 16a94417..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00612.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00612.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00622.stderr b/testing/regressions/_options-xclient/out-ref/00622.stderr
index e69de29b..e91bf327 100644
--- a/testing/regressions/_options-xclient/out-ref/00622.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00622.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00622.stdout b/testing/regressions/_options-xclient/out-ref/00622.stdout
index 16a94417..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00622.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00622.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00652.stderr b/testing/regressions/_options-xclient/out-ref/00652.stderr
index e69de29b..150b34c1 100644
--- a/testing/regressions/_options-xclient/out-ref/00652.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00652.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  command line ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00652.stdout b/testing/regressions/_options-xclient/out-ref/00652.stdout
index e67dc0c5..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00652.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00652.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional-strict
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00662.stderr b/testing/regressions/_options-xclient/out-ref/00662.stderr
index e69de29b..3b6f55b3 100644
--- a/testing/regressions/_options-xclient/out-ref/00662.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00662.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  Config file /path/to/OUTDIR/swaksrc-00662 ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00662.stdout b/testing/regressions/_options-xclient/out-ref/00662.stdout
index e67dc0c5..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00662.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00662.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional-strict
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/_options-xclient/out-ref/00672.stderr b/testing/regressions/_options-xclient/out-ref/00672.stderr
index e69de29b..e91bf327 100644
--- a/testing/regressions/_options-xclient/out-ref/00672.stderr
+++ b/testing/regressions/_options-xclient/out-ref/00672.stderr
@@ -0,0 +1 @@
+*** Data left in option list when processing  environment ('foo').  Exiting
diff --git a/testing/regressions/_options-xclient/out-ref/00672.stdout b/testing/regressions/_options-xclient/out-ref/00672.stdout
index e67dc0c5..e69de29b 100644
--- a/testing/regressions/_options-xclient/out-ref/00672.stdout
+++ b/testing/regressions/_options-xclient/out-ref/00672.stdout
@@ -1,5 +0,0 @@
-XCLIENT Info:
-  xclient         = optional-strict
-  no_verify       = FALSE
-  before starttls = FALSE
-  strings         = XCLIENT PORT=26
diff --git a/testing/regressions/bin/find-orphaned-ref-files.pl b/testing/regressions/bin/find-orphaned-ref-files.pl
new file mode 100755
index 00000000..4031fd84
--- /dev/null
+++ b/testing/regressions/bin/find-orphaned-ref-files.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+foreach my $dir (@ARGV) {
+	opendir(D, $dir) || die "couldn't opendir $dir: $!\n";
+	foreach my $testfile (grep /^\d+\.test/, readdir(D)) {
+		if ($testfile =~ /^(\d+)\.test$/) {
+			$tests{$1} = 1;
+		}
+	}
+	closedir(D);
+
+	opendir(D, "$dir/out-ref") || die "Couldn't opendir $dir/out-ref: $!\n";
+	foreach my $reffile (grep /\d{4,}/, readdir(D)) {
+		if ($reffile =~ /(\d{4,})/) {
+			if (!$tests{$1}) {
+				print "Couldn't find test file for ref file $dir/out-ref/$reffile\n";
+			}
+		}
+	}
+	closedir(D);
+}