diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 7ddd1aa..c9b34d7 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.6
+pkgver=2.7
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/rc/bridge.br0.eth0/down b/main/nnd-s6-services/rc/bridge.br0.eth0/down
index f18bf56..324cec5 100644
--- a/main/nnd-s6-services/rc/bridge.br0.eth0/down
+++ b/main/nnd-s6-services/rc/bridge.br0.eth0/down
@@ -1,13 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define BRINFACE br0
 define SLAVEIFACE eth0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec brctl delif ${BRINFACE} ${SLAVEIFACE}
+brctl delif $BRINFACE $SLAVEIFACE
diff --git a/main/nnd-s6-services/rc/bridge.br0.eth0/up b/main/nnd-s6-services/rc/bridge.br0.eth0/up
index ee7a73e..00e90f7 100644
--- a/main/nnd-s6-services/rc/bridge.br0.eth0/up
+++ b/main/nnd-s6-services/rc/bridge.br0.eth0/up
@@ -1,13 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define BRINFACE br0
 define SLAVEIFACE eth0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec brctl addif ${BRINFACE} ${SLAVEIFACE}
+brctl addif $BRINFACE $SLAVEIFACE
diff --git a/main/nnd-s6-services/rc/bridge.br0/down b/main/nnd-s6-services/rc/bridge.br0/down
index 4853285..9f5a08c 100644
--- a/main/nnd-s6-services/rc/bridge.br0/down
+++ b/main/nnd-s6-services/rc/bridge.br0/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE br0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec brctl delbr ${INTERFACE}
+brctl delbr $INTERFACE
diff --git a/main/nnd-s6-services/rc/bridge.br0/up b/main/nnd-s6-services/rc/bridge.br0/up
index 5e4bc53..94e4bad 100644
--- a/main/nnd-s6-services/rc/bridge.br0/up
+++ b/main/nnd-s6-services/rc/bridge.br0/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE br0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec brctl addbr ${INTERFACE}
+brctl addbr $INTERFACE
diff --git a/main/nnd-s6-services/rc/ceph.mds/run b/main/nnd-s6-services/rc/ceph.mds/run
index 4589879..f1b9c11 100755
--- a/main/nnd-s6-services/rc/ceph.mds/run
+++ b/main/nnd-s6-services/rc/ceph.mds/run
@@ -2,4 +2,4 @@
 export DAEMON mds
 backtick -D '0' ID { hostname }
 
-exec /usr/libexec/nnd/s6/ceph
+/usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.mgr/run b/main/nnd-s6-services/rc/ceph.mgr/run
index 3744559..b9785d9 100755
--- a/main/nnd-s6-services/rc/ceph.mgr/run
+++ b/main/nnd-s6-services/rc/ceph.mgr/run
@@ -2,4 +2,4 @@
 export DAEMON mgr
 backtick -D '0' ID { hostname }
 
-exec /usr/libexec/nnd/s6/ceph
+/usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.mon/run b/main/nnd-s6-services/rc/ceph.mon/run
index cd87d28..d2f5e68 100755
--- a/main/nnd-s6-services/rc/ceph.mon/run
+++ b/main/nnd-s6-services/rc/ceph.mon/run
@@ -2,4 +2,4 @@
 export DAEMON mon
 backtick -D '0' ID { hostname }
 
-exec /usr/libexec/nnd/s6/ceph
+/usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.osd.0.block/up b/main/nnd-s6-services/rc/ceph.osd.0.block/up
index 29e27ed..65e4d51 100644
--- a/main/nnd-s6-services/rc/ceph.osd.0.block/up
+++ b/main/nnd-s6-services/rc/ceph.osd.0.block/up
@@ -8,4 +8,4 @@ emptyenv
 export SRC /var/lib/ceph/osd/ceph-${ID}/block
 export DEST $DEV
 
-exec /usr/libexec/nnd/s6/symlink
+/usr/libexec/nnd/s6/symlink
diff --git a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up
index 9054618..953d6d7 100644
--- a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up
+++ b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define ID 0
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/ceph.osd.${ID}
 importas -i DEV DEV
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config
+ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config
diff --git a/main/nnd-s6-services/rc/ceph.osd.0/run b/main/nnd-s6-services/rc/ceph.osd.0/run
index f8c1358..f3342ef 100755
--- a/main/nnd-s6-services/rc/ceph.osd.0/run
+++ b/main/nnd-s6-services/rc/ceph.osd.0/run
@@ -2,4 +2,4 @@
 export DAEMON osd
 export ID 0
 
-exec /usr/libexec/nnd/s6/ceph
+/usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/clock.hw/up b/main/nnd-s6-services/rc/clock.hw/up
index a9e6296..453c7cf 100644
--- a/main/nnd-s6-services/rc/clock.hw/up
+++ b/main/nnd-s6-services/rc/clock.hw/up
@@ -1,11 +1,5 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec hwclock -u --systz
+hwclock -u --systz
diff --git a/main/nnd-s6-services/rc/dir.var-empty/up b/main/nnd-s6-services/rc/dir.var-empty/up
index f7ae63e..d51672d 100644
--- a/main/nnd-s6-services/rc/dir.var-empty/up
+++ b/main/nnd-s6-services/rc/dir.var-empty/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DIR /var/empty
 
-exec /usr/libexec/nnd/s6/dir
+/usr/libexec/nnd/s6/dir
diff --git a/main/nnd-s6-services/rc/dir.var-lock/up b/main/nnd-s6-services/rc/dir.var-lock/up
index 22abf91..27e83a2 100644
--- a/main/nnd-s6-services/rc/dir.var-lock/up
+++ b/main/nnd-s6-services/rc/dir.var-lock/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DIR /var/lock
 
-exec /usr/libexec/nnd/s6/dir
+/usr/libexec/nnd/s6/dir
diff --git a/main/nnd-s6-services/rc/dir.var-log/up b/main/nnd-s6-services/rc/dir.var-log/up
index 7ec689b..cce0196 100644
--- a/main/nnd-s6-services/rc/dir.var-log/up
+++ b/main/nnd-s6-services/rc/dir.var-log/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DIR /var/log
 
-exec /usr/libexec/nnd/s6/dir
+/usr/libexec/nnd/s6/dir
diff --git a/main/nnd-s6-services/rc/dmeventd/run b/main/nnd-s6-services/rc/dmeventd/run
index 4a90f16..f62afd2 100755
--- a/main/nnd-s6-services/rc/dmeventd/run
+++ b/main/nnd-s6-services/rc/dmeventd/run
@@ -1,11 +1,5 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec dmeventd -d -f
+dmeventd -d -f
diff --git a/main/nnd-s6-services/rc/getty.tty1/run b/main/nnd-s6-services/rc/getty.tty1/run
index d501433..ce824d8 100755
--- a/main/nnd-s6-services/rc/getty.tty1/run
+++ b/main/nnd-s6-services/rc/getty.tty1/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export TTY tty1
 
-exec /usr/libexec/nnd/s6/getty
+/usr/libexec/nnd/s6/getty
diff --git a/main/nnd-s6-services/rc/interface.br0.link/down b/main/nnd-s6-services/rc/interface.br0.link/down
index 7bf5a9a..503d7ed 100644
--- a/main/nnd-s6-services/rc/interface.br0.link/down
+++ b/main/nnd-s6-services/rc/interface.br0.link/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE br0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} down
+ip link set dev $INTERFACE down
diff --git a/main/nnd-s6-services/rc/interface.br0.link/up b/main/nnd-s6-services/rc/interface.br0.link/up
index 2724b54..a5df7a1 100644
--- a/main/nnd-s6-services/rc/interface.br0.link/up
+++ b/main/nnd-s6-services/rc/interface.br0.link/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE br0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} up
+ip link set dev $INTERFACE up
diff --git a/main/nnd-s6-services/rc/interface.eth0.link/down b/main/nnd-s6-services/rc/interface.eth0.link/down
index 2ca4102..3a94a9e 100644
--- a/main/nnd-s6-services/rc/interface.eth0.link/down
+++ b/main/nnd-s6-services/rc/interface.eth0.link/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE eth0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} down
+ip link set dev $INTERFACE down
diff --git a/main/nnd-s6-services/rc/interface.eth0.link/up b/main/nnd-s6-services/rc/interface.eth0.link/up
index 39cb580..e55528b 100644
--- a/main/nnd-s6-services/rc/interface.eth0.link/up
+++ b/main/nnd-s6-services/rc/interface.eth0.link/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE eth0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} up
+ip link set dev $INTERFACE up
diff --git a/main/nnd-s6-services/rc/interface.eth0.ready/up b/main/nnd-s6-services/rc/interface.eth0.ready/up
index cc0503c..2039d0f 100644
--- a/main/nnd-s6-services/rc/interface.eth0.ready/up
+++ b/main/nnd-s6-services/rc/interface.eth0.ready/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE eth0
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec bcnm-waitif -u 1 $INTERFACE
+bcnm-waitif -u 1 $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.lo.link/down b/main/nnd-s6-services/rc/interface.lo.link/down
index af76b41..e423d1f 100644
--- a/main/nnd-s6-services/rc/interface.lo.link/down
+++ b/main/nnd-s6-services/rc/interface.lo.link/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE lo
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} down
+ip link set dev $INTERFACE down
diff --git a/main/nnd-s6-services/rc/interface.lo.link/up b/main/nnd-s6-services/rc/interface.lo.link/up
index 0cc0281..ab7c59c 100644
--- a/main/nnd-s6-services/rc/interface.lo.link/up
+++ b/main/nnd-s6-services/rc/interface.lo.link/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE lo
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} up
+ip link set dev $INTERFACE up
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/down b/main/nnd-s6-services/rc/interface.wg-tunnel.create/down
index d781e67..e2a2fda 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.create/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.create/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE wg-tunnel
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link del dev ${INTERFACE}
+ip link del dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/up b/main/nnd-s6-services/rc/interface.wg-tunnel.create/up
index df8749b..272fe49 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.create/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.create/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE wg-tunnel
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link add ${INTERFACE} type wireguard
+ip link add $INTERFACE type wireguard
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/down b/main/nnd-s6-services/rc/interface.wg-tunnel.link/down
index 0fa8b88..1af6cef 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.link/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.link/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE wg-tunnel
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec ip link set dev ${INTERFACE} down
+ip link set dev $INTERFACE down
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/up b/main/nnd-s6-services/rc/interface.wg-tunnel.link/up
index 4586351..d6180fc 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.link/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.link/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define INTERFACE wg-tunnel
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv
 
-exec ip link set dev ${INTERFACE} up
+ip link set dev $INTERFACE up
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
index 13007e3..675f512 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -4 address del ${ADDR} dev ${INTERFACE}
+ip -4 address del $ADDR dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
index 30b4ffc..04f7204 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4
 importas -i ADDR ADDR
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -4 address add ${ADDR} dev ${INTERFACE}
+ip -4 address add $ADDR dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
index 8234621..ea7147c 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -6 address del ${ADDR} dev ${INTERFACE}
+ip -6 address del $ADDR dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
index 27afe27..0f51025 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6
 importas -i ADDR ADDR
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -6 address add ${ADDR} dev ${INTERFACE}
+ip -6 address add $ADDR dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
index 7367fc1..e785fce 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -4 route del ${ROUTE} dev ${INTERFACE}
+ip -4 route del $ROUTE dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
index 5395c86..210e96d 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4
 importas -i ROUTE ROUTE
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -4 route add ${ROUTE} dev ${INTERFACE}
+ip -4 route add $ROUTE dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
index ab5501b..98a8b8b 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -6 route del ${ROUTE} dev ${INTERFACE}
+ip -6 route del $ROUTE dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
index 5f6552b..0953e35 100644
--- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
+++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6
 importas -i ROUTE ROUTE
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ip -6 route add ${ROUTE} dev ${INTERFACE}
+ip -6 route add $ROUTE dev $INTERFACE
diff --git a/main/nnd-s6-services/rc/klogd/run b/main/nnd-s6-services/rc/klogd/run
index 665ce62..0cc5391 100755
--- a/main/nnd-s6-services/rc/klogd/run
+++ b/main/nnd-s6-services/rc/klogd/run
@@ -1,9 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define READFROM /proc/kmsg
 
-redirfd -r 0 $READFROM exec ucspilogd
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+redirfd -r 0 $READFROM ucspilogd
diff --git a/main/nnd-s6-services/rc/kmod.sysfs/up b/main/nnd-s6-services/rc/kmod.sysfs/up
index 929acab..265acfe 100644
--- a/main/nnd-s6-services/rc/kmod.sysfs/up
+++ b/main/nnd-s6-services/rc/kmod.sysfs/up
@@ -1,17 +1,11 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
-
-fdclose 1
-fdclose 2
+emptyenv -p
 
 if -t {
 	pipeline {
 		pipeline {
-			exec find /sys -name modalias -type f -print0
-		} exec xargs -0 sort -u
-	} exec xargs modprobe -b -a -s
+			find /sys -name modalias -type f -print0
+		} xargs -0 sort -u
+	} xargs modprobe -b -a -s
 }
diff --git a/main/nnd-s6-services/rc/libvirt.interface/run b/main/nnd-s6-services/rc/libvirt.interface/run
index bac8efe..35a0c8a 100755
--- a/main/nnd-s6-services/rc/libvirt.interface/run
+++ b/main/nnd-s6-services/rc/libvirt.interface/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME interface
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.lock/run b/main/nnd-s6-services/rc/libvirt.lock/run
index 752a73b..86bded5 100755
--- a/main/nnd-s6-services/rc/libvirt.lock/run
+++ b/main/nnd-s6-services/rc/libvirt.lock/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME lock
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.log/run b/main/nnd-s6-services/rc/libvirt.log/run
index 19e7e37..79e9219 100755
--- a/main/nnd-s6-services/rc/libvirt.log/run
+++ b/main/nnd-s6-services/rc/libvirt.log/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME log
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.lxc/run b/main/nnd-s6-services/rc/libvirt.lxc/run
index 81794a8..96bc49d 100755
--- a/main/nnd-s6-services/rc/libvirt.lxc/run
+++ b/main/nnd-s6-services/rc/libvirt.lxc/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME lxc
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.network/run b/main/nnd-s6-services/rc/libvirt.network/run
index 96a090f..726b0c3 100755
--- a/main/nnd-s6-services/rc/libvirt.network/run
+++ b/main/nnd-s6-services/rc/libvirt.network/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME network
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.nodedev/run b/main/nnd-s6-services/rc/libvirt.nodedev/run
index 1b85518..034e924 100755
--- a/main/nnd-s6-services/rc/libvirt.nodedev/run
+++ b/main/nnd-s6-services/rc/libvirt.nodedev/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME nodedev
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.proxy/run b/main/nnd-s6-services/rc/libvirt.proxy/run
index 5c04f8d..1342420 100755
--- a/main/nnd-s6-services/rc/libvirt.proxy/run
+++ b/main/nnd-s6-services/rc/libvirt.proxy/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME proxy
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.qemu/run b/main/nnd-s6-services/rc/libvirt.qemu/run
index 37a1730..c68a86f 100755
--- a/main/nnd-s6-services/rc/libvirt.qemu/run
+++ b/main/nnd-s6-services/rc/libvirt.qemu/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME qemu
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/libvirt.storage/run b/main/nnd-s6-services/rc/libvirt.storage/run
index f61682f..0542d71 100755
--- a/main/nnd-s6-services/rc/libvirt.storage/run
+++ b/main/nnd-s6-services/rc/libvirt.storage/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME storage
 
-exec /usr/libexec/nnd/s6/libvirtd
+/usr/libexec/nnd/s6/libvirtd
diff --git a/main/nnd-s6-services/rc/logger.ceph/run b/main/nnd-s6-services/rc/logger.ceph/run
index 960d6d7..b20e256 100755
--- a/main/nnd-s6-services/rc/logger.ceph/run
+++ b/main/nnd-s6-services/rc/logger.ceph/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME ceph
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.klogd/run b/main/nnd-s6-services/rc/logger.klogd/run
index 4a5d308..e952c16 100755
--- a/main/nnd-s6-services/rc/logger.klogd/run
+++ b/main/nnd-s6-services/rc/logger.klogd/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME klogd
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.libvirt/run b/main/nnd-s6-services/rc/logger.libvirt/run
index 563c3b1..752175a 100755
--- a/main/nnd-s6-services/rc/logger.libvirt/run
+++ b/main/nnd-s6-services/rc/logger.libvirt/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME libvirt
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.mdevd/run b/main/nnd-s6-services/rc/logger.mdevd/run
index deb2e68..df11a34 100755
--- a/main/nnd-s6-services/rc/logger.mdevd/run
+++ b/main/nnd-s6-services/rc/logger.mdevd/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME mdevd
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.ntpd/run b/main/nnd-s6-services/rc/logger.ntpd/run
index 4692266..345366b 100755
--- a/main/nnd-s6-services/rc/logger.ntpd/run
+++ b/main/nnd-s6-services/rc/logger.ntpd/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME ntpd
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.qemu-ga/run b/main/nnd-s6-services/rc/logger.qemu-ga/run
index 2ed7f38..422576d 100755
--- a/main/nnd-s6-services/rc/logger.qemu-ga/run
+++ b/main/nnd-s6-services/rc/logger.qemu-ga/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME qemu-ga
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.sshd/run b/main/nnd-s6-services/rc/logger.sshd/run
index 142938f..47057c5 100755
--- a/main/nnd-s6-services/rc/logger.sshd/run
+++ b/main/nnd-s6-services/rc/logger.sshd/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME sshd
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.syslogd/run b/main/nnd-s6-services/rc/logger.syslogd/run
index dfc3e07..fe766aa 100755
--- a/main/nnd-s6-services/rc/logger.syslogd/run
+++ b/main/nnd-s6-services/rc/logger.syslogd/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME syslogd
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.udhcpc/run b/main/nnd-s6-services/rc/logger.udhcpc/run
index 28677d9..203987b 100755
--- a/main/nnd-s6-services/rc/logger.udhcpc/run
+++ b/main/nnd-s6-services/rc/logger.udhcpc/run
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export NAME udhcpc
 
-exec /usr/libexec/nnd/s6/logger
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/mdevd.coldplug/up b/main/nnd-s6-services/rc/mdevd.coldplug/up
index 1d02cff..8936472 100644
--- a/main/nnd-s6-services/rc/mdevd.coldplug/up
+++ b/main/nnd-s6-services/rc/mdevd.coldplug/up
@@ -1,11 +1,5 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec mdevd-coldplug
+mdevd-coldplug
diff --git a/main/nnd-s6-services/rc/mdevd/run b/main/nnd-s6-services/rc/mdevd/run
index 024138d..6386d83 100755
--- a/main/nnd-s6-services/rc/mdevd/run
+++ b/main/nnd-s6-services/rc/mdevd/run
@@ -1,13 +1,10 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
+define NOTIFYFD 3
 
 s6-envdir -i /etc/s6/env/mdevd
 importas -i KBUFSZ KBUFSZ
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-define NOTIFYFD 3
-
-exec mdevd -D $NOTIFYFD -b $KBUFSZ
+mdevd -D $NOTIFYFD -b $KBUFSZ
diff --git a/main/nnd-s6-services/rc/module.apparmor/down b/main/nnd-s6-services/rc/module.apparmor/down
index 92fc713..e1ad76e 100644
--- a/main/nnd-s6-services/rc/module.apparmor/down
+++ b/main/nnd-s6-services/rc/module.apparmor/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE apparmor
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.apparmor/up b/main/nnd-s6-services/rc/module.apparmor/up
index f7c7521..75ad8ec 100644
--- a/main/nnd-s6-services/rc/module.apparmor/up
+++ b/main/nnd-s6-services/rc/module.apparmor/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE apparmor
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.bridge/down b/main/nnd-s6-services/rc/module.bridge/down
index 3f8d186..bdb2fa1 100644
--- a/main/nnd-s6-services/rc/module.bridge/down
+++ b/main/nnd-s6-services/rc/module.bridge/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE bridge
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.bridge/up b/main/nnd-s6-services/rc/module.bridge/up
index cb6ff7d..4163e97 100644
--- a/main/nnd-s6-services/rc/module.bridge/up
+++ b/main/nnd-s6-services/rc/module.bridge/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE bridge
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.dm-mod/down b/main/nnd-s6-services/rc/module.dm-mod/down
index 36d0e76..f898912 100644
--- a/main/nnd-s6-services/rc/module.dm-mod/down
+++ b/main/nnd-s6-services/rc/module.dm-mod/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE dm-mod
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.dm-mod/up b/main/nnd-s6-services/rc/module.dm-mod/up
index f958d9a..e2f068d 100644
--- a/main/nnd-s6-services/rc/module.dm-mod/up
+++ b/main/nnd-s6-services/rc/module.dm-mod/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE dm-mod
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.fuse/down b/main/nnd-s6-services/rc/module.fuse/down
index 27802de..ca1ec5c 100644
--- a/main/nnd-s6-services/rc/module.fuse/down
+++ b/main/nnd-s6-services/rc/module.fuse/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE fuse
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.fuse/up b/main/nnd-s6-services/rc/module.fuse/up
index 70b82ed..5fe15ef 100644
--- a/main/nnd-s6-services/rc/module.fuse/up
+++ b/main/nnd-s6-services/rc/module.fuse/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE fuse
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.ipv6/down b/main/nnd-s6-services/rc/module.ipv6/down
index d689db2..8b7eb60 100644
--- a/main/nnd-s6-services/rc/module.ipv6/down
+++ b/main/nnd-s6-services/rc/module.ipv6/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE ipv6
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.ipv6/up b/main/nnd-s6-services/rc/module.ipv6/up
index 15c33b4..89d3b38 100644
--- a/main/nnd-s6-services/rc/module.ipv6/up
+++ b/main/nnd-s6-services/rc/module.ipv6/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE ipv6
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.kvm/down b/main/nnd-s6-services/rc/module.kvm/down
index 084e092..150d4eb 100644
--- a/main/nnd-s6-services/rc/module.kvm/down
+++ b/main/nnd-s6-services/rc/module.kvm/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE kvm
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.kvm/up b/main/nnd-s6-services/rc/module.kvm/up
index 601bff9..b7caf1a 100644
--- a/main/nnd-s6-services/rc/module.kvm/up
+++ b/main/nnd-s6-services/rc/module.kvm/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE kvm
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.tun/down b/main/nnd-s6-services/rc/module.tun/down
index c4a1c60..8dc2fb3 100644
--- a/main/nnd-s6-services/rc/module.tun/down
+++ b/main/nnd-s6-services/rc/module.tun/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE tun
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.tun/up b/main/nnd-s6-services/rc/module.tun/up
index 069527a..3f9eb18 100644
--- a/main/nnd-s6-services/rc/module.tun/up
+++ b/main/nnd-s6-services/rc/module.tun/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE tun
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.wireguard/down b/main/nnd-s6-services/rc/module.wireguard/down
index 92c53cc..4031e1a 100644
--- a/main/nnd-s6-services/rc/module.wireguard/down
+++ b/main/nnd-s6-services/rc/module.wireguard/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE wireguard
 
-exec /usr/libexec/nnd/s6/rmmod
+/usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.wireguard/up b/main/nnd-s6-services/rc/module.wireguard/up
index e7fe245..9f73534 100644
--- a/main/nnd-s6-services/rc/module.wireguard/up
+++ b/main/nnd-s6-services/rc/module.wireguard/up
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export MODULE wireguard
 
-exec /usr/libexec/nnd/s6/modprobe
+/usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/mount.boot-efi/down b/main/nnd-s6-services/rc/mount.boot-efi/down
index 092d5f6..2224bf4 100644
--- a/main/nnd-s6-services/rc/mount.boot-efi/down
+++ b/main/nnd-s6-services/rc/mount.boot-efi/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /boot/efi
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up
index 1b7fea1..7880117 100644
--- a/main/nnd-s6-services/rc/mount.boot-efi/up
+++ b/main/nnd-s6-services/rc/mount.boot-efi/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.boot-efi
 export DEST /boot/efi
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.boot-efi
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.boot/down b/main/nnd-s6-services/rc/mount.boot/down
index 57ac288..6bb7299 100644
--- a/main/nnd-s6-services/rc/mount.boot/down
+++ b/main/nnd-s6-services/rc/mount.boot/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /boot
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up
index 33250fc..b901c9c 100644
--- a/main/nnd-s6-services/rc/mount.boot/up
+++ b/main/nnd-s6-services/rc/mount.boot/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.boot
 export DEST /boot
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.boot
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/down b/main/nnd-s6-services/rc/mount.dev-hugepages/down
index 640eaec..9dacc76 100644
--- a/main/nnd-s6-services/rc/mount.dev-hugepages/down
+++ b/main/nnd-s6-services/rc/mount.dev-hugepages/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /dev/hugepages
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up
index 4bc998e..ef43eea 100644
--- a/main/nnd-s6-services/rc/mount.dev-hugepages/up
+++ b/main/nnd-s6-services/rc/mount.dev-hugepages/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev-hugepages
 export DEST /dev/hugepages
 export FSTYPE hugetlbfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.dev-hugepages
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/down b/main/nnd-s6-services/rc/mount.dev-mqueue/down
index 0ea9fad..57aceae 100644
--- a/main/nnd-s6-services/rc/mount.dev-mqueue/down
+++ b/main/nnd-s6-services/rc/mount.dev-mqueue/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /dev/mqueue
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up
index 9599d46..a04baf9 100644
--- a/main/nnd-s6-services/rc/mount.dev-mqueue/up
+++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev-mqueue
 export DEST /dev/mqueue
 export FSTYPE mqueue
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.dev-mqueue
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.dev-pts/down b/main/nnd-s6-services/rc/mount.dev-pts/down
index b0d548a..fbbd383 100644
--- a/main/nnd-s6-services/rc/mount.dev-pts/down
+++ b/main/nnd-s6-services/rc/mount.dev-pts/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /dev/pts
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up
index 1ed1904..1714981 100644
--- a/main/nnd-s6-services/rc/mount.dev-pts/up
+++ b/main/nnd-s6-services/rc/mount.dev-pts/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev-pts
 export DEST /dev/pts
 export FSTYPE devpts
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.dev-pts
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.dev-shm/down b/main/nnd-s6-services/rc/mount.dev-shm/down
index c5e4238..77567c7 100644
--- a/main/nnd-s6-services/rc/mount.dev-shm/down
+++ b/main/nnd-s6-services/rc/mount.dev-shm/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /dev/shm
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up
index 7b42485..d6bb88f 100644
--- a/main/nnd-s6-services/rc/mount.dev-shm/up
+++ b/main/nnd-s6-services/rc/mount.dev-shm/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev-shm
 export DEST /dev/shm
 export FSTYPE tmpfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.dev-shm
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.dev/down b/main/nnd-s6-services/rc/mount.dev/down
index 0756c46..3bfc2a3 100644
--- a/main/nnd-s6-services/rc/mount.dev/down
+++ b/main/nnd-s6-services/rc/mount.dev/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /dev
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up
index 13032e4..88a131c 100644
--- a/main/nnd-s6-services/rc/mount.dev/up
+++ b/main/nnd-s6-services/rc/mount.dev/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev
 export DEST /dev
 export FSTYPE devtmpfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.dev
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.proc/down b/main/nnd-s6-services/rc/mount.proc/down
index 9fe176d..6753961 100644
--- a/main/nnd-s6-services/rc/mount.proc/down
+++ b/main/nnd-s6-services/rc/mount.proc/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /proc
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up
index dcadf11..72a93c9 100644
--- a/main/nnd-s6-services/rc/mount.proc/up
+++ b/main/nnd-s6-services/rc/mount.proc/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.proc
 export DEST /proc
 export FSTYPE proc
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.proc
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.root/down b/main/nnd-s6-services/rc/mount.root/down
index 6434c30..0830e1a 100644
--- a/main/nnd-s6-services/rc/mount.root/down
+++ b/main/nnd-s6-services/rc/mount.root/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.root/up b/main/nnd-s6-services/rc/mount.root/up
index b812f63..4799ae8 100644
--- a/main/nnd-s6-services/rc/mount.root/up
+++ b/main/nnd-s6-services/rc/mount.root/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.root
 export DEST /
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.root
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.run/down b/main/nnd-s6-services/rc/mount.run/down
index 2a0d355..e88af83 100644
--- a/main/nnd-s6-services/rc/mount.run/down
+++ b/main/nnd-s6-services/rc/mount.run/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /run
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up
index 6becedc..4b181f4 100644
--- a/main/nnd-s6-services/rc/mount.run/up
+++ b/main/nnd-s6-services/rc/mount.run/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.run
 export DEST /run
 export FSTYPE tmpfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.run
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down
index f3c9f46..4d600c9 100644
--- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down
+++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /sys/firmware/efi/efivars
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
index 83715e8..4660d4c 100644
--- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
+++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars
 export DEST /sys/firmware/efi/efivars
 export FSTYPE efivarfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
index f9fb845..660dc63 100644
--- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /sys/fs/cgroup
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
index b63d408..a9d6c9a 100644
--- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.sys-fs-cgroup
 export DEST /sys/fs/cgroup
 export FSTYPE cgroup2
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.sys-fs-cgroup
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/down b/main/nnd-s6-services/rc/mount.sys-fs-pstore/down
index e06c733..51336d7 100644
--- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/down
+++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /sys/fs/pstore
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
index ea2c3dd..892149a 100644
--- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
+++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.sys-fs-pstore
 export DEST /sys/fs/pstore
 export FSTYPE pstore
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.sys-fs-pstore
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/down b/main/nnd-s6-services/rc/mount.sys-kernel-security/down
index 414474e..783ba8f 100644
--- a/main/nnd-s6-services/rc/mount.sys-kernel-security/down
+++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /sys/kernel/security
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/up b/main/nnd-s6-services/rc/mount.sys-kernel-security/up
index 4492255..e3e4e93 100644
--- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up
+++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.sys-kernel-security
 export DEST /sys/kernel/security
 export FSTYPE securityfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.sys-kernel-security
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.sys/down b/main/nnd-s6-services/rc/mount.sys/down
index 8adb00f..803088e 100644
--- a/main/nnd-s6-services/rc/mount.sys/down
+++ b/main/nnd-s6-services/rc/mount.sys/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /sys
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up
index 08289db..1a9d1b3 100644
--- a/main/nnd-s6-services/rc/mount.sys/up
+++ b/main/nnd-s6-services/rc/mount.sys/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.sys
 export DEST /sys
 export FSTYPE sysfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.sys
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.tmp/down b/main/nnd-s6-services/rc/mount.tmp/down
index 2b2082e..abeee3a 100644
--- a/main/nnd-s6-services/rc/mount.tmp/down
+++ b/main/nnd-s6-services/rc/mount.tmp/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /tmp
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up
index 1055241..f1111c0 100644
--- a/main/nnd-s6-services/rc/mount.tmp/up
+++ b/main/nnd-s6-services/rc/mount.tmp/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.tmp
 export DEST /tmp
 export FSTYPE tmpfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -i /etc/s6/env/mount.tmp
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down
index 2fa0fba..d84df26 100644
--- a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down
+++ b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
 export DEST /var/lib/ceph/osd/ceph-0
 
-exec /usr/libexec/nnd/s6/umount
+/usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up
index 319676c..0520edb 100644
--- a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up
+++ b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up
@@ -1,6 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0
 export DEST /var/lib/ceph/osd/ceph-0
 export FSTYPE tmpfs
 
-exec /usr/libexec/nnd/s6/mount
+s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0
+
+/usr/libexec/nnd/s6/mount
diff --git a/main/nnd-s6-services/rc/nameif/up b/main/nnd-s6-services/rc/nameif/up
index 9dbc9e5..4dea15e 100644
--- a/main/nnd-s6-services/rc/nameif/up
+++ b/main/nnd-s6-services/rc/nameif/up
@@ -1,12 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -I /etc/s6/env/nameif
 importas -D /etc/mactab CONFIG CONFIG
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-exec nameif -c $CONFIG
+nameif -c $CONFIG
diff --git a/main/nnd-s6-services/rc/nftables/down b/main/nnd-s6-services/rc/nftables/down
index 2d708fc..82d2844 100644
--- a/main/nnd-s6-services/rc/nftables/down
+++ b/main/nnd-s6-services/rc/nftables/down
@@ -1,11 +1,5 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec nft flush ruleset
+nft flush ruleset
diff --git a/main/nnd-s6-services/rc/nftables/up b/main/nnd-s6-services/rc/nftables/up
index 62ffac5..8734daa 100644
--- a/main/nnd-s6-services/rc/nftables/up
+++ b/main/nnd-s6-services/rc/nftables/up
@@ -1,16 +1,9 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/nftables
 importas -i RULESET RULESET
 importas -i RULEDIR RULEDIR
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec nft -I $RULEDIR -f $RULESET
+nft -I $RULEDIR -f $RULESET
diff --git a/main/nnd-s6-services/rc/ntpd.1/run b/main/nnd-s6-services/rc/ntpd.1/run
index 6d5e355..5613ae2 100755
--- a/main/nnd-s6-services/rc/ntpd.1/run
+++ b/main/nnd-s6-services/rc/ntpd.1/run
@@ -1,14 +1,10 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/ntpd.1
 importas -i NTPS NTPS
 
-emptyenv
-
-export PATH $PATH
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
 fdmove -c 2 1
 
-exec ntpd -n -dd -p ${NTPS}
+ntpd -n -dd -p $NTPS
diff --git a/main/nnd-s6-services/rc/qemu-ga/run b/main/nnd-s6-services/rc/qemu-ga/run
index c61c80b..d6ea062 100755
--- a/main/nnd-s6-services/rc/qemu-ga/run
+++ b/main/nnd-s6-services/rc/qemu-ga/run
@@ -1,10 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define METHOD virtio-serial
 define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0
 
-exec qemu-ga --method $METHOD --path $COMMPATH -r
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+qemu-ga --method $METHOD --path $COMMPATH -r
diff --git a/main/nnd-s6-services/rc/radvd/run b/main/nnd-s6-services/rc/radvd/run
index a3d2ea7..f5ecc22 100755
--- a/main/nnd-s6-services/rc/radvd/run
+++ b/main/nnd-s6-services/rc/radvd/run
@@ -1,12 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/radvd
 importas -i CONFIG CONFIG
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-exec radvd -n -m syslog -C $CONFIG
+radvd -n -m syslog -C $CONFIG
diff --git a/main/nnd-s6-services/rc/sshd.1/run b/main/nnd-s6-services/rc/sshd.1/run
index da91628..8312ae3 100755
--- a/main/nnd-s6-services/rc/sshd.1/run
+++ b/main/nnd-s6-services/rc/sshd.1/run
@@ -1,16 +1,12 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/sshd.1
 importas -i SSHDCFG SSHDCFG
 
-emptyenv
-
-export PATH $PATH
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
 fdmove -c 2 1
 
 # NOTE: SSHD forks itself and requires the full path
 #       - i don't think this is really a concern that should be forced onto users
-/usr/sbin/sshd -D -e -f ${SSHDCFG}
+/usr/sbin/sshd -D -e -f $SSHDCFG
diff --git a/main/nnd-s6-services/rc/sshd.keygen/up b/main/nnd-s6-services/rc/sshd.keygen/up
index 12b91aa..f360bcf 100644
--- a/main/nnd-s6-services/rc/sshd.keygen/up
+++ b/main/nnd-s6-services/rc/sshd.keygen/up
@@ -1,11 +1,5 @@
 #!/bin/execlineb -P
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec ssh-keygen -A
+ssh-keygen -A
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down
index abc694e..9d97448 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down
@@ -2,4 +2,4 @@
 export SYSPATH kernel/mm/ksm/run
 export VAL 0
 
-exec /usr/libexec/nnd/s6/sysfs
+/usr/libexec/nnd/s6/sysfs
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
index 710c292..b91ff55 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run
 export SYSPATH kernel/mm/ksm/run
 
-exec /usr/libexec/nnd/s6/sysfs
+s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run
+
+/usr/libexec/nnd/s6/sysfs
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down
index f83350e..82b7f4e 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 export SYSPATH kernel/mm/transparent_hugepage/enabled
-define VAL never
+export VAL never
 
-exec /usr/libexec/nnd/s6/sysfs
+/usr/libexec/nnd/s6/sysfs
diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
index 0d76028..9efc436 100644
--- a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
+++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled
 export SYSPATH kernel/mm/transparent_hugepage/enabled
 
-exec /usr/libexec/nnd/s6/sysfs
+s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled
+
+/usr/libexec/nnd/s6/sysfs
diff --git a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up
index 98f21d0..162e89f 100644
--- a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up
+++ b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sysctl.kernel-hostname
 export SYSCTL kernel/hostname
 
-exec /usr/libexec/nnd/s6/sysctl
+s6-envdir -i /etc/s6/env/sysctl.kernel-hostname
+
+/usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down
index 3f663f6..85e09a9 100644
--- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down
+++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down
@@ -2,4 +2,4 @@
 export SYSCTL vm/nr_hugepages
 export VAL 0
 
-exec /usr/libexec/nnd/sysctl
+/usr/libexec/nnd/sysctl
diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
index e7c5059..00da7bd 100644
--- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
+++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages
 export SYSCTL vm/nr_hugepages
 
-exec /usr/libexec/nnd/sysctl
+s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages
+
+/usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/syslogd/run b/main/nnd-s6-services/rc/syslogd/run
index c5c5570..f8c7dca 100755
--- a/main/nnd-s6-services/rc/syslogd/run
+++ b/main/nnd-s6-services/rc/syslogd/run
@@ -1,11 +1,9 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 # TODO: Change/allow this to be changed when you find out why this even exists
 define RUNAS nobody
 
-s6-envuidgid ${RUNAS}
-exec s6-socklog -d3 -U -t3000
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+s6-envuidgid $RUNAS
+s6-socklog -d3 -U -t3000
diff --git a/main/nnd-s6-services/rc/udhcpc.br0/run b/main/nnd-s6-services/rc/udhcpc.br0/run
index e54fa7c..eb3c035 100755
--- a/main/nnd-s6-services/rc/udhcpc.br0/run
+++ b/main/nnd-s6-services/rc/udhcpc.br0/run
@@ -2,11 +2,8 @@
 define INTERFACE br0
 
 s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
+emptyenv -p
 
 fdmove -c 2 1
 
-exec udhcpc -i ${INTERFACE} -f -S
+udhcpc -i $INTERFACE -f -S
diff --git a/main/nnd-s6-services/rc/user.sshd/up b/main/nnd-s6-services/rc/user.sshd/up
index 5bdca09..9f1c948 100644
--- a/main/nnd-s6-services/rc/user.sshd/up
+++ b/main/nnd-s6-services/rc/user.sshd/up
@@ -1,18 +1,13 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define SHELL /sbin/nologin
 define USER sshd
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
 # TODO: Handle user already being present
 foreground {
-	exec adduser -s $SHELL -H -D $USER
+	adduser -s $SHELL -H -D $USER
 } if -nt {
 	importas status ? test $status -eq 1
 }
diff --git a/main/nnd-s6-services/rc/utmpd/run b/main/nnd-s6-services/rc/utmpd/run
index 3a9c9df..af9c529 100755
--- a/main/nnd-s6-services/rc/utmpd/run
+++ b/main/nnd-s6-services/rc/utmpd/run
@@ -1,11 +1,9 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define SOCKET /run/utmps/.utmpd-socket
 
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
 # TODO: This is ugly and needs fixes
 foreground { touch /var/log/wtmp }
 foreground { chmod 644 /var/log/wtmp }
@@ -14,4 +12,4 @@ foreground { touch /run/utmps/utmp }
 foreground { chmod 755 /run/utmps }
 foreground { chmod 644 /run/utmps/utmp }
 
-exec s6-ipcserver /run/utmps/.utmpd-socket utmps-utmpd
+s6-ipcserver /run/utmps/.utmpd-socket utmps-utmpd
diff --git a/main/nnd-s6-services/rc/vg.Backplane/down b/main/nnd-s6-services/rc/vg.Backplane/down
index 8757f02..afb2190 100644
--- a/main/nnd-s6-services/rc/vg.Backplane/down
+++ b/main/nnd-s6-services/rc/vg.Backplane/down
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define VG Backplane
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec vgchange -a n $VG
+vgchange -a n $VG
diff --git a/main/nnd-s6-services/rc/vg.Backplane/up b/main/nnd-s6-services/rc/vg.Backplane/up
index 2a94f84..570eeb2 100644
--- a/main/nnd-s6-services/rc/vg.Backplane/up
+++ b/main/nnd-s6-services/rc/vg.Backplane/up
@@ -1,12 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-emptyenv
-
-export PATH $PATH
 define VG Backplane
 
-fdclose 1
-fdclose 2
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-exec vgchange -a y $VG
+vgchange -a y $VG
diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
index 051b646..55c96ff 100644
--- a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
+++ b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up
@@ -1,17 +1,10 @@
 #!/bin/execlineb -P
 define INTERFACE wg-tunnel
 
-s6-envdir -i /etc/s6/env/path
-importas -i PATH PATH
-
 s6-envdir -i /etc/s6/env/wg-config.${INTERFACE}
 importas -i CONFIG CONFIG
 
-emptyenv
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
 
-export PATH $PATH
-
-fdclose 1
-fdclose 2
-
-exec wg setconf ${INTERFACE} ${CONFIG}
+wg setconf $INTERFACE $CONFIG
diff --git a/main/nnd-s6-services/tmpl/ceph b/main/nnd-s6-services/tmpl/ceph
index c923b34..b892945 100755
--- a/main/nnd-s6-services/tmpl/ceph
+++ b/main/nnd-s6-services/tmpl/ceph
@@ -2,16 +2,13 @@
 importas -i DAEMON DAEMON
 importas -i ID ID
 
-s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
-
 s6-envdir -I /etc/s6/env/ceph
 importas -D "/etc/ceph/ceph.conf" CONFIG CONFIG
 
-emptyenv
-export PATH $PATH
+s6-envdir -I /etc/s6/env/path
+emptyenv -p
 
 # Log everything to stdout
 fdmove -c 2 1
 
-exec ceph-${DAEMON} -d -i $ID -c $CONFIG
+ceph-${DAEMON} -d -i $ID -c $CONFIG
diff --git a/main/nnd-s6-services/tmpl/dir b/main/nnd-s6-services/tmpl/dir
index 2a28af3..cdaf7d2 100755
--- a/main/nnd-s6-services/tmpl/dir
+++ b/main/nnd-s6-services/tmpl/dir
@@ -2,9 +2,6 @@
 importas -i DIR DIR
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-exec mkdir -p $DIR
+mkdir -p $DIR
diff --git a/main/nnd-s6-services/tmpl/getty b/main/nnd-s6-services/tmpl/getty
index 5a1cb0b..597d987 100755
--- a/main/nnd-s6-services/tmpl/getty
+++ b/main/nnd-s6-services/tmpl/getty
@@ -1,13 +1,11 @@
 #!/bin/execlineb -W
 importas -i TTY TTY
 
-s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
-
 s6-envdir -I /etc/s6/env/getty.${TTY}
 importas -D 0 BAUD BAUD
 
-emptyenv
-export PATH $PATH
+s6-envdir -I /etc/s6/env/path
 
-exec getty $BAUD $TTY
+emptyenv -p
+
+getty $BAUD $TTY
diff --git a/main/nnd-s6-services/tmpl/libvirtd b/main/nnd-s6-services/tmpl/libvirtd
index 65364d5..ab17b44 100755
--- a/main/nnd-s6-services/tmpl/libvirtd
+++ b/main/nnd-s6-services/tmpl/libvirtd
@@ -1,16 +1,13 @@
 #!/bin/execlineb -W
 importas -i NAME NAME
 
-s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
-
 s6-envdir -I /etc/s6/env/libvirt
 importas -D "/etc/libvirt/virt${NAME}d.conf" CONFIG DEFAULTCONFIG
 
 s6-envdir -I /etc/s6/env/libvirt.${NAME}
 importas -D $DEFAULTCONFIG CONFIG CONFIG
 
-emptyenv
-export PATH $PATH
+s6-envdir -I /etc/s6/env/path
+emptyenv -p
 
-exec virt${NAME}d -f $CONFIG
+virt${NAME}d -f $CONFIG
diff --git a/main/nnd-s6-services/tmpl/logger b/main/nnd-s6-services/tmpl/logger
index 38f5899..df0d507 100755
--- a/main/nnd-s6-services/tmpl/logger
+++ b/main/nnd-s6-services/tmpl/logger
@@ -1,9 +1,6 @@
 #!/bin/execlineb -W
 importas -i NAME NAME
 
-s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
-
 s6-envdir -I /etc/s6/env/logger
 importas -D "/var/log/" PREFIX PREFIX
 importas -D 1000000 SIZE DEFAULTSIZE
@@ -13,7 +10,7 @@ s6-envdir -I /etc/s6/env/logger.${NAME}
 importas -D $DEFAULTSIZE SIZE SIZE
 importas -D $DEFAULTARCHIVES ARCHIVES ARCHIVES
 
-emptyenv
-export PATH $PATH
+s6-envdir -I /etc/s6/env/path
+emptyenv -p
 
-exec s6-log -d3 -- t s${SIZE} n${ARCHIVES} ${PREFIX}/${NAME}
+s6-log -d3 -- t s${SIZE} n${ARCHIVES} ${PREFIX}/${NAME}
diff --git a/main/nnd-s6-services/tmpl/modprobe b/main/nnd-s6-services/tmpl/modprobe
index 7b0da3c..9d8d7d8 100755
--- a/main/nnd-s6-services/tmpl/modprobe
+++ b/main/nnd-s6-services/tmpl/modprobe
@@ -2,9 +2,6 @@
 importas -i MODULE MODULE
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-exec modprobe $MODULE
+modprobe $MODULE
diff --git a/main/nnd-s6-services/tmpl/mount b/main/nnd-s6-services/tmpl/mount
index 5102328..7d67c2a 100755
--- a/main/nnd-s6-services/tmpl/mount
+++ b/main/nnd-s6-services/tmpl/mount
@@ -5,10 +5,7 @@ importas -i FSTYPE FSTYPE
 importas -D "defaults" OPTS OPTS
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
-
-emptyenv
-export PATH $PATH
+emptyenv -p
 
 foreground { mkdir -p $DEST }
 
@@ -18,5 +15,5 @@ backtick -E -D $SRCPROVIDED SRC { findfs $SRCPROVIDED }
 ifelse {
 	redirfd -w 1 /dev/null findmnt -t $FSTYPE $DEST
 } {
-	exec s6-mount -t $FSTYPE -o remount,${OPTS} $SRC $DEST
-} exec s6-mount -t $FSTYPE -o $OPTS $SRC $DEST
+	s6-mount -t $FSTYPE -o remount,${OPTS} $SRC $DEST
+} s6-mount -t $FSTYPE -o $OPTS $SRC $DEST
diff --git a/main/nnd-s6-services/tmpl/rmmod b/main/nnd-s6-services/tmpl/rmmod
index bc9fca1..f8d6edc 100755
--- a/main/nnd-s6-services/tmpl/rmmod
+++ b/main/nnd-s6-services/tmpl/rmmod
@@ -2,9 +2,6 @@
 importas -i MODULE MODULE
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-exec rmmod $MODULE
+rmmod $MODULE
diff --git a/main/nnd-s6-services/tmpl/symlink b/main/nnd-s6-services/tmpl/symlink
index 1271e6a..eae412c 100755
--- a/main/nnd-s6-services/tmpl/symlink
+++ b/main/nnd-s6-services/tmpl/symlink
@@ -3,9 +3,6 @@ importas -i SRC SRC
 importas -i DEST DEST
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-exec ln -sn $DEST $SRC
+ln -sn $DEST $SRC
diff --git a/main/nnd-s6-services/tmpl/sysctl b/main/nnd-s6-services/tmpl/sysctl
index a6c3b3a..545e11c 100755
--- a/main/nnd-s6-services/tmpl/sysctl
+++ b/main/nnd-s6-services/tmpl/sysctl
@@ -3,9 +3,6 @@ importas -i SYSCTL SYSCTL
 importas -i VAL VAL
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-redirfd -w 1 /proc/sys/${SYSCTL} exec echo $VAL
+redirfd -w 1 /proc/sys/${SYSCTL} echo $VAL
diff --git a/main/nnd-s6-services/tmpl/sysfs b/main/nnd-s6-services/tmpl/sysfs
index 711b146..274ba10 100755
--- a/main/nnd-s6-services/tmpl/sysfs
+++ b/main/nnd-s6-services/tmpl/sysfs
@@ -3,9 +3,6 @@ importas -i SYSPATH SYSPATH
 importas -i VAL VAL
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-redirfd -w 1 /sys/${SYSPATH} exec echo $VAL
+redirfd -w 1 /sys/${SYSPATH} echo $VAL
diff --git a/main/nnd-s6-services/tmpl/umount b/main/nnd-s6-services/tmpl/umount
index 4b6e0d6..12b128b 100755
--- a/main/nnd-s6-services/tmpl/umount
+++ b/main/nnd-s6-services/tmpl/umount
@@ -2,9 +2,6 @@
 importas -i DEST DEST
 
 s6-envdir -I /etc/s6/env/path
-importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH
+emptyenv -p
 
-emptyenv
-export PATH $PATH
-
-exec umount $DEST
+umount $DEST