diff --git a/test/asm/shift.asm b/test/asm/shift.asm
index 40efa53d..7f5d2078 100644
--- a/test/asm/shift.asm
+++ b/test/asm/shift.asm
@@ -1,10 +1,11 @@
-test: macro
+macro test
 	; Test the rpn system, as well as the linker...
-	dl \1 + zero
+	DEF expr EQUS STRRPL(STRRPL("\1 + zero)", "<<", "<< ("), ">>", ">> (")
+	dl expr
+	PURGE expr
 
 	; ...as well as the constexpr system
-result\@ equ \1
-	println "\1 = {result\@}"
+	println "\1 = ", (\1)
 endm
 
 section "test", ROM0[0]
diff --git a/test/asm/shift.err b/test/asm/shift.err
index 9bb4109d..60c0c5bc 100644
--- a/test/asm/shift.err
+++ b/test/asm/shift.err
@@ -1,52 +1,26 @@
-warning: shift.asm(13) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(14) -> shift.asm::test(8): [-Wshift-amount]
     Shifting left by large amount 32
-warning: shift.asm(13) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting left by large amount 32
-warning: shift.asm(14) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(15) -> shift.asm::test(8): [-Wshift-amount]
     Shifting left by large amount 9001
-warning: shift.asm(14) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting left by large amount 9001
-warning: shift.asm(16) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(17) -> shift.asm::test(8): [-Wshift-amount]
     Shifting left by large amount 32
-warning: shift.asm(16) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting left by large amount 32
-warning: shift.asm(17) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(18) -> shift.asm::test(8): [-Wshift-amount]
     Shifting left by negative amount -9001
-warning: shift.asm(17) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting left by negative amount -9001
-warning: shift.asm(19) -> shift.asm::test(3): [-Wshift]
+warning: shift.asm(20) -> shift.asm::test(8): [-Wshift]
     Shifting right negative value -1
-warning: shift.asm(19) -> shift.asm::test(6): [-Wshift]
+warning: shift.asm(21) -> shift.asm::test(8): [-Wshift]
     Shifting right negative value -1
-warning: shift.asm(20) -> shift.asm::test(3): [-Wshift]
-    Shifting right negative value -1
-warning: shift.asm(20) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(21) -> shift.asm::test(8): [-Wshift-amount]
     Shifting right by large amount 32
-warning: shift.asm(20) -> shift.asm::test(6): [-Wshift]
+warning: shift.asm(22) -> shift.asm::test(8): [-Wshift]
     Shifting right negative value -1
-warning: shift.asm(20) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting right by large amount 32
-warning: shift.asm(21) -> shift.asm::test(3): [-Wshift]
-    Shifting right negative value -1
-warning: shift.asm(21) -> shift.asm::test(3): [-Wshift-amount]
+warning: shift.asm(22) -> shift.asm::test(8): [-Wshift-amount]
     Shifting right by large amount 9001
-warning: shift.asm(21) -> shift.asm::test(6): [-Wshift]
+warning: shift.asm(23) -> shift.asm::test(8): [-Wshift]
+    Shifting right negative value -4
+warning: shift.asm(24) -> shift.asm::test(8): [-Wshift]
+    Shifting right negative value -4
+warning: shift.asm(25) -> shift.asm::test(8): [-Wshift]
     Shifting right negative value -1
-warning: shift.asm(21) -> shift.asm::test(6): [-Wshift-amount]
-    Shifting right by large amount 9001
-warning: shift.asm(22) -> shift.asm::test(3): [-Wshift]
-    Shifting right negative value -4
-warning: shift.asm(22) -> shift.asm::test(6): [-Wshift]
-    Shifting right negative value -4
-warning: shift.asm(23) -> shift.asm::test(3): [-Wshift]
-    Shifting right negative value -4
-warning: shift.asm(23) -> shift.asm::test(6): [-Wshift]
-    Shifting right negative value -4
-warning: shift.asm(24) -> shift.asm::test(3): [-Wshift]
-    Shifting right negative value -1
-warning: shift.asm(24) -> shift.asm::test(3): [-Wshift-amount]
-    Shifting right by negative amount -9001
-warning: shift.asm(24) -> shift.asm::test(6): [-Wshift]
-    Shifting right negative value -1
-warning: shift.asm(24) -> shift.asm::test(6): [-Wshift-amount]
+warning: shift.asm(25) -> shift.asm::test(8): [-Wshift-amount]
     Shifting right by negative amount -9001