diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index 18865cee4b..ba7fc0e029 100644
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -18,21 +18,21 @@ SYMBOLS:
 SINGLETON: void
 
 TUPLE: abstract-c-type
-{ class class initial: object }
-{ boxed-class class initial: object }
-{ boxer-quot callable }
-{ unboxer-quot callable }
-{ getter callable }
-{ setter callable }
-{ size integer }
-{ signed boolean }
-{ align integer }
-{ align-first integer } ;
+    { class class initial: object }
+    { boxed-class class initial: object }
+    { boxer-quot callable }
+    { unboxer-quot callable }
+    { getter callable }
+    { setter callable }
+    { size integer }
+    { signed boolean }
+    { align integer }
+    { align-first integer } ;
 
 TUPLE: c-type < abstract-c-type
-boxer
-unboxer
-{ rep initial: int-rep } ;
+    boxer
+    unboxer
+    { rep initial: int-rep } ;
 
 : <c-type> ( -- c-type )
     \ c-type new ; inline
diff --git a/basis/threads/threads.factor b/basis/threads/threads.factor
index af9ca5c1ed..586c2cf220 100644
--- a/basis/threads/threads.factor
+++ b/basis/threads/threads.factor
@@ -51,16 +51,16 @@ PRIVATE>
 SYMBOL: initial-thread
 
 TUPLE: thread
-{ name string }
-{ quot callable initial: [ ] }
-{ exit-handler callable initial: [ ] }
-{ id integer }
-{ context box }
-state
-runnable
-mailbox
-{ variables hashtable }
-sleep-entry ;
+    { name string }
+    { quot callable initial: [ ] }
+    { exit-handler callable initial: [ ] }
+    { id integer }
+    { context box }
+    state
+    runnable
+    mailbox
+    { variables hashtable }
+    sleep-entry ;
 
 : self ( -- thread )
     OBJ-CURRENT-THREAD special-object { thread } declare ; inline
diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
index dfe6cf9c97..82cf068164 100644
--- a/basis/ui/gestures/gestures.factor
+++ b/basis/ui/gestures/gestures.factor
@@ -82,20 +82,20 @@ TUPLE: button-up mods # ;   C: <button-up> button-up
 TUPLE: button-down mods # ; C: <button-down> button-down
 
 SINGLETONS:
-motion
-mouse-scroll
-mouse-enter mouse-leave
-lose-focus gain-focus ;
+    motion
+    mouse-scroll
+    mouse-enter mouse-leave
+    lose-focus gain-focus ;
 
 ! Higher-level actions
 SINGLETONS:
-undo-action redo-action
-cut-action copy-action paste-action
-delete-action select-all-action
-left-action right-action up-action down-action
-zoom-in-action zoom-out-action
-new-action open-action save-action save-as-action
-revert-action close-action ;
+    undo-action redo-action
+    cut-action copy-action paste-action
+    delete-action select-all-action
+    left-action right-action up-action down-action
+    zoom-in-action zoom-out-action
+    new-action open-action save-action save-as-action
+    revert-action close-action ;
 
 UNION: action
 undo-action redo-action
diff --git a/core/hash-sets/hash-sets.factor b/core/hash-sets/hash-sets.factor
index 73006ba7ec..9e99dc6a1a 100644
--- a/core/hash-sets/hash-sets.factor
+++ b/core/hash-sets/hash-sets.factor
@@ -8,9 +8,9 @@ vectors ;
 IN: hash-sets
 
 TUPLE: hash-set
-{ count array-capacity }
-{ deleted array-capacity }
-{ array array } ;
+    { count array-capacity }
+    { deleted array-capacity }
+    { array array } ;
 
 <PRIVATE
 
diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 24d25e49d0..d7763428d7 100644
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -5,9 +5,9 @@ math.private sequences sequences.private slots.private vectors ;
 IN: hashtables
 
 TUPLE: hashtable
-{ count array-capacity }
-{ deleted array-capacity }
-{ array array } ;
+    { count array-capacity }
+    { deleted array-capacity }
+    { array array } ;
 
 <PRIVATE