1 files changed, 6 insertions, 13 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index 05a1b00..fdd14f3 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -379,15 +379,9 @@ Running "make install" installs the files in the local TeX tree.
   /witness/msName/.new value = {},
   /witness/origDate/.new value = {}
 }
-\NewDocumentCommand{\DeclareNewWitness}{m m m o}{%
-  \IfNoValueTF{#4}
-  {\luadirect{ekdosis.newwitness(
-      \luastringN{#1},
-      \luastringN{#2},
-      \luastringN{#3}
-      )}}
-  {\bgroup
-    \options{/witness,#4}
+\NewDocumentCommand{\DeclareNewWitness}{m m m O{}}{%
+  \bgroup
+  \options{/witness,#4}
     \letoption{/witness/settlement}\settlement@value
     \letoption{/witness/repository}\repository@value
     \letoption{/witness/idno}\idno@value
@@ -401,10 +395,9 @@ Running "make install" installs the files in the local TeX tree.
       \luastringO{\repository@value},
       \luastringO{\idno@value},
       \luastringO{\msName@value},
-      \luastringO{\origDate@value}
-      )}
-    \egroup}
-}
+      \luastringO{\origDate@value})}
+    \egroup
+  }
 \@onlypreamble\DeclareNewWitness
 \NewDocumentCommand{\DeclareNewHand}{m m m +O{}}{
   \luadirect{ekdosis.newhand(\luastringN{#1},