fixup regression tests wrt skip steps (fixed in pfctl.c rev1.305);

ok henning mcbride (a while back)

71 files changed, 830 insertions, 830 deletions

diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded
index 8928dc6f588..54f66932316 100644
--- a/regress/sbin/pfctl/pf1.loaded
+++ b/regress/sbin/pfctl/pf1.loaded
@@ -1,32 +1,32 @@
 @0 pass in all flags S/SA
-  [ Skip steps: i=end r=end d=end f=4 p=2 sa=4 da=4 sp=2 dp=3 ]
+  [ Skip steps: i=end d=end r=end f=4 p=2 sa=4 da=4 sp=2 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in all no state
-  [ Skip steps: i=end r=end d=end f=4 sa=4 da=4 dp=3 ]
+  [ Skip steps: i=end d=end r=end f=4 sa=4 da=4 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in proto tcp from any port <= 1024 to any flags S/SA label "foo_bar"
-  [ Skip steps: i=end r=end d=end f=4 p=5 sa=4 da=4 ]
+  [ Skip steps: i=end d=end r=end f=4 p=5 sa=4 da=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in proto tcp from any to any port = 25 flags S/SA
-  [ Skip steps: i=end r=end d=end p=5 ]
+  [ Skip steps: i=end d=end r=end p=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != 22 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end sa=6 ]
+  [ Skip steps: i=end d=end r=end f=end sa=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts
-  [ Skip steps: i=end r=end d=end f=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in inet proto tcp from 1.2.3.4 to any flags S/SA label "6:tcp:1.2.3.4::any:"
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in inet proto tcp from 1.2.3.5 to any flags S/SA label "7:tcp:1.2.3.5::any:"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf10.loaded b/regress/sbin/pfctl/pf10.loaded
index 002dd1286d8..c33028c42d6 100644
--- a/regress/sbin/pfctl/pf10.loaded
+++ b/regress/sbin/pfctl/pf10.loaded
@@ -1,120 +1,120 @@
 @0 pass in inet proto icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in inet proto icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block return-rst in inet proto tcp all
-  [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block return-rst in inet6 proto tcp all
-  [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block return-rst(ttl 10) in inet proto tcp all
-  [ Skip steps: i=end r=end d=end p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block return-rst(ttl 10) in inet6 proto tcp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block return-icmp(port-unr) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block return-icmp(net-unr) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block return-icmp(net-unr) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block return-icmp(srcfail) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block return-icmp(srcfail) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 block return-icmp(host-prohib) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block return-icmp(host-prohib) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 block return-icmp(cutoff-preced) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end f=17 p=17 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=17 p=17 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 block return-icmp(cutoff-preced) in inet proto icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 block return-icmp6(noroute-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 block return-icmp6(admin-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 block return-icmp6(notnbr-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 block return-icmp6(addr-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end f=28 p=28 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=28 p=28 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 block return-icmp6(port-unr) in inet6 proto ipv6-icmp all
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 block return-icmp(srcfail, admin-unr) in all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 block return-icmp(srcfail, admin-unr) in all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf100.loaded b/regress/sbin/pfctl/pf100.loaded
index d17bb21f85b..b1d2552e505 100644
--- a/regress/sbin/pfctl/pf100.loaded
+++ b/regress/sbin/pfctl/pf100.loaded
@@ -1,71 +1,71 @@
 @0 pass all flags S/SA
-  [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=6 d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 anchor "a/b" all {
-  [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=6 d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @2 anchor "1/2/3" all {
-  [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=6 d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @3 anchor "relative" all {
-  [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=6 d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass in on lo0 all flags S/SA label "TEST1"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @4 anchor "camield/*" all {
-  [ Skip steps: i=6 r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=6 d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-  [ Skip steps: i=0 r=0 d=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ]
+  [ Skip steps: i=0 d=0 r=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @5 anchor "relayd/*" all {
-  [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-  [ Skip steps: i=0 r=0 d=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ]
+  [ Skip steps: i=0 d=0 r=0 f=0 p=0 sa=0 da=0 sp=0 dp=0 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @6 anchor "foo" in on lo0 all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor "bar" in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor "/1/2/3" all {
-  [ Skip steps: i=2 r=2 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=2 d=2 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @1 anchor "/relative" all {
-  [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @2 pass in on lo0 all flags S/SA label "FOO"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @1 anchor in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass in on lo0 all flags S/SA label "BAR"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
diff --git a/regress/sbin/pfctl/pf101.loaded b/regress/sbin/pfctl/pf101.loaded
index c196b2202d2..3fc68e3567b 100644
--- a/regress/sbin/pfctl/pf101.loaded
+++ b/regress/sbin/pfctl/pf101.loaded
@@ -1,16 +1,16 @@
 @0 pass all flags S/SA prio 3
-  [ Skip steps: d=end f=2 sa=end da=2 sp=end ]
+  [ Skip steps: r=end f=2 sa=end da=2 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass out on lo1000000 proto tcp from any to any port = 22 flags S/SA prio(5, 2)
-  [ Skip steps: d=end sa=end sp=end ]
+  [ Skip steps: r=end sa=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass inet proto udp from any to 127.0.0.1 port = 53 prio 4
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass inet proto udp from any to 127.0.0.2 port = 53 prio 4
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf11.loaded b/regress/sbin/pfctl/pf11.loaded
index aee2929ff6f..a03b91420ed 100644
--- a/regress/sbin/pfctl/pf11.loaded
+++ b/regress/sbin/pfctl/pf11.loaded
@@ -1,72 +1,72 @@
 @0 pass in inet proto icmp all icmp-type echorep
-  [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=4 p=4 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in inet proto icmp all icmp-type echorep code 0
-  [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=4 p=4 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in inet proto icmp all icmp-type 1
-  [ Skip steps: i=end r=end d=end f=4 p=4 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=4 p=4 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in inet proto icmp all icmp-type 1 code 1
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet6 proto ipv6-icmp all icmp6-type 0
-  [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=8 p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in inet6 proto ipv6-icmp all icmp6-type 0 code 0
-  [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=8 p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in inet6 proto ipv6-icmp all icmp6-type unreach
-  [ Skip steps: i=end r=end d=end f=8 p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=8 p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in inet proto icmp all icmp-type echorep
-  [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=12 p=12 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop in inet proto icmp all icmp-type echorep code 0
-  [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=12 p=12 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop in inet proto icmp all icmp-type 1
-  [ Skip steps: i=end r=end d=end f=12 p=12 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=12 p=12 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block drop in inet proto icmp all icmp-type 1 code 1
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop in inet6 proto ipv6-icmp all icmp6-type 0
-  [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=16 p=16 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 block drop in inet6 proto ipv6-icmp all icmp6-type 0 code 0
-  [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=16 p=16 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block drop in inet6 proto ipv6-icmp all icmp6-type unreach
-  [ Skip steps: i=end r=end d=end f=16 p=16 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=16 p=16 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 block drop in inet6 proto ipv6-icmp all icmp6-type unreach code admin-unr
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass in inet proto icmp all icmp-type unreach code needfrag
-  [ Skip steps: i=end r=end d=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in inet6 proto ipv6-icmp all icmp6-type timex code reassemb
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf12.loaded b/regress/sbin/pfctl/pf12.loaded
index 37fd1d4e8f8..422dceedf7d 100644
--- a/regress/sbin/pfctl/pf12.loaded
+++ b/regress/sbin/pfctl/pf12.loaded
@@ -1,20 +1,20 @@
 @0 pass in inet from 127.0.0.1 to 127.0.0.0/8 no state
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf13.loaded b/regress/sbin/pfctl/pf13.loaded
index a6ddabe56cf..36ef48a2aa5 100644
--- a/regress/sbin/pfctl/pf13.loaded
+++ b/regress/sbin/pfctl/pf13.loaded
@@ -1,64 +1,64 @@
 @0 pass in quick on enc0 all flags S/SA
-  [ Skip steps: i=3 r=3 d=end p=6 sa=8 da=4 sp=end dp=6 ]
+  [ Skip steps: i=3 d=3 r=end p=6 sa=8 da=4 sp=end dp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in quick on enc0 inet all flags S/SA
-  [ Skip steps: i=3 r=3 d=end p=6 sa=8 da=4 sp=end dp=6 ]
+  [ Skip steps: i=3 d=3 r=end p=6 sa=8 da=4 sp=end dp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in quick on enc0 inet6 all flags S/SA
-  [ Skip steps: d=end p=6 sa=8 da=4 sp=end dp=6 ]
+  [ Skip steps: r=end p=6 sa=8 da=4 sp=end dp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass out quick on tun1000000 inet all flags S/SA route-to tun1000001
-  [ Skip steps: i=end r=6 d=end f=5 p=6 sa=8 sp=end dp=6 ]
+  [ Skip steps: i=end d=6 r=end f=5 p=6 sa=8 sp=end dp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass out quick on tun1000000 inet from any to 192.168.1.1 flags S/SA route-to tun1000001
-  [ Skip steps: i=end r=6 d=end p=6 sa=8 sp=end dp=6 ]
+  [ Skip steps: i=end d=6 r=end p=6 sa=8 sp=end dp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass out quick on tun1000000 inet6 from any to fec0::1 flags S/SA route-to tun1000001
-  [ Skip steps: i=end d=end sa=8 sp=end ]
+  [ Skip steps: i=end r=end sa=8 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop in on tun1000000 inet proto tcp from any to any port = 21 dup-to 192.168.1.1@tun1000001
-  [ Skip steps: i=end r=end d=end p=8 sa=8 da=8 sp=end dp=8 ]
+  [ Skip steps: i=end d=end r=end p=8 sa=8 da=8 sp=end dp=8 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 dup-to fec0::1@tun1000001
-  [ Skip steps: i=end r=end d=end sp=end ]
+  [ Skip steps: i=end d=end r=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA route-to tun1000001
-  [ Skip steps: i=end r=end d=end p=10 sp=end dp=10 ]
+  [ Skip steps: i=end d=end r=end p=10 sp=end dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA route-to tun1000001
-  [ Skip steps: i=end r=end d=end sp=end ]
+  [ Skip steps: i=end d=end r=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop in on tun1000000 inet proto tcp from any to any port = 21 reply-to 192.168.1.1@tun1000001
-  [ Skip steps: i=end r=end d=end p=12 sa=12 da=12 sp=end dp=12 ]
+  [ Skip steps: i=end d=end r=end p=12 sa=12 da=12 sp=end dp=12 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block drop in on tun1000000 inet6 proto tcp from any to any port = 21 reply-to fec0::1@tun1000001
-  [ Skip steps: i=end r=end d=end sp=end ]
+  [ Skip steps: i=end d=end r=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA reply-to tun1000001
-  [ Skip steps: i=end r=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA reply-to tun1000001
-  [ Skip steps: i=end r=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass in quick on tun1000000 inet from 192.168.1.1 to 10.1.1.1 flags S/SA dup-to 192.168.1.100@tun1000001
-  [ Skip steps: i=end r=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass in quick on tun1000000 inet6 from fec0::/64 to fec1::2 flags S/SA dup-to fec1::2@tun1000001
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf14.loaded b/regress/sbin/pfctl/pf14.loaded
index d0343959bbc..09a60891e42 100644
--- a/regress/sbin/pfctl/pf14.loaded
+++ b/regress/sbin/pfctl/pf14.loaded
@@ -1,24 +1,24 @@
 @0 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=3 da=2 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=3 da=2 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in quick on lo0 inet6 from fe80::1 to fe80::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=3 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=3 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in quick on lo0 inet6 from fe80::1 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in quick on lo0 inet6 from any to fe80::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index 18c5e9b38a7..ec3709ec955 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -1,36 +1,36 @@
 @0 match all scrub (no-df)
-  [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match all scrub (min-ttl 25)
-  [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match all scrub (max-mss 224)
-  [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match all scrub (no-df max-mss 224)
-  [ Skip steps: i=end r=5 d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=5 r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match all scrub (set-tos 0x10)
-  [ Skip steps: i=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match out proto esp all scrub (set-tos 0x08)
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match out proto ah all scrub (set-tos 0x04)
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match out proto icmp all scrub (set-tos 0x12)
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match out all scrub (set-tos 0x08) tagged THROUGHPUT
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf16.loaded b/regress/sbin/pfctl/pf16.loaded
index 542a55b76d7..07a161c69a7 100644
--- a/regress/sbin/pfctl/pf16.loaded
+++ b/regress/sbin/pfctl/pf16.loaded
@@ -1,20 +1,20 @@
 @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1
-  [ Skip steps: i=4 d=end f=4 sp=end ]
+  [ Skip steps: i=4 r=end f=4 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22
-  [ Skip steps: i=4 d=end f=4 sp=end ]
+  [ Skip steps: i=4 r=end f=4 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port
-  [ Skip steps: i=4 d=end f=4 p=end sp=end dp=end ]
+  [ Skip steps: i=4 r=end f=4 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1
-  [ Skip steps: r=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: d=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in on lo1000000 all no state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf17.loaded b/regress/sbin/pfctl/pf17.loaded
index c928653fe74..02480f7b4d3 100644
--- a/regress/sbin/pfctl/pf17.loaded
+++ b/regress/sbin/pfctl/pf17.loaded
@@ -1,344 +1,344 @@
 @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 static-port
-  [ Skip steps: i=82 d=end f=40 p=2 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=2 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet from any to 10.0.0.1 rdr-to 192.168.1.1
-  [ Skip steps: i=82 d=end f=40 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=4 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match in on lo0 inet proto tcp from any to 10.0.0.2 rdr-to 192.168.1.2
-  [ Skip steps: i=82 d=end f=40 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 static-port
-  [ Skip steps: i=82 d=end f=40 p=6 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in on lo0 inet proto udp from any to 10.0.0.3 rdr-to 192.168.1.3
-  [ Skip steps: i=82 d=end f=40 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4 static-port
-  [ Skip steps: i=82 d=end f=40 p=8 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=8 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in on lo0 inet proto icmp from any to 10.0.0.4 rdr-to 192.168.1.4
-  [ Skip steps: i=82 d=end f=40 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match out on lo0 inet from 192.168.1.5 to 172.16.1.1 nat-to 10.0.0.5 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match in on lo0 inet from 172.16.1.1 to 10.0.0.5 rdr-to 192.168.1.5
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match out on lo0 inet from 192.168.1.6 to 172.16.1.2 nat-to 10.0.0.6 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match in on lo0 inet from 172.16.1.2 to 10.0.0.6 rdr-to 192.168.1.6
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 10.0.0.7 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 match in on lo0 inet from 172.16.2.0/24 to 10.0.0.7 rdr-to 192.168.1.7
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 match out on lo0 inet from 192.168.2.0/24 to any nat-to 10.0.5.0/24 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 match in on lo0 inet from any to 10.0.5.0/24 rdr-to 192.168.2.0/24
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 match out on lo0 inet from 192.168.2.0/28 to any nat-to 10.0.4.0/28 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 match in on lo0 inet from any to 10.0.4.0/28 rdr-to 192.168.2.0/28
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 match out on lo0 inet from 192.168.2.0/30 to 192.168.3.1 nat-to 10.0.3.0/30 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 match in on lo0 inet from 192.168.3.1 to 10.0.3.0/30 rdr-to 192.168.2.0/30
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 match in on lo0 inet from ! 172.17.0.0/16 to 10.0.0.8 rdr-to 192.168.1.8
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 match out on lo0 inet from 1.1.1.1 to no-route nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 match in on lo0 inet from no-route to 2.2.2.2 rdr-to 1.1.1.1
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 match in on lo0 inet from 1.1.1.1 to 2.2.2.2 rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 match out on lo0 inet from (lo0:0:1) to 1.1.1.1 nat-to (lo1000000:0:*) static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 match in on lo0 inet from 1.1.1.1 to (lo1000000:0:*) rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end da=30 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 match out on lo0 inet from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port
-  [ Skip steps: i=82 d=end f=40 p=end da=30 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end da=30 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 match in on lo0 inet from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 match out on lo0 inet from 1.1.1.1 to <sometable:*> nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @31 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @32 match out on lo0 inet from 1.1.1.1 to ! <sometable:*> nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @33 match in on lo0 inet from ! <sometable:*> to 2.2.2.2 rdr-to 1.1.1.1
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @34 match out on lo0 inet from 1.1.1.1 to (lo1000000:0:*) nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @35 match in on lo0 inet from (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @36 match out on lo0 inet from 1.1.1.1 to ! (lo1000000:0:*) nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @37 match in on lo0 inet from ! (lo1000000:0:*) to 2.2.2.2 rdr-to 1.1.1.1
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @38 match out on lo0 inet from (lo0:0:1) to <sometable:*> nat-to 2.2.2.2 static-port
-  [ Skip steps: i=82 d=end f=40 p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=40 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @39 match in on lo0 inet from <sometable:*> to 2.2.2.2 rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @40 match out on lo0 inet6 from ::1 to no-route nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @41 match in on lo0 inet6 from no-route to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @42 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @43 match in on lo0 inet6 from ::1 to ::2 rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @44 match out on lo0 inet6 from (lo0:0:1) to ::1 nat-to (lo1000000:0:*) static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @45 match in on lo0 inet6 from ::1 to (lo1000000:0:*) rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end da=48 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @46 match out on lo0 inet6 from (lo0:0:1) to (lo1000000:0:*) nat-to (lo1000000:0:*) static-port
-  [ Skip steps: i=82 d=end f=end p=end da=48 sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end da=48 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @47 match in on lo0 inet6 from (lo1000000:0:*) to (lo1000000:0:*) rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @48 match out on lo0 inet6 from ::1 to <sometable:*> nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @49 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @50 match out on lo0 inet6 from ::1 to ! <sometable:*> nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @51 match in on lo0 inet6 from ! <sometable:*> to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @52 match out on lo0 inet6 from ::1 to (lo1000000:0:*) nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @53 match in on lo0 inet6 from (lo1000000:0:*) to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @54 match out on lo0 inet6 from ::1 to ! (lo1000000:0:*) nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @55 match in on lo0 inet6 from ! (lo1000000:0:*) to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @56 match out on lo0 inet6 from (lo0:0:1) to <sometable:*> nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @57 match in on lo0 inet6 from <sometable:*> to ::2 rdr-to (lo0:0:1)
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @58 match out on lo0 inet6 from ::1 to (lo0:2) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @59 match in on lo0 inet6 from (lo0:2) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @60 match out on lo0 inet6 from ::1 to (lo0:0:1) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @61 match in on lo0 inet6 from (lo0:0:1) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @62 match out on lo0 inet6 from ::1 to (lo0:peer:*) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @63 match in on lo0 inet6 from (lo0:peer:*) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @64 match out on lo0 inet6 from ::1 to (lo0:peer:0:*) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @65 match in on lo0 inet6 from (lo0:peer:0:*) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @66 match out on lo0 inet6 from ::1 to (lo0:broadcast:*) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @67 match in on lo0 inet6 from (lo0:broadcast:*) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @68 match out on lo0 inet6 from ::1 to (lo0:broadcast:0:*) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @69 match in on lo0 inet6 from (lo0:broadcast:0:*) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @70 match out on lo0 inet6 from ::1 to (lo0:network:1) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @71 match in on lo0 inet6 from (lo0:network:1) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @72 match out on lo0 inet6 from ::1 to (lo0:network:0:1) nat-to ::1 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @73 match in on lo0 inet6 from (lo0:network:0:1) to ::1 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @74 match out on lo0 inet6 from ::1 to (lo0:2)/100 nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @75 match in on lo0 inet6 from (lo0:2)/100 to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @76 match out on lo0 inet6 from ::1 to (lo0:0:1)/100 nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @77 match in on lo0 inet6 from (lo0:0:1)/100 to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @78 match out on lo0 inet6 from ::1 to (lo0:peer:*)/100 nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @79 match in on lo0 inet6 from (lo0:peer:*)/100 to ::2 rdr-to ::1
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @80 match out on lo0 inet6 from ::1 to (lo0:peer:0:*)/100 nat-to ::2 static-port
-  [ Skip steps: i=82 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=82 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @81 match in on lo0 inet6 from (lo0:peer:0:*)/100 to ::2 rdr-to ::1
-  [ Skip steps: d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @82 match out on lo inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port
-  [ Skip steps: i=84 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=84 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @83 match in on lo inet6 from ::1 to ::2 rdr-to (lo0:0:1)
-  [ Skip steps: d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @84 match out on tun inet6 from (lo0:0:1) to ::1 nat-to ::2 static-port
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @85 match in on tun inet6 from ::1 to ::2 rdr-to (lo0:0:1)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf18.loaded b/regress/sbin/pfctl/pf18.loaded
index aa9e6660de4..81587a139f1 100644
--- a/regress/sbin/pfctl/pf18.loaded
+++ b/regress/sbin/pfctl/pf18.loaded
@@ -1,76 +1,76 @@
 @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2
-  [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3
-  [ Skip steps: i=15 r=end d=15 f=end da=4 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match out on lo0 inet proto icmp from 192.168.1.4 to any nat-to 10.0.0.4
-  [ Skip steps: i=15 r=end d=15 f=end sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match out on lo0 inet from 192.168.1.5 to 172.6.1.1 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=7 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match out on lo0 inet from 192.168.1.5 to 172.14.1.2 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=7 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=7 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match out on lo0 inet from 192.168.1.5 to 172.16.2.0/24 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match out on lo0 inet from 192.168.1.6 to 172.6.1.1 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=10 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match out on lo0 inet from 192.168.1.6 to 172.14.1.2 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=10 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=10 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match out on lo0 inet from 192.168.1.6 to 172.16.2.0/24 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match out on lo0 inet from 192.168.1.7 to 172.6.1.1 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=13 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match out on lo0 inet from 192.168.1.7 to 172.14.1.2 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sa=13 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sa=13 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 match out on lo0 inet from 192.168.1.7 to 172.16.2.0/24 nat-to 127.0.0.1
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 match out on lo0 inet from 192.168.0.0/24 to any nat-to (lo0:1) round-robin
-  [ Skip steps: i=15 r=end d=15 f=end p=15 sp=end dp=end ]
+  [ Skip steps: i=15 d=end r=15 f=end p=15 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 match out on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 nat-to 10.0.0.8
-  [ Skip steps: r=end f=end sp=end dp=end ]
+  [ Skip steps: d=end f=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 match out on ! lo0 inet proto udp all nat-to 10.0.0.8 static-port
-  [ Skip steps: i=17 r=end d=17 f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=17 d=end r=17 f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 match out on ! lo0 inet proto tcp all nat-to 10.0.0.8 static-port
-  [ Skip steps: r=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: d=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 match out on lo0 inet all nat-to 10.0.0.8
-  [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 match out on tun1000000 inet all nat-to 10.0.0.8
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf19.loaded b/regress/sbin/pfctl/pf19.loaded
index aaae9869f55..2490194fb66 100644
--- a/regress/sbin/pfctl/pf19.loaded
+++ b/regress/sbin/pfctl/pf19.loaded
@@ -1,36 +1,36 @@
 @0 match in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 rdr-to 10.0.0.10 port 22
-  [ Skip steps: i=5 r=end d=end f=end p=end sp=end ]
+  [ Skip steps: i=5 d=end r=end f=end p=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=5 r=end d=end f=end p=end sa=3 sp=end dp=end ]
+  [ Skip steps: i=5 d=end r=end f=end p=end sa=3 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=5 r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=5 d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=5 r=end d=end f=end p=end sa=5 sp=end dp=end ]
+  [ Skip steps: i=5 d=end r=end f=end p=end sa=5 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=7 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=7 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf2.loaded b/regress/sbin/pfctl/pf2.loaded
index 6e0cfd3eee5..82272d631dc 100644
--- a/regress/sbin/pfctl/pf2.loaded
+++ b/regress/sbin/pfctl/pf2.loaded
@@ -1,88 +1,88 @@
 @0 block drop out log on tun1000000 all
-  [ Skip steps: i=12 d=end f=6 p=2 sa=6 da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=6 p=2 sa=6 da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in log on tun1000000 all
-  [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=6 sa=6 da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block return-rst out log on tun1000000 proto tcp all
-  [ Skip steps: i=12 d=end f=6 p=4 sa=6 da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=6 p=4 sa=6 da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block return-rst in log on tun1000000 proto tcp all
-  [ Skip steps: i=12 d=end f=6 sa=6 da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=6 sa=6 da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all
-  [ Skip steps: i=12 d=end f=6 p=6 sa=6 da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=6 p=6 sa=6 da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all
-  [ Skip steps: i=12 d=end da=7 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end da=7 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any
-  [ Skip steps: i=12 d=end f=12 p=13 sp=end dp=16 ]
+  [ Skip steps: i=12 r=end f=12 p=13 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in quick on tun1000000 inet from any to 255.255.255.255
-  [ Skip steps: i=12 r=13 d=end f=12 p=13 sp=end dp=16 ]
+  [ Skip steps: i=12 d=13 r=end f=12 p=13 sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any
-  [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ]
+  [ Skip steps: i=12 d=13 r=end f=12 p=13 da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any
-  [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ]
+  [ Skip steps: i=12 d=13 r=end f=12 p=13 da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any
-  [ Skip steps: i=12 r=13 d=end f=12 p=13 da=end sp=end dp=16 ]
+  [ Skip steps: i=12 d=13 r=end f=12 p=13 da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any
-  [ Skip steps: r=13 d=end p=13 da=end sp=end dp=16 ]
+  [ Skip steps: d=13 r=end p=13 da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop in log quick from no-route to any
-  [ Skip steps: d=end da=end sp=end dp=16 ]
+  [ Skip steps: r=end da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0
-  [ Skip steps: i=end d=end f=15 p=15 sa=end da=end sp=end dp=16 ]
+  [ Skip steps: i=end r=end f=15 p=15 sa=end da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0
-  [ Skip steps: i=end d=end sa=end da=end sp=end dp=16 ]
+  [ Skip steps: i=end r=end sa=end da=end sp=end dp=16 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass out on tun1000000 proto udp all
-  [ Skip steps: i=end d=end f=end p=17 sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end p=17 sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass in on tun1000000 proto udp from any to any port = 53
-  [ Skip steps: i=end d=end f=end sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass out on tun1000000 proto tcp all flags S/SA
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf20.loaded b/regress/sbin/pfctl/pf20.loaded
index 33a0c54b9e8..ed1e8d335e4 100644
--- a/regress/sbin/pfctl/pf20.loaded
+++ b/regress/sbin/pfctl/pf20.loaded
@@ -1,48 +1,48 @@
 @0 match out on lo0 inet from 127.0.0.0/24 to 1.2.3.0/25 nat-to 127.0.0.1
-  [ Skip steps: i=8 r=4 d=end f=end p=4 sa=2 sp=end dp=4 ]
+  [ Skip steps: i=8 d=4 r=end f=end p=4 sa=2 sp=end dp=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 nat-to 127.0.0.1
-  [ Skip steps: i=8 r=4 d=end f=end p=4 sp=end dp=4 ]
+  [ Skip steps: i=8 d=4 r=end f=end p=4 sp=end dp=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet from 10.0.1.0/24 to 1.2.3.0/25 nat-to 127.0.0.1
-  [ Skip steps: i=8 r=4 d=end f=end p=4 sa=4 sp=end dp=4 ]
+  [ Skip steps: i=8 d=4 r=end f=end p=4 sa=4 sp=end dp=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match out on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 nat-to 127.0.0.1
-  [ Skip steps: i=8 d=end f=end sp=end ]
+  [ Skip steps: i=8 r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match in on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=8 r=end d=end f=end p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=8 d=end r=end f=end p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=8 r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=8 d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match in on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=8 r=end d=end f=end p=end sa=8 sp=end dp=end ]
+  [ Skip steps: i=8 d=end r=end f=end p=end sa=8 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=10 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=10 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match in on lo1000000 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 1.2.3.0/25 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match in on lo1000000 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port = 21 rdr-to 127.0.0.1 port 8021
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf23.loaded b/regress/sbin/pfctl/pf23.loaded
index 8a0d52b7f22..f544dd4ddb1 100644
--- a/regress/sbin/pfctl/pf23.loaded
+++ b/regress/sbin/pfctl/pf23.loaded
@@ -1,4 +1,4 @@
 @0 block drop in on ! lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf24.loaded b/regress/sbin/pfctl/pf24.loaded
index 3f1d9dc414c..dcd9ab5f954 100644
--- a/regress/sbin/pfctl/pf24.loaded
+++ b/regress/sbin/pfctl/pf24.loaded
@@ -1,8 +1,8 @@
 @0 pass in proto tcp from any to any port = 22 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in proto tcp from any to any port = 21 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf25.loaded b/regress/sbin/pfctl/pf25.loaded
index e78e2b7fa48..88f09c02158 100644
--- a/regress/sbin/pfctl/pf25.loaded
+++ b/regress/sbin/pfctl/pf25.loaded
@@ -1,20 +1,20 @@
 @0 block drop in on ! lo0 inet6 from ::1 to any
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in on ! lo0 inet from 127.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end f=3 p=end sa=3 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=3 p=end sa=3 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in on ! lo0 from (lo0:network:2) to any
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in log quick on ! lo0 inet from (lo0:network:1) to any
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf26.loaded b/regress/sbin/pfctl/pf26.loaded
index 775a952c8c9..62380a1195b 100644
--- a/regress/sbin/pfctl/pf26.loaded
+++ b/regress/sbin/pfctl/pf26.loaded
@@ -1,8 +1,8 @@
 @0 block drop in on lo0 inet from ! (lo0:1) to any
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop out on lo0 inet from any to ! (lo0:1)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf27.loaded b/regress/sbin/pfctl/pf27.loaded
index 55b4d01f00b..567d20f97e0 100644
--- a/regress/sbin/pfctl/pf27.loaded
+++ b/regress/sbin/pfctl/pf27.loaded
@@ -1,48 +1,48 @@
 @0 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.1
-  [ Skip steps: i=end r=6 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on lo0 inet from 127.0.0.1 to any nat-to 127.0.0.1
-  [ Skip steps: i=end r=6 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.1
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=4 da=4 sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=4 da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match out on lo0 inet from any to 127.0.0.1 nat-to (lo0:1) round-robin
-  [ Skip steps: i=end r=6 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match out on lo0 inet from 127.0.0.1 to any nat-to (lo0:1) round-robin
-  [ Skip steps: i=end r=6 d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match out on lo0 inet from any to (lo0:1) nat-to 127.0.0.1
-  [ Skip steps: i=end d=end f=end p=end sa=7 sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=7 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in on lo0 inet from 127.0.0.1 to any rdr-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end f=end p=end sa=10 da=10 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=10 da=10 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match in on lo0 inet from any to 127.0.0.1 rdr-to (lo0:1) round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match in on lo0 inet from 127.0.0.1 to any rdr-to (lo0:1) round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match in on lo0 inet from any to (lo0:1) rdr-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf28.loaded b/regress/sbin/pfctl/pf28.loaded
index 66831726ec9..7bea6d64c60 100644
--- a/regress/sbin/pfctl/pf28.loaded
+++ b/regress/sbin/pfctl/pf28.loaded
@@ -1,24 +1,24 @@
 @0 block drop in log (all) quick on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in log quick on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in log (all) quick on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in log quick on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in log on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in log (all) on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf29.loaded b/regress/sbin/pfctl/pf29.loaded
index 1789a22e83e..a0e20d339a1 100644
--- a/regress/sbin/pfctl/pf29.loaded
+++ b/regress/sbin/pfctl/pf29.loaded
@@ -1,12 +1,12 @@
 @0 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 8000:8010 rdr-to 127.0.0.1 port 8000:8010
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 21:22 rdr-to 127.0.0.1 port 179:180
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match in on lo0 inet proto tcp from any to 192.168.0.0/24 port 1000:3000 rdr-to 127.0.0.1 port 22
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf3.loaded b/regress/sbin/pfctl/pf3.loaded
index 9b887cb9526..22b580cfaab 100644
--- a/regress/sbin/pfctl/pf3.loaded
+++ b/regress/sbin/pfctl/pf3.loaded
@@ -1,52 +1,52 @@
 @0 pass in all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=2 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=2 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in proto tcp all flags FPUEW/FSRPAUEW
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in proto tcp all flags FS/FSRA
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in proto tcp all flags /FSRAW
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in proto udp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in proto icmp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in proto tcp all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in all flags S/SA no state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in all no state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass in all flags any
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass in all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass in all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf30.loaded b/regress/sbin/pfctl/pf30.loaded
index 74f8675b7e9..7845537c935 100644
--- a/regress/sbin/pfctl/pf30.loaded
+++ b/regress/sbin/pfctl/pf30.loaded
@@ -1,4 +1,4 @@
 @0 block drop in on lo0 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf31.loaded b/regress/sbin/pfctl/pf31.loaded
index d382f77993d..4d0494d861c 100644
--- a/regress/sbin/pfctl/pf31.loaded
+++ b/regress/sbin/pfctl/pf31.loaded
@@ -1,72 +1,72 @@
 @0 block return in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block return in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block return in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block return in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block return in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block return in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 block drop in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block drop in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 block return in on lo0 all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 block return in on lo0 inet all
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 block return in on lo0 inet6 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf32.loaded b/regress/sbin/pfctl/pf32.loaded
index 30afa5afc90..7f286ab1521 100644
--- a/regress/sbin/pfctl/pf32.loaded
+++ b/regress/sbin/pfctl/pf32.loaded
@@ -1,24 +1,24 @@
 @0 pass in inet from 10.0.0.0/8 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=2 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=2 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in inet from 10.0.0.0/8 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in inet from 192.168.37.0/25 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in inet from 192.168.37.0/24 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet from 192.168.0.0/16 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in inet from 192.0.0.0/8 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf34.loaded b/regress/sbin/pfctl/pf34.loaded
index 191bfcf3e61..03794330316 100644
--- a/regress/sbin/pfctl/pf34.loaded
+++ b/regress/sbin/pfctl/pf34.loaded
@@ -1,20 +1,20 @@
 @0 pass in inet from any to 127.0.0.1 flags S/SA
-  [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=4 sa=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in inet6 from any to 2000::1 flags S/SA
-  [ Skip steps: i=end r=end d=end p=4 sa=4 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=4 sa=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in all flags S/SA probability 50%
-  [ Skip steps: i=end r=end d=end f=4 p=4 sa=4 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=4 p=4 sa=4 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in all flags S/SA probability 50%
-  [ Skip steps: i=end r=end d=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet6 proto tcp from ::1 to any flags S/SA probability 0.8%
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf36.loaded b/regress/sbin/pfctl/pf36.loaded
index 39100fcf5a9..a72db426b2f 100644
--- a/regress/sbin/pfctl/pf36.loaded
+++ b/regress/sbin/pfctl/pf36.loaded
@@ -1,52 +1,52 @@
 @0 match out on lo0 inet from any to 127.0.0.1 nat-to <__automatic_0:2> round-robin
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 bitmask static-port
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 random
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0
-  [ Skip steps: i=end r=6 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match out on lo0 inet from any to 127.0.0.1 nat-to 127.0.0.0/24 round-robin
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_3:2> round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in on lo0 inet from any to 127.0.0.1 rdr-to <__automatic_6:2> round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 bitmask
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 random
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x0123456789abcdef0123456789abcdef
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 match in on lo0 inet from any to 127.0.0.1 rdr-to 127.0.0.0/24 round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf38.loaded b/regress/sbin/pfctl/pf38.loaded
index 6a6664d6adf..2c995e15961 100644
--- a/regress/sbin/pfctl/pf38.loaded
+++ b/regress/sbin/pfctl/pf38.loaded
@@ -1,16 +1,16 @@
 @0 pass in on tun1000000 proto tcp all user = 3 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in on tun1000000 proto tcp all group = 7 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in on tun1000000 proto tcp all user = 3 group = 0 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on tun1000000 proto tcp all user = 0 group = 0 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf39.loaded b/regress/sbin/pfctl/pf39.loaded
index 2b0f1cfc387..b0b2b5382ce 100644
--- a/regress/sbin/pfctl/pf39.loaded
+++ b/regress/sbin/pfctl/pf39.loaded
@@ -1,40 +1,40 @@
 @0 pass in log quick on lo0 inet proto tcp all tos 0x08 fragment label "blah"
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in log quick on lo0 inet proto tcp all user = 3 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in log quick on lo0 inet proto tcp all user = 3 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in log quick on lo0 inet proto tcp all user = 0 group = 32767 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end p=5 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=5 sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in log quick on lo0 inet proto tcp all user = 0 group = 0 flags S/SA tos 0x08 allow-opts label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in log quick on lo0 inet proto tcp all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=8 sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=8 sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in log quick on lo0 inet proto tcp all flags S/SA tos 0x08 label "blah" queue blah
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname=blah qid=1 pqname= pqid=1 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf4.loaded b/regress/sbin/pfctl/pf4.loaded
index ca0dcfeaf7c..f3791a7e35b 100644
--- a/regress/sbin/pfctl/pf4.loaded
+++ b/regress/sbin/pfctl/pf4.loaded
@@ -1,248 +1,248 @@
 @0 block drop in all
-  [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=5 sa=5 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in proto tcp all
-  [ Skip steps: i=end r=end d=end f=5 p=3 sa=5 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=5 p=3 sa=5 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in proto tcp all
-  [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=5 sa=5 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in proto udp all
-  [ Skip steps: i=end r=end d=end f=5 sa=5 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=5 sa=5 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in all
-  [ Skip steps: i=end r=end d=end p=9 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end p=9 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in inet from 10.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=9 p=9 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop in inet from ! 10.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=9 p=9 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in inet from 10.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end f=9 p=9 da=14 sp=9 dp=10 ]
+  [ Skip steps: i=end d=end r=end f=9 p=9 da=14 sp=9 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in inet from 172.16.0.0/12 to any
-  [ Skip steps: i=end r=end d=end da=14 dp=10 ]
+  [ Skip steps: i=end d=end r=end da=14 dp=10 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop in proto tcp from any port = 22 to any
-  [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 sp=11 ]
+  [ Skip steps: i=end d=end r=end f=14 p=38 sa=14 da=14 sp=11 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop in proto tcp from any port = 22 to any port 1024:2048
-  [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
+  [ Skip steps: i=end d=end r=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block drop in proto tcp from any port 21 >< 2048 to any port 1024:2048
-  [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
+  [ Skip steps: i=end d=end r=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop in proto tcp from any port != 1234 to any port 1024:2048
-  [ Skip steps: i=end r=end d=end f=14 p=38 sa=14 da=14 dp=14 ]
+  [ Skip steps: i=end d=end r=end f=14 p=38 sa=14 da=14 dp=14 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 block drop in proto tcp from any port >= 80 to any port 1024:2048
-  [ Skip steps: i=end r=end d=end p=38 ]
+  [ Skip steps: i=end d=end r=end p=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=20 sp=17 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=17 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=20 sp=17 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=20 sp=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=20 sp=20 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=20 sp=20 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=26 sp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=23 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=26 sp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 block drop in inet proto tcp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=26 sp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=26 da=26 sp=26 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=26 da=26 sp=26 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 block drop in inet proto tcp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=32 sp=29 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=29 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=32 sp=29 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=32 sp=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=32 sp=32 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=32 sp=32 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @31 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @32 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=38 sp=35 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @33 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=35 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=38 sp=35 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @34 block drop in inet proto tcp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @35 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=38 sp=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @36 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=38 sa=38 da=38 sp=38 ]
+  [ Skip steps: i=end d=end r=end f=end p=38 sa=38 da=38 sp=38 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @37 block drop in inet proto tcp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end ]
+  [ Skip steps: i=end d=end r=end f=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @38 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=44 sp=41 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @39 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=41 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=44 sp=41 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @40 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @41 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=44 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=44 sp=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @42 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=44 sp=44 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=44 sp=44 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @43 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @44 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=50 sp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @45 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=47 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=50 sp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @46 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=50 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @47 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=50 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=50 sp=50 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @48 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=50 da=50 sp=50 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=50 da=50 sp=50 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @49 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @50 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=56 sp=53 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @51 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=53 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=56 sp=53 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @52 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @53 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=56 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=56 sp=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @54 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=56 sp=56 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=56 sp=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @55 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @56 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @57 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=59 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @58 block drop in inet proto udp from 172.16.0.0/12 port = 22 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @59 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @60 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @61 block drop in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port 6669:65535
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf40.loaded b/regress/sbin/pfctl/pf40.loaded
index 0bca07e8d69..08d565da5be 100644
--- a/regress/sbin/pfctl/pf40.loaded
+++ b/regress/sbin/pfctl/pf40.loaded
@@ -1,80 +1,80 @@
 @0 block drop all
-  [ Skip steps: i=12 r=4 d=end f=end p=2 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 d=4 r=end f=end p=2 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block return all
-  [ Skip steps: i=12 r=4 d=end f=end sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 d=4 r=end f=end sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block return-rst proto tcp all
-  [ Skip steps: i=12 r=4 d=end f=end sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 d=4 r=end f=end sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass all flags S/SA
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in all no state
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass out all no state
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass all no state
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in all
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop out all
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop all
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass in all flags S/SA
-  [ Skip steps: i=12 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=12 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass out all flags S/SA
-  [ Skip steps: d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop on lo0 all
-  [ Skip steps: i=15 r=17 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=15 d=17 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass on lo0 all flags S/SA
-  [ Skip steps: i=15 r=17 d=end f=end p=15 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=15 d=17 r=end f=end p=15 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 block drop on lo0 all
-  [ Skip steps: r=17 d=end f=end sa=end da=end sp=end dp=19 ]
+  [ Skip steps: d=17 r=end f=end sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass proto tcp all flags S/SA
-  [ Skip steps: i=19 r=17 d=end f=end sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=19 d=17 r=end f=end sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass proto udp all
-  [ Skip steps: i=19 d=end f=end p=19 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=19 r=end f=end p=19 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in proto udp all
-  [ Skip steps: i=19 d=end f=end p=19 sa=end da=end sp=end dp=19 ]
+  [ Skip steps: i=19 r=end f=end p=19 sa=end da=end sp=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass out proto udp all
-  [ Skip steps: r=end d=end f=end sa=end da=end sp=end ]
+  [ Skip steps: d=end r=end f=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass out on lo0 proto tcp from any to any port = 25 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf44.loaded b/regress/sbin/pfctl/pf44.loaded
index e2a6c95be66..3f1558f8e87 100644
--- a/regress/sbin/pfctl/pf44.loaded
+++ b/regress/sbin/pfctl/pf44.loaded
@@ -1,24 +1,24 @@
 @0 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match in on lo0 all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in on lo0 all scrub (no-df min-ttl 15 reassemble tcp max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf46.loaded b/regress/sbin/pfctl/pf46.loaded
index da5a3115506..6b29b855c3d 100644
--- a/regress/sbin/pfctl/pf46.loaded
+++ b/regress/sbin/pfctl/pf46.loaded
@@ -1,28 +1,28 @@
 @0 pass in on lo0 inet all flags S/SA route-to <__automatic_0:2> round-robin
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass out on lo0 inet all flags S/SA route-to <__automatic_1:2> round-robin
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 bitmask
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass out on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 random
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in on lo0 inet all flags S/SA reply-to 127.0.0.0/28@pflog0
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass out on lo0 inet all flags S/SA route-to 127.0.0.0/24@pflog0 source-hash 0x4da8e393fd22f577426cfdf7fe52d3b0
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in on lo0 inet all flags S/SA dup-to 127.0.0.0/24@pflog0 round-robin
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf47.loaded b/regress/sbin/pfctl/pf47.loaded
index a4af4257e3b..421c75abed9 100644
--- a/regress/sbin/pfctl/pf47.loaded
+++ b/regress/sbin/pfctl/pf47.loaded
@@ -1,244 +1,244 @@
 @0 pass in on lo0 all flags S/SA
-  [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
+  [ Skip steps: d=end r=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in all flags S/SA label "any"
-  [ Skip steps: r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
+  [ Skip steps: d=end r=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in on lo0 all flags S/SA label "lo0"
-  [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on lo0 all flags S/SA label "lo0lo0"
-  [ Skip steps: i=end r=end d=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=5 p=35 sa=6 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in on lo0 all flags S/SA label "any"
-  [ Skip steps: i=end r=end d=end p=35 sa=6 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 sa=6 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in on lo0 inet all flags S/SA label "any"
-  [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1"
-  [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label "127.0.0.1127.0.0.1"
-  [ Skip steps: i=end r=end d=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 sa=9 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in on lo0 inet from 127.0.0.1 to any flags S/SA label ":127.0.0.1:127.0.0.1:"
-  [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA label "127.0.0.0/8"
-  [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass in on lo0 inet from 127.0.0.0/16 to any flags S/SA label "127.0.0.0/16127.0.0.0/16"
-  [ Skip steps: i=end r=end d=end f=12 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=12 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass in on lo0 inet from 127.0.0.0/31 to any flags S/SA label ":127.0.0.0/31:127.0.0.0/31:"
-  [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1"
-  [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass in on lo0 inet6 from fe80::1 to any flags S/SA label "fe80::1fe80::1"
-  [ Skip steps: i=end r=end d=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 sa=15 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass in on lo0 inet6 from fe80::1 to any flags S/SA label ":fe80::1:fe80::1:"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass in on lo0 inet6 from ::/8 to any flags S/SA label "::/8"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass in on lo0 inet6 from fe00::/8 to any flags S/SA label "fe00::/8"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in on lo0 inet6 from ::/64 to any flags S/SA label "::/64::/64"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass in on lo0 inet6 from fe80::/64 to any flags S/SA label "fe80::/64fe80::/64"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in on lo0 inet6 from ::/127 to any flags S/SA label ":::/127:::/127:"
-  [ Skip steps: i=end r=end d=end f=21 p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=21 p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on lo0 inet6 from fe80::/127 to any flags S/SA label ":fe80::/127:fe80::/127:"
-  [ Skip steps: i=end r=end d=end p=35 da=22 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 da=22 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass in on lo0 all flags S/SA label "!any!"
-  [ Skip steps: i=end r=end d=end p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)"
-  [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=28 p=35 sa=60 da=25 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 pass in on lo0 inet from any to (lo0:1) flags S/SA label "(lo0)(lo0)"
-  [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 da=25 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=28 p=35 sa=60 da=25 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 pass in on lo0 inet from any to (lo0:1) flags S/SA label " (lo0) (lo0) "
-  [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 pass in on lo0 inet from any to ! 127.0.0.0/8 flags S/SA label "! 127.0.0.0/8"
-  [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 pass in on lo0 inet from any to ! 127.0.0.0/16 flags S/SA label "! 127.0.0.0/16! 127.0.0.0/16"
-  [ Skip steps: i=end r=end d=end f=28 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=28 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 pass in on lo0 inet from any to ! 127.0.0.0/31 flags S/SA label " ! 127.0.0.0/31 ! 127.0.0.0/31 "
-  [ Skip steps: i=end r=end d=end p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)"
-  [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=34 p=35 sa=60 da=31 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label "! (lo0)! (lo0)"
-  [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 da=31 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=34 p=35 sa=60 da=31 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 pass in on lo0 inet6 from any to ! (lo0:2) flags S/SA label " ! (lo0) ! (lo0) "
-  [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @31 pass in on lo0 inet6 from any to ! ::/8 flags S/SA label "! ::/8"
-  [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @32 pass in on lo0 inet6 from any to ! ::/64 flags S/SA label "! ::/64! ::/64"
-  [ Skip steps: i=end r=end d=end f=34 p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=34 p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @33 pass in on lo0 inet6 from any to ! ::/127 flags S/SA label " ! ::/127 ! ::/127 "
-  [ Skip steps: i=end r=end d=end p=35 sa=60 sp=35 dp=47 ]
+  [ Skip steps: i=end d=end r=end p=35 sa=60 sp=35 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @34 pass in on lo0 all flags S/SA label "xx"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @35 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @36 pass in on lo0 proto tcp from any port 28 >< 29 to any flags S/SA label "28><29"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @37 pass in on lo0 proto tcp from any port 28 <> 29 to any flags S/SA label "28<>29"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @38 pass in on lo0 proto tcp from any port 28:29 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @39 pass in on lo0 proto tcp from any port != 28 to any flags S/SA label "!=28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @40 pass in on lo0 proto tcp from any port < 28 to any flags S/SA label "<28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @41 pass in on lo0 proto tcp from any port <= 28 to any flags S/SA label "<=28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @42 pass in on lo0 proto tcp from any port > 28 to any flags S/SA label ">28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @43 pass in on lo0 proto tcp from any port >= 28 to any flags S/SA label ">=28"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @44 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "2828"
-  [ Skip steps: i=end r=end d=end f=60 p=46 sa=60 da=60 sp=46 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 p=46 sa=60 da=60 sp=46 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @45 pass in on lo0 proto tcp from any port = 28 to any flags S/SA label "$28$28$"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 dp=47 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 dp=47 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @46 pass in on lo0 all flags S/SA
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 sp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @47 pass in on lo0 proto udp from any to any port = 29 label "29"
-  [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=50 sa=60 da=60 sp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @48 pass in on lo0 proto udp from any to any port != 29 label "!=29!=29"
-  [ Skip steps: i=end r=end d=end f=60 p=50 sa=60 da=60 sp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=50 sa=60 da=60 sp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @49 pass in on lo0 proto udp from any to any port > 29 label "x>29x>29x"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 sp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @50 pass in on lo0 all flags S/SA label "ip"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @51 pass in on lo0 proto esp all label "esp"
-  [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @52 pass in on lo0 proto esp all label "espesp"
-  [ Skip steps: i=end r=end d=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=54 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @53 pass in on lo0 proto esp all label "-esp-esp-"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @54 pass in on lo0 proto 166 all label "166"
-  [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @55 pass in on lo0 proto 166 all label "166166"
-  [ Skip steps: i=end r=end d=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=57 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @56 pass in on lo0 proto 166 all label "_166_166_"
-  [ Skip steps: i=end r=end d=end f=60 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @57 pass in on lo0 all flags S/SA label "57"
-  [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @58 pass in on lo0 all flags S/SA label "5858"
-  [ Skip steps: i=end r=end d=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ]
+  [ Skip steps: i=end d=end r=end f=60 p=60 sa=60 da=60 sp=60 dp=60 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @59 pass in on lo0 all flags S/SA label "%59%59%"
-  [ Skip steps: i=end r=end d=end ]
+  [ Skip steps: i=end d=end r=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @60 pass in on lo0 inet proto tcp from 127.0.0.1 port = 30 to 127.0.0.2 port = 44 flags S/SA label "if lo0 proto tcp 127.0.0.1 30 127.0.0.2 44"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded
index d797b2aec82..68b98549d8b 100644
--- a/regress/sbin/pfctl/pf48.loaded
+++ b/regress/sbin/pfctl/pf48.loaded
@@ -1,5 +1,5 @@
 @0 match out on lo0 inet6 from <regress.1:2> to <regress.2:*> nat-to ::1
-  [ Skip steps: r=2 p=end da=4 sp=end dp=end ]
+  [ Skip steps: d=2 p=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on ! lo0 inet from ! <regress.1:2> to <regress.2:*> nat-to 127.0.0.1
@@ -7,50 +7,50 @@
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match in on lo0 inet6 from <regress.1:2> to <regress.2:*> rdr-to ::1
-  [ Skip steps: r=6 f=4 p=end da=4 sp=end dp=end ]
+  [ Skip steps: d=6 f=4 p=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match in on ! lo0 inet6 from ! <regress.1:2> to <regress.2:*> rdr-to ::1
-  [ Skip steps: r=6 p=end sp=end dp=end ]
+  [ Skip steps: d=6 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match in from <regress.1:2> to any
-  [ Skip steps: i=end r=6 d=end f=end p=end da=6 sp=end dp=end ]
+  [ Skip steps: i=end d=6 r=end f=end p=end da=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in from ! <regress.2:*> to any
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match out from any to ! <regress.1:2>
-  [ Skip steps: i=end r=8 d=end f=end p=end sa=8 sp=end dp=end ]
+  [ Skip steps: i=end d=8 r=end f=end p=end sa=8 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match out from any to <regress.2:*>
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in from <regress:6> to any flags S/SA
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass out from any to <regress:6> flags S/SA
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass in from <regress.1:2> to any flags S/SA
-  [ Skip steps: i=end r=12 d=end f=end p=end da=12 sp=end dp=end ]
+  [ Skip steps: i=end d=12 r=end f=end p=end da=12 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass in from <regress.2:*> to any flags S/SA
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass out from any to ! <regress.1:2> flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass out from any to ! <regress.2:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf49.loaded b/regress/sbin/pfctl/pf49.loaded
index 8747aa9fe20..7c4a2aee3e2 100644
--- a/regress/sbin/pfctl/pf49.loaded
+++ b/regress/sbin/pfctl/pf49.loaded
@@ -1,16 +1,16 @@
 @0 pass in on lo0 inet6 from ::1 to any flags S/SA
-  [ Skip steps: i=end r=2 d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=2 r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in on lo0 inet from 127.0.0.0/8 to any flags S/SA
-  [ Skip steps: i=end d=end f=3 p=end sa=3 da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=3 p=end sa=3 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass out on lo0 inet from 127.0.0.0/8 to any flags S/SA
-  [ Skip steps: i=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on lo0 inet6 from ::1 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf5.loaded b/regress/sbin/pfctl/pf5.loaded
index 63af3d0d442..33d7ebb0d1e 100644
--- a/regress/sbin/pfctl/pf5.loaded
+++ b/regress/sbin/pfctl/pf5.loaded
@@ -1,32 +1,32 @@
 @0 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=2 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=2 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in inet proto udp from 10.0.0.0/8 port = 7 to 12.34.56.78 port = 16
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=4 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop in inet proto udp from 10.0.0.0/8 port = 22 to 12.34.56.78 port = 16
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=6 ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=6 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block drop in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf54.loaded b/regress/sbin/pfctl/pf54.loaded
index 64c559232b4..9a05d95c39d 100644
--- a/regress/sbin/pfctl/pf54.loaded
+++ b/regress/sbin/pfctl/pf54.loaded
@@ -1,4 +1,4 @@
 @0 match all scrub (random-id)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf56.loaded b/regress/sbin/pfctl/pf56.loaded
index cf602b9a147..b0ce2d08c40 100644
--- a/regress/sbin/pfctl/pf56.loaded
+++ b/regress/sbin/pfctl/pf56.loaded
@@ -1,8 +1,8 @@
 @0 pass in proto tcp from any to any port = 80 flags S/SA keep state (tcp.established 60)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in proto tcp from any to any port = 80 flags S/SA keep state (max 10, no-sync, tcp.first 2, adaptive.start 6, adaptive.end 12)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf60.loaded b/regress/sbin/pfctl/pf60.loaded
index bfd4763754b..4dac7fc76f8 100644
--- a/regress/sbin/pfctl/pf60.loaded
+++ b/regress/sbin/pfctl/pf60.loaded
@@ -1,28 +1,28 @@
 @0 pass inet from 224.4.5.4 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass inet from 224.4.0.0/16 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass inet from 224.4.5.0/26 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass inet from 224.4.5.64/26 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass inet from 224.4.5.128/26 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass inet from 224.4.5.192/26 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass inet from 224.4.5.4 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf61.loaded b/regress/sbin/pfctl/pf61.loaded
index a4fe4902fa4..d190b617bca 100644
--- a/regress/sbin/pfctl/pf61.loaded
+++ b/regress/sbin/pfctl/pf61.loaded
@@ -1,4 +1,4 @@
 @0 pass inet from any to (lo0:1)/24 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf65.loaded b/regress/sbin/pfctl/pf65.loaded
index fb953ab20bf..3f1155c74bc 100644
--- a/regress/sbin/pfctl/pf65.loaded
+++ b/regress/sbin/pfctl/pf65.loaded
@@ -1,12 +1,12 @@
 @0 block drop in on ! lo0 inet6 from ::1 to any label "antispoof-lo0"
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop in log quick on ! lo0 inet from 127.0.0.0/8 to any label "antispoof-lo0-2"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf66.loaded b/regress/sbin/pfctl/pf66.loaded
index 53e4010c447..dda4fedcd7e 100644
--- a/regress/sbin/pfctl/pf66.loaded
+++ b/regress/sbin/pfctl/pf66.loaded
@@ -1,24 +1,24 @@
 @0 match out on lo0 inet from 192.168.1.1 to any nat-to 10.0.0.1 port 500
-  [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 1000:5000
-  [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:1000
-  [ Skip steps: i=end r=end d=end f=end p=4 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=4 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match out on lo0 inet proto udp from 192.168.1.4 to any nat-to 10.0.0.4 port 50000
-  [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match out on lo0 inet proto tcp from 192.168.1.2 to any nat-to 10.0.0.2 port 80:5000
-  [ Skip steps: i=end r=end d=end f=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match out on lo0 inet proto udp from 192.168.1.3 to any nat-to 10.0.0.3 port 5000:80
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf67.loaded b/regress/sbin/pfctl/pf67.loaded
index 7911a113c54..bf282511ca1 100644
--- a/regress/sbin/pfctl/pf67.loaded
+++ b/regress/sbin/pfctl/pf67.loaded
@@ -1,8 +1,8 @@
 @0 pass in quick on tun1000000 all flags S/SA tag regress
-  [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass out quick on lo0 all flags S/SA tagged regress
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf68.loaded b/regress/sbin/pfctl/pf68.loaded
index 16d022945cb..ca26fc21d39 100644
--- a/regress/sbin/pfctl/pf68.loaded
+++ b/regress/sbin/pfctl/pf68.loaded
@@ -1,248 +1,248 @@
 @0 match on lo0 inet proto tcp from 192.168.1.1 port = 1024 to any port = 80
-  [ Skip steps: r=4 d=end p=end da=9 ]
+  [ Skip steps: d=4 r=end p=end da=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match proto tcp all
-  [ Skip steps: i=13 r=4 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=4 r=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match proto tcp all
-  [ Skip steps: i=13 r=4 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=4 r=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 match proto tcp all
-  [ Skip steps: i=13 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 r=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 match in proto tcp all
-  [ Skip steps: i=13 r=25 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 match in proto tcp all
-  [ Skip steps: i=13 r=25 d=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=9 p=end sa=7 da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 match in proto tcp all scrub (reassemble tcp)
-  [ Skip steps: i=13 r=25 d=end f=9 p=end da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=9 p=end da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 match in proto tcp from <regress.1:*> to any
-  [ Skip steps: i=13 r=25 d=end f=9 p=end da=9 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=9 p=end da=9 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 match in proto tcp from ! <regress.2:*> to any
-  [ Skip steps: i=13 r=25 d=end p=end sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end p=end sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 match in inet proto tcp from 10.0.0.1 to 10.0.0.3
-  [ Skip steps: i=13 r=25 d=end f=13 p=end sa=11 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=13 p=end sa=11 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 match in inet proto tcp from 10.0.0.1 to 10.0.0.4
-  [ Skip steps: i=13 r=25 d=end f=13 p=end sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=13 p=end sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 match in inet proto tcp from 10.0.0.2 to 10.0.0.3
-  [ Skip steps: i=13 r=25 d=end f=13 p=end sa=13 sp=39 dp=31 ]
+  [ Skip steps: i=13 d=25 r=end f=13 p=end sa=13 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 match in inet proto tcp from 10.0.0.2 to 10.0.0.4
-  [ Skip steps: r=25 d=end p=end sp=39 dp=31 ]
+  [ Skip steps: d=25 r=end p=end sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 match in log on lo0 proto tcp all scrub (min-ttl 25)
-  [ Skip steps: i=17 r=25 d=end p=end sp=39 dp=31 ]
+  [ Skip steps: i=17 d=25 r=end p=end sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 match in log on lo0 inet6 proto tcp from (lo1000000:*) to 2000::1
-  [ Skip steps: i=17 r=25 d=end f=16 p=end da=16 sp=39 dp=31 ]
+  [ Skip steps: i=17 d=25 r=end f=16 p=end da=16 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 match in log on lo0 inet6 proto tcp from (lo0:2) to 2000::1
-  [ Skip steps: i=17 r=25 d=end p=end sp=39 dp=31 ]
+  [ Skip steps: i=17 d=25 r=end p=end sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 match in log on lo0 proto tcp all
-  [ Skip steps: r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 match in log on lo1000000 proto tcp all
-  [ Skip steps: r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 match in on lo0 proto tcp all
-  [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 match in on lo0 proto tcp all scrub (max-mss 224)
-  [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 match in on lo0 proto tcp all scrub (no-df)
-  [ Skip steps: i=26 r=25 d=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end f=24 p=end sa=24 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 match in on lo0 proto tcp all scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=26 r=25 d=end p=end da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 d=25 r=end p=end da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 match in on lo0 inet proto tcp from (lo0:1) to any
-  [ Skip steps: i=26 d=end p=end da=27 sp=39 dp=31 ]
+  [ Skip steps: i=26 r=end p=end da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 match on lo0 proto tcp all scrub (max-mss 224)
-  [ Skip steps: d=end f=29 p=end sa=32 da=27 sp=39 dp=31 ]
+  [ Skip steps: r=end f=29 p=end sa=32 da=27 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 match out proto tcp all
-  [ Skip steps: i=29 r=30 d=end f=29 p=end sa=32 sp=39 dp=31 ]
+  [ Skip steps: i=29 d=30 r=end f=29 p=end sa=32 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 match out proto tcp from any to ! <regress.1:*>
-  [ Skip steps: i=29 r=30 d=end f=29 p=end sa=32 sp=39 dp=31 ]
+  [ Skip steps: i=29 d=30 r=end f=29 p=end sa=32 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 match out proto tcp from any to <regress.2:*>
-  [ Skip steps: r=30 d=end p=end sa=32 sp=39 dp=31 ]
+  [ Skip steps: d=30 r=end p=end sa=32 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 scrub (no-df max-mss 224)
-  [ Skip steps: d=end p=end sa=32 sp=39 dp=31 ]
+  [ Skip steps: r=end p=end sa=32 sp=39 dp=31 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @30 match proto tcp all scrub (random-id)
-  [ Skip steps: i=38 r=32 d=end f=34 p=end sa=32 da=34 sp=39 ]
+  [ Skip steps: i=38 d=32 r=end f=34 p=end sa=32 da=34 sp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @31 match proto tcp from any to any port = 80
-  [ Skip steps: i=38 d=end f=34 p=end da=34 sp=39 dp=39 ]
+  [ Skip steps: i=38 r=end f=34 p=end da=34 sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @32 match in proto tcp from <regress.1:*> to any port = 80
-  [ Skip steps: i=38 r=58 d=end f=34 p=end da=34 sp=39 dp=39 ]
+  [ Skip steps: i=38 d=58 r=end f=34 p=end da=34 sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @33 match in proto tcp from ! <regress.2:*> to any port = 80
-  [ Skip steps: i=38 r=58 d=end p=end sp=39 dp=39 ]
+  [ Skip steps: i=38 d=58 r=end p=end sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @34 match in inet proto tcp from 10.0.0.1 to 10.0.0.3 port = 80
-  [ Skip steps: i=38 r=58 d=end f=38 p=end sa=36 sp=39 dp=39 ]
+  [ Skip steps: i=38 d=58 r=end f=38 p=end sa=36 sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @35 match in inet proto tcp from 10.0.0.1 to 10.0.0.4 port = 80
-  [ Skip steps: i=38 r=58 d=end f=38 p=end sp=39 dp=39 ]
+  [ Skip steps: i=38 d=58 r=end f=38 p=end sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @36 match in inet proto tcp from 10.0.0.2 to 10.0.0.3 port = 80
-  [ Skip steps: i=38 r=58 d=end f=38 p=end sa=38 sp=39 dp=39 ]
+  [ Skip steps: i=38 d=58 r=end f=38 p=end sa=38 sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @37 match in inet proto tcp from 10.0.0.2 to 10.0.0.4 port = 80
-  [ Skip steps: r=58 d=end p=end sp=39 dp=39 ]
+  [ Skip steps: d=58 r=end p=end sp=39 dp=39 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @38 match in log on lo0 proto tcp from any to any port = 80 scrub (min-ttl 25)
-  [ Skip steps: i=42 r=58 d=end p=end ]
+  [ Skip steps: i=42 d=58 r=end p=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @39 match in log on lo0 inet6 proto tcp from (lo1000000:*) port = 80 to 2000::1
-  [ Skip steps: i=42 r=58 d=end f=41 p=end da=41 sp=44 dp=45 ]
+  [ Skip steps: i=42 d=58 r=end f=41 p=end da=41 sp=44 dp=45 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @40 match in log on lo0 inet6 proto tcp from (lo0:2) port = 80 to 2000::1
-  [ Skip steps: i=42 r=58 d=end p=end sp=44 dp=45 ]
+  [ Skip steps: i=42 d=58 r=end p=end sp=44 dp=45 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @41 match in log on lo0 proto tcp from any port = 80 to any
-  [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ]
+  [ Skip steps: d=58 r=end f=57 p=end sa=57 da=59 sp=44 dp=45 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @42 match in log on lo1000000 proto tcp from any port = 80 to any
-  [ Skip steps: r=58 d=end f=57 p=end sa=57 da=59 sp=44 dp=45 ]
+  [ Skip steps: d=58 r=end f=57 p=end sa=57 da=59 sp=44 dp=45 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @43 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 dp=45 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 dp=45 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @44 match in on lo0 proto tcp from any port = 81 to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @45 match in on lo0 proto tcp from any to any port = 80 scrub (max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @46 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=48 dp=48 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=48 dp=48 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @47 match in on lo0 proto tcp from any port = 80 to any scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @48 match in on lo0 proto tcp from any to any port = 80 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=51 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=51 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @49 match in on lo0 proto tcp from any to any port = 81 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=51 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=51 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @50 match in on lo0 proto tcp from any to any port = 82 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @51 match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 dp=53 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=54 dp=53 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @52 match in on lo0 proto tcp from any port = 80 to any port = 80 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=54 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=54 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @53 match in on lo0 proto tcp from any port = 80 to any port = 81 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @54 match in on lo0 proto tcp from any port = 81 to any port = 80 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 sp=56 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 sp=56 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @55 match in on lo0 proto tcp from any port = 81 to any port = 81 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end f=57 p=end sa=57 da=59 ]
+  [ Skip steps: i=59 d=58 r=end f=57 p=end sa=57 da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @56 match in on lo0 proto tcp from any to any port = 83 scrub (no-df min-ttl 15 max-mss 224)
-  [ Skip steps: i=59 r=58 d=end p=end da=59 ]
+  [ Skip steps: i=59 d=58 r=end p=end da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @57 match in on lo0 inet proto tcp from (lo0:1) port = 80 to any
-  [ Skip steps: i=59 d=end p=end da=59 ]
+  [ Skip steps: i=59 r=end p=end da=59 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @58 match on lo0 proto tcp from any to any port = 80 scrub (max-mss 224)
-  [ Skip steps: d=end f=61 p=end sa=end sp=end dp=end ]
+  [ Skip steps: r=end f=61 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @59 match out proto tcp from any to ! <regress.1:*> port = 80
-  [ Skip steps: i=61 r=end d=end f=61 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=61 d=end r=end f=61 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @60 match out proto tcp from any to <regress.2:*> port = 80
-  [ Skip steps: r=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: d=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @61 match out log on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 scrub (no-df max-mss 224)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf69.loaded b/regress/sbin/pfctl/pf69.loaded
index 524e70194f3..52f4dcfe3f9 100644
--- a/regress/sbin/pfctl/pf69.loaded
+++ b/regress/sbin/pfctl/pf69.loaded
@@ -1,8 +1,8 @@
 @0 match out on lo0 inet all tag regress nat-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass out quick on lo0 all flags S/SA tagged regress
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf7.loaded b/regress/sbin/pfctl/pf7.loaded
index ea85d48dcf3..4f7ac57bd0d 100644
--- a/regress/sbin/pfctl/pf7.loaded
+++ b/regress/sbin/pfctl/pf7.loaded
@@ -1,108 +1,108 @@
 @0 block drop out log on tun1000000 all
-  [ Skip steps: i=end d=end f=6 p=2 sa=6 da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=6 p=2 sa=6 da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in log on tun1000000 all
-  [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=6 sa=6 da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block return-rst out log on tun1000000 proto tcp all
-  [ Skip steps: i=end d=end f=6 p=4 sa=6 da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=6 p=4 sa=6 da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block return-rst in log on tun1000000 proto tcp all
-  [ Skip steps: i=end d=end f=6 sa=6 da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=6 sa=6 da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block return-icmp(port-unr, port-unr) out log on tun1000000 proto udp all
-  [ Skip steps: i=end d=end f=6 p=6 sa=6 da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=6 p=6 sa=6 da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 block return-icmp(port-unr, port-unr) in log on tun1000000 proto udp all
-  [ Skip steps: i=end d=end da=7 sp=end dp=15 ]
+  [ Skip steps: i=end r=end da=7 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 block drop out log quick on tun1000000 inet from ! 157.161.48.183 to any
-  [ Skip steps: i=end d=end f=14 p=12 sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=14 p=12 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 block drop in quick on tun1000000 inet from any to 255.255.255.255
-  [ Skip steps: i=end r=12 d=end f=14 p=12 sp=end dp=15 ]
+  [ Skip steps: i=end d=12 r=end f=14 p=12 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 block drop in log quick on tun1000000 inet from 10.0.0.0/8 to any
-  [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ]
+  [ Skip steps: i=end d=12 r=end f=14 p=12 da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 block drop in log quick on tun1000000 inet from 172.16.0.0/12 to any
-  [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ]
+  [ Skip steps: i=end d=12 r=end f=14 p=12 da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop in log quick on tun1000000 inet from 192.168.0.0/16 to any
-  [ Skip steps: i=end r=12 d=end f=14 p=12 da=end sp=end dp=15 ]
+  [ Skip steps: i=end d=12 r=end f=14 p=12 da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 block drop in log quick on tun1000000 inet from 255.255.255.255 to any
-  [ Skip steps: i=end d=end f=14 da=end sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=14 da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass out on tun1000000 inet proto icmp all icmp-type echoreq code 0
-  [ Skip steps: i=end d=end f=14 p=14 sa=end da=end sp=end dp=15 ]
+  [ Skip steps: i=end r=end f=14 p=14 sa=end da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass in on tun1000000 inet proto icmp all icmp-type echoreq code 0
-  [ Skip steps: i=end d=end sa=end da=end sp=end dp=15 ]
+  [ Skip steps: i=end r=end sa=end da=end sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass out on tun1000000 proto udp all
-  [ Skip steps: i=end d=end f=end p=16 sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end p=16 sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass in on tun1000000 proto udp from any to any port = 53
-  [ Skip steps: i=end d=end f=end sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass out on tun1000000 proto tcp all flags S/SA modulate state
-  [ Skip steps: i=end d=end f=end p=18 sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end r=end f=end p=18 sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in on tun1000000 proto tcp all flags S/SA modulate state
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass in on tun1000000 proto udp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in on tun1000000 proto icmp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on tun1000000 proto udp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass in on tun1000000 proto tcp all flags S/SA synproxy state
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end dp=23 ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end dp=23 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 pass in on tun1000000 proto icmp all
-  [ Skip steps: i=end r=end d=end f=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 pass in on tun1000000 proto tcp from any to any port = 22 flags S/SA modulate state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 pass in on tun1000000 proto tcp from any to any port = 25 flags S/SA modulate state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 pass in on tun1000000 proto tcp from any to any port = 53 flags S/SA modulate state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 pass in on tun1000000 proto tcp from any to any port = 113 flags S/SA modulate state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf70.loaded b/regress/sbin/pfctl/pf70.loaded
index 6f6450404aa..6a1050c428f 100644
--- a/regress/sbin/pfctl/pf70.loaded
+++ b/regress/sbin/pfctl/pf70.loaded
@@ -1,8 +1,8 @@
 @0 match out on lo0 inet from 10.0.0.0/8 to any nat-to 127.0.0.1
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop out on lo0 all tagged regress
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf71.loaded b/regress/sbin/pfctl/pf71.loaded
index 7c79e53c070..a58ec57e21f 100644
--- a/regress/sbin/pfctl/pf71.loaded
+++ b/regress/sbin/pfctl/pf71.loaded
@@ -1,8 +1,8 @@
 @0 match in on lo0 inet proto tcp from 10.0.0.0/8 to any port = 80 rdr-to 127.0.0.1
-  [ Skip steps: i=end d=end da=end sp=end ]
+  [ Skip steps: i=end r=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop out on lo0 all tagged regress
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf72.loaded b/regress/sbin/pfctl/pf72.loaded
index 49b60c01daf..e7dae6e3dd1 100644
--- a/regress/sbin/pfctl/pf72.loaded
+++ b/regress/sbin/pfctl/pf72.loaded
@@ -1,12 +1,12 @@
 @0 match out on lo0 inet from 192.168.1.1 to any tag regress nat-to 10.0.0.1 static-port
-  [ Skip steps: i=end d=end f=2 p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=2 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet from any to 10.0.0.1 tag regress rdr-to 192.168.1.1
-  [ Skip steps: i=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 block drop out on lo0 all tagged regress
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf73.loaded b/regress/sbin/pfctl/pf73.loaded
index cb5a95d4dd8..19e6ca246ef 100644
--- a/regress/sbin/pfctl/pf73.loaded
+++ b/regress/sbin/pfctl/pf73.loaded
@@ -1,4 +1,4 @@
 @0 pass proto tcp all flags S/SA scrub (reassemble tcp)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf74.loaded b/regress/sbin/pfctl/pf74.loaded
index 1a161d105be..07ee2a6acd5 100644
--- a/regress/sbin/pfctl/pf74.loaded
+++ b/regress/sbin/pfctl/pf74.loaded
@@ -1,4 +1,4 @@
 @0 pass in proto tcp all flags S/SA synproxy state
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf75.loaded b/regress/sbin/pfctl/pf75.loaded
index 3aed65d238c..045adafd6cf 100644
--- a/regress/sbin/pfctl/pf75.loaded
+++ b/regress/sbin/pfctl/pf75.loaded
@@ -1,8 +1,8 @@
 @0 block drop in on lo0 inet proto tcp from 192.168.0.0/24 to any port = 22 tag ssh
-  [ Skip steps: i=end r=end d=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in quick on lo0 all ! tagged ssh
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf76.loaded b/regress/sbin/pfctl/pf76.loaded
index 049f1e16724..8e073a5f46f 100644
--- a/regress/sbin/pfctl/pf76.loaded
+++ b/regress/sbin/pfctl/pf76.loaded
@@ -1,8 +1,8 @@
 @0 match out on lo0 inet from 1.2.3.4 to 5.6.7.8 nat-to 127.0.0.1 static-port
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on lo0 inet from 5.6.7.8 to 127.0.0.1 rdr-to 1.2.3.4
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf77.loaded b/regress/sbin/pfctl/pf77.loaded
index b8a01ce8140..3846adffadb 100644
--- a/regress/sbin/pfctl/pf77.loaded
+++ b/regress/sbin/pfctl/pf77.loaded
@@ -1,4 +1,4 @@
 @0 pass inet from (lo0:1)/8 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf78.loaded b/regress/sbin/pfctl/pf78.loaded
index fcd5d508c41..db7341d3296 100644
--- a/regress/sbin/pfctl/pf78.loaded
+++ b/regress/sbin/pfctl/pf78.loaded
@@ -1,4 +1,4 @@
 @0 pass in inet from 10.0.0.1 to <regress:*> flags S/SA label "10.0.0.1:<regress>"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf79.loaded b/regress/sbin/pfctl/pf79.loaded
index 8ae93f59ee1..cec2caa04cc 100644
--- a/regress/sbin/pfctl/pf79.loaded
+++ b/regress/sbin/pfctl/pf79.loaded
@@ -1,4 +1,4 @@
 @0 pass in inet from 10.0.0.1 to no-route flags S/SA label "10.0.0.1:no-route"
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf8.loaded b/regress/sbin/pfctl/pf8.loaded
index b9148158e10..d28a4d2e9da 100644
--- a/regress/sbin/pfctl/pf8.loaded
+++ b/regress/sbin/pfctl/pf8.loaded
@@ -1,8 +1,8 @@
 @0 block drop out log on tun1000001 inet from ! 10.0.0.0/8 to any
-  [ Skip steps: i=end r=end d=end f=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop out log on tun1000001 inet from 10.1.2.3 to any
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf80.loaded b/regress/sbin/pfctl/pf80.loaded
index f5dddbad5b0..655dff12177 100644
--- a/regress/sbin/pfctl/pf80.loaded
+++ b/regress/sbin/pfctl/pf80.loaded
@@ -1,64 +1,64 @@
 @0 pass out on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass out on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port
-  [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ]
+  [ Skip steps: i=end r=end f=end p=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8
-  [ Skip steps: i=end d=end f=end p=5 sp=end dp=5 ]
+  [ Skip steps: i=end r=end f=end p=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port
-  [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ]
+  [ Skip steps: i=end r=end f=end p=9 sp=end dp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8
-  [ Skip steps: i=end d=end f=end p=9 sp=end dp=9 ]
+  [ Skip steps: i=end r=end f=end p=9 sp=end dp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass out log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 flags S/SA nat-to 172.16.0.1
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = 80 flags S/SA rdr-to 127.0.0.1 port 8080
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass out log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 flags S/SA nat-to 12.0.0.0/8 static-port
-  [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ]
+  [ Skip steps: i=end r=end f=end p=13 sp=end dp=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass in log (all) on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 flags S/SA rdr-to 10.0.0.0/8
-  [ Skip steps: i=end d=end f=end p=13 sp=end dp=13 ]
+  [ Skip steps: i=end r=end f=end p=13 sp=end dp=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 match out log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 nat-to 172.16.0.1
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 match in log on lo0 inet proto tcp from any to 1.2.3.4 port = 80 rdr-to 127.0.0.1 port 8080
-  [ Skip steps: i=end d=end f=end sp=end ]
+  [ Skip steps: i=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 match out log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 nat-to 12.0.0.0/8 static-port
-  [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 match in log on lo0 inet from 11.0.0.0/8 to 12.0.0.0/8 rdr-to 10.0.0.0/8
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf81.loaded b/regress/sbin/pfctl/pf81.loaded
index e3c305ad5d8..ab0d249dda7 100644
--- a/regress/sbin/pfctl/pf81.loaded
+++ b/regress/sbin/pfctl/pf81.loaded
@@ -1,120 +1,120 @@
 @0 pass inet6 from (lo0:2) to ::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=3 p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=3 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass inet6 from (lo0:2) to ::2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=3 p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=3 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass inet6 from (lo0:2) to ::3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass inet from (lo0:1) to 0.0.0.1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=6 p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=6 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass inet from (lo0:1) to 0.0.0.2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=6 p=end sa=6 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=6 p=end sa=6 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass inet from (lo0:1) to 0.0.0.3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass from <foo:*> to <bar1:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=9 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=9 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass from <foo:*> to <bar2:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=9 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=9 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass from <foo:*> to <bar3:*> flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass inet6 from <foo:*> to ::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=12 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=12 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass inet6 from <foo:*> to ::2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=12 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=12 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass inet6 from <foo:*> to ::3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass inet from <foo:*> to 0.0.0.1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=15 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=15 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass inet from <foo:*> to 0.0.0.2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=15 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=15 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass inet from <foo:*> to 0.0.0.3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass from <foo:*> to <bar1:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=21 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=21 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass from <foo:*> to <bar2:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=21 p=end sa=18 sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=21 p=end sa=18 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass from <foo:*> to <bar3:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=21 p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=21 p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass from no-route to <bar1:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=21 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=21 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass from no-route to <bar2:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=21 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=21 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass from no-route to <bar3:*> flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass inet6 from no-route to ::1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=24 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=24 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @22 pass inet6 from no-route to ::2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=24 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=24 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @23 pass inet6 from no-route to ::3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @24 pass inet from no-route to 0.0.0.1 flags S/SA
-  [ Skip steps: i=end r=end d=end f=27 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=27 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @25 pass inet from no-route to 0.0.0.2 flags S/SA
-  [ Skip steps: i=end r=end d=end f=27 p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=27 p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @26 pass inet from no-route to 0.0.0.3 flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @27 pass from no-route to <bar1:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @28 pass from no-route to <bar2:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @29 pass from no-route to <bar3:*> flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf82.loaded b/regress/sbin/pfctl/pf82.loaded
index d0e14960a9b..37fe12683b8 100644
--- a/regress/sbin/pfctl/pf82.loaded
+++ b/regress/sbin/pfctl/pf82.loaded
@@ -1,52 +1,52 @@
 @0 pass inet from (lo0:1) to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=3 p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=3 p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass inet from ! (lo0:1) to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=3 p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=3 p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass inet from (lo0:1) to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=4 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=4 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass inet6 from (lo0:2) to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass from <foo:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=7 p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=7 p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass from ! <foo:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=7 p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=7 p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass from <foo:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass inet from <bar:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=9 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=9 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass from <bar:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass inet6 from <foo:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=11 da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=11 da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass from <foo:*> to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass inet from no-route to any flags S/SA
-  [ Skip steps: i=end r=end d=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass from no-route to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf84.loaded b/regress/sbin/pfctl/pf84.loaded
index f7697aa9e83..b736c1fd8f1 100644
--- a/regress/sbin/pfctl/pf84.loaded
+++ b/regress/sbin/pfctl/pf84.loaded
@@ -1,32 +1,32 @@
 @0 match out on tun1000000 inet from 10.0.0.0/24 to any nat-to <__automatic_0:2> round-robin sticky-address
-  [ Skip steps: i=3 d=end f=3 p=3 sp=end dp=3 ]
+  [ Skip steps: i=3 r=end f=3 p=3 sp=end dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match in on tun1000000 inet from any to 10.0.1.1 rdr-to 10.0.0.0/24 random sticky-address
-  [ Skip steps: i=3 r=end d=end f=3 p=3 sa=end sp=end dp=3 ]
+  [ Skip steps: i=3 d=end r=end f=3 p=3 sa=end sp=end dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 match in on tun1000000 inet from any to 10.0.1.2 rdr-to <__automatic_1:2> round-robin sticky-address
-  [ Skip steps: r=end d=end sa=end sp=end ]
+  [ Skip steps: d=end r=end sa=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in proto tcp from any to any port = 22 flags S/SA keep state (source-track global)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in proto tcp from any to any port = 25 flags S/SA keep state (source-track global)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in proto tcp from any to any port = 80 flags S/SA keep state (source-track rule, max-src-states 3, max-src-nodes 1000)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in proto tcp from any to any port = 123 flags S/SA keep state (source-track rule, max-src-nodes 1000)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in proto tcp from any to any port = 321 flags S/SA keep state (source-track global, max-src-states 3)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf87.loaded b/regress/sbin/pfctl/pf87.loaded
index 5cb44b3b61b..7d12f693806 100644
--- a/regress/sbin/pfctl/pf87.loaded
+++ b/regress/sbin/pfctl/pf87.loaded
@@ -1,88 +1,88 @@
 @0 pass in on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA
-  [ Skip steps: r=5 d=end f=end p=2 da=2 ]
+  [ Skip steps: d=5 r=end f=end p=2 da=2 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in on lo1000001 inet proto tcp from 10.0.0.1 port = 22 to 10.0.0.2 flags S/SA
-  [ Skip steps: i=3 r=5 d=end f=end ]
+  [ Skip steps: i=3 d=5 r=end f=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.4 port = 53
-  [ Skip steps: r=5 d=end f=end p=4 sp=9 dp=4 ]
+  [ Skip steps: d=5 r=end f=end p=4 sp=9 dp=4 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass in on lo1000000 inet proto udp from any to 10.0.0.2 port = 53
-  [ Skip steps: r=5 d=end f=end sa=9 sp=9 ]
+  [ Skip steps: d=5 r=end f=end sa=9 sp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass in inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA
-  [ Skip steps: d=end f=end sa=9 sp=9 ]
+  [ Skip steps: r=end f=end sa=9 sp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass out on lo1000001 inet proto udp from any to 10.0.0.2 port = 53
-  [ Skip steps: d=end f=end sa=9 sp=9 ]
+  [ Skip steps: r=end f=end sa=9 sp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in inet proto tcp from any to 10.0.0.3 port = 80 flags S/SA
-  [ Skip steps: i=9 d=end f=end p=8 sa=9 sp=9 ]
+  [ Skip steps: i=9 r=end f=end p=8 sa=9 sp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass out inet proto tcp from any to 10.0.0.1 port = 81 flags S/SA
-  [ Skip steps: i=9 d=end f=end sa=9 sp=9 ]
+  [ Skip steps: i=9 r=end f=end sa=9 sp=9 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in inet proto udp from any to 10.0.0.3 port = 53
-  [ Skip steps: r=10 d=end f=end p=13 ]
+  [ Skip steps: d=10 r=end f=end p=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in on lo1000001 inet proto udp from 10.0.0.2 port = 53 to 10.0.0.2
-  [ Skip steps: d=end f=end p=13 ]
+  [ Skip steps: r=end f=end p=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 pass out inet proto udp from any to 10.0.0.1 port = 53
-  [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ]
+  [ Skip steps: d=14 r=end f=end p=13 sa=16 sp=end dp=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass out on lo1000000 inet proto udp from any to 10.0.0.2 port = 53
-  [ Skip steps: r=14 d=end f=end p=13 sa=16 sp=end dp=13 ]
+  [ Skip steps: d=14 r=end f=end p=13 sa=16 sp=end dp=13 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 pass out inet proto udp from any to 10.0.0.3 port = 53
-  [ Skip steps: r=14 d=end f=end sa=16 sp=end ]
+  [ Skip steps: d=14 r=end f=end sa=16 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass out on lo1000000 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA
-  [ Skip steps: d=end f=end p=15 sa=16 da=16 sp=end dp=15 ]
+  [ Skip steps: r=end f=end p=15 sa=16 da=16 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA
-  [ Skip steps: i=18 r=17 d=end f=end sa=16 da=16 sp=end ]
+  [ Skip steps: i=18 d=17 r=end f=end sa=16 da=16 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass in on lo1000001 inet proto udp from any to 10.0.0.2 port = 53
-  [ Skip steps: i=18 r=17 d=end f=end sp=end ]
+  [ Skip steps: i=18 d=17 r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.4 flags S/SA
-  [ Skip steps: i=18 d=end f=end p=19 sp=end ]
+  [ Skip steps: i=18 r=end f=end p=19 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass out on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA
-  [ Skip steps: r=19 d=end f=end p=19 sa=20 sp=end ]
+  [ Skip steps: d=19 r=end f=end p=19 sa=20 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass out inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA
-  [ Skip steps: i=20 d=end f=end sa=20 da=20 sp=end ]
+  [ Skip steps: i=20 r=end f=end sa=20 da=20 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in inet proto udp from any to 10.0.0.1 port = 53
-  [ Skip steps: r=end d=end f=end sp=end ]
+  [ Skip steps: d=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on lo1000001 inet proto tcp from 10.0.0.1 to 10.0.0.6 port = 22 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 pass in on lo1000001 inet proto udp from 10.0.0.5 to 10.0.0.2
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf88.loaded b/regress/sbin/pfctl/pf88.loaded
index 924445a8dc7..2f57bf6d2d7 100644
--- a/regress/sbin/pfctl/pf88.loaded
+++ b/regress/sbin/pfctl/pf88.loaded
@@ -1,88 +1,88 @@
 @0 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA
-  [ Skip steps: i=2 r=2 d=end f=2 p=14 sa=10 da=2 sp=end dp=15 ]
+  [ Skip steps: i=2 d=2 r=end f=2 p=14 sa=10 da=2 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass in on lo1000000 inet from any to 10.0.0.1 flags S/SA
-  [ Skip steps: d=end p=14 sa=10 sp=end dp=15 ]
+  [ Skip steps: r=end p=14 sa=10 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass all flags S/SA
-  [ Skip steps: i=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
+  [ Skip steps: i=6 r=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass out all flags S/SA
-  [ Skip steps: i=6 r=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
+  [ Skip steps: i=6 d=6 r=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass out all flags S/SA
-  [ Skip steps: i=6 r=6 d=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
+  [ Skip steps: i=6 d=6 r=end f=6 p=14 sa=10 da=6 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass out quick all flags S/SA
-  [ Skip steps: d=end p=14 sa=10 sp=end dp=15 ]
+  [ Skip steps: r=end p=14 sa=10 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass on lo1000001 inet from any to 10.0.0.1 flags S/SA
-  [ Skip steps: r=14 d=end f=16 p=14 sa=10 da=8 sp=end dp=15 ]
+  [ Skip steps: d=14 r=end f=16 p=14 sa=10 da=8 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass on lo1000000 inet from any to 10.0.0.1 flags S/SA
-  [ Skip steps: r=14 d=end f=16 p=14 sa=10 sp=end dp=15 ]
+  [ Skip steps: d=14 r=end f=16 p=14 sa=10 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass inet from any to 10.0.0.2 flags S/SA modulate state
-  [ Skip steps: i=18 r=14 d=end f=16 p=14 sa=10 da=14 sp=end dp=15 ]
+  [ Skip steps: i=18 d=14 r=end f=16 p=14 sa=10 da=14 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass inet from any to 10.0.0.2 flags S/SA
-  [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ]
+  [ Skip steps: i=18 d=14 r=end f=16 p=14 da=14 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @10 block drop inet from 10.0.0.3 to 10.0.0.2
-  [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ]
+  [ Skip steps: i=18 d=14 r=end f=16 p=14 da=14 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @11 pass inet from any to 10.0.0.2 flags S/SA modulate state
-  [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ]
+  [ Skip steps: i=18 d=14 r=end f=16 p=14 da=14 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @12 block drop inet from 10.0.0.3 to 10.0.0.2
-  [ Skip steps: i=18 r=14 d=end f=16 p=14 da=14 sp=end dp=15 ]
+  [ Skip steps: i=18 d=14 r=end f=16 p=14 da=14 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @13 pass inet from any to 10.0.0.2 flags S/SA synproxy state
-  [ Skip steps: i=18 d=end f=16 sp=end dp=15 ]
+  [ Skip steps: i=18 r=end f=16 sp=end dp=15 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @14 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 flags S/SA
-  [ Skip steps: i=18 r=17 d=end f=16 p=16 sa=16 da=16 sp=end ]
+  [ Skip steps: i=18 d=17 r=end f=16 p=16 sa=16 da=16 sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @15 pass out inet proto tcp from 10.0.0.4 to 10.0.0.5 port = 80 flags S/SA
-  [ Skip steps: i=18 r=17 d=end sp=end ]
+  [ Skip steps: i=18 d=17 r=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @16 pass out all flags S/SA
-  [ Skip steps: i=18 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=18 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @17 pass in all flags S/SA
-  [ Skip steps: r=21 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: d=21 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @18 pass in on lo1000001 all flags S/SA
-  [ Skip steps: i=21 r=21 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=21 d=21 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @19 pass in on lo1000001 all flags S/SA
-  [ Skip steps: i=21 r=21 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=21 d=21 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @20 pass in on lo1000001 all flags S/SA
-  [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @21 block drop all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf89.loaded b/regress/sbin/pfctl/pf89.loaded
index 68071413f04..b5e87367f8f 100644
--- a/regress/sbin/pfctl/pf89.loaded
+++ b/regress/sbin/pfctl/pf89.loaded
@@ -1,40 +1,40 @@
 @0 block drop all
-  [ Skip steps: i=5 r=2 d=end f=5 p=2 da=5 sp=end dp=5 ]
+  [ Skip steps: i=5 d=2 r=end f=5 p=2 da=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop quick from <bad:0> to any
-  [ Skip steps: i=5 d=end f=5 da=5 sp=end dp=5 ]
+  [ Skip steps: i=5 r=end f=5 da=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass out proto tcp all flags S/SA
-  [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ]
+  [ Skip steps: i=5 d=5 r=end f=5 sa=end da=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 pass out proto icmp all
-  [ Skip steps: i=5 r=5 d=end f=5 sa=end da=5 sp=end dp=5 ]
+  [ Skip steps: i=5 d=5 r=end f=5 sa=end da=5 sp=end dp=5 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 pass out proto udp all
-  [ Skip steps: d=end sa=end sp=end ]
+  [ Skip steps: r=end sa=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @5 pass in on lo1000001 inet proto tcp from any to 10.0.0.1 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10, max-src-conn-rate 3/99, src.track 99)
-  [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ]
+  [ Skip steps: i=8 d=end r=end f=end p=end sa=end sp=end dp=8 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @6 pass in on lo1000001 inet proto tcp from any to 10.0.0.2 port = 22 flags S/SA keep state (source-track rule, max-src-conn 10)
-  [ Skip steps: i=8 r=end d=end f=end p=end sa=end sp=end dp=8 ]
+  [ Skip steps: i=8 d=end r=end f=end p=end sa=end sp=end dp=8 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @7 pass in on lo1000001 inet proto tcp from any to 10.0.0.3 port = 22 flags S/SA keep state (source-track rule, max-src-conn-rate 3/99, src.track 99)
-  [ Skip steps: r=end d=end f=end p=end sa=end sp=end ]
+  [ Skip steps: d=end r=end f=end p=end sa=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @8 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 80 flags S/SA modulate state (source-track rule, max-src-conn 100, max-src-conn-rate 10/5, overload <bad> flush, src.track 5)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @9 pass in on lo1000000 inet proto tcp from any to 10.0.0.1 port = 8080 flags S/SA synproxy state (source-track rule, max-src-conn 1000, max-src-conn-rate 1000/5, overload <bad> flush global, src.track 5)
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf9.loaded b/regress/sbin/pfctl/pf9.loaded
index a0cd69d1487..6a72d01429b 100644
--- a/regress/sbin/pfctl/pf9.loaded
+++ b/regress/sbin/pfctl/pf9.loaded
@@ -1,8 +1,8 @@
 @0 block drop in on enc0 all
-  [ Skip steps: r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 block drop in on tun1000000 all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf90.loaded b/regress/sbin/pfctl/pf90.loaded
index 5029e303adc..ec43a8a18a7 100644
--- a/regress/sbin/pfctl/pf90.loaded
+++ b/regress/sbin/pfctl/pf90.loaded
@@ -1,20 +1,20 @@
 @0 pass log (user) all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass log (all) all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @2 pass log (to pflog7) all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 block drop log (all, user, to pflog1) all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @4 block drop log (user, to pflog1) all
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf91.loaded b/regress/sbin/pfctl/pf91.loaded
index 56b94070c1b..905a01c8071 100644
--- a/regress/sbin/pfctl/pf91.loaded
+++ b/regress/sbin/pfctl/pf91.loaded
@@ -1,31 +1,31 @@
 @0 anchor on tun1000000 all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor "foo" out all {
-  [ Skip steps: i=end d=end f=end sa=end da=end sp=end ]
+  [ Skip steps: i=end r=end f=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass proto tcp from any to any port = 1234 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 anchor proto tcp from any to any port = 2413 user = 0 label "foo" {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 block drop all
-  [ Skip steps: i=end r=end d=end p=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end p=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass inet from 127.0.0.1 to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 }
 @1 pass in proto tcp from any to any port = 1234 flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
diff --git a/regress/sbin/pfctl/pf92.loaded b/regress/sbin/pfctl/pf92.loaded
index 8d9dfb74edf..c559444b1a6 100644
--- a/regress/sbin/pfctl/pf92.loaded
+++ b/regress/sbin/pfctl/pf92.loaded
@@ -1,50 +1,50 @@
 @0 anchor all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor in all {
-  [ Skip steps: i=2 d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=2 r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass quick all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
 @1 anchor out all {
-  [ Skip steps: d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor out all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor out all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor out all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 anchor in all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
@@ -56,15 +56,15 @@
 }
 }
 @2 pass in on tun1000000 all flags S/SA
-  [ Skip steps: i=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @3 anchor "foo" on tun1000000 all {
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @0 pass all flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 }
diff --git a/regress/sbin/pfctl/pf99.loaded b/regress/sbin/pfctl/pf99.loaded
index 881fc5a3153..67d04724a9e 100644
--- a/regress/sbin/pfctl/pf99.loaded
+++ b/regress/sbin/pfctl/pf99.loaded
@@ -1,8 +1,8 @@
 @0 pass from route "foo" to any flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 pass from any to route "bar" flags S/SA
-  [ Skip steps: i=end r=end d=end f=end p=end sa=end da=end sp=end dp=end ]
+  [ Skip steps: i=end d=end r=end f=end p=end sa=end da=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]