diff --git a/module/core/former/tests/inc/former_tests/a_basic_manual.rs b/module/core/former/tests/inc/former_tests/a_basic_manual.rs
index 0b7b9e5b05..69a2a92d08 100644
--- a/module/core/former/tests/inc/former_tests/a_basic_manual.rs
+++ b/module/core/former/tests/inc/former_tests/a_basic_manual.rs
@@ -118,7 +118,6 @@ pub struct Struct1FormerStorage
 
 impl ::core::default::Default for Struct1FormerStorage
 {
-
   #[ inline( always ) ]
   fn default() -> Self
   {
@@ -173,8 +172,8 @@ pub struct Struct1Former
   Definition = Struct1FormerDefinition< (), Struct1, former::ReturnPreformed >,
 >
 where
-  Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage >,
+  // Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
 {
   storage : Definition::Storage,
   context : core::option::Option< Definition::Context >,
@@ -184,8 +183,8 @@ where
 #[ automatically_derived ]
 impl< Definition > Struct1Former< Definition >
 where
-  Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage >,
+  // Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
 {
 
   #[ inline( always ) ]
@@ -281,9 +280,8 @@ where
 
 impl< Definition > Struct1Former< Definition >
 where
-  Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage, Formed = Struct1 >,
-  Definition::Storage : former::StoragePreform,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage, Formed = Struct1 >,
+  // Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage, Formed = Struct1 >,
   Definition::Storage : former::StoragePreform< Preformed = Struct1 >,
 {
   pub fn preform( self ) -> < Definition::Types as former::FormerDefinitionTypes >::Formed
diff --git a/module/core/former/tests/inc/former_tests/a_primitives_manual.rs b/module/core/former/tests/inc/former_tests/a_primitives_manual.rs
index 26f12a1cf2..5c0b14ea3f 100644
--- a/module/core/former/tests/inc/former_tests/a_primitives_manual.rs
+++ b/module/core/former/tests/inc/former_tests/a_primitives_manual.rs
@@ -182,8 +182,8 @@ for Struct1FormerStorage
 
 pub struct Struct1Former< Definition = Struct1FormerDefinition >
 where
-  Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage >,
+  // Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
 {
   storage : Definition::Storage,
   context : core::option::Option< Definition::Context >,
@@ -192,8 +192,8 @@ where
 
 impl< Definition > Struct1Former< Definition >
 where
-  Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage >,
+  // Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage >,
 {
 
   #[ inline( always ) ]
@@ -307,7 +307,7 @@ where
 
 impl< Definition > Struct1Former< Definition >
 where
-  Definition : former::FormerDefinition,
+  Definition : former::FormerDefinition< Storage = Struct1FormerStorage, Formed = Struct1 >,
   Definition::Storage : former::StoragePreform,
   Definition::Types : former::FormerDefinitionTypes< Storage = Struct1FormerStorage, Formed = Struct1 >,
 {
diff --git a/module/core/former/tests/inc/former_tests/subformer_custom.rs b/module/core/former/tests/inc/former_tests/subformer_custom.rs
index 9d23d9f24e..1e18a63f42 100644
--- a/module/core/former/tests/inc/former_tests/subformer_custom.rs
+++ b/module/core/former/tests/inc/former_tests/subformer_custom.rs
@@ -72,9 +72,8 @@ impl< K, Definition > AggregatorFormer
 where
   K : core::hash::Hash + std::cmp::Eq,
   Definition : former::FormerDefinition,
-  Definition::Types : former::FormerDefinitionTypes< Storage = AggregatorFormerStorage< K > >,
   Definition::Storage : former::StoragePreform< Preformed = Aggregator< K > >,
-  // Definition::Storage : former::StoragePreform< Preformed = Aggregator< K > >,
+  Definition::Types : former::FormerDefinitionTypes< Storage = AggregatorFormerStorage< K > >, // xxx
 {
 
   //
diff --git a/module/core/former/tests/inc/mod.rs b/module/core/former/tests/inc/mod.rs
index ce1ea7f4c5..44516ef66a 100644
--- a/module/core/former/tests/inc/mod.rs
+++ b/module/core/former/tests/inc/mod.rs
@@ -7,33 +7,33 @@ mod former_tests
   #[ allow( unused_imports ) ]
   use super::*;
 
-//   #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
-//   mod container_former_common;
-//   #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
-//   mod container_former_vec;
-//   #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
-//   mod container_former_hashset;
-//   #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
-//   mod container_former_hashmap;
-//
-//   mod a_basic_manual;
+  #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+  mod container_former_common;
+  #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+  mod container_former_vec;
+  #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+  mod container_former_hashset;
+  #[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
+  mod container_former_hashmap;
+
+  mod a_basic_manual;
   mod a_basic;
-//   mod a_primitives_manual;
-//   mod a_primitives;
-//
-//   mod a_containers_without_subformer;
-//   #[ cfg( not( feature = "no_std" ) ) ]
-//   mod a_containers_with_subformer_manual;
-//   #[ cfg( not( feature = "no_std" ) ) ]
-//   mod a_containers_with_subformer;
-//
-//   mod attribute_default_container;
-//   mod attribute_default_primitive;
-//   mod attribute_perform;
-//   mod attribute_setter;
-//   mod attribute_alias;
-//   mod attribute_feature;
-//
+  mod a_primitives_manual;
+  mod a_primitives;
+
+  mod a_containers_without_subformer;
+  #[ cfg( not( feature = "no_std" ) ) ]
+  mod a_containers_with_subformer_manual;
+  #[ cfg( not( feature = "no_std" ) ) ]
+  mod a_containers_with_subformer;
+
+  mod attribute_default_container;
+  mod attribute_default_primitive;
+  mod attribute_perform;
+  mod attribute_setter;
+  mod attribute_alias;
+  mod attribute_feature;
+
 //   mod string_slice_manual;
 //   mod string_slice;
 //   mod unsigned_primitive_types;
diff --git a/module/core/former_meta/src/derive/former.rs b/module/core/former_meta/src/derive/former.rs
index 8f7a9d8913..29dc646165 100644
--- a/module/core/former_meta/src/derive/former.rs
+++ b/module/core/former_meta/src/derive/former.rs
@@ -1843,7 +1843,7 @@ pub fn former( input : proc_macro::TokenStream ) -> Result< TokenStream >
       pub fn begin
       (
         mut storage : core::option::Option< Definition::Storage >,
-        context : core::option::Option< Definition::Context >, // xxx
+        context : core::option::Option< Definition::Context >,
         on_end : < Definition as former::FormerDefinition >::End,
       )
       -> Self