diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index a00206e7..5d233356 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -26,28 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -ofsm.h -DHandlers=<n> fsm_generator.h
-// Where <n> is the number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 events...
-// cog -d -e -ofsm.h -DHandlers=16 fsm_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_FSM_INCLUDED
 #define ETL_FSM_INCLUDED
 
@@ -88,12 +66,7 @@ namespace etl
   template <typename, typename, etl::fsm_state_id_t, typename...>
   class fsm_state;
 #else
-  template <typename, typename, etl::fsm_state_id_t,
-            typename, typename, typename, typename,
-            typename, typename, typename, typename,
-            typename, typename, typename, typename,
-            typename, typename, typename, typename>
-  class fsm_state;
+  #include "private/fsm_fwd_decl_cpp03.h"
 #endif
 
   //***************************************************************************
@@ -346,12 +319,7 @@ namespace etl
     template <typename, typename, etl::fsm_state_id_t, typename...>
     friend class fsm_state;
 #else
-    template <typename, typename, etl::fsm_state_id_t,
-              typename, typename, typename, typename,
-              typename, typename, typename, typename,
-              typename, typename, typename, typename,
-              typename, typename, typename, typename>
-    friend class etl::fsm_state;
+    #include "private/fsm_friend_decl_cpp03.h"
 #endif
 
     //*******************************************
@@ -994,896 +962,7 @@ namespace etl
   };
 
 #else
-//*************************************************************************************************
-// For C++03 and below.
-//*************************************************************************************************
-  //***************************************************************************
-  // The definition for all 16 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  class fsm_state : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
-        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
-        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
-        case T15::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T15&>(message)); break;
-        case T16::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T16&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 15 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13, typename T14, typename T15>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
-        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
-        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
-        case T15::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T15&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 14 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13, typename T14>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
-        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
-        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 13 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
-        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 12 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 11 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 10 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 9 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 8 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 7 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 6 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 5 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 4 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 3 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 2 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 1 message type.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1>
-  class fsm_state<TContext, TDerived, STATE_ID_, T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      etl::fsm_state_id_t new_state_id;
-      etl::message_id_t event_id = message.get_message_id();
-
-      switch (event_id)
-      {
-        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
-        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
-      }
-
-      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 0 message types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_>
-  class fsm_state<TContext, TDerived, STATE_ID_, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
-  {
-  public:
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-  private:
-
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      return p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);
-    }
-  };
-
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13, typename T14, typename T15, typename T16>
-  ETL_CONSTANT etl::fsm_state_id_t fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::STATE_ID;
+  #include "private/fsm_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/generators/fsm_cpp03_generator.h b/include/etl/generators/fsm_cpp03_generator.h
new file mode 100644
index 00000000..9c0aae28
--- /dev/null
+++ b/include/etl/generators/fsm_cpp03_generator.h
@@ -0,0 +1,199 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+//*************************************************************************************************
+// For C++03 and below.
+//*************************************************************************************************
+  /*[[[cog
+  import cog
+  ################################################
+  # The first definition for all of the events.
+  ################################################
+  cog.outl("//***************************************************************************")
+  cog.outl("// The definition for all %s message types." % Handlers)
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
+  cog.out("         ")
+  for n in range(1, int(Handlers)):
+      cog.out(" typename T%s = void," % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("         ")
+  cog.outl(" typename T%s = void>" % Handlers)
+  cog.outl("class fsm_state : public ifsm_state")
+  cog.outl("{")
+  cog.outl("public:")
+  cog.outl("")
+  cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
+  cog.outl("")
+  cog.outl("  fsm_state()")
+  cog.outl("    : ifsm_state(STATE_ID)")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("protected:")
+  cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("  TContext& get_fsm_context() const")
+  cog.outl("  {")
+  cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("private:")
+  cog.outl("")
+  cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
+  cog.outl("  {")
+  cog.outl("    etl::fsm_state_id_t new_state_id;")
+  cog.outl("    etl::message_id_t event_id = message.get_message_id();")
+  cog.outl("")
+  cog.outl("    switch (event_id)")
+  cog.outl("    {")
+  for n in range(1, int(Handlers) + 1):
+      cog.out("      case T%d::ID:" % n)
+      cog.out(" new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T%d&>(message));" % n)
+      cog.outl(" break;")
+  cog.out("      default:")
+  cog.out(" new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
+  cog.outl(" break;")
+  cog.outl("    }")
+  cog.outl("")
+  cog.outl("    return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);")
+  cog.outl("  }")
+  cog.outl("};")
+
+  ####################################
+  # All of the other specialisations.
+  ####################################
+  for n in range(int(Handlers) - 1, 0, -1):
+      cog.outl("")
+      cog.outl("//***************************************************************************")
+      if n == 1:
+          cog.outl("// Specialisation for %d message type." % n)
+      else:
+          cog.outl("// Specialisation for %d message types." % n)
+      cog.outl("//***************************************************************************")
+      cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
+      cog.out("         ")
+      for t in range(1, n):
+          cog.out(" typename T%d," % t)
+          if t % 4 == 0:
+              cog.outl("")
+              cog.out("         ")
+      cog.outl(" typename T%d>" % n)
+      cog.out("class fsm_state<TContext, TDerived, STATE_ID_,")
+      for t in range(1, n + 1):
+          cog.out(" T%d," % t)
+      if t % 16 == 0:
+          cog.outl("")
+          cog.out("               ")
+      for t in range(n + 1, int(Handlers)):
+          cog.out(" void,")
+      if t % 16 == 0:
+          cog.outl("")
+          cog.out("               ")
+      cog.outl(" void> : public ifsm_state")
+      cog.outl("{")
+      cog.outl("public:")
+      cog.outl("")
+      cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
+      cog.outl("")
+      cog.outl("  fsm_state()")
+      cog.outl("    : ifsm_state(STATE_ID)")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("protected:")
+      cog.outl("")
+      cog.outl("  ~fsm_state()")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  TContext& get_fsm_context() const")
+      cog.outl("  {")
+      cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("private:")
+      cog.outl("")
+      cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
+      cog.outl("  {")
+      cog.outl("    etl::fsm_state_id_t new_state_id;")
+      cog.outl("    etl::message_id_t event_id = message.get_message_id();")
+      cog.outl("")
+      cog.outl("    switch (event_id)")
+      cog.outl("    {")
+      for n in range(1, n + 1):
+          cog.out("      case T%d::ID:" % n)
+          cog.out(" new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T%d&>(message));" % n)
+          cog.outl(" break;")
+      cog.out("      default:")
+      cog.out(" new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
+      cog.outl(" break;")
+      cog.outl("    }")
+      cog.outl("")
+      cog.outl("    return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);")
+      cog.outl("  }")
+      cog.outl("};")
+  ####################################
+  # Specialisation for zero messages.
+  ####################################
+  cog.outl("")
+  cog.outl("//***************************************************************************")
+  cog.outl("// Specialisation for 0 message types.")
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_>")
+  cog.out("class fsm_state<TContext, TDerived, STATE_ID_,")
+  for t in range(1, int(Handlers)):
+      cog.out(" void,")
+  if t % 16 == 0:
+      cog.outl("")
+      cog.out("               ")
+  cog.outl(" void> : public ifsm_state")
+  cog.outl("{")
+  cog.outl("public:")
+  cog.outl("")
+  cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
+  cog.outl("")
+  cog.outl("  fsm_state()")
+  cog.outl("    : ifsm_state(STATE_ID)")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("protected:")
+  cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("  TContext& get_fsm_context() const")
+  cog.outl("  {")
+  cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
+  cog.outl("  }")
+  cog.outl("private:")
+  cog.outl("")
+  cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
+  cog.outl("  {")
+  cog.outl("    return p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
+  cog.outl("  }")
+  cog.outl("};")
+
+  cog.outl("")
+  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
+  cog.out("         ")
+  for n in range(1, int(Handlers)):
+      cog.out(" typename T%s," % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("         ")
+  cog.outl(" typename T%s>" % Handlers)
+  cog.out("ETL_CONSTANT etl::fsm_state_id_t fsm_state<TContext, TDerived, STATE_ID_,")
+  for n in range(1, int(Handlers)):
+      cog.out(" T%s," % n)
+  cog.outl(" T%s>::STATE_ID;" % Handlers)
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/fsm_friend_decl_cpp03_generator.h b/include/etl/generators/fsm_friend_decl_cpp03_generator.h
new file mode 100644
index 00000000..bbc07ecc
--- /dev/null
+++ b/include/etl/generators/fsm_friend_decl_cpp03_generator.h
@@ -0,0 +1,18 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+    /*[[[cog
+    import cog
+    cog.outl("  template <typename, typename, etl::fsm_state_id_t,")
+    cog.out("           ")
+    for n in range(1, int(Handlers)):
+      cog.out(" typename,")
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("           ")
+    cog.outl(" typename>")
+    ]]]*/
+    /*[[[end]]]*/
+    friend class etl::fsm_state;
+
diff --git a/include/etl/generators/fsm_fwd_decl_cpp03_generator.h b/include/etl/generators/fsm_fwd_decl_cpp03_generator.h
new file mode 100644
index 00000000..384843b5
--- /dev/null
+++ b/include/etl/generators/fsm_fwd_decl_cpp03_generator.h
@@ -0,0 +1,18 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("template <typename, typename, etl::fsm_state_id_t,")
+  cog.out("         ")
+  for n in range(1, int(Handlers)):
+    cog.out(" typename,")
+    if n % 4 == 0:
+        cog.outl("")
+        cog.out("         ")
+  cog.outl(" typename>")
+  cog.outl("class fsm_state;")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/fsm_generator.h b/include/etl/generators/fsm_generator.h
deleted file mode 100644
index 98d4c6b0..00000000
--- a/include/etl/generators/fsm_generator.h
+++ /dev/null
@@ -1,1222 +0,0 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2017 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -ofsm.h -DHandlers=<n> fsm_generator.h
-// Where <n> is the number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 events...
-// cog -d -e -ofsm.h -DHandlers=16 fsm_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
-#ifndef ETL_FSM_INCLUDED
-#define ETL_FSM_INCLUDED
-
-#include "platform.h"
-#include "array.h"
-#include "nullptr.h"
-#include "error_handler.h"
-#include "exception.h"
-#include "user_type.h"
-#include "message_router.h"
-#include "integral_limits.h"
-#include "largest.h"
-#if ETL_USING_CPP11
-  #include "tuple.h"
-  #include "type_list.h"
-#endif
-
-#include <stdint.h>
-
-#include "private/minmax_push.h"
-
-namespace etl
-{
-  class fsm;
-  class hfsm;
-
-  /// Allow alternative type for state id.
-#if !defined(ETL_FSM_STATE_ID_TYPE)
-  typedef uint_least8_t fsm_state_id_t;
-#else
-  typedef ETL_FSM_STATE_ID_TYPE fsm_state_id_t;
-#endif
-
-  // For internal FSM use.
-  typedef typename etl::larger_type<etl::message_id_t>::type fsm_internal_id_t;
-
-#if ETL_USING_CPP11 && !defined(ETL_FSM_FORCE_CPP03_IMPLEMENTATION) // For C++11 and above
-  template <typename, typename, etl::fsm_state_id_t, typename...>
-  class fsm_state;
-#else
-  /*[[[cog
-  import cog
-  cog.outl("template <typename, typename, etl::fsm_state_id_t,")
-  cog.out("         ")
-  for n in range(1, int(Handlers)):
-    cog.out(" typename,")
-    if n % 4 == 0:
-        cog.outl("")
-        cog.out("         ")
-  cog.outl(" typename>")
-  cog.outl("class fsm_state;")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-
-  //***************************************************************************
-  /// Base exception class for FSM.
-  //***************************************************************************
-  class fsm_exception : public etl::exception
-  {
-  public:
-
-    fsm_exception(string_type reason_, string_type file_name_, numeric_type line_number_)
-      : etl::exception(reason_, file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for null state pointer.
-  //***************************************************************************
-  class fsm_null_state_exception : public etl::fsm_exception
-  {
-  public:
-
-    fsm_null_state_exception(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:null state", ETL_FSM_FILE_ID"A"), file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for invalid state id.
-  //***************************************************************************
-  class fsm_state_id_exception : public etl::fsm_exception
-  {
-  public:
-
-    fsm_state_id_exception(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state id", ETL_FSM_FILE_ID"B"), file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for incompatible state list.
-  //***************************************************************************
-  class fsm_state_list_exception : public etl::fsm_exception
-  {
-  public:
-
-    fsm_state_list_exception(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list", ETL_FSM_FILE_ID"C"), file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for incompatible order state list.
-  //***************************************************************************
-  class fsm_state_list_order_exception : public etl::fsm_exception
-  {
-  public:
-
-    fsm_state_list_order_exception(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:state list order", ETL_FSM_FILE_ID"D"), file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for message received but not started.
-  //***************************************************************************
-  class fsm_not_started : public etl::fsm_exception
-  {
-  public:
-    fsm_not_started(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:not started", ETL_FSM_FILE_ID"F"), file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Exception for call to receive/start/etc. while receive/start/etc. is already happening.
-  /// A call like that could result in an infinite loop or landing in an incorrect state.
-  //***************************************************************************
-  class fsm_reentrant_transition_forbidden : public etl::fsm_exception
-  {
-  public:
-    fsm_reentrant_transition_forbidden(string_type file_name_, numeric_type line_number_)
-      : etl::fsm_exception(ETL_ERROR_TEXT("fsm:reentrant calls to start/receive/etc. forbidden", ETL_FSM_FILE_ID"G"), file_name_, line_number_)
-    {
-    }
-  };
-
-  namespace private_fsm
-  {
-    template <typename T = void>
-    class ifsm_state_helper
-    {
-    public:
-
-      // Pass this whenever no state change is desired.
-      // The highest unsigned value of fsm_state_id_t.
-      static ETL_CONSTANT fsm_state_id_t No_State_Change = etl::integral_limits<fsm_state_id_t>::max;
-
-      // Pass this when this event also needs to be passed to the parent.
-      static ETL_CONSTANT fsm_state_id_t Pass_To_Parent = No_State_Change - 1U;
-
-      // Pass this when this event should trigger a self transition.
-      static ETL_CONSTANT fsm_state_id_t Self_Transition = No_State_Change - 2U;
-    };
-
-    template <typename T>
-    ETL_CONSTANT fsm_state_id_t ifsm_state_helper<T>::No_State_Change;
-
-    template <typename T>
-    ETL_CONSTANT fsm_state_id_t ifsm_state_helper<T>::Pass_To_Parent;
-
-    template <typename T>
-    ETL_CONSTANT fsm_state_id_t ifsm_state_helper<T>::Self_Transition;
-
-    // Compile-time: TState::ID must equal its index in the type list (0..N-1)
-    template <size_t Id, typename...> struct check_ids : etl::true_type
-    {
-    };
-
-    template <size_t Id, typename TState0, typename... TRest>
-    struct check_ids<Id, TState0, TRest...>
-      : etl::integral_constant<bool, (TState0::STATE_ID == Id) && private_fsm::check_ids<Id + 1, TRest...>::value>
-    {
-    };
-
-    //***************************************************************************
-    /// RAII detection mechanism to catch reentrant calls to methods that might
-    /// transition the state machine to a different state.
-    /// This is not a mutex.
-    //***************************************************************************
-    class fsm_reentrancy_guard
-    {
-    public:
-      //*******************************************
-      /// Constructor.
-      /// Checks if another method has locked reentrancy.
-      //*******************************************
-      fsm_reentrancy_guard(bool& transition_guard_flag)
-        : is_locked(transition_guard_flag)
-      {
-        ETL_ASSERT(!is_locked, ETL_ERROR(etl::fsm_reentrant_transition_forbidden));
-        is_locked = true;
-      }
-
-      //*******************************************
-      /// Destructor.
-      /// Releases lock on reentrancy.
-      //*******************************************
-      ~fsm_reentrancy_guard() ETL_NOEXCEPT
-      {
-        is_locked = false;
-      }
-
-    private:
-      // Reference to the flag signifying a lock on the state machine.
-      bool& is_locked;
-
-      // Copy & move semantics disabled since this is a guard.
-      fsm_reentrancy_guard(fsm_reentrancy_guard const&) ETL_DELETE;
-      fsm_reentrancy_guard& operator= (fsm_reentrancy_guard const&) ETL_DELETE;
-#if ETL_USING_CPP11
-      fsm_reentrancy_guard(fsm_reentrancy_guard&&) ETL_DELETE;
-      fsm_reentrancy_guard& operator= (fsm_reentrancy_guard&&) ETL_DELETE;
-#endif
-    };
-  }
-
-  class ifsm_state;
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// A class to store FSM states.
-  //***************************************************************************
-  template <typename... TStates>
-  class fsm_state_pack
-  {
-  public:
-
-    friend class etl::fsm;
-
-    ETL_STATIC_ASSERT((private_fsm::check_ids<0, TStates...>::value), "State IDs must be 0..N-1 and in order");
-    ETL_STATIC_ASSERT(sizeof...(TStates) > 0, "At least one state is required");
-    ETL_STATIC_ASSERT(sizeof...(TStates) < private_fsm::ifsm_state_helper<>::No_State_Change, "State IDs mst be less than ifsm_state::No_State_Change");
-
-    //*********************************
-    // The number of states.
-    //*********************************
-    static ETL_CONSTEXPR size_t size()
-    {
-      return sizeof...(TStates);
-    }
-
-    //*********************************
-    /// Gets a reference to the state.
-    //*********************************
-    template <typename TState>
-    TState& get()
-    {
-      return etl::get<TState>(storage);
-    }
-
-    //*********************************
-    /// Gets a const reference to the state.
-    //*********************************
-    template <typename TState>
-    const TState& get() const
-    {
-      return etl::get<TState>(storage);
-    }
-
-  private:
-
-    //*********************************
-    /// Gets a pointer to the state list.
-    //*********************************
-    etl::ifsm_state** get_state_list()
-    {
-      return &states[0];
-    }
-
-    /// A tuple to store the states.
-    etl::tuple<TStates...> storage{};
-
-    /// Pointers to the states.
-    etl::ifsm_state* states[sizeof...(TStates)]{ &etl::get<TStates>(storage)... };
-  };
-#endif
-
-  //***************************************************************************
-  /// Interface class for FSM states.
-  //***************************************************************************
-  class ifsm_state : public private_fsm::ifsm_state_helper<>
-  {
-  public:
-
-    /// Allows ifsm_state functions to be private.
-    friend class etl::fsm;
-    friend class etl::hfsm;
-
-    using private_fsm::ifsm_state_helper<>::No_State_Change;
-    using private_fsm::ifsm_state_helper<>::Pass_To_Parent;
-    using private_fsm::ifsm_state_helper<>::Self_Transition;
-
-#if ETL_USING_CPP11 && !defined(ETL_FSM_FORCE_CPP03_IMPLEMENTATION) // For C++11 and above
-    template <typename, typename, etl::fsm_state_id_t, typename...>
-    friend class fsm_state;
-#else
-    /*[[[cog
-    import cog
-    cog.outl("  template <typename, typename, etl::fsm_state_id_t,")
-    cog.out("           ")
-    for n in range(1, int(Handlers)):
-      cog.out(" typename,")
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("           ")
-    cog.outl(" typename>")
-    ]]]*/
-    /*[[[end]]]*/
-    friend class etl::fsm_state;
-#endif
-
-    //*******************************************
-    /// Gets the id for this state.
-    //*******************************************
-    etl::fsm_state_id_t get_state_id() const
-    {
-      return state_id;
-    }
-
-    //*******************************************
-    /// Adds a child to this state.
-    /// Only of use when part of an HFSM.
-    //*******************************************
-    void add_child_state(etl::ifsm_state& state)
-    {
-      ETL_ASSERT(state.p_parent == ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-      state.p_parent = this;
-
-      if (p_default_child == ETL_NULLPTR)
-      {
-        p_default_child = &state;
-      }
-    }
-
-    //*******************************************
-    /// Adds a list of child states.
-    /// Only of use when part of an HFSM.
-    //*******************************************
-    template <typename TSize>
-    void set_child_states(etl::ifsm_state** state_list, TSize size)
-    {
-      p_active_child = ETL_NULLPTR;
-      p_default_child = ETL_NULLPTR;
-
-      for (TSize i = 0; i < size; ++i)
-      {
-        ETL_ASSERT(state_list[i] != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-        add_child_state(*state_list[i]);
-      }
-    }
-
-  protected:
-
-    //*******************************************
-    /// Constructor.
-    //*******************************************
-    ifsm_state(etl::fsm_state_id_t state_id_)
-      : state_id(state_id_),
-      p_context(ETL_NULLPTR),
-      p_parent(ETL_NULLPTR),
-      p_active_child(ETL_NULLPTR),
-      p_default_child(ETL_NULLPTR)
-    {
-    }
-
-    //*******************************************
-    /// Destructor.
-    //*******************************************
-    virtual ~ifsm_state()
-    {
-    }
-
-    //*******************************************
-    etl::fsm& get_fsm_context() const
-    {
-      return *p_context;
-    }
-
-  private:
-
-    virtual fsm_state_id_t process_event(const etl::imessage& message) = 0;
-
-    virtual fsm_state_id_t on_enter_state() { return No_State_Change; } // By default, do nothing.
-    virtual void on_exit_state() {}  // By default, do nothing.
-
-    //*******************************************
-    void set_fsm_context(etl::fsm& context)
-    {
-      p_context = &context;
-    }
-
-    // The state id.
-    const etl::fsm_state_id_t state_id;
-
-    // A pointer to the FSM context.
-    etl::fsm* p_context;
-
-    // A pointer to the parent.
-    ifsm_state* p_parent;
-
-    // A pointer to the active child.
-    ifsm_state* p_active_child;
-
-    // A pointer to the default active child.
-    ifsm_state* p_default_child;
-
-    // Disabled.
-    ifsm_state(const ifsm_state&) ETL_DELETE;
-    ifsm_state& operator =(const ifsm_state&) ETL_DELETE;
-  };
-
-  //***************************************************************************
-  /// The FSM class.
-  //***************************************************************************
-  class fsm : public etl::imessage_router
-  {
-  public:
-
-    friend class etl::hfsm;
-    using imessage_router::receive;
-
-    //*******************************************
-    /// Constructor.
-    //*******************************************
-    fsm(etl::message_router_id_t id)
-      : imessage_router(id)
-      , p_state(ETL_NULLPTR)
-      , state_list(ETL_NULLPTR)
-      , number_of_states(0U)
-      , is_processing_state_change(false)
-    {
-    }
-
-    //*******************************************
-    /// Set the states for the FSM
-    /// From a pointer to etl::ifsm_state and size.
-    //*******************************************
-    template <typename TSize>
-    void set_states(etl::ifsm_state** p_states, TSize size)
-    {
-      state_list = p_states;
-      number_of_states = etl::fsm_state_id_t(size);
-
-      ETL_ASSERT(number_of_states > 0, ETL_ERROR(etl::fsm_state_list_exception));
-      ETL_ASSERT(number_of_states < ifsm_state::No_State_Change, ETL_ERROR(etl::fsm_state_list_exception));
-
-      for (etl::fsm_state_id_t i = 0; i < size; ++i)
-      {
-        ETL_ASSERT(state_list[i] != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-        ETL_ASSERT(state_list[i]->get_state_id() == i, ETL_ERROR(etl::fsm_state_list_order_exception));
-        state_list[i]->set_fsm_context(*this);
-      }
-    }
-
-#if ETL_USING_CPP11
-    //*******************************************
-    /// Set the states for the FSM
-    /// From an etl::fsm_state_pack.
-    //*******************************************
-    template <typename... TStates>
-    void set_states(etl::fsm_state_pack<TStates...>& state_pack)
-    {
-      state_list = state_pack.get_state_list();
-      number_of_states = etl::fsm_state_id_t(state_pack.size());
-
-      for (etl::fsm_state_id_t i = 0; i < number_of_states; ++i)
-      {
-        state_list[i]->set_fsm_context(*this);
-      }
-    }
-#endif
-
-    //*******************************************
-    /// Starts the FSM.
-    /// Can only be called once.
-    /// Subsequent calls will do nothing.
-    ///\param call_on_enter_state If true will call on_enter_state() for the first state. Default = true.
-    //*******************************************
-    virtual void start(bool call_on_enter_state = true)
-    {
-      private_fsm::fsm_reentrancy_guard transition_lock(is_processing_state_change);
-
-      // Can only be started once.
-      if (!is_started())
-      {
-        p_state = state_list[0];
-        ETL_ASSERT(p_state != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-
-        if (call_on_enter_state)
-        {
-          etl::fsm_state_id_t next_state_id;
-          etl::ifsm_state* p_last_state;
-
-          do
-          {
-            p_last_state = p_state;
-            next_state_id = p_state->on_enter_state();
-            if (next_state_id != ifsm_state::No_State_Change)
-            {
-              ETL_ASSERT(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception));
-              p_state = state_list[next_state_id];
-            }
-          } while (p_last_state != p_state);
-        }
-      }
-    }
-
-    //*******************************************
-    /// Top level message handler for the FSM.
-    //*******************************************
-    void receive(const etl::imessage& message) ETL_OVERRIDE
-    {
-      private_fsm::fsm_reentrancy_guard transition_lock(is_processing_state_change);
-
-      if (is_started())
-      {
-        etl::fsm_state_id_t next_state_id = p_state->process_event(message);
-
-        process_state_change(next_state_id);
-      }
-      else
-      {
-        ETL_ASSERT_FAIL(ETL_ERROR(etl::fsm_not_started));
-      }
-    }
-
-    //*******************************************
-    /// Invoke a state transition.
-    //*******************************************
-    etl::fsm_state_id_t transition_to(etl::fsm_state_id_t new_state_id)
-    {
-      private_fsm::fsm_reentrancy_guard transition_lock(is_processing_state_change);
-
-      if (is_started())
-      {
-        return process_state_change(new_state_id);
-      }
-      else
-      {
-        return ifsm_state::No_State_Change;
-      }
-    }
-
-    using imessage_router::accepts;
-
-    //*******************************************
-    /// Does this FSM accept the message id?
-    /// Yes, it accepts everything!
-    //*******************************************
-    bool accepts(etl::message_id_t) const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //*******************************************
-    /// Gets the current state id.
-    //*******************************************
-    etl::fsm_state_id_t get_state_id() const
-    {
-      ETL_ASSERT(p_state != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-      return p_state->get_state_id();
-    }
-
-    //*******************************************
-    /// Gets a reference to the current state interface.
-    //*******************************************
-    ifsm_state& get_state()
-    {
-      ETL_ASSERT(p_state != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-      return *p_state;
-    }
-
-    //*******************************************
-    /// Gets a const reference to the current state interface.
-    //*******************************************
-    const ifsm_state& get_state() const
-    {
-      ETL_ASSERT(p_state != ETL_NULLPTR, ETL_ERROR(etl::fsm_null_state_exception));
-      return *p_state;
-    }
-
-    //*******************************************
-    /// Checks if the FSM has been started.
-    //*******************************************
-    bool is_started() const
-    {
-      return p_state != ETL_NULLPTR;
-    }
-
-    //*******************************************
-    /// Reset the FSM to pre-started state.
-    ///\param call_on_exit_state If true will call on_exit_state() for the current state. Default = false.
-    //*******************************************
-    virtual void reset(bool call_on_exit_state = false)
-    {
-      private_fsm::fsm_reentrancy_guard transition_lock(is_processing_state_change);
-
-      if (is_started() && call_on_exit_state)
-      {
-        p_state->on_exit_state();
-      }
-
-      p_state = ETL_NULLPTR;
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-  private:
-
-    //********************************************
-    bool have_changed_state(etl::fsm_state_id_t next_state_id) const
-    {
-      return (next_state_id != p_state->get_state_id()) &&
-             (next_state_id != ifsm_state::No_State_Change) &&
-             (next_state_id != ifsm_state::Self_Transition);
-    }
-
-    //********************************************
-    bool is_self_transition(etl::fsm_state_id_t next_state_id) const
-    {
-      return (next_state_id == ifsm_state::Self_Transition);
-    }
-
-    //*******************************************
-    /// Core function to process a state change.
-    //*******************************************
-    virtual etl::fsm_state_id_t process_state_change(etl::fsm_state_id_t next_state_id)
-    {
-      if (is_self_transition(next_state_id))
-      {
-        p_state->on_exit_state();
-        next_state_id = p_state->on_enter_state();
-      }
-
-      if (have_changed_state(next_state_id))
-      {
-        ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id());
-        etl::ifsm_state* p_next_state = state_list[next_state_id];
-
-        do
-        {
-          p_state->on_exit_state();
-          p_state = p_next_state;
-
-          next_state_id = p_state->on_enter_state();
-
-          if (have_changed_state(next_state_id))
-          {
-            ETL_ASSERT_OR_RETURN_VALUE(next_state_id < number_of_states, ETL_ERROR(etl::fsm_state_id_exception), p_state->get_state_id());
-            p_next_state = state_list[next_state_id];
-          }
-        } while (p_next_state != p_state); // Have we changed state again?
-      }
-
-      return p_state->get_state_id();
-    }
-
-    etl::ifsm_state*    p_state;          ///< A pointer to the current state.
-    etl::ifsm_state**   state_list;       ///< The list of added states.
-    etl::fsm_state_id_t number_of_states; ///< The number of states.
-    bool is_processing_state_change;      ///< Whether a method call that could potentially trigger a state change is active
-  };
-
-  //*************************************************************************************************
-  // For C++11 and above.
-  //*************************************************************************************************
-#if ETL_USING_CPP11 && !defined(ETL_FSM_FORCE_CPP03_IMPLEMENTATION) // For C++11 and above
-  //***************************************************************************
-  // The definition for all types.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_, typename... TMessageTypes>
-  class fsm_state : public ifsm_state
-  {
-  private:
-
-    using message_id_sequence = etl::index_sequence<TMessageTypes::ID...>;
-
-  public:
-
-    using message_types        = etl::type_list<TMessageTypes...>;
-    using sorted_message_types = etl::type_list_sort_t<message_types, etl::compare_message_id_less>;
-
-    static_assert(etl::type_list_is_unique<message_types>::value,                    "All TMessageTypes must be unique");
-    static_assert(etl::type_list_all_of<message_types, etl::is_message_type>::value, "All TMessageTypes must satisfy the condition etl::is_message_type");
-    static_assert(etl::index_sequence_is_unique<message_id_sequence>::value,         "All message IDs must be unique");
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    static constexpr size_t            Number_Of_Messages = sizeof...(TMessageTypes);
-    static constexpr etl::message_id_t Message_Id_Start   = etl::type_list_type_at_index_t<sorted_message_types, 0>::ID;
-
-    static_assert(Number_Of_Messages > 0, "Zero messages");
-
-    //**********************************************
-    // Checks that the message ids are contiguous.
-    //**********************************************
-    template <size_t Index, bool Last = (Index + 1U >= Number_Of_Messages)>
-    struct contiguous_impl;
-
-    template <size_t Index>
-    struct contiguous_impl<Index, true> : etl::true_type
-    {
-    };
-
-    template <size_t Index>
-    struct contiguous_impl<Index, false>
-      : etl::bool_constant<(etl::type_list_type_at_index_t<sorted_message_types, Index>::ID + 1U ==
-                              etl::type_list_type_at_index_t<sorted_message_types, Index + 1U>::ID) &&
-                              contiguous_impl<Index + 1U>::value>
-    {
-
-
-    };
-
-    // The message ids are contiguous if there are 0 or 1 message types, or if each message id is one greater than the previous message id.
-    static constexpr bool Message_Ids_Are_Contiguous = (Number_Of_Messages <= 1U) ? true : contiguous_impl<0U>::value;
-
-    using handler_ptr              = etl::fsm_state_id_t (*)(TDerived&, const etl::imessage&); ///< Pointer to a handler function that takes a reference to the derived class and a reference to the message.
-    using message_dispatch_table_t = etl::array<handler_ptr, Number_Of_Messages>;              ///< The dispatch table type. An array of handler pointers, one for each message type.
-    using message_id_table_t       = etl::array<etl::message_id_t, Number_Of_Messages>;        ///< The message id table type. An array of message ids, one for each message type.
-
-    //********************************************
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      const etl::message_id_t id = message.get_message_id();
-
-      // The IDs are sorted, so an ID less than the first is not handled by this router.
-      if (id >= Message_Id_Start)
-      {
-        const size_t index = get_dispatch_index_from_message_id(id);
-
-        // If the index is less than Number_Of_Messages, then we have a handler for this message type, so dispatch it.
-        if (index < Number_Of_Messages)
-        {
-          const etl::fsm_state_id_t new_state_id = dispatch(message, index);
-
-          if (new_state_id != Pass_To_Parent)
-          {
-            return new_state_id;
-          }
-        }
-      }
-
-#include "etl/private/diagnostic_array_bounds_push.h"
-      // If we get here, then we don't have a handler for this message type, so pass it to the parent if we have one, otherwise call on_event_unknown.
-      return (p_parent != nullptr) ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);
-#include "etl/private/diagnostic_pop.h"
-    }
-
-    //**********************************************
-    // Call for a single message type
-    //**********************************************
-    template <typename TMessage>
-    static etl::fsm_state_id_t call_on_event(TDerived& derived, const imessage& msg)
-    {
-      return derived.on_event(static_cast<const TMessage&>(msg));
-    }
-
-    //**********************************************
-    // Get the handler for a single message type at the index in the sorted type_list.
-    // This will be called for each message type to generate the dispatch table.
-    //**********************************************
-    template <size_t Index>
-    static constexpr handler_ptr get_message_handler()
-    {
-      return &call_on_event<etl::type_list_type_at_index_t<sorted_message_types, Index>>;
-    }
-
-    //**********************************************
-    // Generate the dispatch table at compile time.
-    // This will create an array of handler pointers, one for each message type.
-    //**********************************************
-    template <size_t... Indices>
-    static constexpr message_dispatch_table_t make_message_dispatch_table(etl::index_sequence<Indices...>)
-    {
-      return message_dispatch_table_t{ { get_message_handler<Indices>()... } };
-    }
-
-    //**********************************************
-    // Get the message id for a single message type at an index in the sorted type_list.
-    // This will be called for each message type to generate the message id table.
-    //**********************************************
-    template <size_t Index>
-    static constexpr etl::message_id_t get_message_id_from_index()
-    {
-      return etl::type_list_type_at_index_t<sorted_message_types, Index>::ID;
-    }
-
-    //**********************************************
-    // Generate the message id table at compile time.
-    // This will create an array of message ids, one for each message type.
-    //**********************************************
-    template <size_t... Indices>
-    static constexpr message_id_table_t make_message_id_table(etl::index_sequence<Indices...>)
-    {
-      return message_id_table_t{ { get_message_id_from_index<Indices>()... } };
-    }
-
-    //**********************************************
-    // Get the dispatch index for a message id.
-    // This will be used at runtime to find the handler for a message id.
-    // If the message ids are contiguous, we can calculate the index directly. If they are not contiguous, we need to do a binary search.
-    // This will return Number_Of_Messages if the message id is not found.
-    //**********************************************
-    static size_t get_dispatch_index_from_message_id(etl::message_id_t id)
-    {
-      if ETL_IF_CONSTEXPR(Message_Ids_Are_Contiguous)
-      {
-        // The IDs are contiguous, so we can calculate the index directly.
-        return static_cast<size_t>(id - Message_Id_Start);
-      }
-      else
-      {
-        // The IDs are not contiguous, so we need to do a binary search.
-        size_t left  = 0;
-        size_t right = Number_Of_Messages;
-
-        while (left < right)
-        {
-          size_t mid = (left + right) / 2;
-
-          if (message_id_table[mid] == id)
-          {
-            return mid;
-          }
-          else if (message_id_table[mid] < id)
-          {
-            left = mid + 1;
-          }
-          else
-          {
-            right = mid;
-          }
-        }
-      }
-
-      return Number_Of_Messages; // Not found
-    }
-
-    //**********************************************
-    // Dispatch the message to the appropriate handler based on the index in the dispatch table.
-    //**********************************************
-    etl::fsm_state_id_t dispatch(const etl::imessage& msg, size_t index)
-    {
-      return message_dispatch_table[index](static_cast<TDerived&>(*this), msg);
-    }
-
-    //**********************************************
-    // The dispatch table is generated at compile time. The dispatch table contains pointers to the on_receive handlers for each message type.
-    //**********************************************
-    static ETL_INLINE_VAR constexpr message_dispatch_table_t message_dispatch_table =
-      etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::make_message_dispatch_table(etl::make_index_sequence<etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::Number_Of_Messages>{});
-
-    //**********************************************
-    // The message id table is generated at compile time. The message id table contains the corresponding message ids for each message type.
-    //**********************************************
-    static ETL_INLINE_VAR constexpr message_id_table_t message_id_table =
-      etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::make_message_id_table(etl::make_index_sequence<etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::Number_Of_Messages>{});
-  };
-
-#if ETL_USING_CPP11 && !ETL_USING_CPP17
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_, typename... TMessageTypes>
-  constexpr const typename etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::message_dispatch_table_t
-    etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::message_dispatch_table;
-
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_, typename... TMessageTypes>
-  constexpr const typename etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::message_id_table_t
-    etl::fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::message_id_table;
-#endif
-
-  /// Definition of STATE_ID
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_, typename... TMessageTypes>
-  ETL_CONSTANT etl::fsm_state_id_t fsm_state<TContext, TDerived, STATE_ID_, TMessageTypes...>::STATE_ID;
-
-  //***************************************************************************
-  // The definition for no messages.
-  //***************************************************************************
-  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_>
-  class fsm_state<TContext, TDerived, STATE_ID_> : public ifsm_state
-  {
-  private:
-
-    using message_id_sequence = etl::index_sequence<>;
-
-  public:
-
-    using message_types        = etl::type_list<>;
-    using sorted_message_types = etl::type_list<>;
-
-    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
-
-    fsm_state()
-      : ifsm_state(STATE_ID)
-    {
-    }
-
-  protected:
-
-    ~fsm_state()
-    {
-    }
-
-    TContext& get_fsm_context() const
-    {
-      return static_cast<TContext&>(ifsm_state::get_fsm_context());
-    }
-
-  private:
-
-    //********************************************
-    etl::fsm_state_id_t process_event(const etl::imessage& message)
-    {
-      return (p_parent != nullptr) ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);
-    }
-  };
-
-#else
-//*************************************************************************************************
-// For C++03 and below.
-//*************************************************************************************************
-  /*[[[cog
-  import cog
-  ################################################
-  # The first definition for all of the events.
-  ################################################
-  cog.outl("//***************************************************************************")
-  cog.outl("// The definition for all %s message types." % Handlers)
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
-  cog.out("         ")
-  for n in range(1, int(Handlers)):
-      cog.out(" typename T%s = void," % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("         ")
-  cog.outl(" typename T%s = void>" % Handlers)
-  cog.outl("class fsm_state : public ifsm_state")
-  cog.outl("{")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
-  cog.outl("")
-  cog.outl("  fsm_state()")
-  cog.outl("    : ifsm_state(STATE_ID)")
-  cog.outl("  {")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("protected:")
-  cog.outl("")
-  cog.outl("  ~fsm_state()")
-  cog.outl("  {")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("  TContext& get_fsm_context() const")
-  cog.outl("  {")
-  cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("private:")
-  cog.outl("")
-  cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
-  cog.outl("  {")
-  cog.outl("    etl::fsm_state_id_t new_state_id;")
-  cog.outl("    etl::message_id_t event_id = message.get_message_id();")
-  cog.outl("")
-  cog.outl("    switch (event_id)")
-  cog.outl("    {")
-  for n in range(1, int(Handlers) + 1):
-      cog.out("      case T%d::ID:" % n)
-      cog.out(" new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T%d&>(message));" % n)
-      cog.outl(" break;")
-  cog.out("      default:")
-  cog.out(" new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
-  cog.outl(" break;")
-  cog.outl("    }")
-  cog.outl("")
-  cog.outl("    return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);")
-  cog.outl("  }")
-  cog.outl("};")
-
-  ####################################
-  # All of the other specialisations.
-  ####################################
-  for n in range(int(Handlers) - 1, 0, -1):
-      cog.outl("")
-      cog.outl("//***************************************************************************")
-      if n == 1:
-          cog.outl("// Specialisation for %d message type." % n)
-      else:
-          cog.outl("// Specialisation for %d message types." % n)
-      cog.outl("//***************************************************************************")
-      cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
-      cog.out("         ")
-      for t in range(1, n):
-          cog.out(" typename T%d," % t)
-          if t % 4 == 0:
-              cog.outl("")
-              cog.out("         ")
-      cog.outl(" typename T%d>" % n)
-      cog.out("class fsm_state<TContext, TDerived, STATE_ID_,")
-      for t in range(1, n + 1):
-          cog.out(" T%d," % t)
-      if t % 16 == 0:
-          cog.outl("")
-          cog.out("               ")
-      for t in range(n + 1, int(Handlers)):
-          cog.out(" void,")
-      if t % 16 == 0:
-          cog.outl("")
-          cog.out("               ")
-      cog.outl(" void> : public ifsm_state")
-      cog.outl("{")
-      cog.outl("public:")
-      cog.outl("")
-      cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
-      cog.outl("")
-      cog.outl("  fsm_state()")
-      cog.outl("    : ifsm_state(STATE_ID)")
-      cog.outl("  {")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("protected:")
-      cog.outl("")
-      cog.outl("  ~fsm_state()")
-      cog.outl("  {")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  TContext& get_fsm_context() const")
-      cog.outl("  {")
-      cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("private:")
-      cog.outl("")
-      cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
-      cog.outl("  {")
-      cog.outl("    etl::fsm_state_id_t new_state_id;")
-      cog.outl("    etl::message_id_t event_id = message.get_message_id();")
-      cog.outl("")
-      cog.outl("    switch (event_id)")
-      cog.outl("    {")
-      for n in range(1, n + 1):
-          cog.out("      case T%d::ID:" % n)
-          cog.out(" new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T%d&>(message));" % n)
-          cog.outl(" break;")
-      cog.out("      default:")
-      cog.out(" new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
-      cog.outl(" break;")
-      cog.outl("    }")
-      cog.outl("")
-      cog.outl("    return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);")
-      cog.outl("  }")
-      cog.outl("};")
-  ####################################
-  # Specialisation for zero messages.
-  ####################################
-  cog.outl("")
-  cog.outl("//***************************************************************************")
-  cog.outl("// Specialisation for 0 message types.")
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_>")
-  cog.out("class fsm_state<TContext, TDerived, STATE_ID_,")
-  for t in range(1, int(Handlers)):
-      cog.out(" void,")
-  if t % 16 == 0:
-      cog.outl("")
-      cog.out("               ")
-  cog.outl(" void> : public ifsm_state")
-  cog.outl("{")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;")
-  cog.outl("")
-  cog.outl("  fsm_state()")
-  cog.outl("    : ifsm_state(STATE_ID)")
-  cog.outl("  {")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("protected:")
-  cog.outl("")
-  cog.outl("  ~fsm_state()")
-  cog.outl("  {")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("  TContext& get_fsm_context() const")
-  cog.outl("  {")
-  cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
-  cog.outl("  }")
-  cog.outl("private:")
-  cog.outl("")
-  cog.outl("  etl::fsm_state_id_t process_event(const etl::imessage& message)")
-  cog.outl("  {")
-  cog.outl("    return p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);")
-  cog.outl("  }")
-  cog.outl("};")
-
-  cog.outl("")
-  cog.outl("template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,")
-  cog.out("         ")
-  for n in range(1, int(Handlers)):
-      cog.out(" typename T%s," % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("         ")
-  cog.outl(" typename T%s>" % Handlers)
-  cog.out("ETL_CONSTANT etl::fsm_state_id_t fsm_state<TContext, TDerived, STATE_ID_,")
-  for n in range(1, int(Handlers)):
-      cog.out(" T%s," % n)
-  cog.outl(" T%s>::STATE_ID;" % Handlers)
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-}
-
-#include "private/minmax_pop.h"
-
-#endif
diff --git a/include/etl/generators/generate.bat b/include/etl/generators/generate.bat
index bee06d99..289d17e8 100644
--- a/include/etl/generators/generate.bat
+++ b/include/etl/generators/generate.bat
@@ -1,9 +1,13 @@
-python3 -m cogapp -d -e -o../fsm.h -DHandlers=16 fsm_generator.h 
-python3 -m cogapp -d -e -o../message_router.h -DHandlers=16 message_router_generator.h 
-python3 -m cogapp -d -e -o../largest.h -DNTypes=16 largest_generator.h
-python3 -m cogapp -d -e -o../smallest.h -DNTypes=16 smallest_generator.h
-python3 -m cogapp -d -e -o../type_traits.h -DIsOneOf=16 type_traits_generator.h
-python3 -m cogapp -d -e -o../type_lookup.h -DNTypes=16 type_lookup_generator.h
-python3 -m cogapp -d -e -o../type_select.h -DNTypes=16 type_select_generator.h
-python3 -m cogapp -d -e -o../message_packet.h -DHandlers=16 message_packet_generator.h
-python3 -m cogapp -d -e -o../variant_pool.h -DNTypes=16 variant_pool_generator.h
+python3 -m cogapp -d -e -o../private/fsm_fwd_decl_cpp03.h -DHandlers=16 fsm_fwd_decl_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/fsm_friend_decl_cpp03.h -DHandlers=16 fsm_friend_decl_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/fsm_cpp03.h -DHandlers=16 fsm_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/message_router_cpp03.h -DHandlers=16 message_router_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/largest_type_cpp03.h -DNTypes=16 largest_type_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/largest_alignment_cpp03.h -DNTypes=16 largest_alignment_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/largest_cpp03.h -DNTypes=16 largest_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/smallest_cpp03.h -DNTypes=16 smallest_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/type_traits_cpp03.h -DIsOneOf=16 type_traits_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/type_lookup_cpp03.h -DNTypes=16 type_lookup_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/type_select_cpp03.h -DNTypes=16 type_select_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/message_packet_cpp03.h -DHandlers=16 message_packet_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/variant_pool_cpp03.h -DNTypes=16 variant_pool_cpp03_generator.h
diff --git a/include/etl/generators/generate_fsm.bat b/include/etl/generators/generate_fsm.bat
index 32c8304f..9ddeb11e 100644
--- a/include/etl/generators/generate_fsm.bat
+++ b/include/etl/generators/generate_fsm.bat
@@ -1 +1,3 @@
-python3 -m cogapp -d -e -o../fsm.h -DHandlers=16 fsm_generator.h 
+python3 -m cogapp -d -e -o../private/fsm_fwd_decl_cpp03.h -DHandlers=16 fsm_fwd_decl_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/fsm_friend_decl_cpp03.h -DHandlers=16 fsm_friend_decl_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/fsm_cpp03.h -DHandlers=16 fsm_cpp03_generator.h
diff --git a/include/etl/generators/generate_largest.bat b/include/etl/generators/generate_largest.bat
index ce76d1c2..704dd535 100644
--- a/include/etl/generators/generate_largest.bat
+++ b/include/etl/generators/generate_largest.bat
@@ -1 +1,3 @@
-python3 -m cogapp -d -e -o../largest.h -DNTypes=16 largest_generator.h
+python3 -m cogapp -d -e -o../private/largest_type_cpp03.h -DNTypes=16 largest_type_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/largest_alignment_cpp03.h -DNTypes=16 largest_alignment_cpp03_generator.h
+python3 -m cogapp -d -e -o../private/largest_cpp03.h -DNTypes=16 largest_cpp03_generator.h
diff --git a/include/etl/generators/generate_message_packet.bat b/include/etl/generators/generate_message_packet.bat
index 37a096e5..414a1f18 100644
--- a/include/etl/generators/generate_message_packet.bat
+++ b/include/etl/generators/generate_message_packet.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../message_packet.h -DHandlers=16 message_packet_generator.h 
+python3 -m cogapp -d -e -o../private/message_packet_cpp03.h -DHandlers=16 message_packet_cpp03_generator.h
diff --git a/include/etl/generators/generate_message_router.bat b/include/etl/generators/generate_message_router.bat
index a54586d6..0fd435c1 100644
--- a/include/etl/generators/generate_message_router.bat
+++ b/include/etl/generators/generate_message_router.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../message_router.h -DHandlers=16 message_router_generator.h 
+python3 -m cogapp -d -e -o../private/message_router_cpp03.h -DHandlers=16 message_router_cpp03_generator.h
diff --git a/include/etl/generators/generate_smallest.bat b/include/etl/generators/generate_smallest.bat
index 70b7da9c..5ad79081 100644
--- a/include/etl/generators/generate_smallest.bat
+++ b/include/etl/generators/generate_smallest.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../smallest.h -DNTypes=16 smallest_generator.h
+python3 -m cogapp -d -e -o../private/smallest_cpp03.h -DNTypes=16 smallest_cpp03_generator.h
diff --git a/include/etl/generators/generate_type_lookup.bat b/include/etl/generators/generate_type_lookup.bat
index 198a50ed..7bed051c 100644
--- a/include/etl/generators/generate_type_lookup.bat
+++ b/include/etl/generators/generate_type_lookup.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../type_lookup.h -DNTypes=16 type_lookup_generator.h
+python3 -m cogapp -d -e -o../private/type_lookup_cpp03.h -DNTypes=16 type_lookup_cpp03_generator.h
diff --git a/include/etl/generators/generate_type_select.bat b/include/etl/generators/generate_type_select.bat
index 2a68cf63..91613c03 100644
--- a/include/etl/generators/generate_type_select.bat
+++ b/include/etl/generators/generate_type_select.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../type_select.h -DNTypes=16 type_select_generator.h
+python3 -m cogapp -d -e -o../private/type_select_cpp03.h -DNTypes=16 type_select_cpp03_generator.h
diff --git a/include/etl/generators/generate_type_traits.bat b/include/etl/generators/generate_type_traits.bat
index 27a48516..8acc50ce 100644
--- a/include/etl/generators/generate_type_traits.bat
+++ b/include/etl/generators/generate_type_traits.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../type_traits.h -DIsOneOf=16 type_traits_generator.h
+python3 -m cogapp -d -e -o../private/type_traits_cpp03.h -DIsOneOf=16 type_traits_cpp03_generator.h
diff --git a/include/etl/generators/generate_variant_pool.bat b/include/etl/generators/generate_variant_pool.bat
index e81e4d84..4fdf27c4 100644
--- a/include/etl/generators/generate_variant_pool.bat
+++ b/include/etl/generators/generate_variant_pool.bat
@@ -1 +1 @@
-python3 -m cogapp -d -e -o../variant_pool.h -DNTypes=16 variant_pool_generator.h
+python3 -m cogapp -d -e -o../private/variant_pool_cpp03.h -DNTypes=16 variant_pool_cpp03_generator.h
diff --git a/include/etl/generators/largest_alignment_cpp03_generator.h b/include/etl/generators/largest_alignment_cpp03_generator.h
new file mode 100644
index 00000000..7e9a40ad
--- /dev/null
+++ b/include/etl/generators/largest_alignment_cpp03_generator.h
@@ -0,0 +1,66 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("/// Template to determine the largest alignment.")
+  cog.outl("/// Supports up to %s types." % int(NTypes))
+  cog.outl("/// Defines <b>value</b> which is the largest alignment of all the parameters.")
+  cog.outl("///\\ingroup largest")
+  cog.outl("//***************************************************************************")
+  cog.out("template <typename T1, ")
+  for n in range(2, int(NTypes)):
+      cog.out("typename T%s = void, " % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("          ")
+  cog.outl("typename T%s = void>" % int(NTypes))
+  cog.outl("struct largest_alignment")
+  cog.outl("{")
+  cog.outl("  // Define 'largest_other' as 'largest_type' with all but the first parameter. ")
+  cog.out("  typedef typename largest_alignment<")
+  for n in range(2, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                ")
+  cog.outl("T%s>::type largest_other;" % int(NTypes))
+  cog.outl("")
+  cog.outl("  // Set 'type' to be the largest of the first parameter and any of the others.")
+  cog.outl("  // This is recursive.")
+  cog.outl("  typedef typename etl::conditional<(etl::alignment_of<T1>::value > etl::alignment_of<largest_other>::value), // Boolean")
+  cog.outl("                                     T1,                                                                      // TrueType")
+  cog.outl("                                     largest_other>                                                           // FalseType")
+  cog.outl("                                     ::type type;                                                             // The largest type of the two.")
+  cog.outl("")
+  cog.outl("  // The largest alignment.")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    value = etl::alignment_of<type>::value")
+  cog.outl("  };")
+  cog.outl("};")
+  cog.outl("")
+  cog.outl("//***************************************************************************")
+  cog.outl("// Specialisation for one template parameter.")
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename T1>")
+  cog.out("struct largest_alignment<T1,   ")
+  for n in range(2, int(NTypes)):
+      cog.out("void, ")
+      if n % 8 == 0:
+          cog.outl("")
+          cog.out("                         ")
+  cog.outl("void>")
+  cog.outl("{")
+  cog.outl("  typedef T1 type;")
+  cog.outl("")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    value = etl::alignment_of<type>::value")
+  cog.outl("  };")
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/largest_cpp03_generator.h b/include/etl/generators/largest_cpp03_generator.h
new file mode 100644
index 00000000..54369dad
--- /dev/null
+++ b/include/etl/generators/largest_cpp03_generator.h
@@ -0,0 +1,50 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("/// Template to determine the largest type, size and alignment.")
+  cog.outl("/// Supports up to %s types." % NTypes)
+  cog.outl("/// Defines <b>value</b> which is the largest type, size and alignment of all the parameters.")
+  cog.outl("///\\ingroup largest")
+  cog.outl("//***************************************************************************")
+  cog.out("template <typename T1, ")
+  for n in range(2, int(NTypes)):
+      cog.out("typename T%s = void, " % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("          ")
+  cog.outl("typename T%s = void>" % NTypes)
+  cog.outl("struct largest")
+  cog.outl("{")
+  cog.out("  typedef typename etl::largest_type<")
+  for n in range(1, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                     ")
+  cog.outl("T%s>::type type;" % NTypes)
+  cog.outl("")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.out("    size      = etl::largest_type<")
+  for n in range(1, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                  ")
+  cog.outl("T%s>::size," % NTypes)
+  cog.out("    alignment = etl::largest_alignment<")
+  for n in range(1, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                       ")
+  cog.outl("T%s>::value" % NTypes)
+  cog.outl("  };")
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/largest_generator.h b/include/etl/generators/largest_generator.h
deleted file mode 100644
index ff31d050..00000000
--- a/include/etl/generators/largest_generator.h
+++ /dev/null
@@ -1,452 +0,0 @@
-///\file
-
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2014 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -olargest.h -DNTypes=<n> largest_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -olargest.h -DNTypes=16 largest_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
-#ifndef ETL_LARGEST_INCLUDED
-#define ETL_LARGEST_INCLUDED
-
-///\defgroup largest largest
-///\ingroup utilities
-
-#include "platform.h"
-#include "type_traits.h"
-#include "smallest.h"
-#include "static_assert.h"
-
-namespace etl
-{
-#if ETL_USING_CPP11 && !defined(ETL_LARGEST_TYPE_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  /// Template to determine the largest type and size.
-  /// Defines 'value_type' which is the type of the largest parameter.
-  /// Defines 'size' which is the size of the largest parameter.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename... TRest>
-  class largest_type
-  {
-  private:
-
-    // Define 'largest_other' as 'largest_type' with all but the first parameter.
-    using largest_other = typename largest_type<TRest...>::type;
-
-  public:
-
-    // Set 'type' to be the largest of the first parameter and any of the others.
-    // This is recursive.
-    using type = typename etl::conditional<(etl::size_of<T1>::value > etl::size_of<largest_other>::value),  // Boolean
-                                            T1,                                                             // TrueType
-                                            largest_other>                                                  // FalseType
-                                            ::type;                                                         // The largest type of the two.
-
-    // The size of the largest type.
-    enum
-    {
-      size = etl::size_of<type>::value
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  class largest_type<T1>
-  {
-  public:
-
-    using type = T1;
-
-    enum
-    {
-      size = etl::size_of<type>::value
-    };
-  };
-
-#if ETL_USING_CPP11
-  template <typename... T>
-  using largest_type_t = typename largest_type<T...>::type;
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  constexpr size_t largest_type_v = largest_type<T...>::size;
-#endif
-
-#else
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("/// Template to determine the largest type and size.")
-  cog.outl("/// Supports up to %s types." % NTypes)
-  cog.outl("/// Defines 'value_type' which is the type of the largest parameter.")
-  cog.outl("/// Defines 'size' which is the size of the largest parameter.")
-  cog.outl("///\\ingroup largest")
-  cog.outl("//***************************************************************************")
-  cog.out("template <typename T1, ")
-  for n in range(2, int(NTypes)):
-      cog.out("typename T%s = void, " % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("          ")
-  cog.outl("typename T%s = void>" % int(NTypes))
-  cog.outl("struct largest_type")
-  cog.outl("{")
-  cog.outl("  // Define 'largest_other' as 'largest_type' with all but the first parameter. ")
-  cog.out("  typedef typename largest_type<")
-  for n in range(2, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                ")
-  cog.outl("T%s>::type largest_other;" % int(NTypes))
-  cog.outl("")
-  cog.outl("  // Set 'type' to be the largest of the first parameter and any of the others.")
-  cog.outl("  // This is recursive.")
-  cog.outl("  typedef typename etl::conditional<(sizeof(T1) > sizeof(largest_other)), // Boolean")
-  cog.outl("                                     T1,                                  // TrueType")
-  cog.outl("                                     largest_other>                       // FalseType")
-  cog.outl("                                     ::type type;                         // The largest type of the two.")
-  cog.outl("")
-  cog.outl("  // The size of the largest type.")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    size = sizeof(type)")
-  cog.outl("  };")
-  cog.outl("};")
-  cog.outl("")
-  cog.outl("//***************************************************************************")
-  cog.outl("// Specialisation for one template parameter.")
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T1>")
-  cog.out("struct largest_type<T1,   ")
-  for n in range(2, int(NTypes)):
-      cog.out("void, ")
-      if n % 8 == 0:
-          cog.outl("")
-          cog.out("                    ")
-  cog.outl("void>")
-  cog.outl("{")
-  cog.outl("  typedef T1 type;")
-  cog.outl("")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    size = sizeof(type)")
-  cog.outl("  };")
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-
-#if ETL_USING_CPP11 && !defined(ETL_LARGEST_ALIGNMENT_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  /// Template to determine the largest alignment.
-  /// Defines <b>value</b> which is the largest alignment of all the parameters.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename... TRest>
-  struct largest_alignment
-  {
-    // Define 'largest_other' as 'largest_type' with all but the first parameter.
-    using largest_other = typename largest_alignment<TRest...>::type;
-
-    // Set 'type' to be the largest of the first parameter and any of the others.
-    // This is recursive.
-    using type = typename etl::conditional<(etl::alignment_of<T1>::value > etl::alignment_of<largest_other>::value), // Boolean
-                                            T1,                                                                      // TrueType
-                                            largest_other>                                                           // FalseType
-                                            ::type;                                                                  // The largest type of the two.
-
-    // The largest alignment.
-    enum
-    {
-      value = etl::alignment_of<type>::value
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  struct largest_alignment<T1>
-  {
-    typedef T1 type;
-
-    enum
-    {
-      value = etl::alignment_of<type>::value
-    };
-  };
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  inline constexpr size_t largest_alignment_v = largest_alignment<T...>::value;
-#endif
-
-#else
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("/// Template to determine the largest alignment.")
-  cog.outl("/// Supports up to %s types." % int(NTypes))
-  cog.outl("/// Defines <b>value</b> which is the largest alignment of all the parameters.")
-  cog.outl("///\\ingroup largest")
-  cog.outl("//***************************************************************************")
-  cog.out("template <typename T1, ")
-  for n in range(2, int(NTypes)):
-      cog.out("typename T%s = void, " % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("          ")
-  cog.outl("typename T%s = void>" % int(NTypes))
-  cog.outl("struct largest_alignment")
-  cog.outl("{")
-  cog.outl("  // Define 'largest_other' as 'largest_type' with all but the first parameter. ")
-  cog.out("  typedef typename largest_alignment<")
-  for n in range(2, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                ")
-  cog.outl("T%s>::type largest_other;" % int(NTypes))
-  cog.outl("")
-  cog.outl("  // Set 'type' to be the largest of the first parameter and any of the others.")
-  cog.outl("  // This is recursive.")
-  cog.outl("  typedef typename etl::conditional<(etl::alignment_of<T1>::value > etl::alignment_of<largest_other>::value), // Boolean")
-  cog.outl("                                     T1,                                                                      // TrueType")
-  cog.outl("                                     largest_other>                                                           // FalseType")
-  cog.outl("                                     ::type type;                                                             // The largest type of the two.")
-  cog.outl("")
-  cog.outl("  // The largest alignment.")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    value = etl::alignment_of<type>::value")
-  cog.outl("  };")
-  cog.outl("};")
-  cog.outl("")
-  cog.outl("//***************************************************************************")
-  cog.outl("// Specialisation for one template parameter.")
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T1>")
-  cog.out("struct largest_alignment<T1,   ")
-  for n in range(2, int(NTypes)):
-      cog.out("void, ")
-      if n % 8 == 0:
-          cog.outl("")
-          cog.out("                         ")
-  cog.outl("void>")
-  cog.outl("{")
-  cog.outl("  typedef T1 type;")
-  cog.outl("")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    value = etl::alignment_of<type>::value")
-  cog.outl("  };")
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-
-  //***************************************************************************
-  /// Defines a type that is as larger or larger than the specified type.
-  /// Will return the specified type is there is not a larger type.
-  ///\\ingroup largest
-  //***************************************************************************
-  template <typename T>
-  struct larger_int_type
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Must be an integral type");
-
-    typedef typename etl::smallest_int_for_bits<etl::integral_limits<typename etl::make_signed<T>::type>::bits + 1>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using larger_int_type_t = typename larger_int_type<T>::type;
-#endif
-
-  //***************************************************************************
-  /// Defines a type that is as larger or larger than the specified type.
-  /// Will return the specified type is there is not a larger type.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T>
-  struct larger_uint_type
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Must be an integral type");
-
-    typedef typename etl::smallest_uint_for_bits<etl::integral_limits<typename etl::make_unsigned<T>::type>::bits + 1>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using larger_uint_type_t = typename larger_uint_type<T>::type;
-#endif
-
-  //***************************************************************************
-  /// Defines a type that is as larger or larger than the specified type.
-  /// Will return the specified type is there is not a larger type.
-  /// The returned type will be of the same sign.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T, bool IS_SIGNED = etl::is_signed<T>::value>
-  struct larger_type;
-
-  template <typename T>
-  struct larger_type<T, false>
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Must be an integral type");
-
-    typedef typename etl::smallest_uint_for_bits<etl::integral_limits<T>::bits + 1>::type type;
-  };
-
-  template <typename T>
-  struct larger_type<T, true>
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Must be an integral type");
-
-    typedef typename etl::smallest_int_for_bits<etl::integral_limits<T>::bits + 1>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using larger_type_t = typename larger_type<T>::type;
-#endif
-
-#if ETL_USING_CPP11 && !defined(ETL_LARGEST_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  /// Template to determine the largest type, size and alignment.
-  /// Defines <b>value</b> which is the largest type, size and alignment of all the parameters.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename... T>
-  struct largest
-  {
-    using type = typename etl::largest_type<T...>::type;
-
-    enum
-    {
-      size      = etl::largest_type<T...>::size,
-      alignment = etl::largest_alignment<T...>::value
-    };
-  };
-
-#if ETL_USING_CPP11
-    template <typename... T>
-    using largest_t = typename largest<T...>::type;
-#endif
-
-#if ETL_USING_CPP17
-    template <typename... T>
-    inline constexpr size_t largest_size = largest<T...>::size;
-#endif
-
-#else
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("/// Template to determine the largest type, size and alignment.")
-  cog.outl("/// Supports up to %s types." % NTypes)
-  cog.outl("/// Defines <b>value</b> which is the largest type, size and alignment of all the parameters.")
-  cog.outl("///\\ingroup largest")
-  cog.outl("//***************************************************************************")
-  cog.out("template <typename T1, ")
-  for n in range(2, int(NTypes)):
-      cog.out("typename T%s = void, " % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("          ")
-  cog.outl("typename T%s = void>" % NTypes)
-  cog.outl("struct largest")
-  cog.outl("{")
-  cog.out("  typedef typename etl::largest_type<")
-  for n in range(1, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                     ")
-  cog.outl("T%s>::type type;" % NTypes)
-  cog.outl("")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.out("    size      = etl::largest_type<")
-  for n in range(1, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                  ")
-  cog.outl("T%s>::size," % NTypes)
-  cog.out("    alignment = etl::largest_alignment<")
-  for n in range(1, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                       ")
-  cog.outl("T%s>::value" % NTypes)
-  cog.outl("  };")
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-}
-
-#endif
diff --git a/include/etl/generators/largest_type_cpp03_generator.h b/include/etl/generators/largest_type_cpp03_generator.h
new file mode 100644
index 00000000..aa603ce1
--- /dev/null
+++ b/include/etl/generators/largest_type_cpp03_generator.h
@@ -0,0 +1,67 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("/// Template to determine the largest type and size.")
+  cog.outl("/// Supports up to %s types." % NTypes)
+  cog.outl("/// Defines 'type' which is the type of the largest parameter.")
+  cog.outl("/// Defines 'size' which is the size of the largest parameter.")
+  cog.outl("///\\ingroup largest")
+  cog.outl("//***************************************************************************")
+  cog.out("template <typename T1, ")
+  for n in range(2, int(NTypes)):
+      cog.out("typename T%s = void, " % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("          ")
+  cog.outl("typename T%s = void>" % int(NTypes))
+  cog.outl("struct largest_type")
+  cog.outl("{")
+  cog.outl("  // Define 'largest_other' as 'largest_type' with all but the first parameter. ")
+  cog.out("  typedef typename largest_type<")
+  for n in range(2, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                ")
+  cog.outl("T%s>::type largest_other;" % int(NTypes))
+  cog.outl("")
+  cog.outl("  // Set 'type' to be the largest of the first parameter and any of the others.")
+  cog.outl("  // This is recursive.")
+  cog.outl("  typedef typename etl::conditional<(sizeof(T1) > sizeof(largest_other)), // Boolean")
+  cog.outl("                                     T1,                                  // TrueType")
+  cog.outl("                                     largest_other>                       // FalseType")
+  cog.outl("                                     ::type type;                         // The largest type of the two.")
+  cog.outl("")
+  cog.outl("  // The size of the largest type.")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    size = sizeof(type)")
+  cog.outl("  };")
+  cog.outl("};")
+  cog.outl("")
+  cog.outl("//***************************************************************************")
+  cog.outl("// Specialisation for one template parameter.")
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename T1>")
+  cog.out("struct largest_type<T1,   ")
+  for n in range(2, int(NTypes)):
+      cog.out("void, ")
+      if n % 8 == 0:
+          cog.outl("")
+          cog.out("                    ")
+  cog.outl("void>")
+  cog.outl("{")
+  cog.outl("  typedef T1 type;")
+  cog.outl("")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    size = sizeof(type)")
+  cog.outl("  };")
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/message_packet_generator.h b/include/etl/generators/message_packet_cpp03_generator.h
similarity index 62%
rename from include/etl/generators/message_packet_generator.h
rename to include/etl/generators/message_packet_cpp03_generator.h
index 59f3b7e5..4531735b 100644
--- a/include/etl/generators/message_packet_generator.h
+++ b/include/etl/generators/message_packet_cpp03_generator.h
@@ -1,529 +1,7 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2020 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
 //***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -omessage_packet.h -DHandlers=<n> message_packet_generator.h
-// Where <n> is the number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 messages...
-// cog -d -e -omessage_packet.h -DHandlers=16 message_packet_generator.h
-//
-// See generate.bat
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
 //***************************************************************************
 
-#ifndef ETL_MESSAGE_PACKET_INCLUDED
-#define ETL_MESSAGE_PACKET_INCLUDED
-
-#include "platform.h"
-
-#include "message.h"
-#include "error_handler.h"
-#include "static_assert.h"
-#include "largest.h"
-#include "alignment.h"
-#include "utility.h"
-#include "type_list.h"
-
-#include <stdint.h>
-
-namespace etl
-{
-#if ETL_USING_CPP17 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  // The definition for all message types.
-  //***************************************************************************
-  template <typename... TMessageTypes>
-  class message_packet
-  {
-
-  private:
-
-    template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v<etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
-
-    template <typename T>
-    static constexpr bool IsInMessageList = etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<T>>, TMessageTypes...>;
-
-    template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
-
-  public:
-
-    using message_types = etl::type_list<TMessageTypes...>;
-
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    constexpr message_packet() noexcept
-      : valid(false)
-    {
-    }
-#include "private/diagnostic_pop.h"
-
-    //********************************************
-    ///
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    template <typename T, typename = typename etl::enable_if<IsIMessage<T> || IsInMessageList<T>, int>::type>
-    explicit message_packet(T&& msg)
-      : valid(true)
-    {
-      if constexpr (IsIMessage<T>)
-      {
-        if (accepts(msg))
-        {
-          add_new_message(etl::forward<T>(msg));
-          valid = true;
-        }
-        else
-        {
-          valid = false;
-        }
-
-        ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-      }
-      else if constexpr (IsInMessageList<T>)
-      {
-        add_new_message_type<T>(etl::forward<T>(msg));
-      }
-      else
-      {
-        ETL_STATIC_ASSERT(IsInMessageList<T>, "Message not in packet type list");
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-    //**********************************************
-    message_packet(const message_packet& other)
-    {
-      valid = other.is_valid();
-
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-
-#if ETL_USING_CPP11
-    //**********************************************
-    message_packet(message_packet&& other)
-    {
-      valid = other.is_valid();
-
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-#endif
-
-    //**********************************************
-    void copy(const message_packet& other)
-    {
-      valid = other.is_valid();
-
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-
-    //**********************************************
-    void copy(message_packet&& other)
-    {
-      valid = other.is_valid();
-
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-
-    //**********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-#include "private/diagnostic_pop.h"
-
-    //**********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-#include "private/diagnostic_pop.h"
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return (accepts_message<TMessageTypes::ID>(id) || ...);
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return (accepts_message<TMessageTypes::ID, Id>() || ...);
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return accepts<TMessage::ID>();
-    }
-
-    enum
-    {
-      SIZE = etl::largest<TMessageTypes...>::size,
-      ALIGNMENT = etl::largest<TMessageTypes...>::alignment
-    };
-
-  private:
-
-    //**********************************************
-    template <etl::message_id_t Id1, etl::message_id_t Id2>
-    static bool accepts_message()
-    {
-      return Id1 == Id2;
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id1>
-    static bool accepts_message(etl::message_id_t id2)
-    {
-      return Id1 == id2;
-    }
-
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-#if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-#else
-        delete_message(pmsg);
-#endif
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-#if !ETL_HAS_VIRTUAL_MESSAGES
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      (delete_message_type<TMessageTypes>(pmsg) || ...);
-    }
-
-    //********************************************
-    template <typename TType>
-    bool delete_message_type(etl::imessage* pmsg)
-    {
-      if (TType::ID == pmsg->get_message_id())
-      {
-        TType* p = static_cast<TType*>(pmsg);
-        p->~TType();
-        return true;
-      }
-      else
-      {
-        return false;
-      }
-    }
-#endif
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      (add_new_message_type<TMessageTypes>(msg) || ...);
-    }
-
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      (add_new_message_type<TMessageTypes>(etl::move(msg)) || ...);
-    }
-
-#include "private/diagnostic_uninitialized_push.h"
-    //********************************************
-    /// Only enabled for types that are in the typelist.
-    //********************************************
-    template <typename TMessage>
-    etl::enable_if_t<etl::is_one_of_v<etl::remove_const_t<etl::remove_reference_t<TMessage>>, TMessageTypes...>, void>
-      add_new_message_type(TMessage&& msg)
-    {
-      void* p = data;
-      new (p) etl::remove_reference_t<TMessage>((etl::forward<TMessage>(msg)));
-    }
-#include "private/diagnostic_pop.h"
-
-#include "private/diagnostic_uninitialized_push.h"
-    //********************************************
-    template <typename TType>
-    bool add_new_message_type(const etl::imessage& msg)
-    {
-      if (TType::ID == msg.get_message_id())
-      {
-        void* p = data;
-        new (p) TType(static_cast<const TType&>(msg));
-        return true;
-      }
-      else
-      {
-        return false;
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-#include "private/diagnostic_uninitialized_push.h"
-    //********************************************
-    template <typename TType>
-    bool add_new_message_type(etl::imessage&& msg)
-    {
-      if (TType::ID == msg.get_message_id())
-      {
-        void* p = data;
-        new (p) TType(static_cast<TType&&>(msg));
-        return true;
-      }
-      else
-      {
-        return false;
-      }
-    }
-#include "private/diagnostic_pop.h"
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // The definition for no message types.
-  //***************************************************************************
-  template <>
-  class message_packet<>
-  {
-  private:
-
-    template <typename T>
-    static constexpr bool IsMessagePacket = etl::is_same_v<etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<>>;
-
-    template <typename T>
-    static constexpr bool IsInMessageList = false;
-
-    template <typename T>
-    static constexpr bool IsIMessage = etl::is_same_v<etl::remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
-
-  public:
-
-    using message_types = etl::type_list<>;
-
-    //********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    constexpr message_packet() noexcept
-    {
-    }
-#include "private/diagnostic_pop.h"
-
-    //**********************************************
-    message_packet(const message_packet& /*other*/)
-    {
-    }
-
-#if ETL_USING_CPP11
-    //**********************************************
-    message_packet(message_packet&& /*other*/)
-    {
-    }
-#endif
-
-    //**********************************************
-    void copy(const message_packet& /*other*/)
-    {
-    }
-
-    //**********************************************
-    void copy(message_packet&& /*other*/)
-    {
-    }
-
-    //**********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& /*rhs*/)
-    {
-      return *this;
-    }
-#include "private/diagnostic_pop.h"
-
-    //**********************************************
-#include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& /*rhs*/)
-    {
-      return *this;
-    }
-#include "private/diagnostic_pop.h"
-
-    //********************************************
-    ~message_packet()
-    {
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return false;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t /*id*/)
-    {
-      return false;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& /*msg*/)
-    {
-      return false;
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return false;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-      typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return false;
-    }
-
-    enum
-    {
-      SIZE = 0,
-      ALIGNMENT = 1
-    };
-  };
-
-  //***************************************************************************
-  /// Helper to turn etl::type_list<TTypes...> into etl::message_packet<TTypes...>
-  template <typename TList>
-  struct message_packet_from_type_list;
-
-  template <typename... TTypes>
-  struct message_packet_from_type_list<etl::type_list<TTypes...>>
-  {
-    using type = etl::message_packet<TTypes...>;
-  };
-
-  template <typename TTypeList>
-  using message_packet_from_type_list_t = typename message_packet_from_type_list<TTypeList>::type;
-
-#else
 
   /*[[[cog
     import cog
@@ -611,7 +89,7 @@ namespace etl
     cog.outl("{")
     cog.outl("public:")
     cog.outl("")
-    
+
     cog.outl("#if ETL_USING_CPP11")
     cog.out("  using message_types = etl::type_list<")
     for n in range(1, int(Handlers)):
@@ -621,15 +99,15 @@ namespace etl
     cog.outl("")
 
     cog.outl("  //********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  ETL_CONSTEXPR message_packet() ETL_NOEXCEPT")
     cog.outl("    : valid(false)")
     cog.outl("  {")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("")
     cog.outl("  //********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  explicit message_packet(const etl::imessage& msg)")
     cog.outl("  {")
     cog.outl("    if (accepts(msg))")
@@ -644,11 +122,11 @@ namespace etl
     cog.outl("")
     cog.outl("    ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("")
     cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
     cog.outl("  //********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  explicit message_packet(etl::imessage&& msg)")
     cog.outl("  {")
     cog.outl("    if (accepts(msg))")
@@ -663,12 +141,12 @@ namespace etl
     cog.outl("")
     cog.outl("    ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("#endif")
     cog.outl("")
     cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)")
     cog.outl("  //********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.out("  template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<")
     for n in range(1, int(Handlers)):
         cog.out("T%s, " % n)
@@ -683,10 +161,10 @@ namespace etl
     cog.outl("  {")
     generate_static_assert_cpp11(int(Handlers))
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("#else")
     cog.outl("  //********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  template <typename TMessage>")
     cog.out("  explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<")
     for n in range(1, int(Handlers)):
@@ -701,11 +179,11 @@ namespace etl
     cog.outl("  {")
     generate_static_assert_cpp03(int(Handlers))
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("#endif")
     cog.outl("")
     cog.outl("  //**********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  message_packet(const message_packet& other)")
     cog.outl("    : valid(other.is_valid())")
     cog.outl("  {")
@@ -714,11 +192,11 @@ namespace etl
     cog.outl("      add_new_message(other.get());")
     cog.outl("    }")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("")
     cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
     cog.outl("  //**********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  message_packet(message_packet&& other)")
     cog.outl("    : valid(other.is_valid())")
     cog.outl("  {")
@@ -727,11 +205,11 @@ namespace etl
     cog.outl("      add_new_message(etl::move(other.get()));")
     cog.outl("    }")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("#endif")
     cog.outl("")
     cog.outl("  //**********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  message_packet& operator =(const message_packet& rhs)")
     cog.outl("  {")
     cog.outl("    delete_current_message();")
@@ -743,11 +221,11 @@ namespace etl
     cog.outl("")
     cog.outl("    return *this;")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("")
     cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
     cog.outl("  //**********************************************")
-    cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("#include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  message_packet& operator =(message_packet&& rhs)")
     cog.outl("  {")
     cog.outl("    delete_current_message();")
@@ -759,7 +237,7 @@ namespace etl
     cog.outl("")
     cog.outl("    return *this;")
     cog.outl("  }")
-    cog.outl("#include \"private/diagnostic_pop.h\"")
+    cog.outl("#include \"diagnostic_pop.h\"")
     cog.outl("#endif")
     cog.outl("")
     cog.outl("  //********************************************")
@@ -829,7 +307,7 @@ namespace etl
     cog.outl("private:")
     cog.outl("")
     cog.outl("  //********************************************")
-    cog.outl("  #include \"private/diagnostic_uninitialized_push.h\"")
+    cog.outl("  #include \"diagnostic_uninitialized_push.h\"")
     cog.outl("  void delete_current_message()")
     cog.outl("  {")
     cog.outl("    if (valid)")
@@ -843,7 +321,7 @@ namespace etl
     cog.outl("#endif")
     cog.outl("    }")
     cog.outl("  }")
-    cog.outl("  #include \"private/diagnostic_pop.h\"")
+    cog.outl("  #include \"diagnostic_pop.h\"")
     cog.outl("")
     cog.outl("  //********************************************")
     cog.outl("  void delete_message(etl::imessage* pmsg)")
@@ -856,7 +334,7 @@ namespace etl
     cog.outl("      default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;")
     cog.outl("    }")
     cog.outl("  }")
-    cog.outl("")      
+    cog.outl("")
     cog.outl("  //********************************************")
     cog.outl("  void add_new_message(const etl::imessage& msg)")
     cog.outl("  {")
@@ -935,15 +413,15 @@ namespace etl
         cog.outl("")
 
         cog.outl("  //********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  ETL_CONSTEXPR message_packet() ETL_NOEXCEPT")
         cog.outl("    : valid(false)")
         cog.outl("  {")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("")
         cog.outl("  //********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  explicit message_packet(const etl::imessage& msg)")
         cog.outl("  {")
         cog.outl("    if (accepts(msg))")
@@ -958,11 +436,11 @@ namespace etl
         cog.outl("")
         cog.outl("    ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("")
         cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
         cog.outl("  //********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  explicit message_packet(etl::imessage&& msg)")
         cog.outl("  {")
         cog.outl("    if (accepts(msg))")
@@ -977,12 +455,12 @@ namespace etl
         cog.outl("")
         cog.outl("    ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("#endif")
         cog.outl("")
         cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)")
         cog.outl("  //********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.out("  template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<")
         for t in range(1, n):
             cog.out("T%s, " % t)
@@ -997,10 +475,10 @@ namespace etl
         cog.outl("  {")
         generate_static_assert_cpp11(n)
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("#else")
         cog.outl("  //********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  template <typename TMessage>")
         cog.out("  explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<")
         for t in range(1, n):
@@ -1015,11 +493,11 @@ namespace etl
         cog.outl("  {")
         generate_static_assert_cpp03(n)
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("#endif")
         cog.outl("")
         cog.outl("  //**********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  message_packet(const message_packet& other)")
         cog.outl("    : valid(other.is_valid())")
         cog.outl("  {")
@@ -1028,11 +506,11 @@ namespace etl
         cog.outl("      add_new_message(other.get());")
         cog.outl("    }")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("")
         cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
         cog.outl("  //**********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  message_packet(message_packet&& other)")
         cog.outl("    : valid(other.is_valid())")
         cog.outl("  {")
@@ -1041,11 +519,11 @@ namespace etl
         cog.outl("      add_new_message(etl::move(other.get()));")
         cog.outl("    }")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("#endif")
         cog.outl("")
         cog.outl("  //**********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  message_packet& operator =(const message_packet& rhs)")
         cog.outl("  {")
         cog.outl("    delete_current_message();")
@@ -1057,11 +535,11 @@ namespace etl
         cog.outl("")
         cog.outl("    return *this;")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("")
         cog.outl("#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)")
         cog.outl("  //**********************************************")
-        cog.outl("#include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("#include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  message_packet& operator =(message_packet&& rhs)")
         cog.outl("  {")
         cog.outl("    delete_current_message();")
@@ -1073,7 +551,7 @@ namespace etl
         cog.outl("")
         cog.outl("    return *this;")
         cog.outl("  }")
-        cog.outl("#include \"private/diagnostic_pop.h\"")
+        cog.outl("#include \"diagnostic_pop.h\"")
         cog.outl("#endif")
         cog.outl("")
         cog.outl("  //********************************************")
@@ -1143,7 +621,7 @@ namespace etl
         cog.outl("private:")
         cog.outl("")
         cog.outl("  //********************************************")
-        cog.outl("  #include \"private/diagnostic_uninitialized_push.h\"")
+        cog.outl("  #include \"diagnostic_uninitialized_push.h\"")
         cog.outl("  void delete_current_message()")
         cog.outl("  {")
         cog.outl("    if (valid)")
@@ -1158,7 +636,7 @@ namespace etl
         cog.outl("#endif")
         cog.outl("    }")
         cog.outl("  }")
-        cog.outl("  #include \"private/diagnostic_pop.h\"")
+        cog.outl("  #include \"diagnostic_pop.h\"")
         cog.outl("")
         cog.outl("  //********************************************")
         cog.outl("  void delete_message(etl::imessage* pmsg)")
@@ -1171,7 +649,7 @@ namespace etl
         cog.outl("      default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;")
         cog.outl("    }")
         cog.outl("  }")
-        cog.outl("") 
+        cog.outl("")
         cog.outl("  //********************************************")
         cog.outl("  void add_new_message(const etl::imessage& msg)")
         cog.outl("  {")
@@ -1263,7 +741,4 @@ namespace etl
 
     bool valid;
   };
-#endif
-}
 
-#endif
diff --git a/include/etl/generators/message_router_cpp03_generator.h b/include/etl/generators/message_router_cpp03_generator.h
new file mode 100644
index 00000000..e2f9aba0
--- /dev/null
+++ b/include/etl/generators/message_router_cpp03_generator.h
@@ -0,0 +1,456 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //*************************************************************************************************
+  // For C++03/98.
+  //*************************************************************************************************
+  /*[[[cog
+      import cog
+      ################################################
+      # The first definition for all of the messages.
+      ################################################
+      cog.outl("//***************************************************************************")
+      cog.outl("// The definition for all %s message types." % Handlers)
+      cog.outl("//***************************************************************************")
+      cog.outl("template <typename TDerived,")
+      cog.out("          ")
+      for n in range(1, int(Handlers)):
+          cog.out("typename T%s = void," % n)
+          if n % 4 == 0:
+              cog.outl("")
+              cog.out("          ")
+          else:
+              cog.out(" ")
+      cog.outl("typename T%s = void>" % int(Handlers))
+      cog.out("class message_router")
+      cog.outl("  : public imessage_router")
+      cog.outl("{")
+      cog.outl("public:")
+      cog.outl("")
+      cog.out("  typedef etl::message_packet<")
+      for n in range(1, int(Handlers)):
+          cog.out("T%s, " % n)
+      cog.outl("T%s> message_packet;" % int(Handlers))
+      cog.outl("")
+
+      cog.outl("#if ETL_USING_CPP11")
+      cog.out("  using message_types = etl::type_list<")
+      for n in range(1, int(Handlers)):
+          cog.out("T%s, " % n)
+      cog.outl("T%s>;" % int(Handlers))
+      cog.outl("#endif")
+      cog.outl("")
+
+      cog.outl("  //**********************************************")
+      cog.outl("  message_router(etl::message_router_id_t id_)")
+      cog.outl("    : imessage_router(id_)")
+      cog.outl("  {")
+      cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //**********************************************")
+      cog.outl("  message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)")
+      cog.outl("    : imessage_router(id_, successor_)")
+      cog.outl("  {")
+      cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //**********************************************")
+      cog.outl("  message_router()")
+      cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER)")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //**********************************************")
+      cog.outl("  message_router(etl::imessage_router& successor_)")
+      cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //**********************************************")
+      cog.outl("  using etl::imessage_router::receive;")
+      cog.outl("")
+      cog.outl("  void receive(const etl::imessage& msg) ETL_OVERRIDE")
+      cog.outl("  {")
+      cog.outl("    const etl::message_id_t id = msg.get_message_id();")
+      cog.outl("")
+      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+      cog.outl("    switch (id)")
+      cog.outl("    {")
+      for n in range(1, int(Handlers) + 1):
+          cog.out("      case T%d::ID:" % n)
+          cog.out(" static_cast<TDerived*>(this)->on_receive(static_cast<const T%d&>(msg));" % n)
+          cog.outl(" break;")
+      cog.outl("      default:")
+      cog.outl("      {")
+      cog.outl("         if (has_successor())")
+      cog.outl("         {")
+      cog.outl("           get_successor().receive(msg);")
+      cog.outl("         }")
+      cog.outl("         else")
+      cog.outl("         {")
+      cog.outl("           static_cast<TDerived*>(this)->on_receive_unknown(msg);")
+      cog.outl("         }")
+      cog.outl("         break;")
+      cog.outl("      }")
+      cog.outl("    }")
+      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  template <typename TMessage>")
+      cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, ")
+      for n in range(1, int(Handlers)):
+          cog.out("T%s, " % n)
+      cog.outl("T%s>::value, void>::type" % int(Handlers))
+      cog.outl("    receive(const TMessage& msg)")
+      cog.outl("  {")
+      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+      cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
+      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  template <typename TMessage>")
+      cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, ")
+      for n in range(1, int(Handlers)):
+          cog.out("T%s, " % n)
+      cog.outl("T%s>::value, void>::type" % int(Handlers))
+      cog.outl("    receive(const TMessage& msg)")
+      cog.outl("  {")
+      cog.outl("    if (has_successor())")
+      cog.outl("    {")
+      cog.outl("      get_successor().receive(msg);")
+      cog.outl("    }")
+      cog.outl("    else")
+      cog.outl("    {")
+      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+      cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
+      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+      cog.outl("    }")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //**********************************************")
+      cog.outl("  using imessage_router::accepts;")
+      cog.outl("")
+      cog.outl("  bool accepts(etl::message_id_t id) const ETL_OVERRIDE")
+      cog.outl("  {")
+      cog.outl("    switch (id)")
+      cog.outl("    {")
+      cog.out("     ")
+      for n in range(1, int(Handlers) + 1):
+          cog.out(" case T%d::ID:" % n)
+          if n % 8 == 0:
+              cog.outl("")
+              cog.out("     ")
+      cog.outl("   return true;")
+      cog.outl("      default:")
+      cog.outl("      {")
+      cog.outl("        if (has_successor())")
+      cog.outl("        {")
+      cog.outl("          return get_successor().accepts(id);")
+      cog.outl("        }")
+      cog.outl("        else")
+      cog.outl("        {")
+      cog.outl("          return false;")
+      cog.outl("        }")
+      cog.outl("      }")
+      cog.outl("    }")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //********************************************")
+      cog.outl("  ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE")
+      cog.outl("  {")
+      cog.outl("    return false;")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //********************************************")
+      cog.outl("  bool is_producer() const ETL_OVERRIDE")
+      cog.outl("  {")
+      cog.outl("    return true;")
+      cog.outl("  }")
+      cog.outl("")
+      cog.outl("  //********************************************")
+      cog.outl("  bool is_consumer() const ETL_OVERRIDE")
+      cog.outl("  {")
+      cog.outl("    return true;")
+      cog.outl("  }")
+      cog.outl("};")
+
+      ####################################
+      # All of the other specialisations.
+      ####################################
+      for n in range(int(Handlers) - 1, 0, -1):
+          cog.outl("")
+          cog.outl("//***************************************************************************")
+          if n == 1:
+              cog.outl("// Specialisation for %d message type." % n)
+          else:
+              cog.outl("// Specialisation for %d message types." % n)
+          cog.outl("//***************************************************************************")
+          cog.outl("template <typename TDerived,")
+          cog.out("          ")
+          for t in range(1, n):
+              cog.out("typename T%d," % t)
+              if t % 4 == 0:
+                  cog.outl("")
+                  cog.out("          ")
+              else:
+                  cog.out(" ")
+          cog.outl("typename T%d>" % n)
+          cog.out("class message_router<TDerived, ")
+          for t in range(1, n + 1):
+              cog.out("T%d, " % t)
+              if t % 16 == 0:
+                  cog.outl("")
+                  cog.out("               ")
+          for t in range(n + 1, int(Handlers)):
+              cog.out("void, ")
+              if t % 16 == 0:
+                  cog.outl("")
+                  cog.out("               ")
+          cog.outl("void>")
+          cog.outl(" : public imessage_router")
+          cog.outl("{")
+          cog.outl("public:")
+          cog.outl("")
+          cog.out("  typedef etl::message_packet<")
+          for t in range(1, n):
+              cog.out("T%s, " % t)
+          cog.outl(" T%s> message_packet;" % n)
+          cog.outl("")
+
+          cog.outl("#if ETL_USING_CPP11")
+          cog.out("  using message_types = etl::type_list<")
+          for t in range(1, n):
+              cog.out("T%s, " % t)
+          cog.outl("T%s>;" % n)
+          cog.outl("#endif")
+          cog.outl("")
+
+          cog.outl("  //**********************************************")
+          cog.outl("  message_router(etl::message_router_id_t id_)")
+          cog.outl("    : imessage_router(id_)")
+          cog.outl("  {")
+          cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //**********************************************")
+          cog.outl("  message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)")
+          cog.outl("    : imessage_router(id_, successor_)")
+          cog.outl("  {")
+          cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //**********************************************")
+          cog.outl("  message_router()")
+          cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER)")
+          cog.outl("  {")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //**********************************************")
+          cog.outl("  message_router(etl::imessage_router& successor_)")
+          cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)")
+          cog.outl("  {")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //**********************************************")
+          cog.outl("  using etl::imessage_router::receive;")
+          cog.outl("")
+          cog.outl("  void receive(const etl::imessage& msg) ETL_OVERRIDE")
+          cog.outl("  {")
+          cog.outl("    const etl::message_id_t id = msg.get_message_id();")
+          cog.outl("")
+          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+          cog.outl("    switch (id)")
+          cog.outl("    {")
+          for t in range(1, n + 1):
+              cog.out("      case T%d::ID:" % t)
+              cog.out(" static_cast<TDerived*>(this)->on_receive(static_cast<const T%d&>(msg));" % t)
+              cog.outl(" break;")
+          cog.outl("      default:")
+          cog.outl("      {")
+          cog.outl("         if (has_successor())")
+          cog.outl("         {")
+          cog.outl("           get_successor().receive(msg);")
+          cog.outl("         }")
+          cog.outl("         else")
+          cog.outl("         {")
+          cog.outl("           static_cast<TDerived*>(this)->on_receive_unknown(msg);")
+          cog.outl("         }")
+          cog.outl("         break;")
+          cog.outl("      }")
+          cog.outl("    }")
+          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  template <typename TMessage>")
+          cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, ")
+          for t in range(1, n):
+              cog.out("T%s, " % t)
+          cog.outl("T%s>::value, void>::type" % n)
+          cog.outl("    receive(const TMessage& msg)")
+          cog.outl("  {")
+          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+          cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
+          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  template <typename TMessage>")
+          cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, ")
+          for t in range(1, n):
+              cog.out("T%s, " % t)
+          cog.outl("T%s>::value, void>::type" % n)
+          cog.outl("    receive(const TMessage& msg)")
+          cog.outl("  {")
+          cog.outl("    if (has_successor())")
+          cog.outl("    {")
+          cog.outl("      get_successor().receive(msg);")
+          cog.outl("    }")
+          cog.outl("    else")
+          cog.outl("    {")
+          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
+          cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
+          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
+          cog.outl("    }")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("")
+          cog.outl("  //**********************************************")
+          cog.outl("  using imessage_router::accepts;")
+          cog.outl("")
+          cog.outl("  bool accepts(etl::message_id_t id) const ETL_OVERRIDE")
+          cog.outl("  {")
+          cog.outl("    switch (id)")
+          cog.outl("    {")
+          cog.out("     ")
+          for t in range(1, n + 1):
+              cog.out(" case T%d::ID:" % t)
+              if t % 8 == 0:
+                  cog.outl("")
+                  if t != n:
+                      cog.out("     ")
+          cog.outl("")
+          cog.outl("        return true;")
+          cog.outl("      default:")
+          cog.outl("      {")
+          cog.outl("        if (has_successor())")
+          cog.outl("        {")
+          cog.outl("          return get_successor().accepts(id);")
+          cog.outl("        }")
+          cog.outl("        else")
+          cog.outl("        {")
+          cog.outl("          return false;")
+          cog.outl("        }")
+          cog.outl("      }")
+          cog.outl("    }")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //********************************************")
+          cog.outl("  ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE")
+          cog.outl("  {")
+          cog.outl("    return false;")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //********************************************")
+          cog.outl("  bool is_producer() const ETL_OVERRIDE")
+          cog.outl("  {")
+          cog.outl("    return true;")
+          cog.outl("  }")
+          cog.outl("")
+          cog.outl("  //********************************************")
+          cog.outl("  bool is_consumer() const ETL_OVERRIDE")
+          cog.outl("  {")
+          cog.outl("    return true;")
+          cog.outl("  }")
+          cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
+  //***************************************************************************
+  // Specialisation for 0 message types.
+  //***************************************************************************
+  template <typename TDerived>
+  class message_router<TDerived, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+    : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<> message_packet;
+
+#if ETL_USING_CPP11
+    using message_types = etl::type_list<>;
+#endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+#include "etl/private/diagnostic_array_bounds_push.h"
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+#include "etl/private/diagnostic_pop.h"
+    }
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      if (has_successor())
+      {
+        return get_successor().accepts(id);
+      }
+      else
+      {
+        return false;
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
diff --git a/include/etl/generators/message_router_generator.h b/include/etl/generators/message_router_generator.h
deleted file mode 100644
index 312848b6..00000000
--- a/include/etl/generators/message_router_generator.h
+++ /dev/null
@@ -1,1356 +0,0 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2017 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -omessage_router.h -DHandlers=<n> message_router_generator.h
-// Where <n> is the maximum number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 messages...
-// cog -d -e -omessage_router.h -DHandlers=16 message_router_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
-#ifndef ETL_MESSAGE_ROUTER_INCLUDED
-#define ETL_MESSAGE_ROUTER_INCLUDED
-
-#include "platform.h"
-#include "message.h"
-#include "shared_message.h"
-#include "message_packet.h"
-#include "message_types.h"
-#include "alignment.h"
-#include "error_handler.h"
-#include "exception.h"
-#include "largest.h"
-#include "nullptr.h"
-#include "placement_new.h"
-#include "successor.h"
-#include "type_traits.h"
-#include "type_list.h"
-#include "array.h"
-
-#include <stdint.h>
-
-namespace etl
-{
-  //***************************************************************************
-  /// Base exception class for message router
-  //***************************************************************************
-  class message_router_exception : public etl::exception
-  {
-  public:
-
-    message_router_exception(string_type reason_, string_type file_name_, numeric_type line_number_)
-      : etl::exception(reason_, file_name_, line_number_)
-    {
-    }
-  };
-
-  //***************************************************************************
-  /// Router id is out of the legal range.
-  //***************************************************************************
-  class message_router_illegal_id : public etl::message_router_exception
-  {
-  public:
-
-    message_router_illegal_id(string_type file_name_, numeric_type line_number_)
-      : message_router_exception(ETL_ERROR_TEXT("message router:illegal id", ETL_MESSAGE_ROUTER_FILE_ID"A"), file_name_, line_number_)
-    {
-    }
-  };
-
-  namespace private_message_router
-  {
-    //***************************************************************************
-    // Traits for a message router.
-    // message packet type
-    // message type_list
-    // sorted message type_list.
-    //***************************************************************************
-    template <typename... TMessageTypes>
-    class traits
-    {
-#if ETL_USING_CPP11
-    private:
-
-      using message_id_sequence = etl::index_sequence<TMessageTypes::ID...>;
-
-    public:
-
-      using message_packet       = etl::message_packet<TMessageTypes...>;
-      using message_types        = etl::type_list<TMessageTypes...>;
-      using sorted_message_types = etl::type_list_sort_t<message_types, etl::compare_message_id_less>;
-
-      static_assert(etl::type_list_is_unique<message_types>::value,                    "All TMessageTypes must be unique");
-      static_assert(etl::type_list_all_of<message_types, etl::is_message_type>::value, "All TMessageTypes must satisfy the condition etl::is_message_type");
-      static_assert(etl::index_sequence_is_unique<message_id_sequence>::value,         "All message IDs must be unique");
-#endif
-    };
-
-    //***************************************************************************
-    // Specialisation of traits for no message types.
-    // message packet type
-    // message type_list
-    // sorted message type_list.
-    //***************************************************************************
-    template <>
-    class traits<>
-    {
-    public:
-
-#if ETL_USING_CPP11
-      using message_packet = etl::message_packet<>;
-      using message_types = etl::type_list<>;
-      using sorted_message_types = etl::type_list<>;
-#endif
-    };
-  }
-
-  //***************************************************************************
-  /// Forward declare null message router functionality.
-  //***************************************************************************
-  class imessage_router;
-
-  etl::imessage_router& get_null_message_router();
-
-  //***************************************************************************
-  /// This is the base of all message routers.
-  //***************************************************************************
-  class imessage_router : public etl::successor<imessage_router>
-  {
-  public:
-
-    virtual ~imessage_router() {}
-    virtual void receive(const etl::imessage&) = 0;
-    virtual bool accepts(etl::message_id_t) const = 0;
-    virtual bool is_null_router() const = 0;
-    virtual bool is_producer() const = 0;
-    virtual bool is_consumer() const = 0;
-
-    //********************************************
-    virtual void receive(etl::message_router_id_t destination_router_id, const etl::imessage& message)
-    {
-      if ((destination_router_id == get_message_router_id()) || (destination_router_id == imessage_router::ALL_MESSAGE_ROUTERS))
-      {
-        receive(message);
-      }
-    }
-
-    //********************************************
-    virtual void receive(etl::shared_message shared_msg)
-    {
-      receive(shared_msg.get_message());
-    }
-
-    //********************************************
-    virtual void receive(etl::message_router_id_t destination_router_id, etl::shared_message shared_msg)
-    {
-      if ((destination_router_id == get_message_router_id()) || (destination_router_id == imessage_router::ALL_MESSAGE_ROUTERS))
-      {
-        receive(shared_msg);
-      }
-    }
-
-    //********************************************
-    bool accepts(const etl::imessage& msg) const
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //********************************************
-    etl::message_router_id_t get_message_router_id() const
-    {
-      return message_router_id;
-    }
-
-    enum
-    {
-      NULL_MESSAGE_ROUTER = 255,
-      MESSAGE_BUS         = 254,
-      ALL_MESSAGE_ROUTERS = 253,
-      MESSAGE_BROKER      = 252,
-      MESSAGE_ROUTER      = 251,
-      MAX_MESSAGE_ROUTER  = 249
-    };
-
-  protected:
-
-    imessage_router(etl::message_router_id_t id_)
-      : message_router_id(id_)
-    {
-    }
-
-    imessage_router(etl::message_router_id_t id_, imessage_router& successor_)
-      : successor(successor_)
-      , message_router_id(id_)
-    {
-    }
-
-  private:
-
-    // Disabled.
-    imessage_router(const imessage_router&);
-    imessage_router& operator =(const imessage_router&);
-
-    etl::message_router_id_t  message_router_id;
-  };
-
-  //***************************************************************************
-  /// This router can be used as a sink for messages or a 'null source' router.
-  //***************************************************************************
-  class null_message_router : public imessage_router
-                            , public private_message_router::traits<>
-  {
-  public:
-
-    //********************************************
-    null_message_router()
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER)
-    {
-    }
-
-    //********************************************
-    null_message_router(etl::imessage_router& successor_)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-    }
-
-    //********************************************
-    using etl::imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        return get_successor().accepts(id);
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    static null_message_router& instance()
-    {
-      static null_message_router nmr;
-      return nmr;
-    }
-  };
-
-  //***********************************************
-  /// null message router functionality.
-  inline etl::imessage_router& get_null_message_router()
-  {
-    return etl::null_message_router::instance();
-  }
-
-  //***************************************************************************
-  /// This router can be used as a producer-only of messages, such an interrupt routine.
-  //***************************************************************************
-  class message_producer : public imessage_router
-                         , public private_message_router::traits<>
-  {
-  public:
-
-    //********************************************
-    message_producer()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //********************************************
-    message_producer(etl::imessage_router& successor_)
-      : imessage_router(imessage_router::NULL_MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //********************************************
-    message_producer(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //********************************************
-    message_producer(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-    }
-
-    //********************************************
-    using etl::imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        return get_successor().accepts(id);
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return false;
-    }
-  };
-
-  //***************************************************************************
-  /// Is T ultimately derived from etl::imessage_router?
-  //***************************************************************************
-  template <typename T>
-  struct is_message_router : public etl::bool_constant<etl::is_base_of<etl::imessage_router, typename etl::remove_cvref<T>::type>::value>
-  {
-  };
-
-  //***************************************************************************
-  /// Send a message to a router.
-  //***************************************************************************
-  template <typename TRouter, typename TMessage>
-  static
-  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
-    send_message(TRouter&        destination,
-                 const TMessage& message)
-  {
-    destination.receive(message);
-  }
-
-  //***************************************************************************
-  /// Send a shared message to a router.
-  //***************************************************************************
-  template <typename TRouter>
-  static
-  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
-    send_message(TRouter&            destination,
-                 etl::shared_message message)
-  {
-    destination.receive(message);
-  }
-
-  //***************************************************************************
-  /// Send a message to a router with a particular id.
-  //***************************************************************************
-  template <typename TRouter, typename TMessage>
-  static
-  typename etl::enable_if<etl::is_message_router<TRouter>::value && etl::is_message<TMessage>::value, void>::type
-    send_message(TRouter&                 destination,
-                 etl::message_router_id_t id,
-                 const TMessage&          message)
-  {
-    destination.receive(id, message);
-  }
-
-  //***************************************************************************
-  /// Send a shared message to a router with a particular id.
-  //***************************************************************************
-  template <typename TRouter>
-  static
-  typename etl::enable_if<etl::is_message_router<TRouter>::value, void>::type
-    send_message(TRouter&                 destination,
-                 etl::message_router_id_t id,
-                 etl::shared_message      message)
-  {
-    destination.receive(id, message);
-  }
-
-  //*************************************************************************************************
-  // For C++11 and above.
-  //*************************************************************************************************
-#if ETL_USING_CPP11 && !defined(ETL_MESSAGE_ROUTER_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  // The definition for all message types.
-  //***************************************************************************
-  template <typename TDerived, typename... TMessageTypes>
-  class message_router : public imessage_router
-                       , public private_message_router::traits<TMessageTypes...>
-  {
-  public:
-
-    using typename private_message_router::traits<TMessageTypes...>::message_packet;
-    using typename private_message_router::traits<TMessageTypes...>::message_types;
-    using typename private_message_router::traits<TMessageTypes...>::sorted_message_types;
-
-    //**********************************************
-    /// Default constructor. The message router id will be MESSAGE_ROUTER.
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    /// Constructor with successor. The message router id will be MESSAGE_ROUTER.
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    /// Constructor with message router id.
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    /// Constructor with message router id and successor.
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    /// Allow visibility of base class receive() methods.
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    //**********************************************
-    /// This will be called for all messages passed as an etl::imessage.
-    /// It will dispatch the message to the correct handler based on the message id,
-    /// or pass it to a successor if there is no handler for the message id.
-    /// \param msg The message.
-    //***********************************************
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const etl::message_id_t id = msg.get_message_id();
-
-      // The IDs are sorted, so an ID less than the first is not handled by this router.
-      if (id >= Message_Id_Start)
-      {
-        const size_t index = get_dispatch_index_from_message_id(id);
-
-        // If the index is less than Number_Of_Messages, then we have a handler for this message type, so dispatch it.
-        if (index < Number_Of_Messages)
-        {
-          dispatch(msg, index);
-          return;
-        }
-      }
-
-      // We don't have a handler for this message type, so pass it to a successor if there is one, or call on_receive_unknown() if there isn't.
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-#include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-    //**********************************************
-    /// This will be called for messages where TMessage is in the message type list.
-    /// \tparam TMessage The message type.
-    /// \param msg The message.
-    /// Enabled if TMessage is in the message type list.
-    //**********************************************
-    template <typename TMessage, typename etl::enable_if<etl::is_one_of<TMessage, TMessageTypes...>::value, int>::type = 0>
-    void receive(const TMessage& msg)
-    {
-#include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-#include "etl/private/diagnostic_pop.h"
-    }
-
-    //**********************************************
-    /// This will be called for messages where TMessage is a message type, but not in the message type list.
-    /// \tparam TMessage The message type.
-    /// \param msg The message.
-    /// Enabled if TMessage is a message type, but not in the message type list.
-    //**********************************************
-    template <typename TMessage, typename etl::enable_if<etl::is_message<TMessage>::value &&
-                                                         !etl::is_one_of<TMessage, TMessageTypes...>::value, int>::type = 0>
-    void receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-#include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-#include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-    //**********************************************
-    /// Allow visibility of base class accepts() methods.
-    //**********************************************
-    using imessage_router::accepts;
-
-    //**********************************************
-    /// This will return true if the message id is in the message type list, or if a successor accepts the message id.
-    //***********************************************
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (id >= Message_Id_Start)
-      {
-        const size_t index = get_dispatch_index_from_message_id(id);
-
-        if (index < Number_Of_Messages)
-        {
-          return true;
-        }
-      }
-
-      return has_successor() ? get_successor().accepts(id) : false;
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-  private:
-
-    static constexpr size_t            Number_Of_Messages = sizeof...(TMessageTypes);
-    static constexpr etl::message_id_t Message_Id_Start   = etl::type_list_type_at_index_t<sorted_message_types, 0>::ID;
-
-    //**********************************************
-    // Checks that the message ids are contiguous.
-    //**********************************************
-    template <size_t Index, bool Last = (Index + 1U >= Number_Of_Messages)>
-    struct contiguous_impl;
-
-    template <size_t Index>
-    struct contiguous_impl<Index, true> : etl::true_type
-    {
-    };
-
-    template <size_t Index>
-    struct contiguous_impl<Index, false>
-      : etl::bool_constant<(etl::type_list_type_at_index_t<sorted_message_types, Index>::ID + 1U ==
-                            etl::type_list_type_at_index_t<sorted_message_types, Index + 1U>::ID) &&
-                            contiguous_impl<Index + 1U>::value>
-    {
-    };
-
-    // The message ids are contiguous if there are 0 or 1 message types, or if each message id is one greater than the previous message id.
-    static constexpr bool Message_Ids_Are_Contiguous = (Number_Of_Messages <= 1U) ? true : contiguous_impl<0U>::value;
-
-    using handler_ptr              = void (*)(TDerived&, const etl::imessage&);         ///< Pointer to a handler function that takes a reference to the derived class and a reference to the message.
-    using message_dispatch_table_t = etl::array<handler_ptr, Number_Of_Messages>;       ///< The dispatch table type. An array of handler pointers, one for each message type.
-    using message_id_table_t       = etl::array<etl::message_id_t, Number_Of_Messages>; ///< The message id table type. An array of message ids, one for each message type.
-
-    //**********************************************
-    // Call for a single message type
-    //**********************************************
-    template <typename TMessage>
-    static void call_on_receive(TDerived& derived, const imessage& msg)
-    {
-      derived.on_receive(static_cast<const TMessage&>(msg));
-    }
-
-    //**********************************************
-    // Get the handler for a single message type at the index in the sorted type_list.
-    // This will be called for each message type to generate the dispatch table.
-    //**********************************************
-    template <size_t Index>
-    static constexpr handler_ptr get_message_handler()
-    {
-      return &call_on_receive<etl::type_list_type_at_index_t<sorted_message_types, Index>>;
-    }
-
-    //**********************************************
-    // Generate the dispatch table at compile time.
-    // This will create an array of handler pointers, one for each message type.
-    //**********************************************
-    template <size_t... Indices>
-    static constexpr message_dispatch_table_t make_message_dispatch_table(etl::index_sequence<Indices...>)
-    {
-      return message_dispatch_table_t{ { get_message_handler<Indices>()... } };
-    }
-
-    //**********************************************
-    // Get the message id for a single message type at an index in the sorted type_list.
-    // This will be called for each message type to generate the message id table.
-    //**********************************************
-    template <size_t Index>
-    static constexpr etl::message_id_t get_message_id_from_index()
-    {
-      return etl::type_list_type_at_index_t<sorted_message_types, Index>::ID;
-    }
-
-    //**********************************************
-    // Generate the message id table at compile time.
-    // This will create an array of message ids, one for each message type.
-    //**********************************************
-    template <size_t... Indices>
-    static constexpr message_id_table_t make_message_id_table(etl::index_sequence<Indices...>)
-    {
-      return message_id_table_t{ { get_message_id_from_index<Indices>()... } };
-    }
-
-    //**********************************************
-    // Get the dispatch index for a message id.
-    // This will be used at runtime to find the handler for a message id.
-    // If the message ids are contiguous, we can calculate the index directly. If they are not contiguous, we need to do a binary search.
-    // This will return Number_Of_Messages if the message id is not found, which indicates that the message should be passed to the successor.
-    //**********************************************
-    static size_t get_dispatch_index_from_message_id(etl::message_id_t id)
-    {
-      if ETL_IF_CONSTEXPR(Message_Ids_Are_Contiguous)
-      {
-        // The IDs are contiguous, so we can calculate the index directly.
-        return static_cast<size_t>(id - Message_Id_Start);
-      }
-      else
-      {
-        // The IDs are not contiguous, so we need to do a binary search.
-        size_t left  = 0;
-        size_t right = Number_Of_Messages;
-
-        while (left < right)
-        {
-          size_t mid = (left + right) / 2;
-
-          if (message_id_table[mid] == id)
-          {
-            return mid;
-          }
-          else if (message_id_table[mid] < id)
-          {
-            left = mid + 1;
-          }
-          else
-          {
-            right = mid;
-          }
-        }
-      }
-
-      return Number_Of_Messages; // Not found
-    }
-
-    //**********************************************
-    // Dispatch the message to the appropriate handler based on the index in the dispatch table.
-    //**********************************************
-    void dispatch(const etl::imessage& msg, size_t index)
-    {
-      message_dispatch_table[index](static_cast<TDerived&>(*this), msg);
-    }
-
-    //**********************************************
-    // The dispatch table is generated at compile time. The dispatch table contains pointers to the on_receive handlers for each message type.
-    //**********************************************
-    static ETL_INLINE_VAR constexpr message_dispatch_table_t message_dispatch_table =
-      etl::message_router<TDerived, TMessageTypes...>::make_message_dispatch_table(etl::make_index_sequence<etl::message_router<TDerived, TMessageTypes...>::Number_Of_Messages>{});
-
-    //**********************************************
-    // The message id table is generated at compile time. The message id table contains the corresponding message ids for each message type.
-    //**********************************************
-    static ETL_INLINE_VAR constexpr message_id_table_t message_id_table =
-      etl::message_router<TDerived, TMessageTypes...>::make_message_id_table(etl::make_index_sequence<etl::message_router<TDerived, TMessageTypes...>::Number_Of_Messages>{});
-  };
-
-#if ETL_USING_CPP11 && !ETL_USING_CPP17
-  template <typename TDerived, typename... TMessageTypes>
-  constexpr const typename etl::message_router<TDerived, TMessageTypes...>::message_dispatch_table_t
-    etl::message_router<TDerived, TMessageTypes...>::message_dispatch_table;
-
-  template <typename TDerived, typename... TMessageTypes>
-  constexpr const typename etl::message_router<TDerived, TMessageTypes...>::message_id_table_t
-    etl::message_router<TDerived, TMessageTypes...>::message_id_table;
-#endif
-
-  //***************************************************************************
-  // The definition of a message_router for zero message types.
-  //***************************************************************************
-  template <typename TDerived>
-  class message_router<TDerived> : public imessage_router
-                                 , public private_message_router::traits<>
-  {
-  public:
-
-    //**********************************************
-    /// Default constructor. The message router id will be MESSAGE_ROUTER.
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    /// Constructor with successor. The message router id will be MESSAGE_ROUTER.
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    /// Constructor with message router id.
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    /// Constructor with message router id and successor.
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    /// Allow visibility of base class receive() methods.
-    using etl::imessage_router::receive;
-
-    //**********************************************
-    /// This will be called for all messages passed as an etl::imessage.
-    /// Since there are no message types, this will just pass the message to a successor if there is one, or call on_receive_unknown() if there isn't.
-    /// \param msg The message.
-    //***********************************************
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-#include "etl/private/diagnostic_array_bounds_push.h"
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-#include "etl/private/diagnostic_pop.h"
-    }
-
-    //**********************************************
-    /// Allow visibility of base class accepts() methods.
-    //**********************************************
-    using imessage_router::accepts;
-
-    //**********************************************
-    /// This will return true if a successor accepts the message id.
-    //***********************************************
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        return get_successor().accepts(id);
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  /// Helper to turn etl::type_list<TTypes...> into etl::message_router<TTypes...>
-  //***************************************************************************
-  template <typename TDerived, typename TList>
-  struct message_router_from_type_list;
-
-  template <typename TDerived, typename... TMessageTypes>
-  struct message_router_from_type_list<TDerived, etl::type_list<TMessageTypes...>>
-  {
-    using type = etl::message_router<TDerived, TMessageTypes...>;
-  };
-
-  template <typename TDerived, typename TTypeList>
-  using message_router_from_type_list_t = typename message_router_from_type_list<TDerived, TTypeList>::type;
-
-#else
-  //*************************************************************************************************
-  // For C++03/98.
-  //*************************************************************************************************
-  /*[[[cog
-      import cog
-      ################################################
-      # The first definition for all of the messages.
-      ################################################
-      cog.outl("//***************************************************************************")
-      cog.outl("// The definition for all %s message types." % Handlers)
-      cog.outl("//***************************************************************************")
-      cog.outl("template <typename TDerived,")
-      cog.out("          ")
-      for n in range(1, int(Handlers)):
-          cog.out("typename T%s = void," % n)
-          if n % 4 == 0:
-              cog.outl("")
-              cog.out("          ")
-          else:
-              cog.out(" ")
-      cog.outl("typename T%s = void>" % int(Handlers))
-      cog.out("class message_router")
-      cog.outl("  : public imessage_router")
-      cog.outl("{")
-      cog.outl("public:")
-      cog.outl("")
-      cog.out("  typedef etl::message_packet<")
-      for n in range(1, int(Handlers)):
-          cog.out("T%s, " % n)
-      cog.outl("T%s> message_packet;" % int(Handlers))
-      cog.outl("")
-
-      cog.outl("#if ETL_USING_CPP11")
-      cog.out("  using message_types = etl::type_list<")
-      for n in range(1, int(Handlers)):
-          cog.out("T%s, " % n)
-      cog.outl("T%s>;" % int(Handlers))
-      cog.outl("#endif")
-      cog.outl("")
-
-      cog.outl("  //**********************************************")
-      cog.outl("  message_router(etl::message_router_id_t id_)")
-      cog.outl("    : imessage_router(id_)")
-      cog.outl("  {")
-      cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //**********************************************")
-      cog.outl("  message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)")
-      cog.outl("    : imessage_router(id_, successor_)")
-      cog.outl("  {")
-      cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //**********************************************")
-      cog.outl("  message_router()")
-      cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER)")
-      cog.outl("  {")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //**********************************************")
-      cog.outl("  message_router(etl::imessage_router& successor_)")
-      cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)")
-      cog.outl("  {")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //**********************************************")
-      cog.outl("  using etl::imessage_router::receive;")
-      cog.outl("")
-      cog.outl("  void receive(const etl::imessage& msg) ETL_OVERRIDE")
-      cog.outl("  {")
-      cog.outl("    const etl::message_id_t id = msg.get_message_id();")
-      cog.outl("")
-      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-      cog.outl("    switch (id)")
-      cog.outl("    {")
-      for n in range(1, int(Handlers) + 1):
-          cog.out("      case T%d::ID:" % n)
-          cog.out(" static_cast<TDerived*>(this)->on_receive(static_cast<const T%d&>(msg));" % n)
-          cog.outl(" break;")
-      cog.outl("      default:")
-      cog.outl("      {")
-      cog.outl("         if (has_successor())")
-      cog.outl("         {")
-      cog.outl("           get_successor().receive(msg);")
-      cog.outl("         }")
-      cog.outl("         else")
-      cog.outl("         {")
-      cog.outl("           static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-      cog.outl("         }")
-      cog.outl("         break;")
-      cog.outl("      }")
-      cog.outl("    }")
-      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  template <typename TMessage>")
-      cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, ")
-      for n in range(1, int(Handlers)):
-          cog.out("T%s, " % n)
-      cog.outl("T%s>::value, void>::type" % int(Handlers))
-      cog.outl("    receive(const TMessage& msg)")
-      cog.outl("  {")
-      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-      cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
-      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  template <typename TMessage>")
-      cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, ")
-      for n in range(1, int(Handlers)):
-          cog.out("T%s, " % n)
-      cog.outl("T%s>::value, void>::type" % int(Handlers))
-      cog.outl("    receive(const TMessage& msg)")
-      cog.outl("  {")
-      cog.outl("    if (has_successor())")
-      cog.outl("    {")
-      cog.outl("      get_successor().receive(msg);")
-      cog.outl("    }")
-      cog.outl("    else")
-      cog.outl("    {")
-      cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-      cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-      cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-      cog.outl("    }")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //**********************************************")
-      cog.outl("  using imessage_router::accepts;")
-      cog.outl("")
-      cog.outl("  bool accepts(etl::message_id_t id) const ETL_OVERRIDE")
-      cog.outl("  {")
-      cog.outl("    switch (id)")
-      cog.outl("    {")
-      cog.out("     ")
-      for n in range(1, int(Handlers) + 1):
-          cog.out(" case T%d::ID:" % n)
-          if n % 8 == 0:
-              cog.outl("")
-              cog.out("     ")
-      cog.outl("   return true;")
-      cog.outl("      default:")
-      cog.outl("      {")
-      cog.outl("        if (has_successor())")
-      cog.outl("        {")
-      cog.outl("          return get_successor().accepts(id);")
-      cog.outl("        }")
-      cog.outl("        else")
-      cog.outl("        {")
-      cog.outl("          return false;")
-      cog.outl("        }")
-      cog.outl("      }")
-      cog.outl("    }")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //********************************************")
-      cog.outl("  ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE")
-      cog.outl("  {")
-      cog.outl("    return false;")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //********************************************")
-      cog.outl("  bool is_producer() const ETL_OVERRIDE")
-      cog.outl("  {")
-      cog.outl("    return true;")
-      cog.outl("  }")
-      cog.outl("")
-      cog.outl("  //********************************************")
-      cog.outl("  bool is_consumer() const ETL_OVERRIDE")
-      cog.outl("  {")
-      cog.outl("    return true;")
-      cog.outl("  }")
-      cog.outl("};")
-
-      ####################################
-      # All of the other specialisations.
-      ####################################
-      for n in range(int(Handlers) - 1, 0, -1):
-          cog.outl("")
-          cog.outl("//***************************************************************************")
-          if n == 1:
-              cog.outl("// Specialisation for %d message type." % n)
-          else:
-              cog.outl("// Specialisation for %d message types." % n)
-          cog.outl("//***************************************************************************")
-          cog.outl("template <typename TDerived,")
-          cog.out("          ")
-          for t in range(1, n):
-              cog.out("typename T%d," % t)
-              if t % 4 == 0:
-                  cog.outl("")
-                  cog.out("          ")
-              else:
-                  cog.out(" ")
-          cog.outl("typename T%d>" % n)
-          cog.out("class message_router<TDerived, ")
-          for t in range(1, n + 1):
-              cog.out("T%d, " % t)
-              if t % 16 == 0:
-                  cog.outl("")
-                  cog.out("               ")
-          for t in range(n + 1, int(Handlers)):
-              cog.out("void, ")
-              if t % 16 == 0:
-                  cog.outl("")
-                  cog.out("               ")
-          cog.outl("void>")
-          cog.outl(" : public imessage_router")
-          cog.outl("{")
-          cog.outl("public:")
-          cog.outl("")
-          cog.out("  typedef etl::message_packet<")
-          for t in range(1, n):
-              cog.out("T%s, " % t)
-          cog.outl(" T%s> message_packet;" % n)
-          cog.outl("")
-
-          cog.outl("#if ETL_USING_CPP11")
-          cog.out("  using message_types = etl::type_list<")
-          for t in range(1, n):
-              cog.out("T%s, " % t)
-          cog.outl("T%s>;" % n)
-          cog.outl("#endif")
-          cog.outl("")
-
-          cog.outl("  //**********************************************")
-          cog.outl("  message_router(etl::message_router_id_t id_)")
-          cog.outl("    : imessage_router(id_)")
-          cog.outl("  {")
-          cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //**********************************************")
-          cog.outl("  message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)")
-          cog.outl("    : imessage_router(id_, successor_)")
-          cog.outl("  {")
-          cog.outl("    ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //**********************************************")
-          cog.outl("  message_router()")
-          cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER)")
-          cog.outl("  {")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //**********************************************")
-          cog.outl("  message_router(etl::imessage_router& successor_)")
-          cog.outl("    : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)")
-          cog.outl("  {")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //**********************************************")
-          cog.outl("  using etl::imessage_router::receive;")
-          cog.outl("")
-          cog.outl("  void receive(const etl::imessage& msg) ETL_OVERRIDE")
-          cog.outl("  {")
-          cog.outl("    const size_t id = msg.get_message_id();")
-          cog.outl("")
-          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-          cog.outl("    switch (id)")
-          cog.outl("    {")
-          for t in range(1, n + 1):
-              cog.out("      case T%d::ID:" % t)
-              cog.out(" static_cast<TDerived*>(this)->on_receive(static_cast<const T%d&>(msg));" % t)
-              cog.outl(" break;")
-          cog.outl("      default:")
-          cog.outl("      {")
-          cog.outl("         if (has_successor())")
-          cog.outl("         {")
-          cog.outl("           get_successor().receive(msg);")
-          cog.outl("         }")
-          cog.outl("         else")
-          cog.outl("         {")
-          cog.outl("           static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-          cog.outl("         }")
-          cog.outl("         break;")
-          cog.outl("      }")
-          cog.outl("    }")
-          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  template <typename TMessage>")
-          cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, ")
-          for t in range(1, n):
-              cog.out("T%s, " % t)
-          cog.outl("T%s>::value, void>::type" % n)
-          cog.outl("    receive(const TMessage& msg)")
-          cog.outl("  {")
-          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-          cog.outl("    static_cast<TDerived*>(this)->on_receive(msg);")
-          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  template <typename TMessage>")
-          cog.out("  typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, ")
-          for t in range(1, n):
-              cog.out("T%s, " % t)
-          cog.outl("T%s>::value, void>::type" % n)
-          cog.outl("    receive(const TMessage& msg)")
-          cog.outl("  {")
-          cog.outl("    if (has_successor())")
-          cog.outl("    {")
-          cog.outl("      get_successor().receive(msg);")
-          cog.outl("    }")
-          cog.outl("    else")
-          cog.outl("    {")
-          cog.outl("#include \"etl/private/diagnostic_array_bounds_push.h\"")
-          cog.outl("      static_cast<TDerived*>(this)->on_receive_unknown(msg);")
-          cog.outl("#include \"etl/private/diagnostic_pop.h\"")
-          cog.outl("    }")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("")
-          cog.outl("  //**********************************************")
-          cog.outl("  using imessage_router::accepts;")
-          cog.outl("")
-          cog.outl("  bool accepts(etl::message_id_t id) const ETL_OVERRIDE")
-          cog.outl("  {")
-          cog.outl("    switch (id)")
-          cog.outl("    {")
-          cog.out("     ")
-          for t in range(1, n + 1):
-              cog.out(" case T%d::ID:" % t)
-              if t % 8 == 0:
-                  cog.outl("")
-                  if t != n:
-                      cog.out("     ")
-          cog.outl("")
-          cog.outl("        return true;")
-          cog.outl("      default:")
-          cog.outl("      {")
-          cog.outl("        if (has_successor())")
-          cog.outl("        {")
-          cog.outl("          return get_successor().accepts(id);")
-          cog.outl("        }")
-          cog.outl("        else")
-          cog.outl("        {")
-          cog.outl("          return false;")
-          cog.outl("        }")
-          cog.outl("      }")
-          cog.outl("    }")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //********************************************")
-          cog.outl("  ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE")
-          cog.outl("  {")
-          cog.outl("    return false;")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //********************************************")
-          cog.outl("  bool is_producer() const ETL_OVERRIDE")
-          cog.outl("  {")
-          cog.outl("    return true;")
-          cog.outl("  }")
-          cog.outl("")
-          cog.outl("  //********************************************")
-          cog.outl("  bool is_consumer() const ETL_OVERRIDE")
-          cog.outl("  {")
-          cog.outl("    return true;")
-          cog.outl("  }")
-          cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-
-  //***************************************************************************
-  // Specialisation for 0 message types.
-  //***************************************************************************
-  template <typename TDerived>
-  class message_router<TDerived, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<> message_packet;
-
-#if ETL_USING_CPP11
-    using message_types = etl::type_list<>;
-#endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-#include "etl/private/diagnostic_array_bounds_push.h"
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-#include "etl/private/diagnostic_pop.h"
-    }
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        return get_successor().accepts(id);
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-#endif
-}
-
-#endif
diff --git a/include/etl/generators/smallest_cpp03_generator.h b/include/etl/generators/smallest_cpp03_generator.h
new file mode 100644
index 00000000..5f957f72
--- /dev/null
+++ b/include/etl/generators/smallest_cpp03_generator.h
@@ -0,0 +1,91 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("/// Template to determine the smallest type and size.")
+  cog.outl("/// Supports up to %s types." % NTypes)
+  cog.outl("/// Defines 'value_type' which is the type of the smallest parameter.")
+  cog.outl("/// Defines 'size' which is the size of the smallest parameter.")
+  cog.outl("///\\ingroup smallest")
+  cog.outl("//***************************************************************************")
+  cog.out("template <typename T1, ")
+  for n in range(2, int(NTypes)):
+      cog.out("typename T%s = void, " % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("          ")
+  cog.outl("typename T%s = void>" % int(NTypes))
+  cog.outl("struct smallest_type")
+  cog.outl("{")
+  cog.outl("private:")
+  cog.outl("")
+  cog.outl("  // Declaration.")
+  cog.outl("  template <bool Boolean, typename TrueType, typename FalseType>")
+  cog.outl("  struct choose_type;")
+  cog.outl("")
+  cog.outl("  // Specialisation for 'true'.")
+  cog.outl("  // Defines 'type' as 'TrueType'.")
+  cog.outl("  template <typename TrueType, typename FalseType>")
+  cog.outl("  struct choose_type<true, TrueType, FalseType>")
+  cog.outl("  {")
+  cog.outl("    typedef TrueType type;")
+  cog.outl("  };")
+  cog.outl("")
+  cog.outl("  // Specialisation for 'false'. ")
+  cog.outl("  // Defines 'type' as 'FalseType'.")
+  cog.outl("  template <typename TrueType, typename FalseType>")
+  cog.outl("  struct choose_type<false, TrueType, FalseType>")
+  cog.outl("  {")
+  cog.outl("    typedef FalseType type;")
+  cog.outl("  };")
+  cog.outl("")
+  cog.outl("public:")
+  cog.outl("")
+  cog.outl("  // Define 'smallest_other' as 'smallest_type' with all but the first parameter. ")
+  cog.out("  typedef typename smallest_type<")
+  for n in range(2, int(NTypes)):
+      cog.out("T%s, " % n)
+      if n % 16 == 0:
+          cog.outl("")
+          cog.out("                                ")
+  cog.outl("T%s>::type smallest_other;" % int(NTypes))
+  cog.outl("")
+  cog.outl("  // Set 'type' to be the smallest of the first parameter and any of the others.")
+  cog.outl("  // This is recursive.")
+  cog.outl("  typedef typename choose_type<(sizeof(T1) < sizeof(smallest_other)), // Boolean")
+  cog.outl("                                T1,                                   // TrueType")
+  cog.outl("                                smallest_other>                       // FalseType")
+  cog.outl("                                ::type type;                          // The smallest type of the two.")
+  cog.outl("")
+  cog.outl("  // The size of the smallest type.")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    size = sizeof(type)")
+  cog.outl("  };")
+  cog.outl("};")
+  cog.outl("")
+  cog.outl("//***************************************************************************")
+  cog.outl("// Specialisation for one template parameter.")
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename T1>")
+  cog.out("struct smallest_type<T1,   ")
+  for n in range(2, int(NTypes)):
+      cog.out("void, ")
+      if n % 8 == 0:
+          cog.outl("")
+          cog.out("                     ")
+  cog.outl("void>")
+  cog.outl("{")
+  cog.outl("  typedef T1 type;")
+  cog.outl("")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    size = sizeof(type)")
+  cog.outl("  };")
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/smallest_generator.h b/include/etl/generators/smallest_generator.h
deleted file mode 100644
index 1690119c..00000000
--- a/include/etl/generators/smallest_generator.h
+++ /dev/null
@@ -1,432 +0,0 @@
-///\file
-
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2014 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -osmallest.h -DNTypes=<n> smallest_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -osmallest.h -DNTypes=16 smallest_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
-#ifndef ETL_SMALLEST_INCLUDED
-#define ETL_SMALLEST_INCLUDED
-
-#include "platform.h"
-#include "integral_limits.h"
-
-#include <stdint.h>
-
-///\defgroup smallest smallest
-///\ingroup utilities
-
-namespace etl
-{
-#if ETL_USING_CPP11 && !defined(ETL_SMALLEST_TYPE_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  /// Template to determine the largest type and size.
-  /// Defines 'value_type' which is the type of the largest parameter.
-  /// Defines 'size' which is the size of the largest parameter.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename... TRest>
-  class smallest_type
-  {
-  private:
-
-    // Define 'smallest_other' as 'smallest_type' with all but the first parameter.
-    using smallest_other = typename smallest_type<TRest...>::type;
-
-  public:
-
-    // Set 'type' to be the smallest of the first parameter and any of the others.
-    // This is recursive.
-    using type = typename etl::conditional<(etl::size_of<T1>::value < etl::size_of<smallest_other>::value), // Boolean
-                                            T1,                                                             // TrueType
-                                            smallest_other>                                                 // FalseType
-                                            ::type;                                                         // The smallest type of the two.
-
-    // The size of the smallest type.
-    enum
-    {
-      size = etl::size_of<type>::value
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  class smallest_type<T1>
-  {
-  public:
-
-    using type = T1;
-
-    enum
-    {
-      size = etl::size_of<type>::value
-    };
-  };
-
-#if ETL_USING_CPP11
-  template <typename... T>
-  using smallest_type_t = typename smallest_type<T...>::type;
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  constexpr size_t smallest_type_v = smallest_type<T...>::size;
-#endif
-
-#else
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("/// Template to determine the smallest type and size.")
-  cog.outl("/// Supports up to %s types." % NTypes)
-  cog.outl("/// Defines 'value_type' which is the type of the smallest parameter.")
-  cog.outl("/// Defines 'size' which is the size of the smallest parameter.")
-  cog.outl("///\\ingroup smallest")
-  cog.outl("//***************************************************************************")
-  cog.out("template <typename T1, ")
-  for n in range(2, int(NTypes)):
-      cog.out("typename T%s = void, " % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("          ")
-  cog.outl("typename T%s = void>" % int(NTypes))
-  cog.outl("struct smallest_type")
-  cog.outl("{")
-  cog.outl("private:")
-  cog.outl("")
-  cog.outl("  // Declaration.")
-  cog.outl("  template <bool Boolean, typename TrueType, typename FalseType>")
-  cog.outl("  struct choose_type;")
-  cog.outl("")
-  cog.outl("  // Specialisation for 'true'.")
-  cog.outl("  // Defines 'type' as 'TrueType'.")
-  cog.outl("  template <typename TrueType, typename FalseType>")
-  cog.outl("  struct choose_type<true, TrueType, FalseType>")
-  cog.outl("  {")
-  cog.outl("    typedef TrueType type;")
-  cog.outl("  };")
-  cog.outl("")
-  cog.outl("  // Specialisation for 'false'. ")
-  cog.outl("  // Defines 'type' as 'FalseType'.")
-  cog.outl("  template <typename TrueType, typename FalseType>")
-  cog.outl("  struct choose_type<false, TrueType, FalseType>")
-  cog.outl("  {")
-  cog.outl("    typedef FalseType type;")
-  cog.outl("  };")
-  cog.outl("")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  // Define 'smallest_other' as 'smallest_type' with all but the first parameter. ")
-  cog.out("  typedef typename smallest_type<")
-  for n in range(2, int(NTypes)):
-      cog.out("T%s, " % n)
-      if n % 16 == 0:
-          cog.outl("")
-          cog.out("                                ")
-  cog.outl("T%s>::type smallest_other;" % int(NTypes))
-  cog.outl("")
-  cog.outl("  // Set 'type' to be the smallest of the first parameter and any of the others.")
-  cog.outl("  // This is recursive.")
-  cog.outl("  typedef typename choose_type<(sizeof(T1) < sizeof(smallest_other)), // Boolean")
-  cog.outl("                                T1,                                   // TrueType")
-  cog.outl("                                smallest_other>                       // FalseType")
-  cog.outl("                                ::type type;                          // The smallest type of the two.")
-  cog.outl("")
-  cog.outl("  // The size of the smallest type.")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    size = sizeof(type)")
-  cog.outl("  };")
-  cog.outl("};")
-  cog.outl("")
-  cog.outl("//***************************************************************************")
-  cog.outl("// Specialisation for one template parameter.")
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T1>")
-  cog.out("struct smallest_type<T1,   ")
-  for n in range(2, int(NTypes)):
-      cog.out("void, ")
-      if n % 8 == 0:
-          cog.outl("")
-          cog.out("                     ")
-  cog.outl("void>")
-  cog.outl("{")
-  cog.outl("  typedef T1 type;")
-  cog.outl("")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    size = sizeof(type)")
-  cog.outl("  };")
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-
-  namespace private_smallest
-  {
-    //*************************************************************************
-    // Determine the type to hold the number of bits based on the index.
-    //*************************************************************************
-    template <int index>
-    struct best_fit_uint_type;
-
-    //*************************************************************************
-    // Less than or equal to 8 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_uint_type<0>
-    {
-      typedef uint_least8_t type;
-    };
-
-    //*************************************************************************
-    // 9 to 16 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_uint_type<1>
-    {
-      typedef uint_least16_t type;
-    };
-
-    //*************************************************************************
-    // 17 to 31 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_uint_type<2>
-    {
-      typedef uint_least32_t type;
-    };
-
-#if ETL_USING_64BIT_TYPES
-    //*************************************************************************
-    // Greater than 32 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_uint_type<3>
-    {
-      typedef uint_least64_t type;
-    };
-#endif
-
-    //*************************************************************************
-    // Determine the type to hold the number of bits based on the index.
-    //*************************************************************************
-    template <int index>
-    struct best_fit_int_type;
-
-    //*************************************************************************
-    // Less than or equal to 8 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_int_type<0>
-    {
-      typedef int_least8_t type;
-    };
-
-    //*************************************************************************
-    // 9 to 16 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_int_type<1>
-    {
-      typedef int_least16_t type;
-    };
-
-    //*************************************************************************
-    // 17 to 31 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_int_type<2>
-    {
-      typedef int_least32_t type;
-    };
-
-#if ETL_USING_64BIT_TYPES
-    //*************************************************************************
-    // Greater than 32 bits.
-    //*************************************************************************
-    template <>
-    struct best_fit_int_type<3>
-    {
-      typedef int_least64_t type;
-    };
-#endif
-  }
-
-  //***************************************************************************
-  /// Template to determine the smallest unsigned int type that can contain a
-  /// value with the specified number of bits.
-  /// Defines 'type' which is the type of the smallest unsigned integer.
-  ///\ingroup smallest
-  //***************************************************************************
-  template <size_t NBITS>
-  struct smallest_uint_for_bits
-  {
-  private:
-
-    // Determines the index of the best unsigned type for the required number of bits.
-    static ETL_CONSTANT int TYPE_INDEX = ((NBITS >  8) ? 1 : 0) +
-                                         ((NBITS > 16) ? 1 : 0) +
-                                         ((NBITS > 32) ? 1 : 0);
-
-  public:
-
-    typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
-  };
-
-  template <size_t NBITS>
-  ETL_CONSTANT int smallest_uint_for_bits<NBITS>::TYPE_INDEX;
-
-#if ETL_USING_CPP11
-  template <size_t NBITS>
-  using smallest_uint_for_bits_t = typename smallest_uint_for_bits<NBITS>::type;
-#endif
-
-  //***************************************************************************
-  /// Template to determine the smallest signed int type that can contain a
-  /// value with the specified number of bits.
-  /// Defines 'type' which is the type of the smallest signed integer.
-  ///\ingroup smallest
-  //***************************************************************************
-  template <size_t NBITS>
-  struct smallest_int_for_bits
-  {
-  private:
-
-    // Determines the index of the best unsigned type for the required number of bits.
-    static ETL_CONSTANT int TYPE_INDEX = ((NBITS >  8) ? 1 : 0) +
-                                         ((NBITS > 16) ? 1 : 0) +
-                                         ((NBITS > 32) ? 1 : 0);
-
-  public:
-
-    typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
-  };
-
-  template <size_t NBITS>
-  ETL_CONSTANT int smallest_int_for_bits<NBITS>::TYPE_INDEX;
-
-#if ETL_USING_CPP11
-  template <size_t NBITS>
-  using smallest_int_for_bits_t = typename smallest_int_for_bits<NBITS>::type;
-#endif
-
-  //***************************************************************************
-  /// Template to determine the smallest unsigned int type that can contain the
-  /// specified unsigned value.
-  /// Defines 'type' which is the type of the smallest unsigned integer.
-  ///\ingroup smallest
-  //***************************************************************************
-  template <uintmax_t VALUE>
-  struct smallest_uint_for_value
-  {
-  private:
-
-    // Determines the index of the best unsigned type for the required value.
-    static ETL_CONSTANT int TYPE_INDEX = ((VALUE > UINT_LEAST8_MAX) ? 1 : 0) +
-      ((VALUE > UINT16_MAX) ? 1 : 0) +
-      ((VALUE > UINT32_MAX) ? 1 : 0);
-
-  public:
-
-    typedef typename private_smallest::best_fit_uint_type<TYPE_INDEX>::type type;
-  };
-
-  template <uintmax_t VALUE>
-  ETL_CONSTANT int smallest_uint_for_value<VALUE>::TYPE_INDEX;
-
-#if ETL_USING_CPP11
-  template <uintmax_t VALUE>
-  using smallest_uint_for_value_t = typename smallest_uint_for_value<VALUE>::type;
-#endif
-
-  //***************************************************************************
-  /// Template to determine the smallest int type that can contain the
-  /// specified signed value.
-  /// Defines 'type' which is the type of the smallest signed integer.
-  ///\ingroup smallest
-  //***************************************************************************
-  template <intmax_t VALUE>
-  struct smallest_int_for_value
-  {
-  private:
-
-    // Determines the index of the best signed type for the required value.
-    static ETL_CONSTANT int TYPE_INDEX = (((VALUE > intmax_t(INT_LEAST8_MAX)) || (VALUE < intmax_t(INT_LEAST8_MIN))) ? 1 : 0) +
-      (((VALUE > intmax_t(INT16_MAX)) || (VALUE < intmax_t(INT16_MIN))) ? 1 : 0) +
-      (((VALUE > intmax_t(INT32_MAX)) || (VALUE < intmax_t(INT32_MIN))) ? 1 : 0);
-
-  public:
-
-    typedef typename private_smallest::best_fit_int_type<TYPE_INDEX>::type type;
-  };
-
-  template <intmax_t VALUE>
-  ETL_CONSTANT int smallest_int_for_value<VALUE>::TYPE_INDEX;
-
-#if ETL_USING_CPP11
-  template <intmax_t VALUE>
-  using smallest_int_for_value_t = typename smallest_int_for_value<VALUE>::type;
-#endif
-}
-
-#endif
diff --git a/include/etl/generators/type_lookup_cpp03_generator.h b/include/etl/generators/type_lookup_cpp03_generator.h
new file mode 100644
index 00000000..065e3465
--- /dev/null
+++ b/include/etl/generators/type_lookup_cpp03_generator.h
@@ -0,0 +1,109 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("// For %s types." % int(NTypes))
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename T1,")
+  for n in range(2, int(NTypes)):
+      cog.outl("          typename T%s = etl::type_id_pair<etl::null_type<0>, -%s>," %(n, n))
+  cog.outl("          typename T%s = etl::type_id_pair<etl::null_type<0>, -%s> >" %(NTypes, NTypes))
+  cog.outl("struct type_id_lookup")
+  cog.outl("{")
+  cog.outl("public:")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <int Id>")
+  cog.outl("  struct type_from_id")
+  cog.outl("  {")
+  cog.outl("    typedef")
+  for n in range(1, int(NTypes) + 1):
+      cog.outl("          typename etl::conditional<Id == T%s::Id, typename T%s::type," %(n, n))
+  cog.out("          etl::null_type<0> >")
+  for n in range(1, int(NTypes) + 1):
+      if n == int(NTypes):
+          cog.outl("::type type;")
+      else:
+          cog.out("::type>")
+      if n % 4 == 0:
+          if n != int(NTypes):
+              cog.outl("")
+              cog.out("                            ")
+  cog.outl("")
+  cog.outl("    ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid id\");")
+  cog.outl("  };")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  enum")
+  cog.outl("  {")
+  cog.outl("    UNKNOWN = UINT_MAX")
+  cog.outl("  };")
+  cog.outl("")
+  cog.outl("  template <typename T>")
+  cog.outl("  struct id_from_type")
+  cog.outl("  {")
+  cog.outl("    enum")
+  cog.outl("    {")
+  cog.outl("      value =")
+  for n in range(1, int(NTypes) + 1) :
+      cog.outl("        (unsigned int) etl::is_same<T, typename T%s::type>::value ? (unsigned int)T%s::Id :" % (n, n))
+  cog.outl("        (unsigned int) UNKNOWN")
+  cog.outl("    };")
+  cog.outl("")
+  cog.outl("    ETL_STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), \"Invalid type\");")
+  cog.outl("  };")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <typename T>")
+  cog.outl("  static unsigned int get_id_from_type(const T&)")
+  cog.outl("  {")
+  cog.outl("    return get_id_from_type<T>();")
+  cog.outl("  }")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <typename T>")
+  cog.outl("  static unsigned int get_id_from_type()")
+  cog.outl("  {")
+  cog.outl("    return id_from_type<T>::value;")
+  cog.outl("  }")
+  cog.outl("};")
+  cog.outl("")
+  cog.outl("//***************************************************************************")
+  cog.outl("// For %s types." % int(NTypes))
+  cog.outl("//***************************************************************************")
+  cog.outl("template <typename T1,")
+  for n in range(2, int(NTypes)):
+      cog.outl("          typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >," %n)
+  cog.outl("          typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> > >" %NTypes)
+  cog.outl("struct type_type_lookup")
+  cog.outl("{")
+  cog.outl("public:")
+  cog.outl("")
+  cog.outl("  //************************************")
+  cog.outl("  template <typename T>")
+  cog.outl("  struct type_from_type")
+  cog.outl("  {")
+  cog.outl("    typedef")
+  for n in range(1, int(NTypes) + 1):
+      cog.outl("          typename etl::conditional<etl::is_same<T, typename T%s::type1>::value, typename T%s::type2," %(n, n))
+  cog.out("          etl::null_type<0> >")
+  for n in range(1, int(NTypes) + 1):
+      if n == int(NTypes):
+          cog.outl("::type type;")
+      else:
+          cog.out("::type>")
+      if n % 8 == 0:
+          if n != int(NTypes):
+              cog.outl("")
+              cog.out("                            ")
+  cog.outl("")
+  cog.outl("    ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid type\");")
+  cog.outl("  };")
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/type_lookup_generator.h b/include/etl/generators/type_lookup_generator.h
deleted file mode 100644
index b024bf8d..00000000
--- a/include/etl/generators/type_lookup_generator.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2017 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-#ifndef ETL_TYPE_LOOKUP_INCLUDED
-#define ETL_TYPE_LOOKUP_INCLUDED
-
-#include "platform.h"
-#include "type_traits.h"
-#include "static_assert.h"
-#include "integral_limits.h"
-#include "null_type.h"
-
-#include <limits.h>
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-namespace etl
-{
-  //***************************************************************************
-  /// The type/id pair type to use for type/id lookup template parameters.
-  //***************************************************************************
-  template <typename T, int ID_>
-  struct type_id_pair
-  {
-    typedef T type;
-
-    enum
-    {
-      Id = ID_
-    };
-  };
-
-  //***************************************************************************
-  /// The type/type pair type to use for type/type lookup template parameters.
-  //***************************************************************************
-  template <typename T1, typename T2>
-  struct type_type_pair
-  {
-    typedef T1 type1;
-    typedef T2 type2;
-  };
-
-#if ETL_USING_CPP11 && !defined(ETL_TYPE_SELECT_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  // type_id_lookup
-  //***************************************************************************
-  template <typename... TTypes>
-  struct type_id_lookup
-  {
-  private:
-
-    // The type for no match.
-    struct nulltype {};
-
-    // For N type pairs.
-    template <int Id, typename T1, typename... TRest>
-    struct type_from_id_helper
-    {
-      using type = typename etl::conditional<Id == T1::Id,
-        typename T1::type,
-        typename type_from_id_helper<Id, TRest...>::type>::type;
-    };
-
-    // Specialisation for 1 type pair.
-    template <int Id, typename T1>
-    struct type_from_id_helper<Id, T1>
-    {
-      using type = typename etl::conditional<Id == T1::Id,
-        typename T1::type,
-        nulltype>::type;
-    };
-
-  public:
-
-    //************************************
-    // type_from_id
-    //************************************
-    template <int Id>
-    struct type_from_id
-    {
-      using type = typename type_from_id_helper<Id, TTypes...>::type;
-
-      static_assert(!(etl::is_same<nulltype, type>::value), "Invalid id");
-    };
-
-    template <int Id>
-    using type_from_id_t = typename type_from_id<Id>::type;
-
-  private:
-
-    static constexpr size_t UNKNOWN = etl::integral_limits<size_t>::max;
-
-    // For N type pairs.
-    template <typename T, typename T1, typename... TRest>
-    struct id_from_type_helper
-    {
-      static constexpr size_t value = etl::is_same<T, typename T1::type>::value ? size_t(T1::Id) : id_from_type_helper<T, TRest...>::value;
-    };
-
-    // Specialisation for 1 type pair.
-    template <typename T, typename T1>
-    struct id_from_type_helper<T, T1>
-    {
-      static constexpr size_t value = etl::is_same<T, typename T1::type>::value ? size_t(T1::Id) : UNKNOWN;
-    };
-
-  public:
-
-    //************************************
-    // id_from_type
-    //************************************
-    template <typename T>
-    struct id_from_type
-    {
-      static constexpr size_t value = id_from_type_helper<T, TTypes...>::value;
-
-      static_assert(value != UNKNOWN, "Invalid type");
-    };
-
-#if ETL_USING_CPP17
-    template <typename T>
-    static constexpr size_t id_from_type_v = id_from_type<T>::value;
-#endif
-
-    //************************************
-    template <typename T>
-    static unsigned int get_id_from_type(const T&)
-    {
-      return get_id_from_type<T>();
-    }
-
-    //************************************
-    template <typename T>
-    static unsigned int get_id_from_type()
-    {
-      return id_from_type<T>::value;
-    }
-  };
-
-  //***************************************************************************
-  // type_type_lookup
-  //***************************************************************************
-  template <typename... TTypes>
-  class type_type_lookup
-  {
-  private:
-
-    // The type for no match.
-    struct nulltype {};
-
-    template <typename T, typename T1, typename... TRest>
-    struct type_from_type_helper
-    {
-      using type = typename etl::conditional<etl::is_same<T, typename T1::type1>::value,
-        typename T1::type2,
-        typename type_from_type_helper<T, TRest...>::type>::type;
-    };
-
-    template <typename T, typename T1>
-    struct type_from_type_helper<T, T1>
-    {
-      using type = typename etl::conditional<etl::is_same<T, typename T1::type1>::value,
-        typename T1::type2,
-        nulltype>::type;
-    };
-
-  public:
-
-    template <typename T>
-    class type_from_type
-    {
-    public:
-
-      // The matched type or nulltype
-      using type = typename type_from_type_helper<T, TTypes...>::type;
-
-      static_assert(!etl::is_same<type, nulltype>::value, "Type match not found");
-    };
-
-    // Template alias.
-    template <typename T>
-    using type_from_type_t = typename type_from_type<T>::type;
-  };
-
-#else
-
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("// For %s types." % int(NTypes))
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T1,")
-  for n in range(2, int(NTypes)):
-      cog.outl("          typename T%s = etl::type_id_pair<etl::null_type<0>, -%s>," %(n, n))
-  cog.outl("          typename T%s = etl::type_id_pair<etl::null_type<0>, -%s> >" %(NTypes, NTypes))
-  cog.outl("struct type_id_lookup")
-  cog.outl("{")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  //************************************")
-  cog.outl("  template <int Id>")
-  cog.outl("  struct type_from_id")
-  cog.outl("  {")
-  cog.outl("    typedef")
-  for n in range(1, int(NTypes) + 1):
-      cog.outl("          typename etl::conditional<Id == T%s::Id, typename T%s::type," %(n, n))
-  cog.out("          etl::null_type<0> >")
-  for n in range(1, int(NTypes) + 1):
-      if n == int(NTypes):
-          cog.outl("::type type;")
-      else:
-          cog.out("::type>")
-      if n % 4 == 0:
-          if n != int(NTypes):
-              cog.outl("")
-              cog.out("                            ")
-  cog.outl("")
-  cog.outl("    ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid id\");")
-  cog.outl("  };")
-  cog.outl("")
-  cog.outl("  //************************************")
-  cog.outl("  enum")
-  cog.outl("  {")
-  cog.outl("    UNKNOWN = UINT_MAX")
-  cog.outl("  };")
-  cog.outl("")
-  cog.outl("  template <typename T>")
-  cog.outl("  struct id_from_type")
-  cog.outl("  {")
-  cog.outl("    enum")
-  cog.outl("    {")
-  cog.outl("      value =")
-  for n in range(1, int(NTypes) + 1) :
-      cog.outl("        (unsigned int) etl::is_same<T, typename T%s::type>::value ? (unsigned int)T%s::Id :" % (n, n))
-  cog.outl("        (unsigned int) UNKNOWN")
-  cog.outl("    };")
-  cog.outl("")
-  cog.outl("    ETL_STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), \"Invalid type\");")
-  cog.outl("  };")
-  cog.outl("")
-  cog.outl("  //************************************")
-  cog.outl("  template <typename T>")
-  cog.outl("  static unsigned int get_id_from_type(const T&)")
-  cog.outl("  {")
-  cog.outl("    return get_id_from_type<T>();")
-  cog.outl("  }")
-  cog.outl("")
-  cog.outl("  //************************************")
-  cog.outl("  template <typename T>")
-  cog.outl("  static unsigned int get_id_from_type()")
-  cog.outl("  {")
-  cog.outl("    return id_from_type<T>::value;")
-  cog.outl("  }")
-  cog.outl("};")
-  cog.outl("")
-  cog.outl("//***************************************************************************")
-  cog.outl("// For %s types." % int(NTypes))
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T1,")
-  for n in range(2, int(NTypes)):
-      cog.outl("          typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >," %n)
-  cog.outl("          typename T%s = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> > >" %NTypes)
-  cog.outl("struct type_type_lookup")
-  cog.outl("{")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  //************************************")
-  cog.outl("  template <typename T>")
-  cog.outl("  struct type_from_type")
-  cog.outl("  {")
-  cog.outl("    typedef")
-  for n in range(1, int(NTypes) + 1):
-      cog.outl("          typename etl::conditional<etl::is_same<T, typename T%s::type1>::value, typename T%s::type2," %(n, n))
-  cog.out("          etl::null_type<0> >")
-  for n in range(1, int(NTypes) + 1):
-      if n == int(NTypes):
-          cog.outl("::type type;")
-      else:
-          cog.out("::type>")
-      if n % 8 == 0:
-          if n != int(NTypes):
-              cog.outl("")
-              cog.out("                            ")
-  cog.outl("")
-  cog.outl("    ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), \"Invalid type\");")
-  cog.outl("  };")
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-
-#endif
-}
-
-#endif
\ No newline at end of file
diff --git a/include/etl/generators/type_select_cpp03_generator.h b/include/etl/generators/type_select_cpp03_generator.h
new file mode 100644
index 00000000..4ec3cd9a
--- /dev/null
+++ b/include/etl/generators/type_select_cpp03_generator.h
@@ -0,0 +1,73 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+/*[[[cog
+import cog
+cog.outl("")
+cog.outl("  //***************************************************************************")
+cog.outl("  // For %s types." % int(NTypes))
+cog.outl("  //***************************************************************************")
+cog.outl("  template <typename T0,")
+for n in range(1, int(NTypes) - 1):
+    cog.outl("            typename T%s = void," % n)
+cog.outl("            typename T%s = void>" %(int(NTypes) - 1))
+cog.outl("  struct type_select")
+cog.outl("  {")
+cog.outl("  public:")
+cog.outl("")
+cog.outl("    template <size_t Id>")
+cog.outl("    struct select")
+cog.outl("    {")
+cog.outl("      typedef typename etl::conditional<Id == 0, T0,")
+for n in range(1, int(NTypes)) :
+    cog.outl("              typename etl::conditional<Id == %s, T%s," % (n, n))
+cog.outl("              etl::null_type<0> >")
+cog.out("              ")
+for n in range(1, int(NTypes)) :
+    cog.out("::type>")
+    if n % 8 == 0:
+        cog.outl("")
+        cog.out("              ")
+cog.outl("::type type;")
+cog.outl("");
+cog.outl("      ETL_STATIC_ASSERT(Id < %s, \"Invalid Id\");" % int(NTypes));
+cog.outl("    };")
+cog.outl("  };")
+
+for s in range(int(NTypes) - 1, 0, -1):
+    cog.outl("")
+    cog.outl("  //***************************************************************************")
+    cog.outl("  // For %s types." % int(s))
+    cog.outl("  //***************************************************************************")
+    cog.out("  template <")
+    for n in range(0, s - 1):
+        cog.outl("typename T%s, " % n)
+        cog.out("            ")
+    cog.outl("typename T%s>" % (s - 1))
+    cog.out("  struct type_select<")
+    for n in range(0, s - 1):
+        cog.out("T%s, " % n)
+    cog.outl("T%s>" % (s - 1))
+    cog.outl("  {")
+    cog.outl("  public:")
+    cog.outl("    template <size_t Id>")
+    cog.outl("    struct select")
+    cog.outl("    {")
+    cog.outl("      typedef typename etl::conditional<Id == 0, T0,")
+    for n in range(1, s) :
+        cog.outl("              typename etl::conditional<Id == %s, T%s," % (n, n))
+    cog.outl("              etl::null_type<0> >")
+    cog.out("              ")
+    for n in range(1, s) :
+        cog.out("::type>")
+        if n % 8 == 0:
+          cog.outl("")
+          cog.out("              ")
+    cog.outl("::type type;")
+    cog.outl("");
+    cog.outl("      ETL_STATIC_ASSERT(Id < %s, \"Invalid Id\");" % s);
+    cog.outl("    };")
+    cog.outl("  };")
+]]]*/
+/*[[[end]]]*/
diff --git a/include/etl/generators/type_select_generator.h b/include/etl/generators/type_select_generator.h
deleted file mode 100644
index aab2d0f3..00000000
--- a/include/etl/generators/type_select_generator.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2018 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-#ifndef ETL_TYPE_SELECT_INCLUDED
-#define ETL_TYPE_SELECT_INCLUDED
-
-#include "platform.h"
-#include "static_assert.h"
-#include "type_traits.h"
-#include "null_type.h"
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-namespace etl
-{
-#if ETL_USING_CPP11 && !defined(ETL_TYPE_SELECT_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  // Variadic version.
-  //***************************************************************************
-  template <typename... TTypes>
-  struct type_select
-  {
-  private:
-
-    //***********************************
-    template <size_t Id, size_t Index, typename T1, typename... TRest>
-    struct type_select_helper
-    {
-      using type = typename etl::conditional<Id == Index,
-                                             T1,
-                                             typename type_select_helper<Id, Index + 1, TRest...>::type>::type;
-    };
-
-    //***********************************
-    template <size_t Id, size_t Index, typename T1>
-    struct type_select_helper<Id, Index, T1>
-    {
-      using type = T1;
-    };
-
-  public:
-
-    template <size_t Id>
-    struct select
-    {
-      static_assert(Id < sizeof...(TTypes), "Illegal type_select::select index");
-
-      using type = typename type_select_helper<Id, 0, TTypes...>::type;
-    };
-
-    template <size_t Id>
-    using select_t = typename select<Id>::type;
-  };
-
-  //***************************************************************************
-  // Select type alias
-  //***************************************************************************
-  template <size_t Index, typename... TTypes>
-  using type_select_t = typename etl::type_select<TTypes...>:: template select_t<Index>;
-
-#else
-
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("// For %s types." % int(NTypes))
-  cog.outl("//***************************************************************************")
-  cog.outl("template <typename T0,")
-  for n in range(1, int(NTypes) - 1):
-      cog.outl("          typename T%s = void," % n)
-  cog.outl("          typename T%s = void>" %(int(NTypes) - 1))
-  cog.outl("struct type_select")
-  cog.outl("{")
-  cog.outl("public:")
-  cog.outl("")
-  cog.outl("  template <size_t Id>")
-  cog.outl("  struct select")
-  cog.outl("  {")
-  cog.outl("    typedef typename etl::conditional<Id == 0, T0,")
-  for n in range(1, int(NTypes)) :
-      cog.outl("            typename etl::conditional<Id == %s, T%s," % (n, n))
-  cog.outl("            etl::null_type<0> >")
-  cog.out("            ")
-  for n in range(1, int(NTypes)) :
-      cog.out("::type>")
-      if n % 8 == 0:
-          cog.outl("")
-          cog.out("            ")
-  cog.outl("::type type;")
-  cog.outl("");
-  cog.outl("    ETL_STATIC_ASSERT(Id < %s, \"Invalid Id\");" % int(NTypes));
-  cog.outl("  };")
-  cog.outl("};")
-
-  for s in range(int(NTypes) - 1, 0, -1):
-      cog.outl("")
-      cog.outl("//***************************************************************************")
-      cog.outl("// For %s types." % int(s))
-      cog.outl("//***************************************************************************")
-      cog.out("template <")
-      for n in range(0, s - 1):
-          cog.outl("typename T%s, " % n)
-          cog.out("          ")
-      cog.outl("typename T%s>" % (s - 1))
-      cog.out("struct type_select<")
-      for n in range(0, s - 1):
-          cog.out("T%s, " % n)
-      cog.outl("T%s>" % (s - 1))
-      cog.outl("{")
-      cog.outl("public:")
-      cog.outl("  template <size_t Id>")
-      cog.outl("  struct select")
-      cog.outl("  {")
-      cog.outl("    typedef typename etl::conditional<Id == 0, T0,")
-      for n in range(1, s) :
-          cog.outl("            typename etl::conditional<Id == %s, T%s," % (n, n))
-      cog.outl("            etl::null_type<0> >")
-      cog.out("            ")
-      for n in range(1, s) :
-          cog.out("::type>")
-          if n % 8 == 0:
-            cog.outl("")
-            cog.out("            ")
-      cog.outl("::type type;")
-      cog.outl("");
-      cog.outl("    ETL_STATIC_ASSERT(Id < %s, \"Invalid Id\");" % s);
-      cog.outl("  };")
-      cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-}
-
-#endif
diff --git a/include/etl/generators/type_traits_cpp03_generator.h b/include/etl/generators/type_traits_cpp03_generator.h
new file mode 100644
index 00000000..7c8d260d
--- /dev/null
+++ b/include/etl/generators/type_traits_cpp03_generator.h
@@ -0,0 +1,28 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  /*[[[cog
+  import cog
+  cog.outl("//***************************************************************************")
+  cog.outl("/// Template to determine if a type is one of a specified list.")
+  cog.outl("///\\ingroup types")
+  cog.outl("template <typename T,")
+  cog.out("         ")
+  cog.out(" typename T1,")
+  for n in range(2, int(IsOneOf)):
+      cog.out(" typename T%s = void," % n)
+      if n % 4 == 0:
+          cog.outl("")
+          cog.out("         ")
+  cog.outl(" typename T%s = void>" % IsOneOf)
+  cog.outl("struct is_one_of")
+  cog.outl("{")
+  cog.outl("  static const bool value =")
+  for n in range(1, int(IsOneOf)):
+      cog.outl("      etl::is_same<T, T%s>::value ||" % n)
+  cog.outl("      etl::is_same<T, T%s>::value;" % IsOneOf)
+  cog.outl("};")
+  ]]]*/
+  /*[[[end]]]*/
+
diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
deleted file mode 100644
index 843ce343..00000000
--- a/include/etl/generators/type_traits_generator.h
+++ /dev/null
@@ -1,3272 +0,0 @@
-///\file
-
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2014 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -otypes.h -DHandlers=<n> types_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -otype_traits.h -DIsOneOf=16 type_traits_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
-#ifndef ETL_TYPE_TRAITS_INCLUDED
-#define ETL_TYPE_TRAITS_INCLUDED
-
-#include "platform.h"
-#include "nullptr.h"
-#include "static_assert.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-///\defgroup type_traits type_traits
-/// A set of type traits definitions.
-/// Derived from either the standard or alternate definitions, dependent on whether or not ETL_NO_STL is defined.
-/// \ingroup utilities
-
-#if ETL_USING_STL && ETL_USING_CPP11
-  #include <type_traits>
-#endif
-
-namespace etl
-{
-#if ETL_USING_CPP11
-  template <typename...>
-  using void_t = void;
-#endif
-
-#if ETL_NOT_USING_STL || ETL_CPP11_NOT_SUPPORTED
-
-  //*****************************************************************************
-  // Traits are defined by the ETL
-  //*****************************************************************************
-
-  //***************************************************************************
-  /// integral_constant
-  template <typename T, T VALUE>
-  struct integral_constant
-  {
-    static const T value = VALUE;
-
-    typedef T value_type;
-    typedef integral_constant<T, VALUE> type;
-
-    operator value_type() const
-    {
-      return value;
-    }
-  };
-
-  /// integral_constant specialisations
-  typedef integral_constant<bool, false> false_type;
-  typedef integral_constant<bool, true>  true_type;
-
-  template <typename T, T VALUE>
-  const T integral_constant<T, VALUE>::value;
-
-#if ETL_USING_CPP17
-  template <typename T, T VALUE>
-  inline constexpr T integral_constant_v = etl::integral_constant<T, VALUE>::value;
-#endif
-
-#if ETL_USING_CPP11
-  template <bool BValue>
-  using bool_constant = integral_constant<bool, BValue>;
-#else
-  template <bool BValue>
-  struct bool_constant : etl::integral_constant<bool, BValue> { };
-#endif
-
-#if ETL_USING_CPP17
-  template <bool BValue>
-  inline constexpr bool bool_constant_v = bool_constant<BValue>::value;
-#endif
-
-  //***************************************************************************
-  /// negation
-  template <typename T>
-  struct negation : etl::bool_constant<!bool(T::value)>
-  {
-  };
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool negation_v = negation<T>::value;
-#endif
-
-  //***************************************************************************
-  /// remove_reference
-  template <typename T> struct remove_reference { typedef T type; };
-  template <typename T> struct remove_reference<T&> { typedef T type; };
-#if ETL_USING_CPP11
-  template <typename T> struct remove_reference<T&&> { typedef T type; };
-#endif
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_reference_t = typename remove_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_pointer
-  template <typename T> struct remove_pointer { typedef T type; };
-  template <typename T> struct remove_pointer<T*> { typedef T type; };
-  template <typename T> struct remove_pointer<const T*> { typedef const T type; };
-  template <typename T> struct remove_pointer<volatile T*> { typedef volatile T type; };
-  template <typename T> struct remove_pointer<const volatile T*> { typedef const volatile T type; };
-  template <typename T> struct remove_pointer<T* const> { typedef T type; };
-  template <typename T> struct remove_pointer<const T* const> { typedef const T type; };
-  template <typename T> struct remove_pointer<volatile T* const> { typedef volatile T type; };
-  template <typename T> struct remove_pointer<const volatile T* const> { typedef const volatile T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_pointer_t = typename remove_pointer<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_pointer
-  template <typename T> struct add_pointer { typedef typename remove_reference<T>::type* type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_pointer_t = typename add_pointer<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_const
-  template <typename T> struct is_const : false_type {};
-  template <typename T> struct is_const<const T> : true_type {};
-  template <typename T> struct is_const<const volatile T> : true_type {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_const_v = is_const<T>::value;
-#endif
-
-  //***************************************************************************
-  /// remove_const
-  template <typename T> struct remove_const { typedef T type; };
-  template <typename T> struct remove_const<const T> { typedef T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_const_t = typename remove_const<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_const
-  template <typename T> struct add_const { typedef const T type; };
-  template <typename T> struct add_const<const T> { typedef const T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_const_t = typename add_const<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_volatile
-  template <typename T> struct is_volatile : false_type {};
-  template <typename T> struct is_volatile<volatile T> : true_type {};
-  template <typename T> struct is_volatile<const volatile T> : true_type {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_volatile_v = is_volatile<T>::value;
-#endif
-
-  //***************************************************************************
-  /// remove_volatile
-  template <typename T> struct remove_volatile { typedef T type; };
-  template <typename T> struct remove_volatile<volatile T> { typedef T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_volatile_t = typename remove_volatile<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_volatile
-  template <typename T> struct add_volatile { typedef volatile T type; };
-  template <typename T> struct add_volatile<volatile T> { typedef volatile T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_volatile_t = typename add_volatile<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_cv
-  template <typename T> struct remove_cv
-  {
-    typedef typename remove_volatile<typename remove_const<T>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_cv_t = typename remove_cv<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_cv
-  template <typename T> struct add_cv
-  {
-    typedef typename add_volatile<typename add_const<T>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_cv_t = typename add_cv<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_cvref
-  template <typename T> struct remove_cvref
-  {
-    typedef typename remove_cv<typename remove_reference<T>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_cvref_t = typename remove_cvref<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_integral
-  template <typename T> struct is_integral : false_type {};
-  template <> struct is_integral<bool> : true_type {};
-  template <> struct is_integral<char> : true_type {};
-  template <> struct is_integral<unsigned char> : true_type {};
-  template <> struct is_integral<signed char> : true_type {};
-  template <> struct is_integral<wchar_t> : true_type {};
-  template <> struct is_integral<short> : true_type {};
-  template <> struct is_integral<unsigned short> : true_type {};
-  template <> struct is_integral<int> : true_type {};
-  template <> struct is_integral<unsigned int> : true_type {};
-  template <> struct is_integral<long> : true_type {};
-  template <> struct is_integral<unsigned long> : true_type {};
-  template <> struct is_integral<long long> : true_type {};
-  template <> struct is_integral<unsigned long long> : true_type {};
-#if ETL_HAS_NATIVE_CHAR8_T
-  template <> struct is_integral<char8_t> : true_type {};
-#endif
-#if ETL_HAS_NATIVE_CHAR16_T
-  template <> struct is_integral<char16_t> : true_type {};
-#endif
-#if ETL_HAS_NATIVE_CHAR32_T
-  template <> struct is_integral<char32_t> : true_type {};
-#endif
-  template <typename T> struct is_integral<const T> : is_integral<T> {};
-  template <typename T> struct is_integral<volatile T> : is_integral<T> {};
-  template <typename T> struct is_integral<const volatile T> : is_integral<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_integral_v = is_integral<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_signed
-  template <typename T> struct is_signed : false_type {};
-  template <> struct is_signed<char> : etl::bool_constant<(char(255) < 0)> {};
-  template <> struct is_signed<wchar_t> : public etl::bool_constant<wchar_t(-1) < wchar_t(0)> {};
-  template <> struct is_signed<signed char> : true_type {};
-  template <> struct is_signed<short> : true_type {};
-  template <> struct is_signed<int> : true_type {};
-  template <> struct is_signed<long> : true_type {};
-  template <> struct is_signed<long long> : true_type {};
-  template <> struct is_signed<float> : true_type {};
-  template <> struct is_signed<double> : true_type {};
-  template <> struct is_signed<long double> : true_type {};
-#if ETL_HAS_NATIVE_CHAR8_T
-  template <> struct is_signed<char8_t> : true_type {};
-#endif
-#if ETL_HAS_NATIVE_CHAR16_T
-  template <> struct is_signed<char16_t> : true_type {};
-#endif
-#if ETL_HAS_NATIVE_CHAR32_T
-  template <> struct is_signed<char32_t> : true_type {};
-#endif
-  template <typename T> struct is_signed<const T> : is_signed<T> {};
-  template <typename T> struct is_signed<volatile T> : is_signed<T> {};
-  template <typename T> struct is_signed<const volatile T> : is_signed<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_signed_v = is_signed<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_unsigned
-  template <typename T> struct is_unsigned : false_type {};
-  template <> struct is_unsigned<bool> : true_type {};
-  template <> struct is_unsigned<char> : etl::bool_constant<(char(255) > 0)> {};
-  template <> struct is_unsigned<unsigned char> : true_type {};
-  template <> struct is_unsigned<wchar_t> : public etl::bool_constant<(wchar_t(-1) > wchar_t(0))> {};
-  template <> struct is_unsigned<unsigned short> : true_type {};
-  template <> struct is_unsigned<unsigned int> : true_type {};
-  template <> struct is_unsigned<unsigned long> : true_type {};
-  template <> struct is_unsigned<unsigned long long> : true_type {};
-  template <typename T> struct is_unsigned<const T> : is_unsigned<T> {};
-  template <typename T> struct is_unsigned<volatile T> : is_unsigned<T> {};
-  template <typename T> struct is_unsigned<const volatile T> : is_unsigned<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_floating_point
-  template <typename T> struct is_floating_point : false_type {};
-  template <> struct is_floating_point<float> : true_type {};
-  template <> struct is_floating_point<double> : true_type {};
-  template <> struct is_floating_point<long double> : true_type {};
-  template <typename T> struct is_floating_point<const T> : is_floating_point<T> {};
-  template <typename T> struct is_floating_point<volatile T> : is_floating_point<T> {};
-  template <typename T> struct is_floating_point<const volatile T> : is_floating_point<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_floating_point_v = is_floating_point<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_same
-  template <typename T1, typename T2> struct is_same : public false_type {};
-  template <typename T> struct is_same<T, T> : public true_type {};
-
-#if ETL_USING_CPP17
-  template <typename T1, typename T2>
-  inline constexpr bool is_same_v = is_same<T1, T2>::value;
-#endif
-
-  //***************************************************************************
-  /// is_void
-  template<typename T> struct is_void : false_type {};
-  template<> struct is_void<void> : true_type {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_void_v = is_void<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_arithmetic
-  template<typename T> struct is_arithmetic : etl::bool_constant<is_integral<T>::value || is_floating_point<T>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_fundamental
-  template <typename T> struct is_fundamental : etl::bool_constant<is_arithmetic<T>::value || is_void<T>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_fundamental_v = is_fundamental<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_compound
-  template <typename T> struct is_compound : etl::bool_constant<!is_fundamental<T>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_compound_v = is_compound<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_array
-  template <typename T> struct is_array : false_type {};
-  template <typename T> struct is_array<T[]> : true_type {};
-  template <typename T, size_t Size> struct is_array<T[Size]> : true_type {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_array_v = is_array<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_pointer
-  template<typename T> struct is_pointer_helper : false_type {};
-  template<typename T> struct is_pointer_helper<T*> : true_type {};
-  template<typename T> struct is_pointer_helper<const T*> : is_pointer_helper<T*> {};
-  template<typename T> struct is_pointer_helper<volatile T*> : is_pointer_helper<T*> {};
-  template<typename T> struct is_pointer_helper<const volatile T*> : is_pointer_helper<T*> {};
-  template<typename T> struct is_pointer : is_pointer_helper<typename remove_cv<T>::type> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_pointer_v = is_pointer<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_lvalue_reference
-  template<typename T> struct is_lvalue_reference_helper : false_type {};
-  template<typename T> struct is_lvalue_reference_helper<T&> : true_type {};
-  template<typename T> struct is_lvalue_reference : is_lvalue_reference_helper<typename remove_cv<T>::type> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_lvalue_reference_v = etl::is_lvalue_reference<T>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// is_rvalue_reference
-  template<typename T> struct is_rvalue_reference_helper : false_type {};
-  template<typename T> struct is_rvalue_reference_helper<T&&> : true_type {};
-  template<typename T> struct is_rvalue_reference : is_rvalue_reference_helper<typename remove_cv<T>::type> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_rvalue_reference_v = etl::is_rvalue_reference<T>::value;
-#endif
-#endif
-
-  //***************************************************************************
-  /// is_reference
-  // Either lvalue or rvalue (for CPP11)
-  template<typename T> struct is_reference : integral_constant<bool,
-    is_lvalue_reference<T>::value
-    #if ETL_USING_CPP11
-        || is_rvalue_reference<T>::value
-    #endif
-  >{};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_reference_v = is_reference<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_pod
-  /// Only fundamental and pointers types are recognised.
-  template <typename T> struct is_pod : etl::bool_constant<etl::is_fundamental<T>::value || etl::is_pointer<T>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_pod_v = etl::is_pod<T>::value;
-#endif
-
-  //***************************************************************************
-  /// conditional
-  template <bool BValue, typename T, typename F>  struct conditional { typedef T type; };
-  template <typename T, typename F> struct conditional<false, T, F> { typedef F type; };
-
-#if ETL_USING_CPP11
-  template <bool BValue, typename T, typename F>
-  using conditional_t = typename conditional<BValue, T, F>::type;
-#endif
-
-  //***************************************************************************
-  /// make_signed
-  template <typename T> struct make_signed { typedef  T type; };
-  template <> struct make_signed<char> { typedef  signed char type; };
-  template <> struct make_signed<unsigned char> { typedef  signed char type; };
-
-  template <> struct make_signed<wchar_t>
-  {
-    typedef etl::conditional<sizeof(wchar_t) == sizeof(int16_t),
-                             int16_t,
-                             etl::conditional<sizeof(wchar_t) == sizeof(int32_t),
-                                              int32_t,
-                                              void>::type>::type type;
-  };
-
-  template <> struct make_signed<unsigned short> { typedef  short type; };
-  template <> struct make_signed<unsigned int> { typedef int type; };
-  template <> struct make_signed<unsigned long> { typedef  long type; };
-  template <> struct make_signed<unsigned long long> { typedef long long type; };
-  template <typename T> struct make_signed<const T> : add_const<typename make_signed<T>::type> {};
-  template <typename T> struct make_signed<volatile T> : add_volatile<typename make_signed<T>::type> {};
-  template <typename T> struct make_signed<const volatile T> : add_const<typename add_volatile<typename make_signed<T>::type>::type> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using make_signed_t = typename make_signed<T>::type;
-#endif
-
-  //***************************************************************************
-  /// make_unsigned
-  template <typename T> struct make_unsigned { typedef  T type; };
-  template <> struct make_unsigned<char> { typedef unsigned char type; };
-  template <> struct make_unsigned<signed char> { typedef unsigned char type; };
-  template <> struct make_unsigned<short> { typedef unsigned short type; };
-
-  template <> struct make_unsigned<wchar_t>
-  {
-    typedef etl::conditional<sizeof(wchar_t) == sizeof(uint16_t),
-                             uint16_t,
-                             etl::conditional<sizeof(wchar_t) == sizeof(uint32_t),
-                                              uint32_t,
-                                              void>::type>::type type;
-  };
-
-  template <> struct make_unsigned<int> { typedef unsigned int type; };
-  template <> struct make_unsigned<long> { typedef unsigned long type; };
-  template <> struct make_unsigned<long long> { typedef unsigned long long type; };
-  template <typename T> struct make_unsigned<const T> : add_const<typename make_unsigned<T>::type> {};
-  template <typename T> struct make_unsigned<volatile T> : add_volatile<typename make_unsigned<T>::type> {};
-  template <typename T> struct make_unsigned<const volatile T> : add_const<typename add_volatile<typename make_unsigned<T>::type>::type> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using make_unsigned_t = typename make_unsigned<T>::type;
-#endif
-
-  //***************************************************************************
-  /// enable_if
-  template <bool BValue, typename T = void> struct enable_if {};
-  template <typename T> struct enable_if<true, T> { typedef T type; };
-
-#if ETL_USING_CPP11
-  template <bool BValue, typename T = void>
-  using enable_if_t = typename enable_if<BValue, T>::type;
-#endif
-
-  //***************************************************************************
-  /// extent
-  template <typename T, unsigned Size = 0U>
-  struct extent : integral_constant<size_t, 0U> {};
-
-  template <typename T>
-  struct extent<T[], 0> : integral_constant<size_t, 0U> {};
-
-  template <typename T, unsigned Size>
-  struct extent<T[], Size> : integral_constant<size_t, extent<T, Size - 1>::value> {};
-
-  template <typename T, unsigned Size>
-  struct extent<T[Size], 0> : integral_constant<size_t, Size> {};
-
-  template <typename T, unsigned I, unsigned Size>
-  struct extent<T[I], Size> : integral_constant<size_t, extent<T, Size - 1>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T, unsigned Size = 0U>
-  inline constexpr size_t extent_v = extent<T, Size>::value;
-#endif
-
-  //***************************************************************************
-  /// remove_extent
-  template <typename T> struct remove_extent { typedef T type; };
-  template <typename T> struct remove_extent<T[]> { typedef T type; };
-  template <typename T, size_t Size> struct remove_extent<T[Size]> { typedef T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_extent_t = typename remove_extent<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_all_extents
-  template <typename T> struct remove_all_extents { typedef T type; };
-  template <typename T> struct remove_all_extents<T[]> { typedef typename remove_all_extents<T>::type type; };
-  template <typename T, size_t Size> struct remove_all_extents<T[Size]> { typedef typename remove_all_extents<T>::type type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_all_extents_t = typename remove_all_extents<T>::type;
-#endif
-
-  //***************************************************************************
-  /// rank
-  template <typename T>struct rank : integral_constant<size_t, 0> {};
-  template <typename T> struct rank<T[]> : public integral_constant<size_t, rank<T>::value + 1> {};
-  template <typename T, size_t Size> struct rank<T[Size]> : public integral_constant<size_t, rank<T>::value + 1> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr size_t rank_v = rank<T>::value;
-#endif
-
-  //***************************************************************************
-  /// decay
-  template <typename T>
-  struct decay
-  {
-    typedef typename etl::remove_reference<T>::type U;
-    typedef typename etl::conditional<etl::is_array<U>::value,
-                                      typename etl::remove_extent<U>::type*,
-                                      typename etl::remove_cv<U>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using decay_t = typename decay<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_class
-  namespace private_type_traits
-  {
-    template <typename T> char test(int T::*); // Match for classes.
-
-    struct dummy { char c[2]; };
-    template <typename T> dummy test(...);     // Match for non-classes.
-  }
-
-  template <typename T>
-  struct is_class : etl::bool_constant<sizeof(private_type_traits::test<T>(0)) == 1U> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_class_v = is_class<T>::value;
-#endif
-
-  //***************************************************************************
-  /// is_base_of
-#if ETL_USING_CPP11
-  namespace private_type_traits
-  {
-    template<typename B>
-    etl::true_type test_ptr_conv(const volatile B*);
-    template<typename>
-    etl::false_type test_ptr_conv(const volatile void*);
-
-    template<typename B, typename D>
-    auto test_is_base_of(int) -> decltype(test_ptr_conv<B>(static_cast<D*>(nullptr)));
-    template<typename, typename>
-    auto test_is_base_of(...) -> etl::true_type; // private or ambiguous base
-  }
-
-  template<typename TBase, typename TDerived>
-  struct is_base_of: etl::integral_constant<
-    bool,
-    etl::is_class<TBase>::value &&
-    etl::is_class<TDerived>::value &&
-    decltype(private_type_traits::test_is_base_of<TBase, TDerived>(0))::value
-    > {};
-#else
-  template<typename TBase,
-           typename TDerived,
-           const bool IsFundamental = (etl::is_fundamental<TBase>::value || etl::is_fundamental<TDerived>::value || etl::is_array<TDerived>::value)>
-  struct is_base_of
-  {
-  private:
-
-    static TBase* check(TBase*) { return (TBase*)0; }
-    static char check(...) { return 0; }
-
-  public:
-
-    static const bool value = (sizeof(check((TDerived*)0)) == sizeof(TBase*));
-  };
-
-  // For when TBase or TDerived is a fundamental type.
-  template<typename TBase, typename TDerived>
-  struct is_base_of<TBase, TDerived, true>
-  {
-    static const bool value = false;
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T1, typename T2>
-  inline constexpr bool is_base_of_v = is_base_of<T1, T2>::value;
-#endif
-
-  //***************************************************************************
-  /// add_lvalue_reference
-  template <typename T> struct add_lvalue_reference { typedef T& type; };
-  template <typename T> struct add_lvalue_reference<T&> { typedef T& type; };
-  template <>           struct add_lvalue_reference<void> { typedef void type; };
-  template <>           struct add_lvalue_reference<const void> { typedef const void type; };
-  template <>           struct add_lvalue_reference<volatile void> { typedef volatile void type; };
-  template <>           struct add_lvalue_reference<const volatile void> { typedef const volatile void type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_lvalue_reference_t = typename etl::add_lvalue_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_rvalue_reference
-#if ETL_USING_CPP11
-  template <typename T> struct add_rvalue_reference { using type = T && ; };
-  template <typename T> struct add_rvalue_reference<T&> { using type = T & ; };
-  template <>           struct add_rvalue_reference<void> { using type = void; };
-  template <>           struct add_rvalue_reference<const void> { using type = const void; };
-  template <>           struct add_rvalue_reference<volatile void> { using type = volatile void; };
-  template <>           struct add_rvalue_reference<const volatile void> { using type = const volatile void; };
-#endif
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_rvalue_reference_t = typename etl::add_rvalue_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// declval
-#if ETL_USING_CPP11
-  template <typename T>
-  typename etl::add_rvalue_reference<T>::type declval() ETL_NOEXCEPT;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// is_enum
-  ///\ingroup type_traits
-  /// Implemented by checking if type is convertible to an integer through static_cast
-
-  namespace private_type_traits
-  {
-    // Base case
-    template <typename T, typename = int>
-    struct is_convertible_to_int
-      : false_type
-    {
-    };
-
-    // Selected if `static_cast<int>(declval<T>())` is a valid statement
-    // 2nd template argument of base case defaults to int to ensure that this partial specialization is always tried first
-    template <typename T>
-    struct is_convertible_to_int<T, decltype(static_cast<int>(declval<T>()))>
-      : true_type
-    {
-    };
-  }
-
-  template <typename T>
-  struct is_enum
-    : integral_constant<bool, private_type_traits::is_convertible_to_int<T>::value &&
-                              !is_class<T>::value &&
-                              !is_arithmetic<T>::value &&
-                              !is_reference<T>::value>
-  {
-  };
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_enum_v = etl::is_enum<T>::value;
-#endif
-#else
-  namespace private_type_traits
-  {
-    // Helper to detect if a type is convertible to an integer
-    template <typename T>
-    struct is_convertible_to_int
-    {
-      static char test(int);   // Match if T is convertible to int
-      static double test(...); // Fallback for other types
-
-      static const bool value = sizeof(test(static_cast<T>(0))) == sizeof(char);
-    };
-  }
-
-  // Implementation of is_enum
-  template <typename T>
-  struct is_enum
-  {
-    static const bool value = private_type_traits::is_convertible_to_int<T>::value &&
-                              !is_class<T>::value &&
-                              !is_arithmetic<T>::value &&
-                              !is_reference<T>::value;
-  };
-#endif
-
-  //***************************************************************************
-  /// is_convertible
-  ///\ingroup type_traits
-#if ETL_USING_CPP11
-  namespace private_type_traits
-  {
-    template <typename>
-    using true_type_for = etl::true_type;
-
-    template <typename T>
-    auto returnable(int)->true_type_for<T()>;
-
-    template <typename>
-    auto returnable(...)->etl::false_type;
-
-    template <typename TFrom, typename TTo>
-    auto nonvoid_convertible(int)->true_type_for<decltype(etl::declval<void(&)(TTo)>()(etl::declval<TFrom>()))
-    >;
-    template <typename, typename>
-    auto nonvoid_convertible(...)->etl::false_type;
-  }
-
-#if defined(ETL_COMPILER_ARM5)
-  template <typename TFrom, typename TTo>
-  struct is_convertible : etl::bool_constant<__is_convertible_to(TFrom, TTo)> {};
-#else
-  template <typename TFrom, typename TTo>
-  struct is_convertible : etl::bool_constant<(decltype(private_type_traits::returnable<TTo>(0))::value &&
-                                              decltype(private_type_traits::nonvoid_convertible<TFrom, TTo>(0))::value) ||
-                                              (etl::is_void<TFrom>::value && etl::is_void<TTo>::value)> {};
-#endif
-
-  // Is convertible and the conversion is noexcept.
-  template <typename TFrom, typename TTo>
-  struct is_nothrow_convertible
-  {
-  private:
-    // Helper: a function taking TTo to require the conversion.
-    static void sink(TTo) noexcept;
-
-    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
-    template <typename F>
-    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
-
-    // Fallback if conversion is not viable.
-    template <typename>
-    static etl::false_type test(...);
-
-  public:
-    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
-  };
-#else
-  namespace private_type_traits
-  {
-    typedef char yes;
-    struct no { char dummy[2]; };
-
-    template <typename TFrom, typename TTo>
-    struct is_convertible_impl
-    {
-      static yes test(TTo);
-      static no test(...);
-      static TFrom make();
-      static const bool value = (sizeof(test(make())) == sizeof(yes));
-    };
-
-    template <typename TTo>
-    struct is_convertible_impl<void, TTo>
-    {
-      static const bool value = false;
-    };
-
-    template <typename TFrom>
-    struct is_convertible_impl<TFrom, void>
-    {
-      static const bool value = false;
-    };
-
-    template <>
-    struct is_convertible_impl<void, void>
-    {
-      static const bool value = true;
-    };
-  }
-
-  template <typename TFrom, typename TTo>
-  struct is_convertible : etl::bool_constant<private_type_traits::is_convertible_impl<TFrom, TTo>::value> {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename TFrom, typename TTo >
-  inline constexpr bool is_convertible_v = etl::is_convertible<TFrom, TTo>::value;
-
-  template <typename TFrom, typename TTo >
-  inline constexpr bool is_nothrow_convertible_v = etl::is_nothrow_convertible<TFrom, TTo>::value;
-#endif
-
-  //***************************************************************************
-  /// Alignment templates.
-  /// These require compiler specific intrinsics.
-#if ETL_USING_CPP11 && !defined(ETL_COMPILER_ARM5)
-  template <typename T> struct alignment_of : integral_constant<size_t, alignof(T)> { };
-#elif defined(ETL_COMPILER_MICROSOFT)
-  template <typename T> struct alignment_of : integral_constant<size_t, size_t(__alignof(T))> {};
-#elif defined(ETL_COMPILER_IAR) || defined(ETL_COMPILER_TI)
-  template <typename T> struct alignment_of : integral_constant<size_t, size_t(__ALIGNOF__(T))> {};
-#else
-  template <typename T> struct alignment_of : integral_constant<size_t, size_t(__alignof__(T))> {};
-#endif
-
-  /// Specialisation of 'alignment_of' for 'void'.
-  ///\ingroup type_traits
-  template <> struct alignment_of<void> : integral_constant <size_t, 0> {};
-  template <> struct alignment_of<const void> : integral_constant <size_t, 0> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr size_t alignment_of_v = etl::alignment_of<T>::value;
-#endif
-
-#else // Condition = ETL_USING_STL && ETL_USING_CPP11
-
-//*****************************************************************************
-// Traits are derived from the STL
-//*****************************************************************************
-
-  //***************************************************************************
-  /// integral_constant
-  ///\ingroup type_traits
-  template <typename T, T VALUE>
-  struct integral_constant : std::integral_constant<T, VALUE> {};
-
-/// integral_constant specialisations
-///\ingroup type_traits
-typedef integral_constant<bool, false> false_type;
-typedef integral_constant<bool, true>  true_type;
-
-#if ETL_USING_CPP17
-  template <typename T, T VALUE>
-  inline constexpr T integral_constant_v = std::integral_constant<T, VALUE>::value;
-#endif
-
-#if ETL_USING_CPP17
-  template <bool BValue>
-  using bool_constant = std::bool_constant<BValue>;
-#else
-  template <bool BValue>
-  struct bool_constant : std::integral_constant<bool, BValue> { };
-#endif
-
-#if ETL_USING_CPP17
-  template <bool BValue>
-  inline constexpr bool bool_constant_v = bool_constant<BValue>::value;
-#endif
-
-  //***************************************************************************
-  /// negation
-  ///\ingroup type_traits
-#if ETL_USING_CPP17
-  template <typename T>
-  using negation = std::negation<T>;
-#else
-  template <typename T>
-  struct negation : etl::bool_constant<!bool(T::value)>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool negation_v = std::negation_v<T>;
-#endif
-
-  //***************************************************************************
-  /// remove_reference
-  ///\ingroup type_traits
-  template <typename T> struct remove_reference : std::remove_reference<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_reference_t = typename std::remove_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_pointer
-  ///\ingroup type_traits
-  template <typename T> struct remove_pointer : std::remove_pointer<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_pointer_t = typename std::remove_pointer<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_pointer
-  ///\ingroup type_traits
-  template <typename T> struct add_pointer : std::add_pointer<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_pointer_t = typename std::add_pointer<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_const
-  ///\ingroup type_traits
-  template <typename T> struct is_const : std::is_const<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_const_v = std::is_const_v<T>;
-#endif
-
-  //***************************************************************************
-  /// remove_const
-  ///\ingroup type_traits
-  template <typename T> struct remove_const : std::remove_const<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_const_t = typename std::remove_const<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_const
-  ///\ingroup type_traits
-  template <typename T> struct add_const : std::add_const<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_const_t = typename std::add_const<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_volatile
-  ///\ingroup type_traits
-  template <typename T> struct is_volatile : std::is_volatile<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_volatile_v = std::is_volatile_v<T>;
-#endif
-
-  //***************************************************************************
-  /// remove_volatile
-  ///\ingroup type_traits
-  template <typename T> struct remove_volatile : std::remove_volatile<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_volatile_t = typename std::remove_volatile<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_volatile
-  ///\ingroup type_traits
-  template <typename T> struct add_volatile : std::add_volatile<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_volatile_t = typename std::add_volatile<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_cv
-  ///\ingroup type_traits
-  template <typename T> struct remove_cv : std::remove_cv<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_cv_t = typename std::remove_cv<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_cv
-  ///\ingroup type_traits
-  template <typename T> struct add_cv : std::add_cv<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_cv_t = typename std::add_cv<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_cvref
-  ///\ingroup type_traits
-  template <typename T> struct remove_cvref
-  {
-    typedef typename std::remove_cv<typename std::remove_reference<T>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_cvref_t = typename etl::remove_cvref<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_integral
-  ///\ingroup type_traits
-  template <typename T> struct is_integral : std::is_integral<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_integral_v = std::is_integral_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_signed
-  ///\ingroup type_traits
-  template <typename T> struct is_signed : std::is_signed<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_signed_v = std::is_signed_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_unsigned
-  ///\ingroup type_traits
-  template <typename T> struct is_unsigned : std::is_unsigned<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_unsigned_v = std::is_unsigned_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_floating_point
-  ///\ingroup type_traits
-  template <typename T> struct is_floating_point : std::is_floating_point<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_floating_point_v = std::is_floating_point_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_same
-  ///\ingroup type_traits
-  template <typename T1, typename T2> struct is_same : std::is_same<T1, T2> {};
-
-#if ETL_USING_CPP17
-  template <typename T1, typename T2>
-  inline constexpr bool is_same_v = std::is_same_v<T1, T2>;
-#endif
-
-  //***************************************************************************
-  /// is_void
-  ///\ingroup type_traits
-  template<typename T> struct is_void : std::is_void<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_void_v = std::is_void_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_arithmetic
-  ///\ingroup type_traits
-  template<typename T> struct is_arithmetic : std::is_arithmetic<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_arithmetic_v = std::is_arithmetic_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_fundamental
-  ///\ingroup type_traits
-  template <typename T> struct is_fundamental : std::is_fundamental<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_fundamental_v = std::is_fundamental_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_compound
-  ///\ingroup type_traits
-  template <typename T> struct is_compound : std::is_compound<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_compound_v = std::is_compound_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_array
-  ///\ingroup type_traits
-  template <typename T> struct is_array : std::is_array<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_array_v = std::is_array_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_pointer
-  ///\ingroup type_traits
-  template<typename T> struct is_pointer : std::is_pointer<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_pointer_v = std::is_pointer_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_reference
-  ///\ingroup type_traits
-  template<typename T> struct is_reference : std::is_reference<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_reference_v = std::is_reference_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_lvalue_reference
-  ///\ingroup type_traits
-  template<typename T> struct is_lvalue_reference : std::is_lvalue_reference<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_lvalue_reference_v = std::is_lvalue_reference_v<T>;
-#endif
-
-  //***************************************************************************
-  /// is_rvalue_reference
-  ///\ingroup type_traits
-#if ETL_USING_CPP11
-  template<typename T> struct is_rvalue_reference : std::is_rvalue_reference<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_rvalue_reference_v = std::is_rvalue_reference_v<T>;
-#endif
-#endif
-
-  //***************************************************************************
-  /// is_pod
-  ///\ingroup type_traits
-  template <typename T>
-  struct is_pod : std::integral_constant<bool, std::is_standard_layout<T>::value && std::is_trivially_default_constructible<T>::value && std::is_trivially_copyable<T>::value> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_pod_v = std::is_standard_layout_v<T> && std::is_trivially_default_constructible_v<T> && std::is_trivially_copyable_v<T>;
-#endif
-
-#if defined(ETL_COMPILER_GCC)
-  #if ETL_COMPILER_VERSION >= 5
-    #define ETL_GCC_V5_TYPE_TRAITS_SUPPORTED
-  #endif
-#endif
-
-  //***************************************************************************
-  /// conditional
-  ///\ingroup type_traits
-  template <bool BValue, typename T, typename F>  struct conditional { typedef T type; };
-  template <typename T, typename F> struct conditional<false, T, F> { typedef F type; };
-
-#if ETL_USING_CPP11
-  template <bool BValue, typename T, typename F>
-  using conditional_t = typename conditional<BValue, T, F>::type;
-#endif
-
-  //***************************************************************************
-  /// make_signed
-  ///\ingroup type_traits
-  template <typename T> struct make_signed : std::make_signed<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using make_signed_t = typename std::make_signed<T>::type;
-#endif
-
-  //***************************************************************************
-  /// make_unsigned
-  ///\ingroup type_traits
-  template <typename T> struct make_unsigned : std::make_unsigned<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using make_unsigned_t = typename std::make_unsigned<T>::type;
-#endif
-
-  //***************************************************************************
-  /// enable_if
-  ///\ingroup type_traits
-  template <bool BValue, typename T = void> struct enable_if : std::enable_if<BValue, T> {};
-
-#if ETL_USING_CPP11
-  template <bool BValue, typename T = void>
-  using enable_if_t = typename std::enable_if<BValue, T>::type;
-#endif
-
-  //***************************************************************************
-  /// extent
-  ///\ingroup type_traits
-  template <typename T, unsigned Size = 0U>
-  struct extent : std::extent<T, Size> {};
-
-#if ETL_USING_CPP17
-  template <typename T, unsigned Size = 0U>
-  inline constexpr size_t extent_v = std::extent_v<T, Size>;
-#endif
-
-  //***************************************************************************
-  /// remove_extent
-  ///\ingroup type_traits
-  template <typename T> struct remove_extent : std::remove_extent<T> { };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_extent_t = typename std::remove_extent<T>::type;
-#endif
-
-  //***************************************************************************
-  /// remove_all_extents
-  ///\ingroup type_traits
-  template <typename T> struct remove_all_extents : std::remove_all_extents<T> { };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using remove_all_extents_t = typename std::remove_all_extents<T>::type;
-#endif
-
-  //***************************************************************************
-  /// rank
-  ///\ingroup type_traits
-  template <typename T>struct rank : std::rank<T> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr size_t rank_v = std::rank_v<T>;
-#endif
-
-  //***************************************************************************
-  /// decay
-  ///\ingroup type_traits
-  template <typename T> struct decay : std::decay<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using decay_t = typename std::decay<T>::type;
-#endif
-
-  //***************************************************************************
-  /// is_base_of
-  ///\ingroup type_traits
-  template<typename TBase, typename TDerived> struct is_base_of : std::is_base_of<TBase, TDerived> {};
-
-#if ETL_USING_CPP17
-  template <typename TBase, typename TDerived>
-  inline constexpr bool is_base_of_v = std::is_base_of_v<TBase, TDerived>;
-#endif
-
-  //***************************************************************************
-  /// is_class
-  template <typename T> struct is_class : std::is_class<T>{};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_class_v = is_class<T>::value;
-#endif
-
-  //***************************************************************************
-  /// add_lvalue_reference
-  template <typename T> struct add_lvalue_reference : std::add_lvalue_reference<T> {};
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// add_rvalue_reference
-#if ETL_USING_CPP11
-  template <typename T> struct add_rvalue_reference : std::add_rvalue_reference<T> {};
-#endif
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
-#endif
-
-  //***************************************************************************
-  /// declval
-#if ETL_USING_CPP11
-  template <typename T>
-  typename std::add_rvalue_reference<T>::type declval() ETL_NOEXCEPT;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// is_enum
-  ///\ingroup type_traits
-  template <typename T>
-  struct is_enum : std::is_enum<T>
-  {
-  };
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_enum_v = etl::is_enum<T>::value;
-#endif
-
-#endif
-
-  //***************************************************************************
-  /// is_convertible
-  ///\ingroup type_traits
-#if ETL_USING_CPP11
-  template <typename TFrom, typename TTo>
-  struct is_convertible : std::is_convertible<TFrom, TTo> {};
-
-  // Is convertible and the conversion is noexcept.
-  template <typename TFrom, typename TTo>
-  struct is_nothrow_convertible
-  {
-  private:
-    // Helper: a function taking TTo to require the conversion.
-    static void sink(TTo) noexcept;
-
-    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
-    template <typename F>
-    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
-
-    // Fallback if conversion is not viable.
-    template <typename>
-    static etl::false_type test(...);
-
-  public:
-    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
-  };
-#else
-  namespace private_type_traits
-  {
-    typedef char yes;
-    struct no { char dummy[2]; };
-
-    template <typename TFrom, typename TTo>
-    struct is_convertible_impl
-    {
-      static yes test(TTo);
-      static no test(...);
-      static TFrom make();
-      static const bool value = (sizeof(test(make())) == sizeof(yes));
-    };
-
-    template <typename TTo>
-    struct is_convertible_impl<void, TTo>
-    {
-      static const bool value = false;
-    };
-
-    template <typename TFrom>
-    struct is_convertible_impl<TFrom, void>
-    {
-      static const bool value = false;
-    };
-
-    template <>
-    struct is_convertible_impl<void, void>
-    {
-      static const bool value = true;
-    };
-  }
-
-  template <typename TFrom, typename TTo>
-  struct is_convertible : etl::bool_constant<private_type_traits::is_convertible_impl<TFrom, TTo>::value> {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename TFrom, typename TTo>
-  inline constexpr bool is_convertible_v = std::is_convertible_v<TFrom, TTo>;
-
-  template <typename TFrom, typename TTo >
-  inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<TFrom, TTo>::value;
-#endif
-
-  //***************************************************************************
-  /// Alignment templates.
-  ///\ingroup type_traits
-  template <typename T> struct alignment_of : std::alignment_of<T> {};
-  template <> struct alignment_of<void> : std::integral_constant<size_t, 0> {};
-  template <> struct alignment_of<const void> : std::integral_constant <size_t, 0> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr size_t alignment_of_v = std::alignment_of_v<T>;
-#endif
-
-#endif // Condition = ETL_USING_STL && ETL_USING_CPP11
-
-  //***************************************************************************
-  // ETL extended type traits.
-  //***************************************************************************
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// conjunction
-#if ETL_USING_CPP11
-  template <typename...>
-  struct conjunction : public etl::true_type
-  {
-  };
-
-  template <typename T1, typename... Tn>
-  struct conjunction<T1, Tn...> : public etl::conditional_t<bool(T1::value), etl::conjunction<Tn...>, T1>
-  {
-  };
-
-  template <typename T>
-  struct conjunction<T> : public T
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  inline constexpr bool conjunction_v = conjunction<T...>::value;
-#endif
-
-  //***************************************************************************
-  /// disjunction
-#if ETL_USING_CPP11
-  template <typename...>
-  struct disjunction : public etl::false_type
-  {
-  };
-
-  template <typename T1, typename... Tn>
-  struct disjunction<T1, Tn...> : public etl::conditional_t<bool(T1::value), T1, disjunction<Tn...>>
-  {
-  };
-
-  template <typename T1> struct disjunction<T1> : public T1
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  inline constexpr bool disjunction_v = etl::disjunction<T...>::value;
-#endif
-
-#endif
-
-  //***************************************************************************
-  /// exclusive_disjunction
-#if ETL_USING_CPP11
-  template <typename... TTypes>
-  struct exclusive_disjunction;
-
-  template <typename T>
-  struct exclusive_disjunction<T> : public etl::bool_constant<T::value>
-  {
-  };
-
-  // Recursive case: XOR the first two values and recurse
-  template <typename T1, typename T2, typename... TRest>
-  struct exclusive_disjunction<T1, T2, TRest...> : public etl::exclusive_disjunction<etl::integral_constant<bool, etl::disjunction<T1, T2>::value && !etl::conjunction<T1, T2>::value>, TRest...>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... T>
-  inline constexpr bool exclusive_disjunction_v = etl::exclusive_disjunction<T...>::value;
-#endif
-
-  //***************************************************************************
-  /// conditional_integral_constant
-  // /\ingroup type_traits
-  template <bool BValue, typename T, T TRUE_VALUE, T FALSE_VALUE>
-  struct conditional_integral_constant;
-
-  template <typename T, T TRUE_VALUE, T FALSE_VALUE>
-  struct conditional_integral_constant<true, T, TRUE_VALUE, FALSE_VALUE>
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
-    static const T value = TRUE_VALUE;
-  };
-
-  template <typename T, T TRUE_VALUE, T FALSE_VALUE>
-  struct conditional_integral_constant<false, T, TRUE_VALUE, FALSE_VALUE>
-  {
-    ETL_STATIC_ASSERT(etl::is_integral<T>::value, "Not an integral type");
-    static const T value = FALSE_VALUE;
-  };
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Template to determine if a type is a base of all types in a specified list.
-  ///\ingroup types
-  template <typename T, typename... TRest>
-  struct is_one_of : etl::disjunction<etl::is_same<T, TRest>...>
-  {
-  };
-#else
-  /*[[[cog
-  import cog
-  cog.outl("//***************************************************************************")
-  cog.outl("/// Template to determine if a type is one of a specified list.")
-  cog.outl("///\\ingroup types")
-  cog.outl("template <typename T,")
-  cog.out("         ")
-  cog.out(" typename T1,")
-  for n in range(2, int(IsOneOf)):
-      cog.out(" typename T%s = void," % n)
-      if n % 4 == 0:
-          cog.outl("")
-          cog.out("         ")
-  cog.outl(" typename T%s = void>" % IsOneOf)
-  cog.outl("struct is_one_of")
-  cog.outl("{")
-  cog.outl("  static const bool value =")
-  for n in range(1, int(IsOneOf)):
-      cog.outl("      etl::is_same<T, T%s>::value ||" % n)
-  cog.outl("      etl::is_same<T, T%s>::value;" % IsOneOf)
-  cog.outl("};")
-  ]]]*/
-  /*[[[end]]]*/
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TRest>
-  inline constexpr bool is_one_of_v = etl::is_one_of<T, TRest...>::value;
-#endif
-
-#if ETL_USING_CPP11
-  namespace private_type_traits
-  {
-    //***************************************************************************
-    // Helper to count occurrences of a type in a list of types
-    template<typename T, typename... TTypes>
-    struct count_type;
-
-    // Base case: zero occurrences
-    template<typename T>
-    struct count_type<T> : etl::integral_constant<size_t, 0>
-    {
-    };
-
-    // Recursive case: increment count if head is the same as T, otherwise continue with tail
-    template<typename T, typename THead, typename... TTail>
-    struct count_type<T, THead, TTail...> : etl::integral_constant<size_t, (etl::is_same<T, THead>::value ? 1 : 0) + count_type<T, TTail...>::value>
-    {
-    };
-  }
-
-  template<typename T, typename... TTypes>
-  struct has_duplicates_of
-    : etl::integral_constant<bool, (private_type_traits::count_type<T, TTypes...>::value > 1)>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TRest>
-  inline constexpr bool has_duplicates_of_v = etl::has_duplicates_of<T, TRest...>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Template to determine if a type is a base of all types in a specified list.
-  ///\ingroup types
-  template <typename TBase, typename... TDerived>
-  struct is_base_of_all : etl::conjunction<etl::is_base_of<TBase, TDerived>...>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TRest>
-  inline constexpr bool is_base_of_all_v = etl::is_base_of_all<T, TRest...>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Template to determine if a type is a base of any type in a specified list.
-  ///\ingroup types
-  template <typename TBase, typename... TDerived>
-  struct is_base_of_any : etl::disjunction<etl::is_base_of<TBase, TDerived>...>
-  {
-  };
-
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TRest>
-  inline constexpr bool is_base_of_any_v = etl::is_base_of_any<T, TRest...>::value;
-#endif
-
-  //***************************************************************************
-  /// Get the Nth base of a recursively inherited type.
-  /// Requires that the class has defined 'base_type'.
-  //***************************************************************************
-  // Recursive definition of the type.
-  template <size_t Index, typename TType>
-  struct nth_base
-  {
-    typedef typename nth_base<Index - 1U, typename TType::base_type>::type type;
-  };
-
-  template <typename TType>
-  struct nth_base<0, TType>
-  {
-    typedef TType type;
-  };
-
-#if ETL_USING_CPP11
-  template <size_t Index, typename TType>
-  using nth_base_t = typename nth_base<Index, TType>::type;
-#endif
-
-  //***************************************************************************
-  /// A set of templates to allow related types to be derived.
-  ///\ingroup types
-
-  // Default.
-  template <typename T>
-  struct types
-  {
-  private:
-
-    typedef typename etl::remove_reference<typename etl::remove_cv<T>::type>::type type_t;
-
-  public:
-
-    typedef type_t              type;
-    typedef type_t&             reference;
-    typedef const type_t&       const_reference;
-    typedef type_t*             pointer;
-    typedef const type_t*       const_pointer;
-    typedef const type_t* const const_pointer_const;
-
-#if ETL_USING_CPP11
-    typedef type_t&&            rvalue_reference;
-#endif
-  };
-
-  // Pointers.
-  template <typename T>
-  struct types<T*>
-  {
-  private:
-
-    typedef typename etl::remove_reference<typename etl::remove_cv<T>::type>::type type_t;
-
-  public:
-
-    typedef type_t              type;
-    typedef type_t&             reference;
-    typedef const type_t&       const_reference;
-    typedef type_t*             pointer;
-    typedef const type_t*       const_pointer;
-    typedef const type_t* const const_pointer_const;
-
-#if ETL_USING_CPP11
-    typedef type_t&&            rvalue_reference;
-#endif
-  };
-
-  // Pointers.
-  template <typename T>
-  struct types<T* const>
-  {
-  private:
-
-    typedef typename etl::remove_reference<typename etl::remove_cv<T>::type>::type type_t;
-
-  public:
-
-    typedef type_t              type;
-    typedef type_t&             reference;
-    typedef const type_t&       const_reference;
-    typedef type_t*             pointer;
-    typedef const type_t* const_pointer;
-    typedef const type_t* const const_pointer_const;
-
-#if ETL_USING_CPP11
-    typedef type_t&&            rvalue_reference;
-#endif
-  };
-
-  // References.
-  template <typename T>
-  struct types<T&>
-  {
-  private:
-
-    typedef typename etl::remove_reference<typename etl::remove_cv<T>::type>::type type_t;
-
-  public:
-
-    typedef type_t              type;
-    typedef type_t&             reference;
-    typedef const type_t&       const_reference;
-    typedef type_t*             pointer;
-    typedef const type_t*       const_pointer;
-    typedef const type_t* const const_pointer_const;
-
-#if ETL_USING_CPP11
-    typedef type_t&&            rvalue_reference;
-#endif
-  };
-
-#if ETL_USING_CPP11
-  // rvalue References.
-  template <typename T>
-  struct types<T&&>
-  {
-  private:
-
-    typedef typename etl::remove_reference<typename etl::remove_cv<T>::type>::type type_t;
-
-  public:
-
-    typedef type_t              type;
-    typedef type_t&             reference;
-    typedef const type_t&       const_reference;
-    typedef type_t*             pointer;
-    typedef const type_t*       const_pointer;
-    typedef const type_t* const const_pointer_const;
-
-#if ETL_USING_CPP11
-    typedef type_t&&            rvalue_reference;
-#endif
-  };
-#endif
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using types_t = typename types<T>::type;
-
-  template <typename T>
-  using types_r = typename types<T>::reference;
-
-  template <typename T>
-  using types_cr = typename types<T>::const_reference;
-
-  template <typename T>
-  using types_rr = typename types<T>::rvalue_reference;
-
-  template <typename T>
-  using types_p = typename types<T>::pointer;
-
-  template <typename T>
-  using types_cp = typename types<T>::const_pointer;
-
-  template <typename T>
-  using types_cpc = typename types<T>::const_pointer_const;
-#endif
-
-  //***************************************************************************
-  /// size_of
-  ///\ingroup types
-  template <typename T> struct size_of : etl::integral_constant<size_t, sizeof(T)> {};
-  template <> struct size_of<void> : etl::integral_constant<size_t, 1U> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr size_t size_of_v = etl::size_of<T>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// are_all_same
-  template <typename T, typename... TRest>
-  struct are_all_same : etl::conjunction<etl::is_same<T, TRest>...>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TRest>
-  inline constexpr bool are_all_same_v = are_all_same<T, TRest...>::value;
-#endif
-
-  //***************************************************************************
-#if ETL_USING_STL && ETL_USING_CPP11 && !defined(ETL_USE_TYPE_TRAITS_BUILTINS) && !defined(ETL_USER_DEFINED_TYPE_TRAITS) && ((!defined(ARDUINO) && ETL_NOT_USING_STLPORT) || defined(ETL_GCC_V5_TYPE_TRAITS_SUPPORTED))
-
-  //*********************************************
-  // Use the STL's definitions.
-  //*********************************************
-
-  //*********************************************
-  // is_assignable
-  template<typename T1, typename T2>
-  using is_assignable = std::is_assignable<T1, T2>;
-
-  //*********************************************
-  // is_constructible
-  template<typename T, typename... TArgs>
-  using is_constructible = std::is_constructible<T, TArgs...>;
-
-  //*********************************************
-  // is_copy_constructible
-  template <typename T>
-  using is_copy_constructible = std::is_copy_constructible<T>;
-
-  //*********************************************
-  // is_move_constructible
-  template <typename T>
-  using is_move_constructible = std::is_move_constructible<T>;
-
-  //*********************************************
-  // is_copy_assignable
-  template <typename T>
-  using is_copy_assignable = std::is_copy_assignable<T>;
-
-  //*********************************************
-  // is_move_assignable
-  template <typename T>
-  using is_move_assignable = std::is_move_assignable<T>;
-
-  //*********************************************
-  // is_trivially_constructible
-#if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
-  template <typename T>
-  using is_trivially_constructible = std::is_trivially_constructible<T>;
-#else
-  template <typename T>
-  using is_trivially_constructible = etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>;
-#endif
-
-  //*********************************************
-  // is_trivially_copy_constructible
-#if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
-  template <typename T>
-  using is_trivially_copy_constructible = std::is_trivially_copy_constructible<T>;
-#else
-  template <typename T>
-  using is_trivially_copy_constructible = etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>;
-#endif
-
-  //*********************************************
-  // is_trivially_destructible
-#if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
-  template <typename T>
-  using is_trivially_destructible = std::is_trivially_destructible<T>;
-#else
-  template <typename T>
-  using is_trivially_destructible = etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>;
-#endif
-
-  //*********************************************
-  // is_trivially_copy_assignable
-#if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
-  template <typename T>
-  using is_trivially_copy_assignable = std::is_trivially_copy_assignable<T>;
-#else
-  template <typename T>
-  using is_trivially_copy_assignable = etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>;
-#endif
-
-  //*********************************************
-  // is_trivially_copyable
-#if ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED
-  template <typename T>
-  using is_trivially_copyable = std::is_trivially_copyable<T>;
-#elif ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE
-  template <typename T>
-  using is_trivially_copyable = etl::bool_constant<__is_trivially_copyable(T)>;
-#else
-  template <typename T>
-  using is_trivially_copyable = etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>;
-#endif
-
-#elif defined(ETL_USE_TYPE_TRAITS_BUILTINS) && !defined(ETL_USER_DEFINED_TYPE_TRAITS)
-
-  //*********************************************
-  // Use the compiler's builtins.
-  //*********************************************
-
-  //*********************************************
-  // is_assignable
-  template<typename T1, typename T2>
-  struct is_assignable
-  {
-    static ETL_CONSTANT bool value = __is_assignable(T1, T2);
-  };
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // is_constructible
-  template<typename T, typename... TArgs>
-  struct is_constructible
-  {
-    static ETL_CONSTANT bool value = __is_constructible(T, TArgs...);
-  };
-#else
-  //*********************************************
-  // is_constructible
-  template<typename T, typename TArgs = void>
-  struct is_constructible
-  {
-    static ETL_CONSTANT bool value = __is_constructible(T, TArgs);
-  };
-
-  //*********************************************
-  // is_constructible
-  template<typename T>
-  struct is_constructible<T, void>
-  {
-    static ETL_CONSTANT bool value = __is_constructible(T);
-  };
-#endif
-
-  //*********************************************
-  // is_copy_constructible
-  template <typename T>
-  struct is_copy_constructible : public etl::is_constructible<T, typename etl::add_lvalue_reference<const T>::type>
-  {
-  };
-
-  //*********************************************
-  // is_move_constructible
-  template <typename T>
-  struct is_move_constructible : public etl::is_constructible<T, T>
-  {
-  };
-
-  //*********************************************
-  // is_copy_assignable
-  template <typename T>
-  struct is_copy_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T>::type,
-                                                        typename etl::add_lvalue_reference<const T>::type>
-  {
-  };
-
-  //*********************************************
-  // is_move_assignable
-#if ETL_USING_CPP11
-  template <typename T>
-  struct is_move_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T>::type,
-                                                        typename etl::add_rvalue_reference<T>::type>
-  {
-  };
-#else
-  template <typename T>
-  struct is_move_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T>::type, T>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // is_trivially_constructible
-  template <typename T, typename... TArgs>
-  struct is_trivially_constructible
-  {
-#if defined(ETL_COMPILER_GCC)
-    static ETL_CONSTANT bool value = __has_trivial_constructor(T);
-#else
-    static ETL_CONSTANT bool value = __is_trivially_constructible(T, TArgs...);
-#endif
-  };
-#else
-  //*********************************************
-  // is_trivially_constructible
-  template <typename T, typename TArgs = void>
-  struct is_trivially_constructible
-  {
-#if defined(ETL_COMPILER_GCC)
-    static ETL_CONSTANT bool value = __has_trivial_constructor(T);
-#else
-    static ETL_CONSTANT bool value = __is_trivially_constructible(T, TArgs);
-#endif
-  };
-
-  //*********************************************
-  // is_trivially_constructible
-  template <typename T>
-  struct is_trivially_constructible<T, void>
-  {
-#if defined(ETL_COMPILER_GCC)
-    static ETL_CONSTANT bool value = __has_trivial_constructor(T);
-#else
-    static ETL_CONSTANT bool value = __is_trivially_constructible(T);
-#endif
-  };
-#endif
-
-  //*********************************************
-  // is_trivially_copy_constructible
-  template <typename T>
-  struct is_trivially_copy_constructible : public is_trivially_constructible<T, typename add_lvalue_reference<const T>::type>
-  {
-  };
-
-  //*********************************************
-  // is_trivially_destructible
-  template <typename T>
-  struct is_trivially_destructible
-  {
-#if defined(ETL_COMPILER_GCC)
-    static ETL_CONSTANT bool value = __has_trivial_destructor(T);
-#else
-    static ETL_CONSTANT bool value = __is_trivially_destructible(T);
-#endif
-  };
-
-  //*********************************************
-  // is_trivially_copy_assignable
-  template <typename T>
-  struct is_trivially_copy_assignable
-  {
-#if defined(ETL_COMPILER_GCC)
-    static ETL_CONSTANT bool value = __has_trivial_copy(T);
-#else
-    static ETL_CONSTANT bool value = __is_trivially_copyable(T);
-#endif
-  };
-
-  //*********************************************
-  // is_trivially_copyable
-  template <typename T>
-  struct is_trivially_copyable
-  {
-    static ETL_CONSTANT bool value = __is_trivially_copyable(T);
-  };
-
-#elif defined(ETL_USER_DEFINED_TYPE_TRAITS) && !defined(ETL_USE_TYPE_TRAITS_BUILTINS)
-
-  //*********************************************
-  // Force the user to provide specialisations for
-  // anything other than arithmetics and pointers.
-  //*********************************************
-
-  //*********************************************
-  // is_assignable
-  template <typename T1,
-            typename T2,
-            bool BValue = (etl::is_arithmetic<T1>::value || etl::is_pointer<T1>::value) && (etl::is_arithmetic<T2>::value || etl::is_pointer<T2>::value)>
-  struct is_assignable;
-
-  template <typename T1, typename T2>
-  struct is_assignable<T1, T2, true> : public etl::true_type
-  {
-  };
-
-  template <typename T1, typename T2>
-  struct is_assignable<T1, T2, false>;
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // is_constructible
-  template <typename T, bool BValue, typename... TArgs>
-  struct is_constructible_helper;
-
-  template <typename T, typename... TArgs>
-  struct is_constructible_helper<T, true, TArgs...> : public etl::true_type
-  {
-  };
-
-  template <typename T, typename... TArgs>
-  struct is_constructible_helper<T, false, TArgs...>;
-
-  template <typename T, typename... TArgs>
-  struct is_constructible : public is_constructible_helper<T, etl::is_arithmetic<T>::value || etl::is_pointer<T>::value, TArgs...>
-  {
-  };
-#endif
-
-  //*********************************************
-  // is_copy_constructible
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_copy_constructible;
-
-  template <typename T>
-  struct is_copy_constructible<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_copy_constructible<T, false>;
-
-  //*********************************************
-  // is_move_constructible
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_move_constructible;
-
-  template <typename T>
-  struct is_move_constructible<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_move_constructible<T, false>;
-
-  //*********************************************
-  // is_copy_assignable
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_copy_assignable;
-
-  template <typename T>
-  struct is_copy_assignable<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_copy_assignable<T, false>;
-
-  //*********************************************
-  // is_move_assignable
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_move_assignable;
-
-  template <typename T>
-  struct is_move_assignable<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_move_assignable<T, false>;
-
-  //*********************************************
-  // is_trivially_constructible
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_trivially_constructible;
-
-  template <typename T>
-  struct is_trivially_constructible<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_trivially_constructible<T, false>;
-
-  //*********************************************
-  // is_trivially_copy_constructible
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_trivially_copy_constructible;
-
-  template <typename T>
-  struct is_trivially_copy_constructible<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_trivially_copy_constructible<T, false>;
-
-  //*********************************************
-  // is_trivially_destructible
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_trivially_destructible;
-
-  template <typename T>
-  struct is_trivially_destructible<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_trivially_destructible<T, false>;
-
-  //*********************************************
-  // is_trivially_copy_assignable
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_trivially_copy_assignable;
-
-  template <typename T>
-  struct is_trivially_copy_assignable<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_trivially_copy_assignable<T, false>;
-
-  //*********************************************
-  // is_trivially_copyable
-  template <typename T, bool BValue = etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  struct is_trivially_copyable;
-
-  template <typename T>
-  struct is_trivially_copyable<T, true> : public etl::true_type
-  {
-  };
-
-  template <typename T>
-  struct is_trivially_copyable<T, false>;
-
-#else
-
-  //*********************************************
-  // Assume that anything other than arithmetics
-  // and pointers return false for the traits.
-  //*********************************************
-
-  //*********************************************
-  // is_assignable
-  template <typename T1, typename T2>
-#if ETL_USING_BUILTIN_IS_ASSIGNABLE
-  struct is_assignable : public etl::bool_constant<__is_assignable(T1, T2)>
-#else
-  struct is_assignable : public etl::bool_constant<(etl::is_arithmetic<T1>::value || etl::is_pointer<T1>::value) && (etl::is_arithmetic<T2>::value || etl::is_pointer<T2>::value)>
-#endif
-  {
-  };
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// is_constructible
-  namespace private_type_traits
-  {
-    template <class, class T, class... TArgs>
-    struct is_constructible_ : etl::false_type {};
-
-    template <class T, class... TArgs>
-    struct is_constructible_<void_t<decltype(T(etl::declval<TArgs>()...))>, T, TArgs...> : etl::true_type {};
-  }
-
-  //*********************************************
-  // is_constructible
-  template <class T, class... TArgs>
-  using is_constructible = private_type_traits::is_constructible_<void_t<>, T, TArgs...>;
-
-  //*********************************************
-  // is_copy_constructible
-  template <class T> struct is_copy_constructible : public is_constructible<T,  typename etl::add_lvalue_reference<typename etl::add_const<T>::type>::type>{};
-  template <> struct is_copy_constructible<void> : public false_type{};
-  template <> struct is_copy_constructible<void const> : public false_type{};
-  template <> struct is_copy_constructible<void volatile> : public false_type{};
-  template <> struct is_copy_constructible<void const volatile> : public false_type{};
-
-  //*********************************************
-  // is_move_constructible
-  template <typename T> struct is_move_constructible: public is_constructible<T, typename etl::add_rvalue_reference<T>::type>{};
-  template <> struct is_move_constructible<void> : public false_type{};
-  template <> struct is_move_constructible<void const> : public false_type{};
-  template <> struct is_move_constructible<void volatile> : public false_type{};
-  template <> struct is_move_constructible<void const volatile> : public false_type{};
-
-#else
-
-  //*********************************************
-  // is_copy_constructible
-  template <typename T>
-  struct is_copy_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-
-  //*********************************************
-  // is_move_constructible
-  template <typename T>
-  struct is_move_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-#endif
-
-  //*********************************************
-  // is_copy_assignable
-  template <typename T>
-  struct is_copy_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T>::type,
-                                                        typename etl::add_lvalue_reference<const T>::type>
-  {
-  };
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // is_move_assignable
-  template <typename T>
-  struct is_move_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T>::type,
-                                                        typename etl::add_rvalue_reference<T>::type>
-  {
-  };
-#else
-  //*********************************************
-  // is_move_assignable
-  template <typename T>
-  struct is_move_assignable : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-#endif
-
-  //*********************************************
-  // is_trivially_constructible
-  template <typename T>
-  struct is_trivially_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-
-  //*********************************************
-  // is_trivially_copy_constructible
-  template <typename T>
-  struct is_trivially_copy_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-
-  //*********************************************
-  // is_trivially_destructible
-  template <typename T>
-  struct is_trivially_destructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-
-  //*********************************************
-  // is_trivially_copy_assignable
-  template <typename T>
-  struct is_trivially_copy_assignable : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-
-  //*********************************************
-  // is_trivially_copyable
-  template <typename T>
-#if ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE
-  struct is_trivially_copyable : public etl::bool_constant<__is_trivially_copyable(T)>
-#else
-  struct is_trivially_copyable : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-#endif
-  {
-  };
-
-#endif
-
-  template <typename T1, typename T2>
-  struct is_lvalue_assignable : public etl::is_assignable<typename etl::add_lvalue_reference<T1>::type,
-                                                          typename etl::add_lvalue_reference<typename etl::add_const<T2>::type>::type>
-  {
-  };
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // is_default_constructible
-  template<typename T, typename = void>
-  struct is_default_constructible : etl::false_type { };
-
-  template<typename T>
-  struct is_default_constructible<T, etl::void_t<decltype(T())>> : etl::true_type { };
-#else
-  template <typename T>
-  struct is_default_constructible : public etl::bool_constant<etl::is_arithmetic<T>::value || etl::is_pointer<T>::value>
-  {
-  };
-#endif
-
-#if ETL_USING_CPP17
-
-  template <typename T1, typename T2>
-  inline constexpr bool is_assignable_v = etl::is_assignable<T1, T2>::value;
-
-  template <typename T1, typename T2>
-  inline constexpr bool is_lvalue_assignable_v = etl::is_lvalue_assignable<T1, T2>::value;
-
-  template<typename T, typename... TArgs>
-  inline constexpr bool is_constructible_v = etl::is_constructible<T, TArgs...>::value;
-
-  template<typename T, typename... TArgs>
-  inline constexpr bool is_default_constructible_v = etl::is_default_constructible<T, TArgs...>::value;
-
-  template<typename T>
-  inline constexpr bool is_copy_constructible_v = etl::is_copy_constructible<T>::value;
-
-  template<typename T>
-  inline constexpr bool is_move_constructible_v = etl::is_move_constructible<T>::value;
-
-  template<typename T>
-  inline constexpr bool is_copy_assignable_v = etl::is_copy_assignable<T>::value;
-
-  template<typename T>
-  inline constexpr bool is_move_assignable_v = etl::is_move_assignable<T>::value;
-
-  template <typename T>
-  inline constexpr bool is_trivially_constructible_v = etl::is_trivially_constructible<T>::value;
-
-  template <typename T>
-  inline constexpr bool is_trivially_copy_constructible_v = etl::is_trivially_copy_constructible<T>::value;
-
-  template <typename T>
-  inline constexpr bool is_trivially_destructible_v = etl::is_trivially_destructible<T>::value;
-
-  template <typename T>
-  inline constexpr bool is_trivially_copy_assignable_v = etl::is_trivially_copy_assignable<T>::value;
-
-  template <typename T>
-  inline constexpr bool is_trivially_copyable_v = etl::is_trivially_copyable<T>::value;
-
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // common_type
-  // Based on the sample implementation detailed on
-  // https://en.cppreference.com/w/cpp/types/common_type
-  //*********************************************
-  //***********************************
-  // Primary template
-  template<typename...>
-  struct common_type
-  {
-  };
-
-  //***********************************
-  // One type
-  template <typename T>
-  struct common_type<T> : common_type<T, T>
-  {
-  };
-
-  namespace private_common_type
-  {
-    template <typename T1, typename T2>
-    using conditional_result_t = decltype(false ? declval<T1>() : declval<T2>());
-
-    template <typename, typename, typename = void>
-    struct decay_conditional_result
-    {
-    };
-
-    template <typename T1, typename T2>
-    struct decay_conditional_result<T1, T2, void_t<conditional_result_t<T1, T2>>>
-      : etl::decay<conditional_result_t<T1, T2>>
-    {
-    };
-
-    template <typename T1, typename T2, typename = void>
-    struct common_type_2_impl
-      : decay_conditional_result<const T1&, const T2&>
-    {
-    };
-
-    template <typename T1, typename T2>
-    struct common_type_2_impl<T1, T2, void_t<conditional_result_t<T1, T2>>>
-      : decay_conditional_result<T1, T2>
-    {
-    };
-  }
-
-  //***********************************
-  // Two types
-  template <typename T1, typename T2>
-  struct common_type<T1, T2>
-    : etl::conditional<etl::is_same<T1, typename etl::decay<T1>::type>::value&& etl::is_same<T2, typename etl::decay<T2>::type>::value,
-                       private_common_type::common_type_2_impl<T1, T2>,
-                       common_type<typename etl::decay<T2>::type,
-                       typename etl::decay<T2>::type>>::type
-  {
-  };
-
-  //***********************************
-  // Three or more types
-  namespace private_common_type
-  {
-    template <typename AlwaysVoid, typename T1, typename T2, typename... TRest>
-    struct common_type_multi_impl
-    {
-    };
-
-    template <typename T1, typename T2, typename... TRest>
-    struct common_type_multi_impl<void_t<typename common_type<T1, T2>::type>, T1, T2, TRest...>
-      : common_type<typename common_type<T1, T2>::type, TRest...>
-    {
-    };
-  }
-
-  template<typename T1, typename T2, typename... TRest>
-  struct common_type<T1, T2, TRest...>
-    : private_common_type::common_type_multi_impl<void, T1, T2, TRest...>
-  {
-  };
-
-  template <typename... T>
-  using common_type_t = typename common_type<T...>::type;
-#endif
-
-  //***************************************************************************
-  /// Defines one of five unsigned types that has the same size as T.
-  //***************************************************************************
-  template <typename T>
-  struct unsigned_type
-  {
-    typedef typename etl::conditional<sizeof(T) == sizeof(unsigned char), unsigned char,
-      typename etl::conditional<sizeof(T) == sizeof(unsigned short), unsigned short,
-        typename etl::conditional<sizeof(T) == sizeof(unsigned int), unsigned int,
-          typename etl::conditional<sizeof(T) == sizeof(unsigned long), unsigned long,
-            unsigned long long>::type>::type>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using unsigned_type_t = typename unsigned_type<T>::type;
-#endif
-
-  //***************************************************************************
-  /// Defines one of five signed types that has the same size as T.
-  //***************************************************************************
-  template <typename T>
-  struct signed_type
-  {
-    typedef typename etl::conditional<sizeof(T) == sizeof(char), char,
-      typename etl::conditional<sizeof(T) == sizeof(short), short,
-        typename etl::conditional<sizeof(T) == sizeof(int), int,
-          typename etl::conditional<sizeof(T) == sizeof(long), long,
-            long long>::type>::type>::type>::type type;
-  };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using signed_type_t = typename signed_type<T>::type;
-#endif
-
-  //*********************************************
-  // type_identity
-
-  template <typename T>
-  struct type_identity { typedef T type; };
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using type_identity_t = typename type_identity<T>::type;
-#endif
-
-  //*********************************************
-  // underlying_type
-#if ETL_USING_BUILTIN_UNDERLYING_TYPE
-  // Primary template for etl::underlying_type
-  template <typename T, bool = etl::is_enum<T>::value>
-  struct underlying_type;
-
-  // Specialization for non-enum types (invalid case)
-  template <typename T>
-  struct underlying_type<T, false>
-  {
-    // Static assertion to ensure this is only used with enums
-    ETL_STATIC_ASSERT(etl::is_enum<T>::value, "etl::underlying_type can only be used with enumeration types.");
-  };
-
-  template <typename T>
-  struct underlying_type<T, true>
-  {
-    typedef __underlying_type(T) type;
-  };
-#else
-  /// Primary template for etl::underlying_type
-  /// Users must specialise this template for their enumerations.
-  template <typename T>
-  struct underlying_type
-  {
-    typedef int type;
-  };
-#endif
-
-#if ETL_USING_CPP11
-  template <typename T>
-  using underlying_type_t = typename underlying_type<T>::type;
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // has_duplicates
-  template <typename... TTypes>
-  struct has_duplicates;
-
-  template <typename TFirst, typename... TRest>
-  struct has_duplicates<TFirst, TRest...> : etl::conditional_t<etl::is_one_of<TFirst, TRest...>::value,
-                                                               etl::true_type,
-                                                               has_duplicates<TRest...>> {};
-
-  template <typename T>
-  struct has_duplicates<T> : etl::false_type {};
-
-  template <>
-  struct has_duplicates<> : etl::false_type {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename... TTypes>
-  inline constexpr bool has_duplicates_v = etl::has_duplicates<TTypes...>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************************
-  // count_of
-  template <typename T, typename... TTypes>
-  struct count_of;
-
-  template <typename T, typename U, typename... URest>
-  struct count_of<T, U, URest...> : etl::integral_constant<size_t,
-                                                            etl::is_same<T, U>::value +
-                                                              count_of<T, URest...>::value> {};
-
-  template <typename T>
-  struct count_of<T> : etl::integral_constant<size_t, 0> {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, typename... TTypes>
-  inline constexpr size_t count_of_v = etl::count_of<T, TTypes...>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************************
-  /// is_specialization
-  template <typename T, template <typename...> class Template>
-  struct is_specialization : etl::false_type {};
-
-  template <template <typename...> class Template, typename... TArgs>
-  struct is_specialization<Template<TArgs...>, Template> : etl::true_type {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T, template <typename...> class Template>
-  inline constexpr bool is_specialization_v = etl::is_specialization<T, Template>::value;
-#endif
-
-  //*********************************************
-  // is_constant_evaluated
-  ETL_CONSTEXPR inline bool is_constant_evaluated() ETL_NOEXCEPT
-  {
-#if ETL_USING_CPP23
-    if consteval
-    {
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-#elif ETL_USING_BUILTIN_IS_CONSTANT_EVALUATED == 1
-    // Fallback for C++20 on supported compilers
-    return __builtin_is_constant_evaluated();
-#else
-    // default if unsupported
-    return false;
-#endif
-  }
-
-#if ETL_USING_CPP11
-  //*********************************
-  /// Check if T is a function type
-  //*********************************
-  template<typename T>
-  struct is_function : etl::false_type
-  {
-  };
-
-  // Plain / cv-qualified
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...)> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) const> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) volatile> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) const volatile> : etl::true_type {};
-
-  // Variadic
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...)> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) const> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) volatile> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) const volatile> : etl::true_type {};
-
-  // noexcept variants (if supported)
-#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) const noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) volatile noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs...) const volatile noexcept> : etl::true_type {};
-
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) const noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) volatile noexcept> : etl::true_type {};
-
-  template<typename TReturn, typename... TArgs>
-  struct is_function<TReturn(TArgs..., ...) const volatile noexcept> : etl::true_type {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_function_v = etl::is_function<T>::value;
-#endif
-#endif
-
-#if ETL_USING_CPP11
-  //*********************************
-  /// Check for the presence of operator()
-  //*********************************
-  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
-  struct has_call_operator
-  {
-    template <typename U>
-    static auto test(int) -> decltype(&U::operator(), etl::true_type());
-
-    template <typename>
-    static etl::false_type test(...);
-
-    static const bool value = etl::is_same<decltype(test<T>(0)), etl::true_type>::value;
-  };
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool has_call_operator_v = etl::has_call_operator<T>::value;
-#endif
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Check that there is only one operator()
-  //***************************************************************************
-  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
-  struct has_unique_call_operator
-  {
-    //*********************************
-    // Test for presence of operator()
-    //*********************************
-    template <typename U>
-    static auto test(int) -> decltype(&U::operator(), etl::true_type());
-
-    //*********************************
-    // Fallback
-    //*********************************
-    template <typename>
-    static auto test(...) -> etl::false_type;
-
-    //*********************************
-    // <b>true</b> if operator() exists and is unique
-    //*********************************
-    static constexpr bool value = decltype(test<etl::decay_t<T>>(0))::value;
-  };
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool has_unique_call_operator_v = etl::has_unique_call_operator<T>::value;
-#endif
-#endif
-
-  //***************************************************************************
-  /// Is T a member pointer
-  //***************************************************************************
-  namespace private_type_traits
-  {
-    template<typename T>
-    struct is_member_pointer_helper : etl::false_type {};
-
-    template<typename T, typename TObject>
-    struct is_member_pointer_helper<T TObject::*> : etl::true_type {};
-  }
-
-  template<typename T>
-  struct is_member_pointer : private_type_traits::is_member_pointer_helper<typename etl::remove_cv<T>::type> {};
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_member_pointer_v = etl::is_member_pointer<T>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Is T a member function pointer
-  //***************************************************************************
-  template <typename T> struct is_member_function_pointer : etl::false_type {};
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...)> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile> : etl::true_type {};
-
-#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile noexcept> : etl::true_type {};
-#endif
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) &>                : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const &>          : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile &>       : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile &> : etl::true_type {};
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) &&>               : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const &&>         : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile &&>      : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile &&>: etl::true_type {};
-
-#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) & noexcept>                : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const & noexcept>          : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile & noexcept>       : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile & noexcept> : etl::true_type {};
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) && noexcept>               : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const && noexcept>         : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) volatile && noexcept>      : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs...) const volatile && noexcept>: etl::true_type {};
-#endif
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...)> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile> : etl::true_type {};
-
-#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile noexcept> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile noexcept> : etl::true_type {};
-#endif
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) &>                : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const &>          : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile &>       : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile &> : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) &&>               : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const &&>         : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile &&>      : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile &&>: etl::true_type {};
-
-#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) & noexcept>                : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const & noexcept>          : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile & noexcept>       : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile & noexcept> : etl::true_type {};
-
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) && noexcept>               : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const && noexcept>         : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) volatile && noexcept>      : etl::true_type {};
-  template <typename TReturn, typename TObject, typename... TArgs> struct is_member_function_pointer<TReturn(TObject::*)(TArgs..., ...) const volatile && noexcept>: etl::true_type {};
-#endif
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_member_function_pointer_v = etl::is_member_function_pointer<T>::value;
-#endif
-
-#if ETL_USING_CPP11
-  //***************************************************************************
-  /// Is T a member object pointer
-  //***************************************************************************
-  namespace private_type_traits
-  {
-    template<typename>
-    struct is_member_object_pointer_helper : public etl::false_type {};
-
-    template<typename T, typename TObject>
-    struct is_member_object_pointer_helper<T TObject::*> : public etl::negation<etl::is_function<T>> {};
-  }
-
-  template<typename T> struct is_member_object_pointer : public private_type_traits::is_member_object_pointer_helper<etl::remove_cv_t<T>>::type {};
-#endif
-
-#if ETL_USING_CPP17
-  template <typename T>
-  inline constexpr bool is_member_object_pointer_v = etl::is_member_object_pointer<T>::value;
-#endif
-
-#if ETL_USING_CPP20
-  template <class... TArgs>
-  struct common_reference;
-
-  template <class... TArgs>
-  using common_reference_t = typename etl::common_reference<TArgs...>::type;
-
-  template <class T, class U, template <class> class TQual, template <class> class UQual>
-  struct basic_common_reference
-  {
-  };
-
-  // If sizeof...(T) is 0: no member
-  template <>
-  struct common_reference<>
-  {
-  };
-
-  // If sizeof...(T) is 1
-  template <class T>
-  struct common_reference<T>
-  {
-    using type = T;
-  };
-
-  namespace private_type_traits
-  {
-    template <class T1, class T2>
-    using cond_res = decltype(false ? etl::declval<T1 (&)()>()() : etl::declval<T2 (&)()>()());
-
-    template <class From>
-    struct copy_cv
-    {
-      template <class To>
-      using apply = To;
-    };
-
-    template <class From>
-    struct copy_cv<const From>
-    {
-      template <class To>
-      using apply = const To;
-    };
-
-    template <class From>
-    struct copy_cv<volatile From>
-    {
-      template <class To>
-      using apply = volatile To;
-    };
-
-    template <class From>
-    struct copy_cv<const volatile From>
-    {
-      template <class To>
-      using apply = const volatile To;
-    };
-
-    template <class From, class To>
-    using copy_cv_t = typename copy_cv<From>::template apply<To>;
-
-    template <class From>
-    struct copy_cvref
-    {
-      template <class To>
-      using apply = copy_cv_t<From, To>;
-    };
-
-    template <class From>
-    struct copy_cvref<From&>
-    {
-      template <class To>
-      using apply = add_lvalue_reference_t<copy_cv_t<From, To>>;
-    };
-
-    template <class From>
-    struct copy_cvref<From&&>
-    {
-      template <class To>
-      using apply = add_lvalue_reference_t<copy_cv_t<From, To>>;
-    };
-
-    template <class From, class To>
-    using copy_cvref_t = typename copy_cvref<From>::template apply<To>;
-
-    template <class T1>
-    struct xref
-    {
-      template <class T2>
-      using apply = copy_cvref_t<T1, T2>;
-    };
-
-    template <class T1, class T2, class T1_RR = remove_reference_t<T1>, class T2_RR = remove_reference_t<T2>>
-    struct common_ref;
-
-    template <class T1, class T2>
-    using common_ref_t = typename common_ref<T1, T2>::type;
-
-    template <class T1, class T2>
-    using cv_cond_res = cond_res<copy_cv_t<T1, T2>&, copy_cv_t<T2, T1>&>;
-
-    template <class T1, class T2, class T1_RR, class T2_RR>
-      requires requires { typename cv_cond_res<T1_RR, T2_RR>; } &&
-        is_reference_v<cv_cond_res<T1_RR, T2_RR>>
-    struct common_ref<T1&, T2&, T1_RR, T2_RR>
-    {
-      using type = cv_cond_res<T1_RR, T2_RR>;
-    };
-
-    template <class T1, class T2>
-    using common_ref_rr = remove_reference_t<common_ref_t<T1&, T2&>>&&;
-
-    template <class T1, class T2, class T1_R, class T2_R>
-      requires requires { typename common_ref_rr<T1_R, T2_R>; } &&
-        is_convertible_v<T1&&, common_ref_rr<T1_R, T2_R>> &&
-        is_convertible_v<T2&&, common_ref_rr<T1_R, T2_R>>
-    struct common_ref<T1&&, T2&&, T1_R, T2_R>
-    {
-      using type = common_ref_rr<T1_R, T2_R>;
-    };
-
-    template <class T1, class T2>
-    using common_ref_cr = common_ref_t<const T1&, T2&>;
-
-    template <class T1, class T2, class T3, class T4>
-      requires requires { typename common_ref_cr<T3, T4>; } &&
-        is_convertible_v<T1&&, common_ref_cr<T3, T4>>
-    struct common_ref<T1&&, T2&, T3, T4>
-    {
-      using type = common_ref_cr<T3, T4>;
-    };
-
-    template <class T1, class T2, class T3, class T4>
-    struct common_ref<T1&, T2&&, T3, T4>: common_ref<T2&&, T1&>
-    {
-    };
-
-    template <class T1, class T2, class T3, class T4>
-    struct common_ref
-    {
-    };
-
-    template <class T1, class T2>
-    struct common_reference_impl3;
-
-    template <class T1, class T2>
-    struct common_reference_impl2: common_reference_impl3<T1, T2>
-    {
-    };
-
-    template <class T1, class T2>
-    struct common_reference_impl1: common_reference_impl2<T1, T2>
-    {
-    };
-  }
-
-  // If sizeof...(T) is 2
-  template <class T1, class T2>
-  struct common_reference<T1, T2>: private_type_traits::common_reference_impl1<T1, T2>
-  {
-  };
-
-  namespace private_type_traits
-  {
-    template <class T1, class T2>
-      requires is_reference_v<T1> && is_reference_v<T2> && requires { typename common_ref_t<T1, T2>; } &&
-               is_convertible_v<add_pointer_t<T1>, add_pointer_t<common_ref_t<T1, T2>>> &&
-               is_convertible_v<add_pointer_t<T2>, add_pointer_t<common_ref_t<T1, T2>>>
-    struct common_reference_impl1<T1, T2>
-    {
-      using type = common_ref_t<T1, T2>;
-    };
-
-    template <class T1, class T2>
-    using basic_common_reference_t =
-      typename basic_common_reference<remove_cvref_t<T1>,
-                                      remove_cvref_t<T2>,
-                                      xref<T1>::template apply,
-                                      xref<T2>::template apply>::type;
-
-    template <class T1, class T2>
-      requires requires { typename basic_common_reference_t<T1, T2>; }
-    struct common_reference_impl2<T1, T2>
-    {
-      using type = basic_common_reference_t<T1, T2>;
-    };
-
-    template <class T1, class T2>
-      requires requires { typename cond_res<T1, T2>; }
-    struct common_reference_impl3<T1, T2>
-    {
-      using type = cond_res<T1, T2>;
-    };
-
-    template <class T1, class T2>
-    struct common_reference_impl3: common_type<T1, T2>
-    {
-    };
-  }
-
-  template <class T1, class T2, class T3, class... TArgs>
-    requires requires { typename common_reference_t<T1, T2>; }
-  struct common_reference<T1, T2, T3, TArgs...> : common_reference<common_reference_t<T1, T2>, T3, TArgs...> {};
-
-  template<class... TArgs>
-  struct common_reference
-  {
-  };
-
-#endif
-
-#if ETL_USING_CPP11
-  template <typename, typename = void>
-  struct has_size : etl::false_type {};
-
-  template <typename T>
-  struct has_size<T, void_t<decltype(etl::declval<T>().size())> >
-    : etl::true_type {};
-#else
-  template <typename T>
-  struct has_size
-  {
-  private:
-    typedef char yes;
-    struct no { char dummy[2]; };
-
-    template <typename U>
-    static yes test_size(char (*)[sizeof(&U::size)]);
-
-    template <typename U>
-    static no test_size(...);
-
-  public:
-
-    static const bool value = (sizeof(test_size<T>(0)) == sizeof(yes));
-  };
-#endif
-
-#if ETL_USING_CPP11
-  template <typename, typename = void>
-  struct has_data : etl::false_type {};
-
-  template <typename T>
-  struct has_data<T, void_t<decltype(etl::declval<T>().data())> >
-    : etl::true_type {};
-#else
-  template <typename T>
-  struct has_data
-  {
-  private:
-    typedef char yes;
-    struct no { char dummy[2]; };
-
-    template <typename U>
-    static yes test_data(char (*)[sizeof(&U::data)]);
-
-    template <typename U>
-    static no test_data(...);
-
-  public:
-
-    static const bool value = (sizeof(test_data<T>(0)) == sizeof(yes));
-  };
-#endif
-}
-
-// Helper macros
-#define ETL_IS_CHAR_TYPE(type)        (etl::is_same<char, type>::value || etl::is_same<signed char, type>::value || etl::is_same<unsigned char, type>::value)
-#define ETL_IS_NOT_CHAR_TYPE(type)    (!ETL_IS_CHAR_TYPE(type))
-
-#define ETL_IS_POINTER_TYPE(type)     (etl::is_pointer<type>::value)
-#define ETL_IS_NOT_POINTER_TYPE(type) (!ETL_IS_POINTER_TYPE(type))
-
-#define ETL_TARGET_IS_TRIVIALLY_COPYABLE(type)     (etl::is_trivially_copyable<typename etl::iterator_traits<type>::value_type>::value)
-#define ETL_TARGET_IS_NOT_TRIVIALLY_COPYABLE(type) (!ETL_TARGET_IS_TRIVIALLY_COPYABLE(type))
-
-#endif // ETL_TYPE_TRAITS_INCLUDED
diff --git a/include/etl/generators/variant_pool_generator.h b/include/etl/generators/variant_pool_cpp03_generator.h
similarity index 69%
rename from include/etl/generators/variant_pool_generator.h
rename to include/etl/generators/variant_pool_cpp03_generator.h
index 25718949..c7930faa 100644
--- a/include/etl/generators/variant_pool_generator.h
+++ b/include/etl/generators/variant_pool_cpp03_generator.h
@@ -1,192 +1,7 @@
-/******************************************************************************
-The MIT License(MIT)
-
-Embedded Template Library.
-https://github.com/ETLCPP/etl
-https://www.etlcpp.com
-
-Copyright(c) 2017 John Wellbelove
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-******************************************************************************/
-
-/*[[[cog
-import cog
-cog.outl("#if 0")
-]]]*/
-/*[[[end]]]*/
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-/*[[[cog
-import cog
-cog.outl("#endif")
-]]]*/
-/*[[[end]]]*/
-
-/*[[[cog
-import cog
-cog.outl("//***************************************************************************")
-cog.outl("// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.")
-cog.outl("//***************************************************************************")
-]]]*/
-/*[[[end]]]*/
-
 //***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -ovariant_pool.h -DNTypes=<n> variant_pool_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -ovariant_pool.h -DNTypes=16 variant_pool_generator.h
-//
-// See generate.bat
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
 //***************************************************************************
 
-#ifndef ETL_VARIANT_POOL_INCLUDED
-#define ETL_VARIANT_POOL_INCLUDED
-
-#include "platform.h"
-#include "pool.h"
-#include "type_traits.h"
-#include "static_assert.h"
-#include "largest.h"
-
-#include <stdint.h>
-
-namespace etl
-{
-#if ETL_USING_CPP11 && !defined(ETL_VARIANT_POOL_FORCE_CPP03_IMPLEMENTATION)
-  //***************************************************************************
-  template <size_t MAX_SIZE_, typename ... Ts>
-  class variant_pool
-    : public etl::generic_pool<etl::largest<Ts...>::size,
-                               etl::largest<Ts...>::alignment,
-                               MAX_SIZE_>
-  {
-  public:
-
-    typedef etl::generic_pool<etl::largest<Ts...>::size,
-                              etl::largest<Ts...>::alignment,
-                              MAX_SIZE_> base_t;
-
-    static const size_t MAX_SIZE = MAX_SIZE_;
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    variant_pool()
-    {
-    }
-
-    //*************************************************************************
-    /// Creates the object from a type. Variadic parameter constructor.
-    //*************************************************************************
-    template <typename T, typename... Args>
-    T* create(Args&&... args)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, Ts...>::value), "Unsupported type");
-
-      return base_t::template create<T>(etl::forward<Args>(args)...);
-    }
-
-    //*************************************************************************
-    /// Destroys the object.
-    //*************************************************************************
-    template <typename T>
-    void destroy(const T* const p)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, Ts...>::value || etl::is_base_of_any<T, Ts...>::value), "Invalid type");
-
-      base_t::destroy(p);
-    }
-
-    //*************************************************************************
-    /// Returns the maximum number of items in the variant_pool.
-    //*************************************************************************
-    size_t max_size() const
-    {
-      return MAX_SIZE;
-    }
-
-  private:
-
-    variant_pool(const variant_pool&) ETL_DELETE;
-    variant_pool& operator =(const variant_pool&) ETL_DELETE;
-  };
-
-  //***************************************************************************
-  template <typename ... Ts>
-  class variant_pool_ext
-    : public etl::generic_pool_ext<etl::largest<Ts...>::size,
-                                   etl::largest<Ts...>::alignment>
-  {
-  public:
-
-    typedef etl::generic_pool_ext<etl::largest<Ts...>::size,
-                                  etl::largest<Ts...>::alignment> base_t;
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    variant_pool_ext(typename base_t::element* buffer, size_t size)
-      : base_t(buffer, size)
-    {
-    }
-
-    //*************************************************************************
-    /// Creates the object from a type. Variadic parameter constructor.
-    //*************************************************************************
-    template <typename T, typename... Args>
-    T* create(Args&&... args)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, Ts...>::value), "Unsupported type");
-
-      return base_t::template create<T>(etl::forward<Args>(args)...);
-    }
-
-    //*************************************************************************
-    /// Destroys the object.
-    //*************************************************************************
-    template <typename T>
-    void destroy(const T* const p)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, Ts...>::value || etl::is_base_of_any<T, Ts...>::value), "Invalid type");
-
-      base_t::destroy(p);
-    }
-
-    //*************************************************************************
-    /// Returns the maximum number of items in the variant_pool.
-    //*************************************************************************
-    size_t max_size() const
-    {
-      return base_t::max_size();
-    }
-
-  private:
-
-    variant_pool_ext(const variant_pool_ext&) ETL_DELETE;
-    variant_pool_ext& operator =(const variant_pool_ext&) ETL_DELETE;
-  };
-#else
   //***************************************************************************
   /*[[[cog
   import cog
@@ -443,7 +258,7 @@ namespace etl
     /// Default constructor.
     //*************************************************************************
     variant_pool_ext(typename base_t::element* buffer, size_t size)
-      : base_t(buffer, size) 
+      : base_t(buffer, size)
     {
     }
 
@@ -604,9 +419,9 @@ namespace etl
     //*************************************************************************
     /// Returns the maximum number of items in the variant_pool.
     //*************************************************************************
-    size_t max_size() const 
-    { 
-      return base_t::max_size(); 
+    size_t max_size() const
+    {
+      return base_t::max_size();
     }
 
   private:
@@ -614,7 +429,4 @@ namespace etl
     variant_pool_ext(const variant_pool_ext&) ETL_DELETE;
     variant_pool_ext& operator =(const variant_pool_ext&) ETL_DELETE;
   };
-#endif
-}
 
-#endif
diff --git a/include/etl/largest.h b/include/etl/largest.h
index a3a96487..86a89446 100644
--- a/include/etl/largest.h
+++ b/include/etl/largest.h
@@ -28,28 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -olargest.h -DNTypes=<n> largest_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -olargest.h -DNTypes=16 largest_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_LARGEST_INCLUDED
 #define ETL_LARGEST_INCLUDED
 
@@ -121,50 +99,7 @@ namespace etl
 #endif
 
 #else
-  //***************************************************************************
-  /// Template to determine the largest type and size.
-  /// Supports up to 16 types.
-  /// Defines 'value_type' which is the type of the largest parameter.
-  /// Defines 'size' which is the size of the largest parameter.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  struct largest_type
-  {
-    // Define 'largest_other' as 'largest_type' with all but the first parameter. 
-    typedef typename largest_type<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type largest_other;
-
-    // Set 'type' to be the largest of the first parameter and any of the others.
-    // This is recursive.
-    typedef typename etl::conditional<(sizeof(T1) > sizeof(largest_other)), // Boolean
-                                       T1,                                  // TrueType
-                                       largest_other>                       // FalseType
-                                       ::type type;                         // The largest type of the two.
-
-    // The size of the largest type.
-    enum
-    {
-      size = sizeof(type)
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  struct largest_type<T1,   void, void, void, void, void, void, void, 
-                      void, void, void, void, void, void, void, void>
-  {
-    typedef T1 type;
-
-    enum
-    {
-      size = sizeof(type)
-    };
-  };
+  #include "private/largest_type_cpp03.h"
 #endif
 
 #if ETL_USING_CPP11 && !defined(ETL_LARGEST_ALIGNMENT_FORCE_CPP03_IMPLEMENTATION)
@@ -213,49 +148,7 @@ namespace etl
 #endif
 
 #else
-  //***************************************************************************
-  /// Template to determine the largest alignment.
-  /// Supports up to 16 types.
-  /// Defines <b>value</b> which is the largest alignment of all the parameters.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  struct largest_alignment
-  {
-    // Define 'largest_other' as 'largest_type' with all but the first parameter. 
-    typedef typename largest_alignment<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type largest_other;
-
-    // Set 'type' to be the largest of the first parameter and any of the others.
-    // This is recursive.
-    typedef typename etl::conditional<(etl::alignment_of<T1>::value > etl::alignment_of<largest_other>::value), // Boolean
-                                       T1,                                                                      // TrueType
-                                       largest_other>                                                           // FalseType
-                                       ::type type;                                                             // The largest type of the two.
-
-    // The largest alignment.
-    enum
-    {
-      value = etl::alignment_of<type>::value
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  struct largest_alignment<T1,   void, void, void, void, void, void, void, 
-                           void, void, void, void, void, void, void, void>
-  {
-    typedef T1 type;
-
-    enum
-    {
-      value = etl::alignment_of<type>::value
-    };
-  };
+  #include "private/largest_alignment_cpp03.h"
 #endif
 
   //***************************************************************************
@@ -353,26 +246,7 @@ namespace etl
 #endif
 
 #else
-  //***************************************************************************
-  /// Template to determine the largest type, size and alignment.
-  /// Supports up to 16 types.
-  /// Defines <b>value</b> which is the largest type, size and alignment of all the parameters.
-  ///\ingroup largest
-  //***************************************************************************
-  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  struct largest
-  {
-    typedef typename etl::largest_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type type;
-
-    enum
-    {
-      size      = etl::largest_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-      alignment = etl::largest_alignment<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value
-    };
-  };
+  #include "private/largest_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index ef419bc4..41d2a9b9 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -26,28 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -omessage_packet.h -DHandlers=<n> message_packet_generator.h
-// Where <n> is the number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 messages...
-// cog -d -e -omessage_packet.h -DHandlers=16 message_packet_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_MESSAGE_PACKET_INCLUDED
 #define ETL_MESSAGE_PACKET_INCLUDED
 
@@ -512,4869 +490,7 @@ namespace etl
   using message_packet_from_type_list_t = typename message_packet_from_type_list<TTypeList>::type;
 
 #else
-
-  //***************************************************************************
-  // The definition for all 16 message types.
-  //***************************************************************************
-  template <typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void, 
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  class message_packet
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
-             T13::ID == id || T14::ID == id || T15::ID == id || T16::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
-             T13::ID == Id || T14::ID == Id || T15::ID == Id || T16::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
-             T13::ID == TMessage::ID || T14::ID == TMessage::ID || T15::ID == TMessage::ID || T16::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
-        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
-        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
-        case T15::ID: static_cast<const T15*>(pmsg)->~T15(); break;
-        case T16::ID: static_cast<const T16*>(pmsg)->~T16(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
-        case T15::ID: ::new (p) T15(static_cast<const T15&>(msg)); break;
-        case T16::ID: ::new (p) T16(static_cast<const T16&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
-        case T15::ID: ::new (p) T15(static_cast<T15&&>(msg)); break;
-        case T16::ID: ::new (p) T16(static_cast<T16&&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 15 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10, typename T11, typename T12, 
-            typename T13, typename T14, typename T15>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
-             T13::ID == id || T14::ID == id || T15::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
-             T13::ID == Id || T14::ID == Id || T15::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
-             T13::ID == TMessage::ID || T14::ID == TMessage::ID || T15::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
-        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
-        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
-        case T15::ID: static_cast<const T15*>(pmsg)->~T15(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
-        case T15::ID: ::new (p) T15(static_cast<const T15&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
-        case T15::ID: ::new (p) T15(static_cast<T15&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 14 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10, typename T11, typename T12, 
-            typename T13, typename T14>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
-             T13::ID == id || T14::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
-             T13::ID == Id || T14::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
-             T13::ID == TMessage::ID || T14::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
-        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
-        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
-        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 13 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10, typename T11, typename T12, 
-            typename T13>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
-             T13::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
-             T13::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
-             T13::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
-        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
-        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 12 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10, typename T11, typename T12>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 11 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10, typename T11>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id || T11::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id || T11::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 10 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9, typename T10>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id || T10::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id || T10::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID || T10::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 9 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8, 
-            typename T9>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
-             T9::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
-             T9::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
-             T9::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 8 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7, typename T8>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 7 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6, typename T7>
-  class message_packet<T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id || T7::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id || T7::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 6 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5, typename T6>
-  class message_packet<T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id || T6::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id || T6::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID || T6::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 5 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4, 
-            typename T5>
-  class message_packet<T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
-             T5::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
-             T5::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
-             T5::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4, T5>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 4 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3, typename T4>
-  class message_packet<T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3, T4>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3, T4>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 3 message types.
-  //***************************************************************************
-  template <typename T1, typename T2, typename T3>
-  class message_packet<T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id || T3::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id || T3::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2, T3>::size,
-      ALIGNMENT = etl::largest<T1, T2, T3>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 2 message types.
-  //***************************************************************************
-  template <typename T1, typename T2>
-  class message_packet<T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id || T2::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id || T2::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID || T2::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1, T2>::size,
-      ALIGNMENT = etl::largest<T1, T2>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 1 message type.
-  //***************************************************************************
-  template <typename T1>
-  class message_packet<T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-  {
-  public:
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1>;
-  #endif
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-  #include "private/diagnostic_pop.h"
-
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(const etl::imessage& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(msg);
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    explicit message_packet(etl::imessage&& msg)
-    {
-      if (accepts(msg))
-      {
-        add_new_message(etl::move(msg));
-        valid = true;
-      }
-      else
-      {
-        valid = false;
-      }
-
-      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
-                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1>::value, int>::type>
-    explicit message_packet(TMessage&& /*msg*/)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
-                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #else
-    //********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    template <typename TMessage>
-    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
-                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1>::value, int>::type = 0)
-      : valid(true)
-    {
-      // Not etl::message_packet, not etl::imessage and in typelist.
-      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
-                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
-                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1>::value);
-
-      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(const message_packet& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(other.get());
-      }
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet(message_packet&& other)
-      : valid(other.is_valid())
-    {
-      if (valid)
-      {
-        add_new_message(etl::move(other.get()));
-      }
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(const message_packet& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(rhs.get());
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //**********************************************
-  #include "private/diagnostic_uninitialized_push.h"
-    message_packet& operator =(message_packet&& rhs)
-    {
-      delete_current_message();
-      valid = rhs.is_valid();
-      if (valid)
-      {
-        add_new_message(etl::move(rhs.get()));
-      }
-
-      return *this;
-    }
-  #include "private/diagnostic_pop.h"
-  #endif
-
-    //********************************************
-    ~message_packet()
-    {
-      delete_current_message();
-    }
-
-    //********************************************
-    etl::imessage& get() ETL_NOEXCEPT
-    {
-      return *static_cast<etl::imessage*>(data);
-    }
-
-    //********************************************
-    const etl::imessage& get() const ETL_NOEXCEPT
-    {
-      return *static_cast<const etl::imessage*>(data);
-    }
-
-    //********************************************
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
-    {
-      return T1::ID == id;
-    }
-
-    //**********************************************
-    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
-    {
-      return accepts(msg.get_message_id());
-    }
-
-    //**********************************************
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return T1::ID == Id;
-    }
-
-    //**********************************************
-    template <typename TMessage>
-    static ETL_CONSTEXPR
-    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
-      accepts()
-    {
-      return T1::ID == TMessage::ID;
-    }
-
-    enum
-    {
-      SIZE      = etl::largest<T1>::size,
-      ALIGNMENT = etl::largest<T1>::alignment
-    };
-
-  private:
-
-    //********************************************
-    #include "private/diagnostic_uninitialized_push.h"
-    void delete_current_message()
-    {
-      if (valid)
-      {
-        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
-
-
-  #if ETL_HAS_VIRTUAL_MESSAGES
-        pmsg->~imessage();
-  #else
-        delete_message(pmsg);
-  #endif
-      }
-    }
-    #include "private/diagnostic_pop.h"
-
-    //********************************************
-    void delete_message(etl::imessage* pmsg)
-    {
-      switch (pmsg->get_message_id())
-      {
-        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-    //********************************************
-    void add_new_message(const etl::imessage& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
-        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
-      }
-    }
-
-  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
-    //********************************************
-    void add_new_message(etl::imessage&& msg)
-    {
-      const size_t id = msg.get_message_id();
-      void* p = data;
-
-      switch (id)
-      {
-        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
-        default: break;
-      }
-    }
-  #endif
-
-    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
-    bool valid;
-  };
-
-  //***************************************************************************
-  // Specialisation for 0 message types.
-  //***************************************************************************
-  template <>
-  class message_packet<void, void, void, void, void, void, void, void,
-                       void, void, void, void, void, void, void, void>
-  {
-  public:
-
-#if ETL_USING_CPP11
-    using message_types = etl::type_list<>;
-#endif
-
-    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
-      : valid(false)
-    {
-    }
-
-    static ETL_CONSTEXPR bool accepts(etl::message_id_t)
-    {
-      return false;
-    }
-
-    static ETL_CONSTEXPR bool accepts(const etl::imessage&)
-    {
-      return false;
-    }
-
-    template <etl::message_id_t Id>
-    static ETL_CONSTEXPR bool accepts()
-    {
-      return false;
-    }
-
-    template <typename TMessage>
-    static ETL_CONSTEXPR typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type accepts()
-    {
-      return false;
-    }
-
-    bool is_valid() const
-    {
-      return valid;
-    }
-
-    enum
-    {
-      SIZE = 0U,
-      ALIGNMENT = 1U
-    };
-
-  private:
-
-    bool valid;
-  };
+  #include "private/message_packet_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index 7e510466..f6d41243 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -26,28 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -omessage_router.h -DHandlers=<n> message_router_generator.h
-// Where <n> is the maximum number of messages to support.
-//
-// e.g.
-// To generate handlers for up to 16 messages...
-// cog -d -e -omessage_router.h -DHandlers=16 message_router_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_MESSAGE_ROUTER_INCLUDED
 #define ETL_MESSAGE_ROUTER_INCLUDED
 
@@ -887,2439 +865,7 @@ namespace etl
   using message_router_from_type_list_t = typename message_router_from_type_list<TDerived, TTypeList>::type;
 
 #else
-  //*************************************************************************************************
-  // For C++03/98.
-  //*************************************************************************************************
-  //***************************************************************************
-  // The definition for all 16 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  class message_router  : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const etl::message_id_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
-        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
-        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
-        case T15::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T15&>(msg)); break;
-        case T16::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T16&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID: case T15::ID: case T16::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 15 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13, typename T14, typename T15>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,  T15> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
-        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
-        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
-        case T15::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T15&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID: case T15::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 14 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13, typename T14>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,  T14> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
-        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
-        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 13 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12,
-            typename T13>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,  T13> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
-        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 12 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11, typename T12>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,  T12> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID: case T12::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 11 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10, typename T11>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,  T11> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID: case T11::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 10 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9, typename T10>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9,  T10> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID: case T10::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 9 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8,
-            typename T9>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8,  T9> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-        case T9::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 8 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7, typename T8>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7,  T8> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
-
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 7 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6, typename T7>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5, T6,  T7> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 6 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5, typename T6>
-  class message_router<TDerived, T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4, T5,  T6> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 5 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4,
-            typename T5>
-  class message_router<TDerived, T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3, T4,  T5> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4, T5>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 4 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3, typename T4>
-  class message_router<TDerived, T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2, T3,  T4> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3, T4>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID: case T4::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 3 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2, typename T3>
-  class message_router<TDerived, T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1, T2,  T3> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2, T3>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID: case T3::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 2 message types.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1, typename T2>
-  class message_router<TDerived, T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<T1,  T2> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1, T2>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID: case T2::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 1 message type.
-  //***************************************************************************
-  template <typename TDerived,
-            typename T1>
-  class message_router<TDerived, T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-   : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet< T1> message_packet;
-
-  #if ETL_USING_CPP11
-    using message_types = etl::type_list<T1>;
-  #endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-      const size_t id = msg.get_message_id();
-
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      switch (id)
-      {
-        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
-        default:
-        {
-           if (has_successor())
-           {
-             get_successor().receive(msg);
-           }
-           else
-           {
-             static_cast<TDerived*>(this)->on_receive_unknown(msg);
-           }
-           break;
-        }
-      }
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1>::value, void>::type
-      receive(const TMessage& msg)
-    {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-      static_cast<TDerived*>(this)->on_receive(msg);
-  #include "etl/private/diagnostic_pop.h"
-    }
-
-    template <typename TMessage>
-    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1>::value, void>::type
-      receive(const TMessage& msg)
-    {
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-      else
-      {
-  #include "etl/private/diagnostic_array_bounds_push.h"
-        static_cast<TDerived*>(this)->on_receive_unknown(msg);
-  #include "etl/private/diagnostic_pop.h"
-      }
-    }
-
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      switch (id)
-      {
-        case T1::ID:
-          return true;
-        default:
-        {
-          if (has_successor())
-          {
-            return get_successor().accepts(id);
-          }
-          else
-          {
-            return false;
-          }
-        }
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
-
-  //***************************************************************************
-  // Specialisation for 0 message types.
-  //***************************************************************************
-  template <typename TDerived>
-  class message_router<TDerived, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
-    : public imessage_router
-  {
-  public:
-
-    typedef etl::message_packet<> message_packet;
-
-#if ETL_USING_CPP11
-    using message_types = etl::type_list<>;
-#endif
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_)
-      : imessage_router(id_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
-      : imessage_router(id_, successor_)
-    {
-      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
-    }
-
-    //**********************************************
-    message_router()
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
-    {
-    }
-
-    //**********************************************
-    message_router(etl::imessage_router& successor_)
-      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
-    {
-    }
-
-    //**********************************************
-    using etl::imessage_router::receive;
-
-    void receive(const etl::imessage& msg) ETL_OVERRIDE
-    {
-#include "etl/private/diagnostic_array_bounds_push.h"
-      if (has_successor())
-      {
-        get_successor().receive(msg);
-      }
-#include "etl/private/diagnostic_pop.h"
-    }
-
-    //**********************************************
-    using imessage_router::accepts;
-
-    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
-    {
-      if (has_successor())
-      {
-        return get_successor().accepts(id);
-      }
-      else
-      {
-        return false;
-      }
-    }
-
-    //********************************************
-    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
-    {
-      return false;
-    }
-
-    //********************************************
-    bool is_producer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-
-    //********************************************
-    bool is_consumer() const ETL_OVERRIDE
-    {
-      return true;
-    }
-  };
+  #include "private/message_router_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/private/fsm_cpp03.h b/include/etl/private/fsm_cpp03.h
new file mode 100644
index 00000000..e6e0ed32
--- /dev/null
+++ b/include/etl/private/fsm_cpp03.h
@@ -0,0 +1,895 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+//*************************************************************************************************
+// For C++03 and below.
+//*************************************************************************************************
+  //***************************************************************************
+  // The definition for all 16 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  class fsm_state : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
+        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
+        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
+        case T15::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T15&>(message)); break;
+        case T16::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T16&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 15 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13, typename T14, typename T15>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
+        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
+        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
+        case T15::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T15&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 14 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13, typename T14>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
+        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
+        case T14::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T14&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 13 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
+        case T13::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T13&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 12 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        case T12::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T12&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 11 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        case T11::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T11&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 10 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        case T10::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T10&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 9 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        case T9::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T9&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 8 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        case T8::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T8&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 7 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        case T7::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T7&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 6 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        case T6::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T6&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 5 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        case T5::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T5&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 4 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        case T4::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T4&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 3 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        case T3::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T3&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 2 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        case T2::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T2&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 1 message type.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1>
+  class fsm_state<TContext, TDerived, STATE_ID_, T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      etl::fsm_state_id_t new_state_id;
+      etl::message_id_t event_id = message.get_message_id();
+
+      switch (event_id)
+      {
+        case T1::ID: new_state_id = static_cast<TDerived*>(this)->on_event(static_cast<const T1&>(message)); break;
+        default: new_state_id = p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message); break;
+      }
+
+      return (new_state_id != Pass_To_Parent) ? new_state_id : (p_parent ? p_parent->process_event(message) : No_State_Change);
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 0 message types.
+  //***************************************************************************
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_>
+  class fsm_state<TContext, TDerived, STATE_ID_, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void> : public ifsm_state
+  {
+  public:
+
+    static ETL_CONSTANT etl::fsm_state_id_t STATE_ID = STATE_ID_;
+
+    fsm_state()
+      : ifsm_state(STATE_ID)
+    {
+    }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
+
+    TContext& get_fsm_context() const
+    {
+      return static_cast<TContext&>(ifsm_state::get_fsm_context());
+    }
+  private:
+
+    etl::fsm_state_id_t process_event(const etl::imessage& message)
+    {
+      return p_parent ? p_parent->process_event(message) : static_cast<TDerived*>(this)->on_event_unknown(message);
+    }
+  };
+
+  template <typename TContext, typename TDerived, etl::fsm_state_id_t STATE_ID_,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13, typename T14, typename T15, typename T16>
+  ETL_CONSTANT etl::fsm_state_id_t fsm_state<TContext, TDerived, STATE_ID_, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::STATE_ID;
+
diff --git a/include/etl/private/fsm_friend_decl_cpp03.h b/include/etl/private/fsm_friend_decl_cpp03.h
new file mode 100644
index 00000000..a0485ef9
--- /dev/null
+++ b/include/etl/private/fsm_friend_decl_cpp03.h
@@ -0,0 +1,11 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+    template <typename, typename, etl::fsm_state_id_t,
+              typename, typename, typename, typename,
+              typename, typename, typename, typename,
+              typename, typename, typename, typename,
+              typename, typename, typename, typename>
+    friend class etl::fsm_state;
+
diff --git a/include/etl/private/fsm_fwd_decl_cpp03.h b/include/etl/private/fsm_fwd_decl_cpp03.h
new file mode 100644
index 00000000..65c2d008
--- /dev/null
+++ b/include/etl/private/fsm_fwd_decl_cpp03.h
@@ -0,0 +1,11 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  template <typename, typename, etl::fsm_state_id_t,
+            typename, typename, typename, typename,
+            typename, typename, typename, typename,
+            typename, typename, typename, typename,
+            typename, typename, typename, typename>
+  class fsm_state;
+
diff --git a/include/etl/private/largest_alignment_cpp03.h b/include/etl/private/largest_alignment_cpp03.h
new file mode 100644
index 00000000..0b9c90c2
--- /dev/null
+++ b/include/etl/private/largest_alignment_cpp03.h
@@ -0,0 +1,48 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  /// Template to determine the largest alignment.
+  /// Supports up to 16 types.
+  /// Defines <b>value</b> which is the largest alignment of all the parameters.
+  ///\ingroup largest
+  //***************************************************************************
+  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  struct largest_alignment
+  {
+    // Define 'largest_other' as 'largest_type' with all but the first parameter. 
+    typedef typename largest_alignment<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type largest_other;
+
+    // Set 'type' to be the largest of the first parameter and any of the others.
+    // This is recursive.
+    typedef typename etl::conditional<(etl::alignment_of<T1>::value > etl::alignment_of<largest_other>::value), // Boolean
+                                       T1,                                                                      // TrueType
+                                       largest_other>                                                           // FalseType
+                                       ::type type;                                                             // The largest type of the two.
+
+    // The largest alignment.
+    enum
+    {
+      value = etl::alignment_of<type>::value
+    };
+  };
+
+  //***************************************************************************
+  // Specialisation for one template parameter.
+  //***************************************************************************
+  template <typename T1>
+  struct largest_alignment<T1,   void, void, void, void, void, void, void, 
+                           void, void, void, void, void, void, void, void>
+  {
+    typedef T1 type;
+
+    enum
+    {
+      value = etl::alignment_of<type>::value
+    };
+  };
+
diff --git a/include/etl/private/largest_cpp03.h b/include/etl/private/largest_cpp03.h
new file mode 100644
index 00000000..7e2fb7af
--- /dev/null
+++ b/include/etl/private/largest_cpp03.h
@@ -0,0 +1,25 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  /// Template to determine the largest type, size and alignment.
+  /// Supports up to 16 types.
+  /// Defines <b>value</b> which is the largest type, size and alignment of all the parameters.
+  ///\ingroup largest
+  //***************************************************************************
+  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  struct largest
+  {
+    typedef typename etl::largest_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type type;
+
+    enum
+    {
+      size      = etl::largest_type<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+      alignment = etl::largest_alignment<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value
+    };
+  };
+
diff --git a/include/etl/private/largest_type_cpp03.h b/include/etl/private/largest_type_cpp03.h
new file mode 100644
index 00000000..1773f316
--- /dev/null
+++ b/include/etl/private/largest_type_cpp03.h
@@ -0,0 +1,49 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  /// Template to determine the largest type and size.
+  /// Supports up to 16 types.
+  /// Defines 'type' which is the type of the largest parameter.
+  /// Defines 'size' which is the size of the largest parameter.
+  ///\ingroup largest
+  //***************************************************************************
+  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  struct largest_type
+  {
+    // Define 'largest_other' as 'largest_type' with all but the first parameter. 
+    typedef typename largest_type<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type largest_other;
+
+    // Set 'type' to be the largest of the first parameter and any of the others.
+    // This is recursive.
+    typedef typename etl::conditional<(sizeof(T1) > sizeof(largest_other)), // Boolean
+                                       T1,                                  // TrueType
+                                       largest_other>                       // FalseType
+                                       ::type type;                         // The largest type of the two.
+
+    // The size of the largest type.
+    enum
+    {
+      size = sizeof(type)
+    };
+  };
+
+  //***************************************************************************
+  // Specialisation for one template parameter.
+  //***************************************************************************
+  template <typename T1>
+  struct largest_type<T1,   void, void, void, void, void, void, void, 
+                      void, void, void, void, void, void, void, void>
+  {
+    typedef T1 type;
+
+    enum
+    {
+      size = sizeof(type)
+    };
+  };
+
diff --git a/include/etl/private/message_packet_cpp03.h b/include/etl/private/message_packet_cpp03.h
new file mode 100644
index 00000000..71d4ad5a
--- /dev/null
+++ b/include/etl/private/message_packet_cpp03.h
@@ -0,0 +1,4868 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+
+  //***************************************************************************
+  // The definition for all 16 message types.
+  //***************************************************************************
+  template <typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void, 
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  class message_packet
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
+             T13::ID == id || T14::ID == id || T15::ID == id || T16::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
+             T13::ID == Id || T14::ID == Id || T15::ID == Id || T16::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
+             T13::ID == TMessage::ID || T14::ID == TMessage::ID || T15::ID == TMessage::ID || T16::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
+        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
+        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
+        case T15::ID: static_cast<const T15*>(pmsg)->~T15(); break;
+        case T16::ID: static_cast<const T16*>(pmsg)->~T16(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
+        case T15::ID: ::new (p) T15(static_cast<const T15&>(msg)); break;
+        case T16::ID: ::new (p) T16(static_cast<const T16&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
+        case T15::ID: ::new (p) T15(static_cast<T15&&>(msg)); break;
+        case T16::ID: ::new (p) T16(static_cast<T16&&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 15 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10, typename T11, typename T12, 
+            typename T13, typename T14, typename T15>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
+             T13::ID == id || T14::ID == id || T15::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
+             T13::ID == Id || T14::ID == Id || T15::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
+             T13::ID == TMessage::ID || T14::ID == TMessage::ID || T15::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
+        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
+        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
+        case T15::ID: static_cast<const T15*>(pmsg)->~T15(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
+        case T15::ID: ::new (p) T15(static_cast<const T15&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
+        case T15::ID: ::new (p) T15(static_cast<T15&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 14 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10, typename T11, typename T12, 
+            typename T13, typename T14>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
+             T13::ID == id || T14::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
+             T13::ID == Id || T14::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
+             T13::ID == TMessage::ID || T14::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
+        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
+        case T14::ID: static_cast<const T14*>(pmsg)->~T14(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<const T14&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
+        case T14::ID: ::new (p) T14(static_cast<T14&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 13 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10, typename T11, typename T12, 
+            typename T13>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id ||
+             T13::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id ||
+             T13::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID ||
+             T13::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
+        case T13::ID: static_cast<const T13*>(pmsg)->~T13(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<const T13&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
+        case T13::ID: ::new (p) T13(static_cast<T13&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 12 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10, typename T11, typename T12>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id || T12::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id || T12::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID || T12::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        case T12::ID: static_cast<const T12*>(pmsg)->~T12(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<const T12&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        case T12::ID: ::new (p) T12(static_cast<T12&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 11 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10, typename T11>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id || T11::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id || T11::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID || T11::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        case T11::ID: static_cast<const T11*>(pmsg)->~T11(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<const T11&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        case T11::ID: ::new (p) T11(static_cast<T11&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 10 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9, typename T10>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id || T10::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id || T10::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID || T10::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        case T10::ID: static_cast<const T10*>(pmsg)->~T10(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<const T10&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        case T10::ID: ::new (p) T10(static_cast<T10&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 9 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8, 
+            typename T9>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8, T9>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id ||
+             T9::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id ||
+             T9::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID ||
+             T9::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        case T9::ID: static_cast<const T9*>(pmsg)->~T9(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<const T9&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        case T9::ID: ::new (p) T9(static_cast<T9&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 8 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7, typename T8>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7, T8>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7, T8>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id || T8::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id || T8::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID || T8::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7, T8>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        case T8::ID: static_cast<const T8*>(pmsg)->~T8(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<const T8&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        case T8::ID: ::new (p) T8(static_cast<T8&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 7 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6, typename T7>
+  class message_packet<T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6, T7>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6, T7> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6, T7>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id || T7::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id || T7::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID || T7::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6, T7>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6, T7>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        case T7::ID: static_cast<const T7*>(pmsg)->~T7(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<const T7&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        case T7::ID: ::new (p) T7(static_cast<T7&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 6 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5, typename T6>
+  class message_packet<T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5, T6>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5, T6> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5, T6>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id || T6::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id || T6::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID || T6::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5, T6>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5, T6>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        case T6::ID: static_cast<const T6*>(pmsg)->~T6(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<const T6&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        case T6::ID: ::new (p) T6(static_cast<T6&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 5 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4, 
+            typename T5>
+  class message_packet<T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4, T5>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4, T5> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4, T5>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id ||
+             T5::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id ||
+             T5::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID ||
+             T5::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4, T5>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4, T5>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        case T5::ID: static_cast<const T5*>(pmsg)->~T5(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<const T5&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        case T5::ID: ::new (p) T5(static_cast<T5&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 4 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3, typename T4>
+  class message_packet<T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3, T4>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3, T4> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3, T4>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id || T4::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id || T4::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID || T4::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3, T4>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3, T4>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        case T4::ID: static_cast<const T4*>(pmsg)->~T4(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<const T4&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        case T4::ID: ::new (p) T4(static_cast<T4&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 3 message types.
+  //***************************************************************************
+  template <typename T1, typename T2, typename T3>
+  class message_packet<T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2, T3>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2, T3> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2, T3>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id || T3::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id || T3::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID || T3::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2, T3>::size,
+      ALIGNMENT = etl::largest<T1, T2, T3>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        case T3::ID: static_cast<const T3*>(pmsg)->~T3(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<const T3&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        case T3::ID: ::new (p) T3(static_cast<T3&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 2 message types.
+  //***************************************************************************
+  template <typename T1, typename T2>
+  class message_packet<T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1, T2>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1, T2> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1, T2>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id || T2::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id || T2::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID || T2::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1, T2>::size,
+      ALIGNMENT = etl::largest<T1, T2>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        case T2::ID: static_cast<const T2*>(pmsg)->~T2(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<const T2&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        case T2::ID: ::new (p) T2(static_cast<T2&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 1 message type.
+  //***************************************************************************
+  template <typename T1>
+  class message_packet<T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+  {
+  public:
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1>;
+  #endif
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+  #include "diagnostic_pop.h"
+
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(const etl::imessage& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(msg);
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    explicit message_packet(etl::imessage&& msg)
+    {
+      if (accepts(msg))
+      {
+        add_new_message(etl::move(msg));
+        valid = true;
+      }
+      else
+      {
+        valid = false;
+      }
+
+      ETL_ASSERT(valid, ETL_ERROR(unhandled_message_exception));
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION) && !defined(ETL_COMPILER_GREEN_HILLS)
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage, typename = typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
+                                                                    !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                    !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1>::value, int>::type>
+    explicit message_packet(TMessage&& /*msg*/)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static constexpr bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
+                                       !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                       etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #else
+    //********************************************
+  #include "diagnostic_uninitialized_push.h"
+    template <typename TMessage>
+    explicit message_packet(const TMessage& /*msg*/, typename etl::enable_if<!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
+                                                                         !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                                                         !etl::is_one_of<typename etl::remove_cvref<TMessage>::type, T1>::value, int>::type = 0)
+      : valid(true)
+    {
+      // Not etl::message_packet, not etl::imessage and in typelist.
+      static const bool Enabled = (!etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::message_packet<T1> >::value &&
+                                   !etl::is_same<typename etl::remove_cvref<TMessage>::type, etl::imessage>::value &&
+                                   etl::is_one_of<typename etl::remove_cvref<TMessage>::type,T1>::value);
+
+      ETL_STATIC_ASSERT(Enabled, "Message not in packet type list");
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(const message_packet& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(other.get());
+      }
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet(message_packet&& other)
+      : valid(other.is_valid())
+    {
+      if (valid)
+      {
+        add_new_message(etl::move(other.get()));
+      }
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(const message_packet& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(rhs.get());
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //**********************************************
+  #include "diagnostic_uninitialized_push.h"
+    message_packet& operator =(message_packet&& rhs)
+    {
+      delete_current_message();
+      valid = rhs.is_valid();
+      if (valid)
+      {
+        add_new_message(etl::move(rhs.get()));
+      }
+
+      return *this;
+    }
+  #include "diagnostic_pop.h"
+  #endif
+
+    //********************************************
+    ~message_packet()
+    {
+      delete_current_message();
+    }
+
+    //********************************************
+    etl::imessage& get() ETL_NOEXCEPT
+    {
+      return *static_cast<etl::imessage*>(data);
+    }
+
+    //********************************************
+    const etl::imessage& get() const ETL_NOEXCEPT
+    {
+      return *static_cast<const etl::imessage*>(data);
+    }
+
+    //********************************************
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t id)
+    {
+      return T1::ID == id;
+    }
+
+    //**********************************************
+    static ETL_CONSTEXPR bool accepts(const etl::imessage& msg)
+    {
+      return accepts(msg.get_message_id());
+    }
+
+    //**********************************************
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return T1::ID == Id;
+    }
+
+    //**********************************************
+    template <typename TMessage>
+    static ETL_CONSTEXPR
+    typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type
+      accepts()
+    {
+      return T1::ID == TMessage::ID;
+    }
+
+    enum
+    {
+      SIZE      = etl::largest<T1>::size,
+      ALIGNMENT = etl::largest<T1>::alignment
+    };
+
+  private:
+
+    //********************************************
+    #include "diagnostic_uninitialized_push.h"
+    void delete_current_message()
+    {
+      if (valid)
+      {
+        etl::imessage* pmsg = static_cast<etl::imessage*>(data);
+
+
+  #if ETL_HAS_VIRTUAL_MESSAGES
+        pmsg->~imessage();
+  #else
+        delete_message(pmsg);
+  #endif
+      }
+    }
+    #include "diagnostic_pop.h"
+
+    //********************************************
+    void delete_message(etl::imessage* pmsg)
+    {
+      switch (pmsg->get_message_id())
+      {
+        case T1::ID: static_cast<const T1*>(pmsg)->~T1(); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+    //********************************************
+    void add_new_message(const etl::imessage& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<const T1&>(msg)); break;
+        default: ETL_ASSERT_FAIL(ETL_ERROR(unhandled_message_exception)); break;
+      }
+    }
+
+  #if ETL_USING_CPP11 && !defined(ETL_MESSAGE_PACKET_FORCE_CPP03_IMPLEMENTATION)
+    //********************************************
+    void add_new_message(etl::imessage&& msg)
+    {
+      const size_t id = msg.get_message_id();
+      void* p = data;
+
+      switch (id)
+      {
+        case T1::ID: ::new (p) T1(static_cast<T1&&>(msg)); break;
+        default: break;
+      }
+    }
+  #endif
+
+    typename etl::aligned_storage<SIZE, ALIGNMENT>::type data;
+    bool valid;
+  };
+
+  //***************************************************************************
+  // Specialisation for 0 message types.
+  //***************************************************************************
+  template <>
+  class message_packet<void, void, void, void, void, void, void, void,
+                       void, void, void, void, void, void, void, void>
+  {
+  public:
+
+#if ETL_USING_CPP11
+    using message_types = etl::type_list<>;
+#endif
+
+    ETL_CONSTEXPR message_packet() ETL_NOEXCEPT
+      : valid(false)
+    {
+    }
+
+    static ETL_CONSTEXPR bool accepts(etl::message_id_t)
+    {
+      return false;
+    }
+
+    static ETL_CONSTEXPR bool accepts(const etl::imessage&)
+    {
+      return false;
+    }
+
+    template <etl::message_id_t Id>
+    static ETL_CONSTEXPR bool accepts()
+    {
+      return false;
+    }
+
+    template <typename TMessage>
+    static ETL_CONSTEXPR typename etl::enable_if<etl::is_base_of<etl::imessage, TMessage>::value, bool>::type accepts()
+    {
+      return false;
+    }
+
+    bool is_valid() const
+    {
+      return valid;
+    }
+
+    enum
+    {
+      SIZE = 0U,
+      ALIGNMENT = 1U
+    };
+
+  private:
+
+    bool valid;
+  };
+
diff --git a/include/etl/private/message_router_cpp03.h b/include/etl/private/message_router_cpp03.h
new file mode 100644
index 00000000..5844d430
--- /dev/null
+++ b/include/etl/private/message_router_cpp03.h
@@ -0,0 +1,2438 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //*************************************************************************************************
+  // For C++03/98.
+  //*************************************************************************************************
+  //***************************************************************************
+  // The definition for all 16 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void,
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  class message_router  : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
+        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
+        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
+        case T15::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T15&>(msg)); break;
+        case T16::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T16&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID: case T15::ID: case T16::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 15 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13, typename T14, typename T15>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,  T15> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
+        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
+        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
+        case T15::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T15&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID: case T15::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 14 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13, typename T14>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,  T14> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
+        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
+        case T14::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T14&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID: case T14::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 13 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12,
+            typename T13>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,  T13> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
+        case T13::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T13&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID: case T12::ID: case T13::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 12 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11, typename T12>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,  T12> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        case T12::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T12&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID: case T12::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 11 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10, typename T11>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,  T11> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        case T11::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T11&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID: case T11::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 10 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9, typename T10>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8, T9,  T10> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        case T10::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T10&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID: case T10::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 9 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8,
+            typename T9>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, T9, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7, T8,  T9> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8, T9>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        case T9::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T9&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8, T9>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+        case T9::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 8 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7, typename T8>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, T8, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6, T7,  T8> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7, T8>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        case T8::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T8&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7, T8>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID: case T8::ID:
+
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 7 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6, typename T7>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, T7, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5, T6,  T7> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6, T7>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        case T7::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T7&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6, T7>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID: case T7::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 6 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5, typename T6>
+  class message_router<TDerived, T1, T2, T3, T4, T5, T6, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4, T5,  T6> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5, T6>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        case T6::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T6&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5, T6>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID: case T6::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 5 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4,
+            typename T5>
+  class message_router<TDerived, T1, T2, T3, T4, T5, void, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3, T4,  T5> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4, T5>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        case T5::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T5&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4, T5>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4, T5>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID: case T5::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 4 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3, typename T4>
+  class message_router<TDerived, T1, T2, T3, T4, void, void, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2, T3,  T4> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3, T4>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        case T4::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T4&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3, T4>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3, T4>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID: case T4::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 3 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2, typename T3>
+  class message_router<TDerived, T1, T2, T3, void, void, void, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1, T2,  T3> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2, T3>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        case T3::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T3&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2, T3>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2, T3>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID: case T3::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 2 message types.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1, typename T2>
+  class message_router<TDerived, T1, T2, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<T1,  T2> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1, T2>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        case T2::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T2&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1, T2>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1, T2>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID: case T2::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 1 message type.
+  //***************************************************************************
+  template <typename TDerived,
+            typename T1>
+  class message_router<TDerived, T1, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+   : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet< T1> message_packet;
+
+  #if ETL_USING_CPP11
+    using message_types = etl::type_list<T1>;
+  #endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+      const etl::message_id_t id = msg.get_message_id();
+
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      switch (id)
+      {
+        case T1::ID: static_cast<TDerived*>(this)->on_receive(static_cast<const T1&>(msg)); break;
+        default:
+        {
+           if (has_successor())
+           {
+             get_successor().receive(msg);
+           }
+           else
+           {
+             static_cast<TDerived*>(this)->on_receive_unknown(msg);
+           }
+           break;
+        }
+      }
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && etl::is_one_of<TMessage, T1>::value, void>::type
+      receive(const TMessage& msg)
+    {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+      static_cast<TDerived*>(this)->on_receive(msg);
+  #include "etl/private/diagnostic_pop.h"
+    }
+
+    template <typename TMessage>
+    typename etl::enable_if<etl::is_message<TMessage>::value && !etl::is_one_of<TMessage, T1>::value, void>::type
+      receive(const TMessage& msg)
+    {
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+      else
+      {
+  #include "etl/private/diagnostic_array_bounds_push.h"
+        static_cast<TDerived*>(this)->on_receive_unknown(msg);
+  #include "etl/private/diagnostic_pop.h"
+      }
+    }
+
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      switch (id)
+      {
+        case T1::ID:
+          return true;
+        default:
+        {
+          if (has_successor())
+          {
+            return get_successor().accepts(id);
+          }
+          else
+          {
+            return false;
+          }
+        }
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
+  //***************************************************************************
+  // Specialisation for 0 message types.
+  //***************************************************************************
+  template <typename TDerived>
+  class message_router<TDerived, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void>
+    : public imessage_router
+  {
+  public:
+
+    typedef etl::message_packet<> message_packet;
+
+#if ETL_USING_CPP11
+    using message_types = etl::type_list<>;
+#endif
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_)
+      : imessage_router(id_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router(etl::message_router_id_t id_, etl::imessage_router& successor_)
+      : imessage_router(id_, successor_)
+    {
+      ETL_ASSERT(id_ <= etl::imessage_router::MAX_MESSAGE_ROUTER, ETL_ERROR(etl::message_router_illegal_id));
+    }
+
+    //**********************************************
+    message_router()
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER)
+    {
+    }
+
+    //**********************************************
+    message_router(etl::imessage_router& successor_)
+      : imessage_router(etl::imessage_router::MESSAGE_ROUTER, successor_)
+    {
+    }
+
+    //**********************************************
+    using etl::imessage_router::receive;
+
+    void receive(const etl::imessage& msg) ETL_OVERRIDE
+    {
+#include "etl/private/diagnostic_array_bounds_push.h"
+      if (has_successor())
+      {
+        get_successor().receive(msg);
+      }
+#include "etl/private/diagnostic_pop.h"
+    }
+
+    //**********************************************
+    using imessage_router::accepts;
+
+    bool accepts(etl::message_id_t id) const ETL_OVERRIDE
+    {
+      if (has_successor())
+      {
+        return get_successor().accepts(id);
+      }
+      else
+      {
+        return false;
+      }
+    }
+
+    //********************************************
+    ETL_DEPRECATED bool is_null_router() const ETL_OVERRIDE
+    {
+      return false;
+    }
+
+    //********************************************
+    bool is_producer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+
+    //********************************************
+    bool is_consumer() const ETL_OVERRIDE
+    {
+      return true;
+    }
+  };
+
diff --git a/include/etl/private/smallest_cpp03.h b/include/etl/private/smallest_cpp03.h
new file mode 100644
index 00000000..1bf78bb9
--- /dev/null
+++ b/include/etl/private/smallest_cpp03.h
@@ -0,0 +1,73 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  /// Template to determine the smallest type and size.
+  /// Supports up to 16 types.
+  /// Defines 'value_type' which is the type of the smallest parameter.
+  /// Defines 'size' which is the size of the smallest parameter.
+  ///\ingroup smallest
+  //***************************************************************************
+  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  struct smallest_type
+  {
+  private:
+
+    // Declaration.
+    template <bool Boolean, typename TrueType, typename FalseType>
+    struct choose_type;
+
+    // Specialisation for 'true'.
+    // Defines 'type' as 'TrueType'.
+    template <typename TrueType, typename FalseType>
+    struct choose_type<true, TrueType, FalseType>
+    {
+      typedef TrueType type;
+    };
+
+    // Specialisation for 'false'. 
+    // Defines 'type' as 'FalseType'.
+    template <typename TrueType, typename FalseType>
+    struct choose_type<false, TrueType, FalseType>
+    {
+      typedef FalseType type;
+    };
+
+  public:
+
+    // Define 'smallest_other' as 'smallest_type' with all but the first parameter. 
+    typedef typename smallest_type<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type smallest_other;
+
+    // Set 'type' to be the smallest of the first parameter and any of the others.
+    // This is recursive.
+    typedef typename choose_type<(sizeof(T1) < sizeof(smallest_other)), // Boolean
+                                  T1,                                   // TrueType
+                                  smallest_other>                       // FalseType
+                                  ::type type;                          // The smallest type of the two.
+
+    // The size of the smallest type.
+    enum
+    {
+      size = sizeof(type)
+    };
+  };
+
+  //***************************************************************************
+  // Specialisation for one template parameter.
+  //***************************************************************************
+  template <typename T1>
+  struct smallest_type<T1,   void, void, void, void, void, void, void, 
+                       void, void, void, void, void, void, void, void>
+  {
+    typedef T1 type;
+
+    enum
+    {
+      size = sizeof(type)
+    };
+  };
+
diff --git a/include/etl/private/type_lookup_cpp03.h b/include/etl/private/type_lookup_cpp03.h
new file mode 100644
index 00000000..469286a3
--- /dev/null
+++ b/include/etl/private/type_lookup_cpp03.h
@@ -0,0 +1,157 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+
+  //***************************************************************************
+  // For 16 types.
+  //***************************************************************************
+  template <typename T1,
+            typename T2 = etl::type_id_pair<etl::null_type<0>, -2>,
+            typename T3 = etl::type_id_pair<etl::null_type<0>, -3>,
+            typename T4 = etl::type_id_pair<etl::null_type<0>, -4>,
+            typename T5 = etl::type_id_pair<etl::null_type<0>, -5>,
+            typename T6 = etl::type_id_pair<etl::null_type<0>, -6>,
+            typename T7 = etl::type_id_pair<etl::null_type<0>, -7>,
+            typename T8 = etl::type_id_pair<etl::null_type<0>, -8>,
+            typename T9 = etl::type_id_pair<etl::null_type<0>, -9>,
+            typename T10 = etl::type_id_pair<etl::null_type<0>, -10>,
+            typename T11 = etl::type_id_pair<etl::null_type<0>, -11>,
+            typename T12 = etl::type_id_pair<etl::null_type<0>, -12>,
+            typename T13 = etl::type_id_pair<etl::null_type<0>, -13>,
+            typename T14 = etl::type_id_pair<etl::null_type<0>, -14>,
+            typename T15 = etl::type_id_pair<etl::null_type<0>, -15>,
+            typename T16 = etl::type_id_pair<etl::null_type<0>, -16> >
+  struct type_id_lookup
+  {
+  public:
+
+    //************************************
+    template <int Id>
+    struct type_from_id
+    {
+      typedef
+            typename etl::conditional<Id == T1::Id, typename T1::type,
+            typename etl::conditional<Id == T2::Id, typename T2::type,
+            typename etl::conditional<Id == T3::Id, typename T3::type,
+            typename etl::conditional<Id == T4::Id, typename T4::type,
+            typename etl::conditional<Id == T5::Id, typename T5::type,
+            typename etl::conditional<Id == T6::Id, typename T6::type,
+            typename etl::conditional<Id == T7::Id, typename T7::type,
+            typename etl::conditional<Id == T8::Id, typename T8::type,
+            typename etl::conditional<Id == T9::Id, typename T9::type,
+            typename etl::conditional<Id == T10::Id, typename T10::type,
+            typename etl::conditional<Id == T11::Id, typename T11::type,
+            typename etl::conditional<Id == T12::Id, typename T12::type,
+            typename etl::conditional<Id == T13::Id, typename T13::type,
+            typename etl::conditional<Id == T14::Id, typename T14::type,
+            typename etl::conditional<Id == T15::Id, typename T15::type,
+            typename etl::conditional<Id == T16::Id, typename T16::type,
+            etl::null_type<0> >::type>::type>::type>::type>
+                              ::type>::type>::type>::type>
+                              ::type>::type>::type>::type>
+                              ::type>::type>::type>::type type;
+
+      ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), "Invalid id");
+    };
+
+    //************************************
+    enum
+    {
+      UNKNOWN = UINT_MAX
+    };
+
+    template <typename T>
+    struct id_from_type
+    {
+      enum
+      {
+        value =
+          (unsigned int) etl::is_same<T, typename T1::type>::value ? (unsigned int)T1::Id :
+          (unsigned int) etl::is_same<T, typename T2::type>::value ? (unsigned int)T2::Id :
+          (unsigned int) etl::is_same<T, typename T3::type>::value ? (unsigned int)T3::Id :
+          (unsigned int) etl::is_same<T, typename T4::type>::value ? (unsigned int)T4::Id :
+          (unsigned int) etl::is_same<T, typename T5::type>::value ? (unsigned int)T5::Id :
+          (unsigned int) etl::is_same<T, typename T6::type>::value ? (unsigned int)T6::Id :
+          (unsigned int) etl::is_same<T, typename T7::type>::value ? (unsigned int)T7::Id :
+          (unsigned int) etl::is_same<T, typename T8::type>::value ? (unsigned int)T8::Id :
+          (unsigned int) etl::is_same<T, typename T9::type>::value ? (unsigned int)T9::Id :
+          (unsigned int) etl::is_same<T, typename T10::type>::value ? (unsigned int)T10::Id :
+          (unsigned int) etl::is_same<T, typename T11::type>::value ? (unsigned int)T11::Id :
+          (unsigned int) etl::is_same<T, typename T12::type>::value ? (unsigned int)T12::Id :
+          (unsigned int) etl::is_same<T, typename T13::type>::value ? (unsigned int)T13::Id :
+          (unsigned int) etl::is_same<T, typename T14::type>::value ? (unsigned int)T14::Id :
+          (unsigned int) etl::is_same<T, typename T15::type>::value ? (unsigned int)T15::Id :
+          (unsigned int) etl::is_same<T, typename T16::type>::value ? (unsigned int)T16::Id :
+          (unsigned int) UNKNOWN
+      };
+
+      ETL_STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
+    };
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type(const T&)
+    {
+      return get_id_from_type<T>();
+    }
+
+    //************************************
+    template <typename T>
+    static unsigned int get_id_from_type()
+    {
+      return id_from_type<T>::value;
+    }
+  };
+
+  //***************************************************************************
+  // For 16 types.
+  //***************************************************************************
+  template <typename T1,
+            typename T2 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T3 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T4 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T5 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T6 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T7 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T8 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T9 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T10 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T11 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T12 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T13 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T14 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T15 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
+            typename T16 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> > >
+  struct type_type_lookup
+  {
+  public:
+
+    //************************************
+    template <typename T>
+    struct type_from_type
+    {
+      typedef
+            typename etl::conditional<etl::is_same<T, typename T1::type1>::value, typename T1::type2,
+            typename etl::conditional<etl::is_same<T, typename T2::type1>::value, typename T2::type2,
+            typename etl::conditional<etl::is_same<T, typename T3::type1>::value, typename T3::type2,
+            typename etl::conditional<etl::is_same<T, typename T4::type1>::value, typename T4::type2,
+            typename etl::conditional<etl::is_same<T, typename T5::type1>::value, typename T5::type2,
+            typename etl::conditional<etl::is_same<T, typename T6::type1>::value, typename T6::type2,
+            typename etl::conditional<etl::is_same<T, typename T7::type1>::value, typename T7::type2,
+            typename etl::conditional<etl::is_same<T, typename T8::type1>::value, typename T8::type2,
+            typename etl::conditional<etl::is_same<T, typename T9::type1>::value, typename T9::type2,
+            typename etl::conditional<etl::is_same<T, typename T10::type1>::value, typename T10::type2,
+            typename etl::conditional<etl::is_same<T, typename T11::type1>::value, typename T11::type2,
+            typename etl::conditional<etl::is_same<T, typename T12::type1>::value, typename T12::type2,
+            typename etl::conditional<etl::is_same<T, typename T13::type1>::value, typename T13::type2,
+            typename etl::conditional<etl::is_same<T, typename T14::type1>::value, typename T14::type2,
+            typename etl::conditional<etl::is_same<T, typename T15::type1>::value, typename T15::type2,
+            typename etl::conditional<etl::is_same<T, typename T16::type1>::value, typename T16::type2,
+            etl::null_type<0> >::type>::type>::type>::type>::type>::type>::type>::type>
+                              ::type>::type>::type>::type>::type>::type>::type>::type type;
+
+      ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), "Invalid type");
+    };
+  };
+
diff --git a/include/etl/private/type_select_cpp03.h b/include/etl/private/type_select_cpp03.h
new file mode 100644
index 00000000..3c812065
--- /dev/null
+++ b/include/etl/private/type_select_cpp03.h
@@ -0,0 +1,541 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+
+//***************************************************************************
+// For 16 types.
+//***************************************************************************
+template <typename T0,
+          typename T1 = void,
+          typename T2 = void,
+          typename T3 = void,
+          typename T4 = void,
+          typename T5 = void,
+          typename T6 = void,
+          typename T7 = void,
+          typename T8 = void,
+          typename T9 = void,
+          typename T10 = void,
+          typename T11 = void,
+          typename T12 = void,
+          typename T13 = void,
+          typename T14 = void,
+          typename T15 = void>
+struct type_select
+{
+public:
+
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            typename etl::conditional<Id == 11, T11,
+            typename etl::conditional<Id == 12, T12,
+            typename etl::conditional<Id == 13, T13,
+            typename etl::conditional<Id == 14, T14,
+            typename etl::conditional<Id == 15, T15,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 16, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 15 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9, 
+          typename T10, 
+          typename T11, 
+          typename T12, 
+          typename T13, 
+          typename T14>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            typename etl::conditional<Id == 11, T11,
+            typename etl::conditional<Id == 12, T12,
+            typename etl::conditional<Id == 13, T13,
+            typename etl::conditional<Id == 14, T14,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 15, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 14 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9, 
+          typename T10, 
+          typename T11, 
+          typename T12, 
+          typename T13>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            typename etl::conditional<Id == 11, T11,
+            typename etl::conditional<Id == 12, T12,
+            typename etl::conditional<Id == 13, T13,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 14, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 13 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9, 
+          typename T10, 
+          typename T11, 
+          typename T12>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            typename etl::conditional<Id == 11, T11,
+            typename etl::conditional<Id == 12, T12,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 13, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 12 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9, 
+          typename T10, 
+          typename T11>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            typename etl::conditional<Id == 11, T11,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 12, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 11 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9, 
+          typename T10>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            typename etl::conditional<Id == 10, T10,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 11, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 10 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8, 
+          typename T9>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            typename etl::conditional<Id == 9, T9,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 10, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 9 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7, 
+          typename T8>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            typename etl::conditional<Id == 8, T8,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type>
+            ::type type;
+
+    ETL_STATIC_ASSERT(Id < 9, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 8 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6, 
+          typename T7>
+struct type_select<T0, T1, T2, T3, T4, T5, T6, T7>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            typename etl::conditional<Id == 7, T7,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 8, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 7 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5, 
+          typename T6>
+struct type_select<T0, T1, T2, T3, T4, T5, T6>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            typename etl::conditional<Id == 6, T6,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 7, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 6 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4, 
+          typename T5>
+struct type_select<T0, T1, T2, T3, T4, T5>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            typename etl::conditional<Id == 5, T5,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 6, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 5 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3, 
+          typename T4>
+struct type_select<T0, T1, T2, T3, T4>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            typename etl::conditional<Id == 4, T4,
+            etl::null_type<0> >
+            ::type>::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 5, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 4 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2, 
+          typename T3>
+struct type_select<T0, T1, T2, T3>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            typename etl::conditional<Id == 3, T3,
+            etl::null_type<0> >
+            ::type>::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 4, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 3 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1, 
+          typename T2>
+struct type_select<T0, T1, T2>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            typename etl::conditional<Id == 2, T2,
+            etl::null_type<0> >
+            ::type>::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 3, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 2 types.
+//***************************************************************************
+template <typename T0, 
+          typename T1>
+struct type_select<T0, T1>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            typename etl::conditional<Id == 1, T1,
+            etl::null_type<0> >
+            ::type>::type type;
+
+    ETL_STATIC_ASSERT(Id < 2, "Invalid Id");
+  };
+};
+
+//***************************************************************************
+// For 1 types.
+//***************************************************************************
+template <typename T0>
+struct type_select<T0>
+{
+public:
+  template <size_t Id>
+  struct select
+  {
+    typedef typename etl::conditional<Id == 0, T0,
+            etl::null_type<0> >
+            ::type type;
+
+    ETL_STATIC_ASSERT(Id < 1, "Invalid Id");
+  };
+};
diff --git a/include/etl/private/type_traits_cpp03.h b/include/etl/private/type_traits_cpp03.h
new file mode 100644
index 00000000..eeecaac1
--- /dev/null
+++ b/include/etl/private/type_traits_cpp03.h
@@ -0,0 +1,33 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  /// Template to determine if a type is one of a specified list.
+  ///\ingroup types
+  template <typename T,
+            typename T1, typename T2 = void, typename T3 = void, typename T4 = void,
+            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
+            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
+            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
+  struct is_one_of
+  {
+    static const bool value =
+        etl::is_same<T, T1>::value ||
+        etl::is_same<T, T2>::value ||
+        etl::is_same<T, T3>::value ||
+        etl::is_same<T, T4>::value ||
+        etl::is_same<T, T5>::value ||
+        etl::is_same<T, T6>::value ||
+        etl::is_same<T, T7>::value ||
+        etl::is_same<T, T8>::value ||
+        etl::is_same<T, T9>::value ||
+        etl::is_same<T, T10>::value ||
+        etl::is_same<T, T11>::value ||
+        etl::is_same<T, T12>::value ||
+        etl::is_same<T, T13>::value ||
+        etl::is_same<T, T14>::value ||
+        etl::is_same<T, T15>::value ||
+        etl::is_same<T, T16>::value;
+  };
+
diff --git a/include/etl/private/variant_pool_cpp03.h b/include/etl/private/variant_pool_cpp03.h
new file mode 100644
index 00000000..f7172565
--- /dev/null
+++ b/include/etl/private/variant_pool_cpp03.h
@@ -0,0 +1,294 @@
+//***************************************************************************
+// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
+//***************************************************************************
+
+  //***************************************************************************
+  template <size_t MAX_SIZE_,
+            typename T1,
+            typename T2 = void,
+            typename T3 = void,
+            typename T4 = void,
+            typename T5 = void,
+            typename T6 = void,
+            typename T7 = void,
+            typename T8 = void,
+            typename T9 = void,
+            typename T10 = void,
+            typename T11 = void,
+            typename T12 = void,
+            typename T13 = void,
+            typename T14 = void,
+            typename T15 = void,
+            typename T16 = void>
+  class variant_pool
+    : public etl::generic_pool<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+                               etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment,
+                               MAX_SIZE_>
+  {
+  public:
+
+    typedef etl::generic_pool<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+                              etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment,
+                              MAX_SIZE_> base_t;
+
+    static const size_t MAX_SIZE = MAX_SIZE_;
+
+    //*************************************************************************
+    /// Default constructor.
+    //*************************************************************************
+    variant_pool()
+    {
+    }
+
+#if ETL_CPP11_NOT_SUPPORTED || ETL_USING_STLPORT
+    //*************************************************************************
+    /// Creates the object. Default constructor.
+    //*************************************************************************
+    template <typename T>
+    T* create()
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>();
+    }
+
+    //*************************************************************************
+    /// Creates the object. One parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1>
+    T* create(const TP1& p1)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Two parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2>
+    T* create(const TP1& p1, const TP2& p2)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Three parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2, p3);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Four parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3, const TP4& p4)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2, p3, p4);
+    }
+#else
+    //*************************************************************************
+    /// Creates the object from a type. Variadic parameter constructor.
+    //*************************************************************************
+    template <typename T, typename... Args>
+    T* create(Args&&... args)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(etl::forward<Args>(args)...);
+    }
+#endif
+
+    //*************************************************************************
+    /// Destroys the object.
+    //*************************************************************************
+    template <typename T>
+    void destroy(const T* const p)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value ||
+                         etl::is_base_of<T, T1>::value ||
+                         etl::is_base_of<T, T2>::value ||
+                         etl::is_base_of<T, T3>::value ||
+                         etl::is_base_of<T, T4>::value ||
+                         etl::is_base_of<T, T5>::value ||
+                         etl::is_base_of<T, T6>::value ||
+                         etl::is_base_of<T, T7>::value ||
+                         etl::is_base_of<T, T8>::value ||
+                         etl::is_base_of<T, T9>::value ||
+                         etl::is_base_of<T, T10>::value ||
+                         etl::is_base_of<T, T11>::value ||
+                         etl::is_base_of<T, T12>::value ||
+                         etl::is_base_of<T, T13>::value ||
+                         etl::is_base_of<T, T14>::value ||
+                         etl::is_base_of<T, T15>::value ||
+                         etl::is_base_of<T, T16>::value), "Invalid type");
+
+      base_t::destroy(p);
+    }
+
+    //*************************************************************************
+    /// Returns the maximum number of items in the variant_pool.
+    //*************************************************************************
+    size_t max_size() const
+    {
+      return MAX_SIZE;
+    }
+
+  private:
+
+    variant_pool(const variant_pool&) ETL_DELETE;
+    variant_pool& operator =(const variant_pool&) ETL_DELETE;
+  };
+
+  //***************************************************************************
+  template <typename T1,
+            typename T2 = void,
+            typename T3 = void,
+            typename T4 = void,
+            typename T5 = void,
+            typename T6 = void,
+            typename T7 = void,
+            typename T8 = void,
+            typename T9 = void,
+            typename T10 = void,
+            typename T11 = void,
+            typename T12 = void,
+            typename T13 = void,
+            typename T14 = void,
+            typename T15 = void,
+            typename T16 = void>
+  class variant_pool_ext
+    : public etl::generic_pool_ext<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+                                   etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment>
+  {
+  public:
+
+    typedef etl::generic_pool_ext<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
+                                  etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment> base_t;
+
+    //*************************************************************************
+    /// Default constructor.
+    //*************************************************************************
+    variant_pool_ext(typename base_t::element* buffer, size_t size)
+      : base_t(buffer, size)
+    {
+    }
+
+#if ETL_CPP11_NOT_SUPPORTED || ETL_USING_STLPORT
+    //*************************************************************************
+    /// Creates the object. Default constructor.
+    //*************************************************************************
+    template <typename T>
+    T* create()
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>();
+    }
+
+    //*************************************************************************
+    /// Creates the object. One parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1>
+    T* create(const TP1& p1)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Two parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2>
+    T* create(const TP1& p1, const TP2& p2)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Three parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2, p3);
+    }
+
+    //*************************************************************************
+    /// Creates the object. Four parameter constructor.
+    //*************************************************************************
+    template <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
+    T* create(const TP1& p1, const TP2& p2, const TP3& p3, const TP4& p4)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(p1, p2, p3, p4);
+    }
+#else
+    //*************************************************************************
+    /// Creates the object from a type. Variadic parameter constructor.
+    //*************************************************************************
+    template <typename T, typename... Args>
+    T* create(Args&&... args)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
+
+      return base_t::template create<T>(etl::forward<Args>(args)...);
+    }
+#endif
+
+    //*************************************************************************
+    /// Destroys the object.
+    //*************************************************************************
+    template <typename T>
+    void destroy(const T* const p)
+    {
+      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value ||
+                         etl::is_base_of<T, T1>::value ||
+                         etl::is_base_of<T, T2>::value ||
+                         etl::is_base_of<T, T3>::value ||
+                         etl::is_base_of<T, T4>::value ||
+                         etl::is_base_of<T, T5>::value ||
+                         etl::is_base_of<T, T6>::value ||
+                         etl::is_base_of<T, T7>::value ||
+                         etl::is_base_of<T, T8>::value ||
+                         etl::is_base_of<T, T9>::value ||
+                         etl::is_base_of<T, T10>::value ||
+                         etl::is_base_of<T, T11>::value ||
+                         etl::is_base_of<T, T12>::value ||
+                         etl::is_base_of<T, T13>::value ||
+                         etl::is_base_of<T, T14>::value ||
+                         etl::is_base_of<T, T15>::value ||
+                         etl::is_base_of<T, T16>::value), "Invalid type");
+
+      base_t::destroy(p);
+    }
+
+    //*************************************************************************
+    /// Returns the maximum number of items in the variant_pool.
+    //*************************************************************************
+    size_t max_size() const
+    {
+      return base_t::max_size();
+    }
+
+  private:
+
+    variant_pool_ext(const variant_pool_ext&) ETL_DELETE;
+    variant_pool_ext& operator =(const variant_pool_ext&) ETL_DELETE;
+  };
+
diff --git a/include/etl/smallest.h b/include/etl/smallest.h
index 635a8edd..29efa37e 100644
--- a/include/etl/smallest.h
+++ b/include/etl/smallest.h
@@ -28,28 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -osmallest.h -DNTypes=<n> smallest_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -osmallest.h -DNTypes=16 smallest_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_SMALLEST_INCLUDED
 #define ETL_SMALLEST_INCLUDED
 
@@ -121,74 +99,7 @@ namespace etl
 #endif
 
 #else
-  //***************************************************************************
-  /// Template to determine the smallest type and size.
-  /// Supports up to 16 types.
-  /// Defines 'value_type' which is the type of the smallest parameter.
-  /// Defines 'size' which is the size of the smallest parameter.
-  ///\ingroup smallest
-  //***************************************************************************
-  template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void, 
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void, 
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void, 
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  struct smallest_type
-  {
-  private:
-
-    // Declaration.
-    template <bool Boolean, typename TrueType, typename FalseType>
-    struct choose_type;
-
-    // Specialisation for 'true'.
-    // Defines 'type' as 'TrueType'.
-    template <typename TrueType, typename FalseType>
-    struct choose_type<true, TrueType, FalseType>
-    {
-      typedef TrueType type;
-    };
-
-    // Specialisation for 'false'. 
-    // Defines 'type' as 'FalseType'.
-    template <typename TrueType, typename FalseType>
-    struct choose_type<false, TrueType, FalseType>
-    {
-      typedef FalseType type;
-    };
-
-  public:
-
-    // Define 'smallest_other' as 'smallest_type' with all but the first parameter. 
-    typedef typename smallest_type<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::type smallest_other;
-
-    // Set 'type' to be the smallest of the first parameter and any of the others.
-    // This is recursive.
-    typedef typename choose_type<(sizeof(T1) < sizeof(smallest_other)), // Boolean
-                                  T1,                                   // TrueType
-                                  smallest_other>                       // FalseType
-                                  ::type type;                          // The smallest type of the two.
-
-    // The size of the smallest type.
-    enum
-    {
-      size = sizeof(type)
-    };
-  };
-
-  //***************************************************************************
-  // Specialisation for one template parameter.
-  //***************************************************************************
-  template <typename T1>
-  struct smallest_type<T1,   void, void, void, void, void, void, void, 
-                       void, void, void, void, void, void, void, void>
-  {
-    typedef T1 type;
-
-    enum
-    {
-      size = sizeof(type)
-    };
-  };
+  #include "private/smallest_cpp03.h"
 #endif
 
   namespace private_smallest
diff --git a/include/etl/type_lookup.h b/include/etl/type_lookup.h
index 4369f5fe..182ab151 100644
--- a/include/etl/type_lookup.h
+++ b/include/etl/type_lookup.h
@@ -36,15 +36,6 @@ SOFTWARE.
 #include "null_type.h"
 
 #include <limits.h>
-
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
 namespace etl
 {
   //***************************************************************************
@@ -214,159 +205,7 @@ namespace etl
   };
 
 #else
-
-  //***************************************************************************
-  // For 16 types.
-  //***************************************************************************
-  template <typename T1,
-            typename T2 = etl::type_id_pair<etl::null_type<0>, -2>,
-            typename T3 = etl::type_id_pair<etl::null_type<0>, -3>,
-            typename T4 = etl::type_id_pair<etl::null_type<0>, -4>,
-            typename T5 = etl::type_id_pair<etl::null_type<0>, -5>,
-            typename T6 = etl::type_id_pair<etl::null_type<0>, -6>,
-            typename T7 = etl::type_id_pair<etl::null_type<0>, -7>,
-            typename T8 = etl::type_id_pair<etl::null_type<0>, -8>,
-            typename T9 = etl::type_id_pair<etl::null_type<0>, -9>,
-            typename T10 = etl::type_id_pair<etl::null_type<0>, -10>,
-            typename T11 = etl::type_id_pair<etl::null_type<0>, -11>,
-            typename T12 = etl::type_id_pair<etl::null_type<0>, -12>,
-            typename T13 = etl::type_id_pair<etl::null_type<0>, -13>,
-            typename T14 = etl::type_id_pair<etl::null_type<0>, -14>,
-            typename T15 = etl::type_id_pair<etl::null_type<0>, -15>,
-            typename T16 = etl::type_id_pair<etl::null_type<0>, -16> >
-  struct type_id_lookup
-  {
-  public:
-
-    //************************************
-    template <int Id>
-    struct type_from_id
-    {
-      typedef
-            typename etl::conditional<Id == T1::Id, typename T1::type,
-            typename etl::conditional<Id == T2::Id, typename T2::type,
-            typename etl::conditional<Id == T3::Id, typename T3::type,
-            typename etl::conditional<Id == T4::Id, typename T4::type,
-            typename etl::conditional<Id == T5::Id, typename T5::type,
-            typename etl::conditional<Id == T6::Id, typename T6::type,
-            typename etl::conditional<Id == T7::Id, typename T7::type,
-            typename etl::conditional<Id == T8::Id, typename T8::type,
-            typename etl::conditional<Id == T9::Id, typename T9::type,
-            typename etl::conditional<Id == T10::Id, typename T10::type,
-            typename etl::conditional<Id == T11::Id, typename T11::type,
-            typename etl::conditional<Id == T12::Id, typename T12::type,
-            typename etl::conditional<Id == T13::Id, typename T13::type,
-            typename etl::conditional<Id == T14::Id, typename T14::type,
-            typename etl::conditional<Id == T15::Id, typename T15::type,
-            typename etl::conditional<Id == T16::Id, typename T16::type,
-            etl::null_type<0> >::type>::type>::type>::type>
-                              ::type>::type>::type>::type>
-                              ::type>::type>::type>::type>
-                              ::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), "Invalid id");
-    };
-
-    //************************************
-    enum
-    {
-      UNKNOWN = UINT_MAX
-    };
-
-    template <typename T>
-    struct id_from_type
-    {
-      enum
-      {
-        value =
-          (unsigned int) etl::is_same<T, typename T1::type>::value ? (unsigned int)T1::Id :
-          (unsigned int) etl::is_same<T, typename T2::type>::value ? (unsigned int)T2::Id :
-          (unsigned int) etl::is_same<T, typename T3::type>::value ? (unsigned int)T3::Id :
-          (unsigned int) etl::is_same<T, typename T4::type>::value ? (unsigned int)T4::Id :
-          (unsigned int) etl::is_same<T, typename T5::type>::value ? (unsigned int)T5::Id :
-          (unsigned int) etl::is_same<T, typename T6::type>::value ? (unsigned int)T6::Id :
-          (unsigned int) etl::is_same<T, typename T7::type>::value ? (unsigned int)T7::Id :
-          (unsigned int) etl::is_same<T, typename T8::type>::value ? (unsigned int)T8::Id :
-          (unsigned int) etl::is_same<T, typename T9::type>::value ? (unsigned int)T9::Id :
-          (unsigned int) etl::is_same<T, typename T10::type>::value ? (unsigned int)T10::Id :
-          (unsigned int) etl::is_same<T, typename T11::type>::value ? (unsigned int)T11::Id :
-          (unsigned int) etl::is_same<T, typename T12::type>::value ? (unsigned int)T12::Id :
-          (unsigned int) etl::is_same<T, typename T13::type>::value ? (unsigned int)T13::Id :
-          (unsigned int) etl::is_same<T, typename T14::type>::value ? (unsigned int)T14::Id :
-          (unsigned int) etl::is_same<T, typename T15::type>::value ? (unsigned int)T15::Id :
-          (unsigned int) etl::is_same<T, typename T16::type>::value ? (unsigned int)T16::Id :
-          (unsigned int) UNKNOWN
-      };
-
-      ETL_STATIC_ASSERT(((unsigned int)value != (unsigned int)UNKNOWN), "Invalid type");
-    };
-
-    //************************************
-    template <typename T>
-    static unsigned int get_id_from_type(const T&)
-    {
-      return get_id_from_type<T>();
-    }
-
-    //************************************
-    template <typename T>
-    static unsigned int get_id_from_type()
-    {
-      return id_from_type<T>::value;
-    }
-  };
-
-  //***************************************************************************
-  // For 16 types.
-  //***************************************************************************
-  template <typename T1,
-            typename T2 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T3 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T4 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T5 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T6 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T7 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T8 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T9 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T10 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T11 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T12 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T13 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T14 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T15 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> >,
-            typename T16 = etl::type_type_pair<etl::null_type<0>, etl::null_type<0> > >
-  struct type_type_lookup
-  {
-  public:
-
-    //************************************
-    template <typename T>
-    struct type_from_type
-    {
-      typedef
-            typename etl::conditional<etl::is_same<T, typename T1::type1>::value, typename T1::type2,
-            typename etl::conditional<etl::is_same<T, typename T2::type1>::value, typename T2::type2,
-            typename etl::conditional<etl::is_same<T, typename T3::type1>::value, typename T3::type2,
-            typename etl::conditional<etl::is_same<T, typename T4::type1>::value, typename T4::type2,
-            typename etl::conditional<etl::is_same<T, typename T5::type1>::value, typename T5::type2,
-            typename etl::conditional<etl::is_same<T, typename T6::type1>::value, typename T6::type2,
-            typename etl::conditional<etl::is_same<T, typename T7::type1>::value, typename T7::type2,
-            typename etl::conditional<etl::is_same<T, typename T8::type1>::value, typename T8::type2,
-            typename etl::conditional<etl::is_same<T, typename T9::type1>::value, typename T9::type2,
-            typename etl::conditional<etl::is_same<T, typename T10::type1>::value, typename T10::type2,
-            typename etl::conditional<etl::is_same<T, typename T11::type1>::value, typename T11::type2,
-            typename etl::conditional<etl::is_same<T, typename T12::type1>::value, typename T12::type2,
-            typename etl::conditional<etl::is_same<T, typename T13::type1>::value, typename T13::type2,
-            typename etl::conditional<etl::is_same<T, typename T14::type1>::value, typename T14::type2,
-            typename etl::conditional<etl::is_same<T, typename T15::type1>::value, typename T15::type2,
-            typename etl::conditional<etl::is_same<T, typename T16::type1>::value, typename T16::type2,
-            etl::null_type<0> >::type>::type>::type>::type>::type>::type>::type>::type>
-                              ::type>::type>::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(!(etl::is_same<etl::null_type<0>, type>::value), "Invalid type");
-    };
-  };
-
+#include "private/type_lookup_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/type_select.h b/include/etl/type_select.h
index 36b9be0d..678ff80b 100644
--- a/include/etl/type_select.h
+++ b/include/etl/type_select.h
@@ -33,15 +33,6 @@ SOFTWARE.
 #include "static_assert.h"
 #include "type_traits.h"
 #include "null_type.h"
-
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
 namespace etl
 {
 #if ETL_USING_CPP11 && !defined(ETL_TYPE_SELECT_FORCE_CPP03_IMPLEMENTATION)
@@ -90,543 +81,7 @@ namespace etl
   using type_select_t = typename etl::type_select<TTypes...>:: template select_t<Index>;
 
 #else
-
-  //***************************************************************************
-  // For 16 types.
-  //***************************************************************************
-  template <typename T0,
-            typename T1 = void,
-            typename T2 = void,
-            typename T3 = void,
-            typename T4 = void,
-            typename T5 = void,
-            typename T6 = void,
-            typename T7 = void,
-            typename T8 = void,
-            typename T9 = void,
-            typename T10 = void,
-            typename T11 = void,
-            typename T12 = void,
-            typename T13 = void,
-            typename T14 = void,
-            typename T15 = void>
-  struct type_select
-  {
-  public:
-
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              typename etl::conditional<Id == 11, T11,
-              typename etl::conditional<Id == 12, T12,
-              typename etl::conditional<Id == 13, T13,
-              typename etl::conditional<Id == 14, T14,
-              typename etl::conditional<Id == 15, T15,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 16, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 15 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9, 
-            typename T10, 
-            typename T11, 
-            typename T12, 
-            typename T13, 
-            typename T14>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              typename etl::conditional<Id == 11, T11,
-              typename etl::conditional<Id == 12, T12,
-              typename etl::conditional<Id == 13, T13,
-              typename etl::conditional<Id == 14, T14,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 15, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 14 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9, 
-            typename T10, 
-            typename T11, 
-            typename T12, 
-            typename T13>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              typename etl::conditional<Id == 11, T11,
-              typename etl::conditional<Id == 12, T12,
-              typename etl::conditional<Id == 13, T13,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 14, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 13 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9, 
-            typename T10, 
-            typename T11, 
-            typename T12>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              typename etl::conditional<Id == 11, T11,
-              typename etl::conditional<Id == 12, T12,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 13, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 12 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9, 
-            typename T10, 
-            typename T11>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              typename etl::conditional<Id == 11, T11,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 12, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 11 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9, 
-            typename T10>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              typename etl::conditional<Id == 10, T10,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 11, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 10 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8, 
-            typename T9>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              typename etl::conditional<Id == 9, T9,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 10, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 9 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7, 
-            typename T8>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7, T8>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              typename etl::conditional<Id == 8, T8,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type>
-              ::type type;
-
-      ETL_STATIC_ASSERT(Id < 9, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 8 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6, 
-            typename T7>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6, T7>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              typename etl::conditional<Id == 7, T7,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 8, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 7 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5, 
-            typename T6>
-  struct type_select<T0, T1, T2, T3, T4, T5, T6>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              typename etl::conditional<Id == 6, T6,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 7, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 6 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4, 
-            typename T5>
-  struct type_select<T0, T1, T2, T3, T4, T5>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              typename etl::conditional<Id == 5, T5,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 6, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 5 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3, 
-            typename T4>
-  struct type_select<T0, T1, T2, T3, T4>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              typename etl::conditional<Id == 4, T4,
-              etl::null_type<0> >
-              ::type>::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 5, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 4 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2, 
-            typename T3>
-  struct type_select<T0, T1, T2, T3>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              typename etl::conditional<Id == 3, T3,
-              etl::null_type<0> >
-              ::type>::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 4, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 3 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1, 
-            typename T2>
-  struct type_select<T0, T1, T2>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              typename etl::conditional<Id == 2, T2,
-              etl::null_type<0> >
-              ::type>::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 3, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 2 types.
-  //***************************************************************************
-  template <typename T0, 
-            typename T1>
-  struct type_select<T0, T1>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              typename etl::conditional<Id == 1, T1,
-              etl::null_type<0> >
-              ::type>::type type;
-
-      ETL_STATIC_ASSERT(Id < 2, "Invalid Id");
-    };
-  };
-
-  //***************************************************************************
-  // For 1 types.
-  //***************************************************************************
-  template <typename T0>
-  struct type_select<T0>
-  {
-  public:
-    template <size_t Id>
-    struct select
-    {
-      typedef typename etl::conditional<Id == 0, T0,
-              etl::null_type<0> >
-              ::type type;
-
-      ETL_STATIC_ASSERT(Id < 1, "Invalid Id");
-    };
-  };
+#include "private/type_select_cpp03.h"
 #endif
 }
 
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 34462e61..39fc26b3 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -28,28 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -otypes.h -DHandlers=<n> types_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -otype_traits.h -DIsOneOf=16 type_traits_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_TYPE_TRAITS_INCLUDED
 #define ETL_TYPE_TRAITS_INCLUDED
 
@@ -1610,34 +1588,7 @@ typedef integral_constant<bool, true>  true_type;
   {
   };
 #else
-  //***************************************************************************
-  /// Template to determine if a type is one of a specified list.
-  ///\ingroup types
-  template <typename T,
-            typename T1, typename T2 = void, typename T3 = void, typename T4 = void,
-            typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void,
-            typename T9 = void, typename T10 = void, typename T11 = void, typename T12 = void,
-            typename T13 = void, typename T14 = void, typename T15 = void, typename T16 = void>
-  struct is_one_of
-  {
-    static const bool value =
-        etl::is_same<T, T1>::value ||
-        etl::is_same<T, T2>::value ||
-        etl::is_same<T, T3>::value ||
-        etl::is_same<T, T4>::value ||
-        etl::is_same<T, T5>::value ||
-        etl::is_same<T, T6>::value ||
-        etl::is_same<T, T7>::value ||
-        etl::is_same<T, T8>::value ||
-        etl::is_same<T, T9>::value ||
-        etl::is_same<T, T10>::value ||
-        etl::is_same<T, T11>::value ||
-        etl::is_same<T, T12>::value ||
-        etl::is_same<T, T13>::value ||
-        etl::is_same<T, T14>::value ||
-        etl::is_same<T, T15>::value ||
-        etl::is_same<T, T16>::value;
-  };
+  #include "private/type_traits_cpp03.h"
 #endif
 
 #if ETL_USING_CPP17
diff --git a/include/etl/variant_pool.h b/include/etl/variant_pool.h
index c0bc2161..c7843bc4 100644
--- a/include/etl/variant_pool.h
+++ b/include/etl/variant_pool.h
@@ -26,28 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if 0
-#error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.
-#endif
-
-//***************************************************************************
-// THIS FILE HAS BEEN AUTO GENERATED. DO NOT EDIT THIS FILE.
-//***************************************************************************
-
-//***************************************************************************
-// To generate to header file, run this at the command line.
-// Note: You will need Python and COG installed.
-//
-// cog -d -e -ovariant_pool.h -DNTypes=<n> variant_pool_generator.h
-// Where <n> is the number of types to support.
-//
-// e.g.
-// To generate handlers for up to 16 types...
-// cog -d -e -ovariant_pool.h -DNTypes=16 variant_pool_generator.h
-//
-// See generate.bat
-//***************************************************************************
-
 #ifndef ETL_VARIANT_POOL_INCLUDED
 #define ETL_VARIANT_POOL_INCLUDED
 
@@ -175,295 +153,7 @@ namespace etl
     variant_pool_ext& operator =(const variant_pool_ext&) ETL_DELETE;
   };
 #else
-  //***************************************************************************
-  template <size_t MAX_SIZE_,
-            typename T1,
-            typename T2 = void,
-            typename T3 = void,
-            typename T4 = void,
-            typename T5 = void,
-            typename T6 = void,
-            typename T7 = void,
-            typename T8 = void,
-            typename T9 = void,
-            typename T10 = void,
-            typename T11 = void,
-            typename T12 = void,
-            typename T13 = void,
-            typename T14 = void,
-            typename T15 = void,
-            typename T16 = void>
-  class variant_pool
-    : public etl::generic_pool<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-                               etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment,
-                               MAX_SIZE_>
-  {
-  public:
-
-    typedef etl::generic_pool<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-                              etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment,
-                              MAX_SIZE_> base_t;
-
-    static const size_t MAX_SIZE = MAX_SIZE_;
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    variant_pool()
-    {
-    }
-
-#if ETL_CPP11_NOT_SUPPORTED || ETL_USING_STLPORT
-    //*************************************************************************
-    /// Creates the object. Default constructor.
-    //*************************************************************************
-    template <typename T>
-    T* create()
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>();
-    }
-
-    //*************************************************************************
-    /// Creates the object. One parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1>
-    T* create(const TP1& p1)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Two parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2>
-    T* create(const TP1& p1, const TP2& p2)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Three parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2, typename TP3>
-    T* create(const TP1& p1, const TP2& p2, const TP3& p3)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2, p3);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Four parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
-    T* create(const TP1& p1, const TP2& p2, const TP3& p3, const TP4& p4)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2, p3, p4);
-    }
-#else
-    //*************************************************************************
-    /// Creates the object from a type. Variadic parameter constructor.
-    //*************************************************************************
-    template <typename T, typename... Args>
-    T* create(Args&&... args)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(etl::forward<Args>(args)...);
-    }
-#endif
-
-    //*************************************************************************
-    /// Destroys the object.
-    //*************************************************************************
-    template <typename T>
-    void destroy(const T* const p)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value ||
-                         etl::is_base_of<T, T1>::value ||
-                         etl::is_base_of<T, T2>::value ||
-                         etl::is_base_of<T, T3>::value ||
-                         etl::is_base_of<T, T4>::value ||
-                         etl::is_base_of<T, T5>::value ||
-                         etl::is_base_of<T, T6>::value ||
-                         etl::is_base_of<T, T7>::value ||
-                         etl::is_base_of<T, T8>::value ||
-                         etl::is_base_of<T, T9>::value ||
-                         etl::is_base_of<T, T10>::value ||
-                         etl::is_base_of<T, T11>::value ||
-                         etl::is_base_of<T, T12>::value ||
-                         etl::is_base_of<T, T13>::value ||
-                         etl::is_base_of<T, T14>::value ||
-                         etl::is_base_of<T, T15>::value ||
-                         etl::is_base_of<T, T16>::value), "Invalid type");
-
-      base_t::destroy(p);
-    }
-
-    //*************************************************************************
-    /// Returns the maximum number of items in the variant_pool.
-    //*************************************************************************
-    size_t max_size() const
-    {
-      return MAX_SIZE;
-    }
-
-  private:
-
-    variant_pool(const variant_pool&) ETL_DELETE;
-    variant_pool& operator =(const variant_pool&) ETL_DELETE;
-  };
-
-  //***************************************************************************
-  template <typename T1,
-            typename T2 = void,
-            typename T3 = void,
-            typename T4 = void,
-            typename T5 = void,
-            typename T6 = void,
-            typename T7 = void,
-            typename T8 = void,
-            typename T9 = void,
-            typename T10 = void,
-            typename T11 = void,
-            typename T12 = void,
-            typename T13 = void,
-            typename T14 = void,
-            typename T15 = void,
-            typename T16 = void>
-  class variant_pool_ext
-    : public etl::generic_pool_ext<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-                                   etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment>
-  {
-  public:
-
-    typedef etl::generic_pool_ext<etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::size,
-                                  etl::largest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::alignment> base_t;
-
-    //*************************************************************************
-    /// Default constructor.
-    //*************************************************************************
-    variant_pool_ext(typename base_t::element* buffer, size_t size)
-      : base_t(buffer, size) 
-    {
-    }
-
-#if ETL_CPP11_NOT_SUPPORTED || ETL_USING_STLPORT
-    //*************************************************************************
-    /// Creates the object. Default constructor.
-    //*************************************************************************
-    template <typename T>
-    T* create()
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>();
-    }
-
-    //*************************************************************************
-    /// Creates the object. One parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1>
-    T* create(const TP1& p1)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Two parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2>
-    T* create(const TP1& p1, const TP2& p2)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Three parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2, typename TP3>
-    T* create(const TP1& p1, const TP2& p2, const TP3& p3)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2, p3);
-    }
-
-    //*************************************************************************
-    /// Creates the object. Four parameter constructor.
-    //*************************************************************************
-    template <typename T, typename TP1, typename TP2, typename TP3, typename TP4>
-    T* create(const TP1& p1, const TP2& p2, const TP3& p3, const TP4& p4)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(p1, p2, p3, p4);
-    }
-#else
-    //*************************************************************************
-    /// Creates the object from a type. Variadic parameter constructor.
-    //*************************************************************************
-    template <typename T, typename... Args>
-    T* create(Args&&... args)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value), "Unsupported type");
-
-      return base_t::template create<T>(etl::forward<Args>(args)...);
-    }
-#endif
-
-    //*************************************************************************
-    /// Destroys the object.
-    //*************************************************************************
-    template <typename T>
-    void destroy(const T* const p)
-    {
-      ETL_STATIC_ASSERT((etl::is_one_of<T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>::value ||
-                         etl::is_base_of<T, T1>::value ||
-                         etl::is_base_of<T, T2>::value ||
-                         etl::is_base_of<T, T3>::value ||
-                         etl::is_base_of<T, T4>::value ||
-                         etl::is_base_of<T, T5>::value ||
-                         etl::is_base_of<T, T6>::value ||
-                         etl::is_base_of<T, T7>::value ||
-                         etl::is_base_of<T, T8>::value ||
-                         etl::is_base_of<T, T9>::value ||
-                         etl::is_base_of<T, T10>::value ||
-                         etl::is_base_of<T, T11>::value ||
-                         etl::is_base_of<T, T12>::value ||
-                         etl::is_base_of<T, T13>::value ||
-                         etl::is_base_of<T, T14>::value ||
-                         etl::is_base_of<T, T15>::value ||
-                         etl::is_base_of<T, T16>::value), "Invalid type");
-
-      base_t::destroy(p);
-    }
-
-    //*************************************************************************
-    /// Returns the maximum number of items in the variant_pool.
-    //*************************************************************************
-    size_t max_size() const 
-    { 
-      return base_t::max_size(); 
-    }
-
-  private:
-
-    variant_pool_ext(const variant_pool_ext&) ETL_DELETE;
-    variant_pool_ext& operator =(const variant_pool_ext&) ETL_DELETE;
-  };
+  #include "private/variant_pool_cpp03.h"
 #endif
 }