diff --git a/extra/documents/documents.factor b/extra/documents/documents.factor
index 9e4802c2ef..d046102ec9 100755
--- a/extra/documents/documents.factor
+++ b/extra/documents/documents.factor
@@ -15,11 +15,11 @@ IN: documents
 
 : lines-equal? ( loc1 loc2 -- ? ) [ first ] bi@ number= ;
 
-TUPLE: document locs ;
+TUPLE: document < model locs ;
 
 : <document> ( -- document )
-    V{ "" } clone <model> V{ } clone
-    { set-delegate set-document-locs } document construct ;
+    V{ "" } clone document new-model
+    V{ } clone >>locs ;
 
 : add-loc ( loc document -- ) locs>> push ;