1 files changed, 11 insertions, 6 deletions
diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux
index 683ba1432..7195c4918 100644
--- a/stdlib/source/library/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/library/lux/target/jvm/type/signature.lux
@@ -78,8 +78,13 @@
     [upper ..upper_prefix]
     )
 
-  (def: .public parameters_start "<")
-  (def: .public parameters_end ">")
+  (template [<char> <name>]
+    [(def: .public <name>
+       <char>)]
+
+    ["<" parameters_start]
+    [">" parameters_end]
+    )
 
   (def: .public (class name parameters)
     (-> External (List (Signature Parameter)) (Signature Class))
@@ -94,7 +99,7 @@
                (format ..parameters_start
                        (|> parameters
                            (list\map ..signature)
-                           text.joined)
+                           text.together)
                        ..parameters_end))
              //descriptor.class_suffix)))
 
@@ -130,18 +135,18 @@
                (|> type_variables
                    (list\map (|>> ..var_name
                                   (text.suffix ..class_bound)))
-                   text.joined
+                   text.together
                    (text.enclosed [..parameters_start
                                    ..parameters_end])))
              (|> inputs
                  (list\map ..signature)
-                 text.joined
+                 text.together
                  (text.enclosed [..arguments_start
                                  ..arguments_end]))
              (:representation output)
              (|> exceptions
                  (list\map (|>> :representation (format ..exception_prefix)))
-                 text.joined))))
+                 text.together))))
 
   (implementation: .public equivalence
     (All [category] (Equivalence (Signature category)))