diff --git a/panc/src/main/jjtree/PanParser.jjt b/panc/src/main/jjtree/PanParser.jjt
index 162333e2..df14569a 100644
--- a/panc/src/main/jjtree/PanParser.jjt
+++ b/panc/src/main/jjtree/PanParser.jjt
@@ -713,7 +713,7 @@ org.quattor.pan.ttemplate.SourceRange typeSpec() #TypeSpec :
 org.quattor.pan.ttemplate.SourceRange baseTypeSpec() #BaseTypeSpec :
 { Token t = null, b=null, e=null; org.quattor.pan.utils.Range r = null; }
 {
-  t=<CHOICE> <LPAREN> stringLiteral() (<COMMA> stringLiteral())* e=<RPAREN>
+  t=<CHOICE> <LPAREN> stringLiteral() (LOOKAHEAD(2) <COMMA> stringLiteral())* [ <COMMA> ] e=<RPAREN>
   {
     jjtThis.setIdentifier(t.image);
     jjtThis.setSourceRange(PanParserUtils.sourceRangeFromTokens(t,(e!=null)?e:t));
diff --git a/panc/src/test/pan/Functionality/choice/choice18.pan b/panc/src/test/pan/Functionality/choice/choice18.pan
index ff22d004..fee99b2d 100644
--- a/panc/src/test/pan/Functionality/choice/choice18.pan
+++ b/panc/src/test/pan/Functionality/choice/choice18.pan
@@ -4,6 +4,11 @@
 
 object template choice18;
 
-type mychoice = choice("aa", "bb", "aaa", "bbb");
+type mychoice = choice(
+    "aa",
+    "bb",
+    "aaa",
+    "bbb",
+);
 bind '/x' = mychoice with length(SELF) == 3;
 '/x' = "aaa";
diff --git a/panc/src/test/pan/Functionality/choice/choice19.pan b/panc/src/test/pan/Functionality/choice/choice19.pan
index f38bc778..91f45fa7 100644
--- a/panc/src/test/pan/Functionality/choice/choice19.pan
+++ b/panc/src/test/pan/Functionality/choice/choice19.pan
@@ -4,6 +4,11 @@
 
 object template choice19;
 
-type mychoice = choice("aa", "bb", "aaa", "bbb");
+type mychoice = choice(
+    "aa",
+    "bb",
+    "aaa",
+    "bbb",
+);
 bind '/x' = mychoice with length(SELF) == 3;
 '/x' = "aa";
diff --git a/panc/src/test/pan/Functionality/choice/choice20.pan b/panc/src/test/pan/Functionality/choice/choice20.pan
index 85c4a27c..1ee3df33 100644
--- a/panc/src/test/pan/Functionality/choice/choice20.pan
+++ b/panc/src/test/pan/Functionality/choice/choice20.pan
@@ -4,6 +4,11 @@
 
 object template choice20;
 
-type mychoice = choice("aa", "bb", "aaa", "bbb");
+type mychoice = choice(
+    "aa",
+    "bb",
+    "aaa",
+    "bbb",
+);
 bind '/x' = mychoice with length(SELF) == 3;
 '/x' = "ddd";
diff --git a/panc/src/test/pan/Functionality/choice/choice21.pan b/panc/src/test/pan/Functionality/choice/choice21.pan
index 79a10d1d..ee876884 100644
--- a/panc/src/test/pan/Functionality/choice/choice21.pan
+++ b/panc/src/test/pan/Functionality/choice/choice21.pan
@@ -4,6 +4,11 @@
 
 object template choice21;
 
-type mychoice = choice("aa", "bb", "aaa", "bbb");
+type mychoice = choice(
+    "aa",
+    "bb",
+    "aaa",
+    "bbb",
+);
 bind '/x' = mychoice(3);
-'/x' = "aaa";
\ No newline at end of file
+'/x' = "aaa";
diff --git a/panc/src/test/pan/Functionality/choice/choice22.pan b/panc/src/test/pan/Functionality/choice/choice22.pan
index 093d4dcc..e100e5f2 100644
--- a/panc/src/test/pan/Functionality/choice/choice22.pan
+++ b/panc/src/test/pan/Functionality/choice/choice22.pan
@@ -4,6 +4,11 @@
 
 object template choice22;
 
-type mychoice = choice("aa", "bb", "aaa", "bbb");
+type mychoice = choice(
+    "aa",
+    "bb",
+    "aaa",
+    "bbb",
+);
 bind '/x' = mychoice(3);
-'/x' = "aa";
\ No newline at end of file
+'/x' = "aa";