regen/embed.pl: Combine the common parts of two 'if's

This commit combines two separate 'if' blocks into one big if block with
the conditionals in common to the two blocks, and then the two smaller
blocks, each with the conditions that apply to it individually.

And then everything is reindented to correspond

Author: khwilliamson

regen/embed.pl

@@ -275,20 +275,17 @@ sub generate_proto_h {
                 }
                 my $argname = $1;
 
-                if (   defined $argname
-                    && ($nn||$nz)
-                    && (! $has_mflag || $binarycompat))
-                {
-                    push @names_of_nn, $argname;
-                }
+                if (defined $argname && (! $has_mflag || $binarycompat)) {
+                    if ($nn||$nz) {
+                        push @names_of_nn, $argname;
+                    }
 
-                if (    defined $argname
-                    and (! $has_mflag || $binarycompat)
-                    and ! $nocheck
-                    and defined $argtype
-                    and exists $type_asserts{$argtype})
-                {
-                    push @typed_args, [ $argtype, $argname ];
+                    if (   ! $nocheck
+                        && defined $argtype
+                        && exists $type_asserts{$argtype})
+                    {
+                        push @typed_args, [ $argtype, $argname ];
+                    }
                 }
             }
             $ret .= join ", ", @$args;