diff --git a/ChangeLog b/ChangeLog
index c7c8543..cfa9547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@ offset is set zero for early errors.
   (b) pcre2grep snprintf() workaround as used elsewhere in the tree.
   
   (c) Support for non-C99 snprintf() that returns -1 in the overflow case.  
+  
+11. Minor tidy of pcre2_dfa_matgch() code. 
 
 
 Version 10.31 12-February-2018
diff --git a/src/pcre2_dfa_match.c b/src/pcre2_dfa_match.c
index c6184ff..fc04bfc 100644
--- a/src/pcre2_dfa_match.c
+++ b/src/pcre2_dfa_match.c
@@ -2615,8 +2615,6 @@ for (;;)
       case OP_COND:
       case OP_SCOND:
         {
-        PCRE2_SIZE local_offsets[1000];
-        int local_workspace[1000];
         int codelink = (int)GET(code, 1);
         PCRE2_UCHAR condcode;
 
@@ -2672,6 +2670,8 @@ for (;;)
 
         else
           {
+          PCRE2_SIZE local_offsets[2];
+          int local_workspace[1000];
           int rc;
           PCRE2_SPTR asscode = code + LINK_SIZE + 1;
           PCRE2_SPTR endasscode = asscode + GET(asscode, 1);