diff --git a/deps/dizzle b/deps/dizzle
index 89c436df..361874ff 160000
--- a/deps/dizzle
+++ b/deps/dizzle
@@ -1 +1 @@
-Subproject commit 89c436dff4caa7b09f06f58d47a750554be2abd5
+Subproject commit 361874ff72b19d2386f3cb6e8604e673c02203c9
diff --git a/deps/tengri b/deps/tengri
index f3fcf663..eaa05b7f 160000
--- a/deps/tengri
+++ b/deps/tengri
@@ -1 +1 @@
-Subproject commit f3fcf663a8fed20a59503d94061ad8b7f8c38486
+Subproject commit eaa05b7f091b9f22572a9ff98c6739b5c273066b
diff --git a/device/editor.rs b/device/editor.rs
index 2ec4d37e..20bd1b1f 100644
--- a/device/editor.rs
+++ b/device/editor.rs
@@ -40,8 +40,12 @@ impl std::fmt::Debug for MidiEditor {
         f.debug_struct("MidiEditor").field("mode", &self.mode).finish()
     }
 }
-from!(|clip: &Arc<RwLock<MidiClip>>|MidiEditor = { let model = Self::from(Some(clip.clone())); model.redraw(); model });
-from!(|clip: Option<Arc<RwLock<MidiClip>>>|MidiEditor = {
+from!(MidiEditor: |clip: &Arc<RwLock<MidiClip>>| {
+    let model = Self::from(Some(clip.clone()));
+    model.redraw();
+    model
+});
+from!(MidiEditor: |clip: Option<Arc<RwLock<MidiClip>>>| {
     let mut model = Self::default();
     *model.clip_mut() = clip;
     model.redraw();
diff --git a/device/pool.rs b/device/pool.rs
index 42bef43c..ab54633f 100644
--- a/device/pool.rs
+++ b/device/pool.rs
@@ -184,8 +184,11 @@ pub trait HasClips {
 }
 has_clips!(|self: Pool|self.clips);
 has_clip!(|self: Pool|self.clips().get(self.clip_index()).map(|c|c.clone()));
-from!(|clip:&Arc<RwLock<MidiClip>>|Pool = {
-    let model = Self::default(); model.clips.write().unwrap().push(clip.clone()); model.clip.store(1, Relaxed); model
+from!(Pool: |clip:&Arc<RwLock<MidiClip>>|{
+    let model = Self::default();
+    model.clips.write().unwrap().push(clip.clone());
+    model.clip.store(1, Relaxed);
+    model
 });
 impl Pool {
     fn _todo_usize_ (&self) -> usize     { todo!() }
diff --git a/engine/note/note_range.rs b/engine/note/note_range.rs
index 40e7acc0..16eab7a4 100644
--- a/engine/note/note_range.rs
+++ b/engine/note/note_range.rs
@@ -18,7 +18,7 @@ pub struct MidiRangeModel {
     pub note_lo:    Arc<AtomicUsize>,
 }
 
-from!(|data:(usize, bool)|MidiRangeModel = Self {
+from!(MidiRangeModel: |data:(usize, bool)| Self {
     time_len:   Arc::new(0.into()),
     note_axis:  Arc::new(0.into()),
     note_lo:    Arc::new(0.into()),