diff --git a/doc/programming/examples/_parse-backtrack.spicy.output b/doc/programming/examples/_parse-backtrack.spicy.output
index 4d95477ca..5246eee5a 100644
--- a/doc/programming/examples/_parse-backtrack.spicy.output
+++ b/doc/programming/examples/_parse-backtrack.spicy.output
@@ -1,6 +1,6 @@
 # Automatically generated; do not edit. -- <HASH> printf '\001\002\003\004' | spicy-driver %INPUT; printf '\003\004' | spicy-driver %INPUT/printf '\001\002\003\004' | spicy-driver %INPUT; printf '\003\004' | spicy-driver %INPUT/False
-# printf '\001\002\003\004' | spicy-driver backtrack.spicy; printf '\003\004' | spicy-driver backtrack.spicy
+# printf '\001\002\003\004' | spicy-driver backtrack.spicy
 [$foo=[$a=1, $b=2], $bar=[$a=3, $b=4]]
 
-# printf '\001\002\003\004' | spicy-driver backtrack.spicy; printf '\003\004' | spicy-driver backtrack.spicy
+#  printf '\003\004' | spicy-driver backtrack.spicy
 [$foo=[$a=3, $b=(not set)], $bar=[$a=3, $b=4]]
diff --git a/doc/programming/examples/_parse-if.spicy.output b/doc/programming/examples/_parse-if.spicy.output
index dd492b13b..43797fac6 100644
--- a/doc/programming/examples/_parse-if.spicy.output
+++ b/doc/programming/examples/_parse-if.spicy.output
@@ -1,6 +1,6 @@
 # Automatically generated; do not edit. -- <HASH> printf '\01\02\03\04' | spicy-driver %INPUT; printf '\02\02\03\04' | spicy-driver %INPUT/printf '\01\02\03\04' | spicy-driver %INPUT; printf '\02\02\03\04' | spicy-driver %INPUT/False
-# printf '\01\02\03\04' | spicy-driver foo.spicy; printf '\02\02\03\04' | spicy-driver foo.spicy
+# printf '\01\02\03\04' | spicy-driver foo.spicy
 [$a=1, $b=2, $c=(not set), $d=3]
 
-# printf '\01\02\03\04' | spicy-driver foo.spicy; printf '\02\02\03\04' | spicy-driver foo.spicy
+# printf '\02\02\03\04' | spicy-driver foo.spicy
 [$a=2, $b=(not set), $c=2, $d=3]
diff --git a/doc/programming/examples/_parse-random-access.spicy.output b/doc/programming/examples/_parse-random-access.spicy.output
index 8af340a56..47ee6266b 100644
Binary files a/doc/programming/examples/_parse-random-access.spicy.output and b/doc/programming/examples/_parse-random-access.spicy.output differ
diff --git a/doc/programming/examples/_parse-switch-lhead-2.spicy.output b/doc/programming/examples/_parse-switch-lhead-2.spicy.output
index 43f529d99..255e8c330 100644
--- a/doc/programming/examples/_parse-switch-lhead-2.spicy.output
+++ b/doc/programming/examples/_parse-switch-lhead-2.spicy.output
@@ -1,6 +1,6 @@
 # Automatically generated; do not edit. -- <HASH> printf 'A ' | spicy-driver %INPUT; printf '\377\377' | spicy-driver %INPUT/printf 'A ' | spicy-driver %INPUT; printf '\377\377' | spicy-driver %INPUT/False
-# printf 'A ' | spicy-driver foo.spicy; printf '\377\377' | spicy-driver foo.spicy
+# printf 'A ' | spicy-driver foo.spicy
 [$a=[$a=b"A"], $b=(not set)]
 
-# printf 'A ' | spicy-driver foo.spicy; printf '\377\377' | spicy-driver foo.spicy
+# printf '\377\377' | spicy-driver foo.spicy
 [$a=(not set), $b=[$b=65535]]
diff --git a/doc/programming/examples/_parse-switch.spicy.output b/doc/programming/examples/_parse-switch.spicy.output
index 25b125c16..42a5926d9 100644
--- a/doc/programming/examples/_parse-switch.spicy.output
+++ b/doc/programming/examples/_parse-switch.spicy.output
@@ -1,6 +1,6 @@
 # Automatically generated; do not edit. -- <HASH> printf 'A\01' | spicy-driver %INPUT; printf 'B\01\02' | spicy-driver %INPUT/printf 'A\01' | spicy-driver %INPUT; printf 'B\01\02' | spicy-driver %INPUT/False
-# printf 'A\01' | spicy-driver foo.spicy; printf 'B\01\02' | spicy-driver foo.spicy
+# printf 'A\01' | spicy-driver foo.spicy
 [$x=b"A", $a8=1, $a16=(not set), $a32=(not set)]
 
-# printf 'A\01' | spicy-driver foo.spicy; printf 'B\01\02' | spicy-driver foo.spicy
+# printf 'B\01\02' | spicy-driver foo.spicy
 [$x=b"B", $a8=(not set), $a16=258, $a32=(not set)]
diff --git a/doc/programming/examples/_parse-unit-params.spicy.output b/doc/programming/examples/_parse-unit-params.spicy.output
index 43f0acfd0..785825e8d 100644
--- a/doc/programming/examples/_parse-unit-params.spicy.output
+++ b/doc/programming/examples/_parse-unit-params.spicy.output
@@ -1,4 +1,4 @@
 # Automatically generated; do not edit. -- <HASH> printf '\01\02' | spicy-driver %INPUT/printf '\01\02' | spicy-driver %INPUT/False
 # printf '\01\02' | spicy-driver foo.spicy
-"Spicy": 1
+Spicy: 1
 [$y=[$x=1]]
diff --git a/doc/programming/examples/_unit-params.spicy.output b/doc/programming/examples/_unit-params.spicy.output
index 5d37bcfbf..d44bee7ca 100644
--- a/doc/programming/examples/_unit-params.spicy.output
+++ b/doc/programming/examples/_unit-params.spicy.output
@@ -1,3 +1,3 @@
 # Automatically generated; do not edit. -- <HASH> printf '\05' | spicy-driver %INPUT/printf '\05' | spicy-driver %INPUT/False
 # printf '\05' | spicy-driver foo.spicy
-"My multiplied integer": 25
+My multiplied integer: 25
diff --git a/doc/scripts/spicy.py b/doc/scripts/spicy.py
index fe64c5480..44af17874 100644
--- a/doc/scripts/spicy.py
+++ b/doc/scripts/spicy.py
@@ -384,6 +384,10 @@ def update(self, source, destination, cmd):
         all_good = True
         first = True
 
+        show_as = []
+        if self.show_as:
+            show_as = self.show_as.split(";")
+
         for one_cmd in cmd.split(";"):
             one_cmd = one_cmd.strip()
 
@@ -418,12 +422,14 @@ def update(self, source, destination, cmd):
                     out = open(destination, "ab")
                     out.write(b"\n")
 
-                if self.show_as:
-                    one_cmd = "# %s\n" % self.show_as
+                if show_as:
+                    one_cmd = "# %s\n" % show_as[0].strip()
                     one_cmd = one_cmd.replace("%INPUT", self.show_with)
                     output = output.replace(
                         source.encode(), self.show_with.encode())
                     out.write(one_cmd.encode())
+                    show_as = show_as[1:]
+
                 out.write(output)
                 out.close()
                 first = False