diff --git a/grammars/basicdoc.rnc b/grammars/basicdoc.rnc
index 29cfba3..0eb942e 100644
--- a/grammars/basicdoc.rnc
+++ b/grammars/basicdoc.rnc
@@ -118,18 +118,24 @@ note =
   element note {
     RequiredId,
     NoteAttr,
-    paragraph+
+    NoteBody
   }
 
 note-no-id =
   element note {
     OptionalId,
     NoteAttr,
-    paragraph-no-id+
+    NoteNoIdBody
   }
 
 NoteAttr = empty
 
+NoteBody =
+    paragraph+
+
+NoteNoIdBody =
+    paragraph-no-id+
+
 review =
   element review {
   RequiredId,
diff --git a/grammars/basicdoc.rng b/grammars/basicdoc.rng
index a873314..a3fb24c 100644
--- a/grammars/basicdoc.rng
+++ b/grammars/basicdoc.rng
@@ -281,23 +281,29 @@
     <element name="note">
       <ref name="RequiredId"/>
       <ref name="NoteAttr"/>
-      <oneOrMore>
-        <ref name="paragraph"/>
-      </oneOrMore>
+      <ref name="NoteBody"/>
     </element>
   </define>
   <define name="note-no-id">
     <element name="note">
       <ref name="OptionalId"/>
       <ref name="NoteAttr"/>
-      <oneOrMore>
-        <ref name="paragraph-no-id"/>
-      </oneOrMore>
+      <ref name="NoteNoIdBody"/>
     </element>
   </define>
   <define name="NoteAttr">
     <empty/>
   </define>
+  <define name="NoteBody">
+    <oneOrMore>
+      <ref name="paragraph"/>
+    </oneOrMore>
+  </define>
+  <define name="NoteNoIdBody">
+    <oneOrMore>
+      <ref name="paragraph-no-id"/>
+    </oneOrMore>
+  </define>
   <define name="review">
     <element name="review">
       <ref name="RequiredId"/>