gras: work on generator scripts for template madness

4 files changed, 990 insertions, 16 deletions

diff --git a/include/gras/callable.hpp b/include/gras/callable.hpp
index 60d0fb0..015f965 100644
--- a/include/gras/callable.hpp
+++ b/include/gras/callable.hpp
@@ -57,10 +57,10 @@ protected:
      ******************************************************************/
 protected:
     template <typename ClassType, typename ReturnType>
-    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(void));
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)());
 
     template <typename ClassType>
-    void register_call(const std::string &name, void(ClassType::*fcn)(void));
+    void register_call(const std::string &name, void(ClassType::*fcn)());
 
     template <typename ClassType, typename ReturnType, typename Arg0>
     void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &));
@@ -80,6 +80,48 @@ protected:
     template <typename ClassType, typename Arg0, typename Arg1, typename Arg2>
     void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &));
 
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &));
+
+    template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    void register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &));
+
+    template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    void register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &));
+
     /*******************************************************************
      * Call API - don't look here, template magic, not helpful
      ******************************************************************/
@@ -108,6 +150,48 @@ public:
     template <typename Arg0, typename Arg1, typename Arg2>
     void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &);
 
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    ReturnType x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    void x(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
+
     /*******************************************************************
      * Private registration hooks
      ******************************************************************/
diff --git a/include/gras/detail/callable.hpp b/include/gras/detail/callable.hpp
index 98fa29d..7a82a45 100644
--- a/include/gras/detail/callable.hpp
+++ b/include/gras/detail/callable.hpp
@@ -24,18 +24,20 @@ struct GRAS_API CallableRegistryEntry
 template <typename ClassType, typename ReturnType>
 struct CallableRegistryEntryImpl0 : CallableRegistryEntry
 {
-    typedef ReturnType(ClassType::*Fcn)(void);
+    typedef ReturnType(ClassType::*Fcn)();
     CallableRegistryEntryImpl0(ClassType *obj, Fcn fcn):
     _obj(obj), _fcn(fcn){}
-    PMCC call(const PMCC &)
+    PMCC call(const PMCC &args)
     {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 0) throw a;
         return PMC_M((_obj->*_fcn)());
     }
     ClassType *_obj; Fcn _fcn;
 };
 
 template <typename ClassType, typename ReturnType>
-void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(void))
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)())
 {
     ClassType *obj = dynamic_cast<ClassType *>(this);
     void *fr = new CallableRegistryEntryImpl0<ClassType, ReturnType>(obj, fcn);
@@ -45,18 +47,20 @@ void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn
 template <typename ClassType>
 struct CallableRegistryEntryImplVoid0 : CallableRegistryEntry
 {
-    typedef void(ClassType::*Fcn)(void);
+    typedef void(ClassType::*Fcn)();
     CallableRegistryEntryImplVoid0(ClassType *obj, Fcn fcn):
     _obj(obj), _fcn(fcn){}
-    PMCC call(const PMCC &)
+    PMCC call(const PMCC &args)
     {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 0) throw a;
         (_obj->*_fcn)(); return PMCC();
     }
     ClassType *_obj; Fcn _fcn;
 };
 
 template <typename ClassType>
-void Callable::register_call(const std::string &name, void(ClassType::*fcn)(void))
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)())
 {
     ClassType *obj = dynamic_cast<ClassType *>(this);
     void *fr = new CallableRegistryEntryImplVoid0<ClassType>(obj, fcn);
@@ -75,6 +79,7 @@ struct CallableRegistryEntryImpl1 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 1) throw a;
         return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>()));
     }
     ClassType *_obj; Fcn _fcn;
@@ -97,6 +102,7 @@ struct CallableRegistryEntryImplVoid1 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 1) throw a;
         (_obj->*_fcn)(a[0].safe_as<Arg0>()); return PMCC();
     }
     ClassType *_obj; Fcn _fcn;
@@ -122,6 +128,7 @@ struct CallableRegistryEntryImpl2 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 2) throw a;
         return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>()));
     }
     ClassType *_obj; Fcn _fcn;
@@ -144,6 +151,7 @@ struct CallableRegistryEntryImplVoid2 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 2) throw a;
         (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>()); return PMCC();
     }
     ClassType *_obj; Fcn _fcn;
@@ -169,6 +177,7 @@ struct CallableRegistryEntryImpl3 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 3) throw a;
         return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>()));
     }
     ClassType *_obj; Fcn _fcn;
@@ -191,6 +200,7 @@ struct CallableRegistryEntryImplVoid3 : CallableRegistryEntry
     PMCC call(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 3) throw a;
         (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>()); return PMCC();
     }
     ClassType *_obj; Fcn _fcn;
@@ -205,6 +215,349 @@ void Callable::register_call(const std::string &name, void(ClassType::*fcn)(cons
 }
 
 /***********************************************************************
+ * Registration for return with 4 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+struct CallableRegistryEntryImpl4 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+    CallableRegistryEntryImpl4(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 4) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl4<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+struct CallableRegistryEntryImplVoid4 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+    CallableRegistryEntryImplVoid4(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 4) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid4<ClassType, Arg0, Arg1, Arg2, Arg3>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 5 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+struct CallableRegistryEntryImpl5 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+    CallableRegistryEntryImpl5(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 5) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl5<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+struct CallableRegistryEntryImplVoid5 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+    CallableRegistryEntryImplVoid5(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 5) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid5<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 6 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+struct CallableRegistryEntryImpl6 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+    CallableRegistryEntryImpl6(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 6) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl6<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+struct CallableRegistryEntryImplVoid6 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+    CallableRegistryEntryImplVoid6(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 6) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid6<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 7 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+struct CallableRegistryEntryImpl7 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+    CallableRegistryEntryImpl7(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 7) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl7<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+struct CallableRegistryEntryImplVoid7 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+    CallableRegistryEntryImplVoid7(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 7) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid7<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 8 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+struct CallableRegistryEntryImpl8 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+    CallableRegistryEntryImpl8(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 8) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl8<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+struct CallableRegistryEntryImplVoid8 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+    CallableRegistryEntryImplVoid8(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 8) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid8<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 9 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+struct CallableRegistryEntryImpl9 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+    CallableRegistryEntryImpl9(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 9) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl9<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+struct CallableRegistryEntryImplVoid9 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+    CallableRegistryEntryImplVoid9(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 9) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid9<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
+ * Registration for return with 10 args
+ **********************************************************************/
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+struct CallableRegistryEntryImpl10 : CallableRegistryEntry
+{
+    typedef ReturnType(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
+    CallableRegistryEntryImpl10(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 10) throw a;
+        return PMC_M((_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>(), a[9].safe_as<Arg9>()));
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+void Callable::register_call(const std::string &name, ReturnType(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImpl10<ClassType, ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9>(obj, fcn);
+    _register_call(name, fr);
+}
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+struct CallableRegistryEntryImplVoid10 : CallableRegistryEntry
+{
+    typedef void(ClassType::*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
+    CallableRegistryEntryImplVoid10(ClassType *obj, Fcn fcn):
+    _obj(obj), _fcn(fcn){}
+    PMCC call(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 10) throw a;
+        (_obj->*_fcn)(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>(), a[9].safe_as<Arg9>()); return PMCC();
+    }
+    ClassType *_obj; Fcn _fcn;
+};
+
+template <typename ClassType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+void Callable::register_call(const std::string &name, void(ClassType::*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &))
+{
+    ClassType *obj = dynamic_cast<ClassType *>(this);
+    void *fr = new CallableRegistryEntryImplVoid10<ClassType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9>(obj, fcn);
+    _register_call(name, fr);
+}
+
+/***********************************************************************
  * Call implementations with 0 args
  **********************************************************************/
 template <typename ReturnType>
@@ -288,6 +641,230 @@ void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const
     _handle_call(name, PMC_M(args));
 }
 
+/***********************************************************************
+ * Call implementations with 4 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3)
+{
+    PMCList args(4);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3)
+{
+    PMCList args(4);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 5 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4)
+{
+    PMCList args(5);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4)
+{
+    PMCList args(5);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 6 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5)
+{
+    PMCList args(6);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5)
+{
+    PMCList args(6);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 7 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6)
+{
+    PMCList args(7);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6)
+{
+    PMCList args(7);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 8 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7)
+{
+    PMCList args(8);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7)
+{
+    PMCList args(8);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 9 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8)
+{
+    PMCList args(9);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8)
+{
+    PMCList args(9);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    _handle_call(name, PMC_M(args));
+}
+
+/***********************************************************************
+ * Call implementations with 10 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+ReturnType Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8, const Arg9 &a9)
+{
+    PMCList args(10);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    args[9] = PMC_M(a9);
+    PMCC r = _handle_call(name, PMC_M(args));
+    return r.safe_as<ReturnType>();
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+void Callable::x(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8, const Arg9 &a9)
+{
+    PMCList args(10);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    args[9] = PMC_M(a9);
+    _handle_call(name, PMC_M(args));
+}
+
 } //namespace gras
 
 #endif /*INCLUDED_GRAS_DETAIL_CALLABLE_HPP*/
diff --git a/include/gras/detail/factory.hpp b/include/gras/detail/factory.hpp
index 632e09d..6570da4 100644
--- a/include/gras/detail/factory.hpp
+++ b/include/gras/detail/factory.hpp
@@ -24,17 +24,19 @@ struct GRAS_API FactoryRegistryEntry
 template <typename ReturnType>
 struct FactoryRegistryEntryImpl0 : FactoryRegistryEntry
 {
-    typedef ReturnType(*Fcn)(void);
+    typedef ReturnType(*Fcn)();
     FactoryRegistryEntryImpl0(Fcn fcn):_fcn(fcn){}
-    Element *make(const PMCC &)
+    Element *make(const PMCC &args)
     {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 0) throw a;
         return _fcn();
     }
     Fcn _fcn;
 };
 
 template <typename ReturnType>
-void Factory::register_make(const std::string &name, ReturnType(*fcn)(void))
+void Factory::register_make(const std::string &name, ReturnType(*fcn)())
 {
     void *r = new FactoryRegistryEntryImpl0<ReturnType>(fcn);
     Factory::_register_make(name, r);
@@ -51,6 +53,7 @@ struct FactoryRegistryEntryImpl1 : FactoryRegistryEntry
     Element *make(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 1) throw a;
         return _fcn(a[0].safe_as<Arg0>());
     }
     Fcn _fcn;
@@ -74,6 +77,7 @@ struct FactoryRegistryEntryImpl2 : FactoryRegistryEntry
     Element *make(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 2) throw a;
         return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>());
     }
     Fcn _fcn;
@@ -97,6 +101,7 @@ struct FactoryRegistryEntryImpl3 : FactoryRegistryEntry
     Element *make(const PMCC &args)
     {
         const PMCList &a = args.as<PMCList>();
+        if (a.size() < 3) throw a;
         return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>());
     }
     Fcn _fcn;
@@ -110,6 +115,174 @@ void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0
 }
 
 /***********************************************************************
+ * Templated registration - 4 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+struct FactoryRegistryEntryImpl4 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+    FactoryRegistryEntryImpl4(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 4) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &))
+{
+    void *r = new FactoryRegistryEntryImpl4<ReturnType, Arg0, Arg1, Arg2, Arg3>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 5 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+struct FactoryRegistryEntryImpl5 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+    FactoryRegistryEntryImpl5(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 5) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &))
+{
+    void *r = new FactoryRegistryEntryImpl5<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 6 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+struct FactoryRegistryEntryImpl6 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+    FactoryRegistryEntryImpl6(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 6) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &))
+{
+    void *r = new FactoryRegistryEntryImpl6<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 7 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+struct FactoryRegistryEntryImpl7 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+    FactoryRegistryEntryImpl7(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 7) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &))
+{
+    void *r = new FactoryRegistryEntryImpl7<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 8 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+struct FactoryRegistryEntryImpl8 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+    FactoryRegistryEntryImpl8(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 8) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &))
+{
+    void *r = new FactoryRegistryEntryImpl8<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 9 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+struct FactoryRegistryEntryImpl9 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+    FactoryRegistryEntryImpl9(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 9) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &))
+{
+    void *r = new FactoryRegistryEntryImpl9<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
+ * Templated registration - 10 args
+ **********************************************************************/
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+struct FactoryRegistryEntryImpl10 : FactoryRegistryEntry
+{
+    typedef ReturnType(*Fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
+    FactoryRegistryEntryImpl10(Fcn fcn):_fcn(fcn){}
+    Element *make(const PMCC &args)
+    {
+        const PMCList &a = args.as<PMCList>();
+        if (a.size() < 10) throw a;
+        return _fcn(a[0].safe_as<Arg0>(), a[1].safe_as<Arg1>(), a[2].safe_as<Arg2>(), a[3].safe_as<Arg3>(), a[4].safe_as<Arg4>(), a[5].safe_as<Arg5>(), a[6].safe_as<Arg6>(), a[7].safe_as<Arg7>(), a[8].safe_as<Arg8>(), a[9].safe_as<Arg9>());
+    }
+    Fcn _fcn;
+};
+
+template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+void Factory::register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &))
+{
+    void *r = new FactoryRegistryEntryImpl10<ReturnType, Arg0, Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9>(fcn);
+    Factory::_register_make(name, r);
+}
+
+/***********************************************************************
  * Templated make implementations
  **********************************************************************/
 inline
@@ -146,6 +319,104 @@ Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1,
     return Factory::_handle_make(name, PMC_M(args));
 }
 
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3)
+{
+    PMCList args(4);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4)
+{
+    PMCList args(5);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5)
+{
+    PMCList args(6);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6)
+{
+    PMCList args(7);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7)
+{
+    PMCList args(8);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8)
+{
+    PMCList args(9);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
+template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+Element *Factory::make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2, const Arg3 &a3, const Arg4 &a4, const Arg5 &a5, const Arg6 &a6, const Arg7 &a7, const Arg8 &a8, const Arg9 &a9)
+{
+    PMCList args(10);
+    args[0] = PMC_M(a0);
+    args[1] = PMC_M(a1);
+    args[2] = PMC_M(a2);
+    args[3] = PMC_M(a3);
+    args[4] = PMC_M(a4);
+    args[5] = PMC_M(a5);
+    args[6] = PMC_M(a6);
+    args[7] = PMC_M(a7);
+    args[8] = PMC_M(a8);
+    args[9] = PMC_M(a9);
+    return Factory::_handle_make(name, PMC_M(args));
+}
+
 }
 
 #endif /*INCLUDED_GRAS_DETAIL_FACTORY_HPP*/
diff --git a/include/gras/factory.hpp b/include/gras/factory.hpp
index 52ed881..b60b1e7 100644
--- a/include/gras/factory.hpp
+++ b/include/gras/factory.hpp
@@ -37,7 +37,7 @@ struct GRAS_API Factory
      * Register API - don't look here, template magic, not helpful
      ******************************************************************/
     template <typename ReturnType>
-    static void register_make(const std::string &name, ReturnType(*fcn)(void));
+    static void register_make(const std::string &name, ReturnType(*fcn)());
 
     template <typename ReturnType, typename Arg0>
     static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &));
@@ -48,20 +48,62 @@ struct GRAS_API Factory
     template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2>
     static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &));
 
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &));
+
+    template <typename ReturnType, typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    static void register_make(const std::string &name, ReturnType(*fcn)(const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &));
+
     /*******************************************************************
      * Make API - don't look here, template magic, not helpful
-     ******************************************************************/
+     ******************************************************************/;
     inline
     static Element *make(const std::string &name);
 
     template <typename Arg0>
-    static Element *make(const std::string &name, const Arg0 &a0);
+    static Element *make(const std::string &name, const Arg0 &);
 
     template <typename Arg0, typename Arg1>
-    static Element *make(const std::string &name, const Arg0 &a0, const Arg1 &a1);
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &);
 
     template <typename Arg0, typename Arg1, typename Arg2>
-    static Element *make(const std::string &name, const Arg0 &a0, const Arg1 &a1, const Arg2 &a2);
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &);
+
+    template <typename Arg0, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5, typename Arg6, typename Arg7, typename Arg8, typename Arg9>
+    static Element *make(const std::string &name, const Arg0 &, const Arg1 &, const Arg2 &, const Arg3 &, const Arg4 &, const Arg5 &, const Arg6 &, const Arg7 &, const Arg8 &, const Arg9 &);
 
     /*******************************************************************
      * Private registration hooks