diff --git a/repos/pc/run/intel_fb.run b/repos/pc/run/intel_fb.run
index a9db1687d3..971d133c9a 100644
--- a/repos/pc/run/intel_fb.run
+++ b/repos/pc/run/intel_fb.run
@@ -1,13 +1,9 @@
-assert_spec x86_64
+assert {[have_spec x86_64]}
 
-if {[get_cmd_switch --autopilot] && [have_include "power_on/qemu"]} {
-	puts "Run script does not support autopilot mode on Qemu"
-	exit 0
-}
-
-if {[get_cmd_switch --autopilot] && [have_board linux]} {
-	puts "Autopilot mode is not supported on this platform."
-	exit 0
+if {[have_cmd_arg --autopilot]} {
+	assert {![have_include power_on/qemu] &&
+	        ![have_board linux]} \
+		"Autopilot mode is not supported on this platform."
 }
 
 #
@@ -372,7 +368,7 @@ install_config $config
 
 build_boot_image [build_artifacts]
 
-if { [get_cmd_switch --autopilot] } {
+if {[have_cmd_arg --autopilot]} {
 	run_genode_until {\[init -\> init_dynamic -\> intel_fb\].*connector connected="true" name="HDMI-A-3"} 30
 	run_genode_until {\</connectors\>} 20 [output_spawn_id]
 	run_genode_until {green} 30 [output_spawn_id]
diff --git a/repos/pc/run/pc_linux.run b/repos/pc/run/pc_linux.run
index 5b321d9ec8..e1622e5794 100644
--- a/repos/pc/run/pc_linux.run
+++ b/repos/pc/run/pc_linux.run
@@ -1,13 +1,10 @@
-if {![have_include "load/ipxe"]} {
-	puts "run script requires load/ipxe"
-	exit 1
-}
+assert {[have_spec x86]}
+assert {[have_include load/ipxe]}
 
 proc _arch { } {
-	if {[have_spec "x86_32"]} { return "x86_32" }
-	if {[have_spec "x86_64"]} { return "x86_64" }
-	puts "not supported architecture!"
-	exit 1
+	if {[have_spec x86_32]} { return "x86_32" }
+	if {[have_spec x86_64]} { return "x86_64" }
+	assert {false} "Run script is not supported on this platform."
 }
 
 set arch    [_arch]
diff --git a/repos/pc/run/pc_nic.run b/repos/pc/run/pc_nic.run
index 30c6a4e125..5ede8df4bc 100644
--- a/repos/pc/run/pc_nic.run
+++ b/repos/pc/run/pc_nic.run
@@ -1,4 +1,4 @@
-assert_spec x86
+assert {[have_spec x86]}
 
 build { driver/nic/pc }
 
diff --git a/repos/pc/run/pc_wifi.run b/repos/pc/run/pc_wifi.run
index 1ec9de9380..b894ecdc83 100644
--- a/repos/pc/run/pc_wifi.run
+++ b/repos/pc/run/pc_wifi.run
@@ -10,7 +10,7 @@ source ${genode_dir}/repos/dde_linux/run/wifi_config.inc
 #
 # Restrict platforms
 #
-assert_spec x86
+assert {[have_spec x86]}
 
 #
 # Build