More fixes to JSON string buffer sizing

src/xjson.c

@@ -1097,30 +1097,30 @@ static int GetArrayStringSize(int prefixSize, char *ptr, XType type, int ndim, c
 
     switch(type) {
       case X_UNKNOWN:
-        return prefixSize + sizeof(JSON_NULL);
+        return sizeof(JSON_NULL);
 
       case X_STRUCT:
-        m = GetObjectStringSize(prefixSize, (XStructure *) ptr);
+        m = GetObjectStringSize(prefixSize + ilen, (XStructure *) ptr);
         prop_error(fn, m);
         return m;
 
       case X_STRING:
       case X_RAW:
         m = GetJsonStringSize(*(char **) ptr, TERMINATED_STRING);
         prop_error(fn, m);
-        return m + prefixSize;
+        return m;
 
       case X_FIELD: {
         const XField *f = (XField *) ptr;
-        m = GetFieldStringSize(prefixSize, f, TRUE);
+        m = GetFieldStringSize(prefixSize + ilen, f, TRUE);
         prop_error(fn, m);
         return m;
       }
 
       default:
         m = xStringElementSizeOf(type);
         prop_error(fn, m);
-        return m + prefixSize;
+        return m;
     }
   }
   else {

src/xstruct.c

@@ -1007,9 +1007,9 @@ int xReduceField(XField *f) {
 }
 
 /**
- * Recursively eliminates unneccessary embedding of singular structures inside a structure as well as reduces the
- * dimension of all array fields with xReduceDims(). It will also eliminate the unnecessary wrapping of a singular
- * array into a single XField.
+ * Recursively eliminates unneccessary embedding of singular structures inside a structure and reduces the
+ * dimensions of array fields with xReduceDims(), recursively. It will also eliminate the unnecessary wrapping
+ * of a singular array into a single XField.
  *
  * @param s     Pointer to a structure.
  * @return      X_SUCCESS (0) if successful or else X_STRUCT_INVALID if the argument is NULL (errno is