1 files changed, 22 insertions, 22 deletions

diff --git a/src/n3.c b/src/n3.c
index 1883b6b2..ab0cfb37 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -1072,13 +1072,15 @@ read_anon(SerdReader* const reader,
           const bool        subject,
           SerdNode** const  dest)
 {
-  const SerdStatementFlags old_flags = *ctx.flags;
-  bool                     empty     = false;
   eat_byte_safe(reader, '[');
-  if ((empty = peek_delim(reader, ']'))) {
-    *ctx.flags |= (subject) ? SERD_EMPTY_S : SERD_EMPTY_O;
+
+  const SerdStatementFlags old_flags = *ctx.flags;
+  const bool               empty     = peek_delim(reader, ']');
+
+  if (subject) {
+    *ctx.flags |= empty ? SERD_EMPTY_S : SERD_ANON_S;
   } else {
-    *ctx.flags |= (subject) ? SERD_ANON_S_BEGIN : SERD_ANON_O_BEGIN;
+    *ctx.flags |= SERD_ANON_O;
   }
 
   if (!*dest) {
@@ -1087,31 +1089,33 @@ read_anon(SerdReader* const reader,
     }
   }
 
+  // Emit statement with this anonymous object first
   SerdStatus st = SERD_SUCCESS;
   if (ctx.subject) {
     TRY(st, emit_statement(reader, ctx, *dest));
   }
 
+  // Switch the subject to the anonymous node and read its description
   ctx.subject = *dest;
   if (!empty) {
-    *ctx.flags &= ~(unsigned)SERD_LIST_CONT;
-    if (!subject) {
-      *ctx.flags |= SERD_ANON_CONT;
-    }
-
     bool ate_dot_in_list = false;
-    if ((st = read_predicateObjectList(reader, ctx, &ate_dot_in_list))) {
+    st = read_predicateObjectList(reader, ctx, &ate_dot_in_list);
+    if (st > SERD_FAILURE) {
       return st;
     }
 
     if (ate_dot_in_list) {
       return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n");
     }
+
     read_ws_star(reader);
-    serd_sink_write_end(reader->sink, *dest);
     *ctx.flags = old_flags;
   }
 
+  if (!(subject && empty)) {
+    TRY(st, serd_sink_write_end(reader->sink, *dest));
+  }
+
   return eat_byte_check(reader, ']');
 }
 
@@ -1293,10 +1297,8 @@ read_predicateObjectList(SerdReader* const reader,
 }
 
 static SerdStatus
-end_collection(SerdReader* const reader, ReadContext ctx, const SerdStatus st)
+end_collection(SerdReader* const reader, const SerdStatus st)
 {
-  *ctx.flags &= ~(unsigned)SERD_LIST_CONT;
-
   return st ? st : eat_byte_check(reader, ')');
 }
 
@@ -1316,15 +1318,14 @@ read_collection(SerdReader* const reader,
 
   if (ctx.subject) {
     // subject predicate _:head
-    *ctx.flags |= (end ? 0 : SERD_LIST_O_BEGIN);
+    *ctx.flags |= (end ? 0 : SERD_LIST_O);
     TRY(st, emit_statement(reader, ctx, *dest));
-    *ctx.flags |= SERD_LIST_CONT;
   } else {
-    *ctx.flags |= (end ? 0 : SERD_LIST_S_BEGIN);
+    *ctx.flags |= (end ? 0 : SERD_LIST_S);
   }
 
   if (end) {
-    return end_collection(reader, ctx, st);
+    return end_collection(reader, st);
   }
 
   /* The order of node allocation here is necessarily not in stack order,
@@ -1344,7 +1345,7 @@ read_collection(SerdReader* const reader,
     ctx.predicate = reader->rdf_first;
     bool ate_dot  = false;
     if ((st = read_object(reader, &ctx, true, &ate_dot)) || ate_dot) {
-      return end_collection(reader, ctx, st);
+      return end_collection(reader, st);
     }
 
     if (!(end = peek_delim(reader, ')'))) {
@@ -1359,7 +1360,6 @@ read_collection(SerdReader* const reader,
     }
 
     // _:node rdf:rest _:rest
-    *ctx.flags |= SERD_LIST_CONT;
     ctx.predicate = reader->rdf_rest;
     TRY(st, emit_statement(reader, ctx, (end ? reader->rdf_nil : rest)));
 
@@ -1368,7 +1368,7 @@ read_collection(SerdReader* const reader,
     node        = ctx.subject; // invariant
   }
 
-  return end_collection(reader, ctx, st);
+  return end_collection(reader, st);
 }
 
 static SerdStatus