diff --git a/include/yorel/yomm2/macros.hpp b/include/yorel/yomm2/macros.hpp
index 5c926cea..cffedcaf 100644
--- a/include/yorel/yomm2/macros.hpp
+++ b/include/yorel/yomm2/macros.hpp
@@ -62,9 +62,6 @@
             BOOST_PP_REPEAT(BOOST_PP_TUPLE_SIZE(ARGS), yOMM2_ALIST, ARGS));    \
     }
 
-#define YOMM2_DEFINE(NAME, ARGS, ...)                                          \
-    yOMM2_DEFINE(YOMM2_GENSYM, NAME, ARGS, __VA_ARGS__)
-
 #define YOMM2_DEFINE_IN(CONTAINER, NAME, ARGS, ...)                            \
     yOMM2_DEFINE_IN_CONTAINER(                                                 \
         YOMM2_GENSYM, , CONTAINER, NAME, ARGS, __VA_ARGS__)
@@ -79,6 +76,10 @@
     using method_type = _yOMM2_select<void ARGS>::type;                        \
     using _yOMM2_return_t = method_type::return_type;
 
+
+#define YOMM2_DEFINE(NAME, ARGS, ...)                                          \
+    yOMM2_DEFINE(YOMM2_GENSYM, NAME, ARGS, __VA_ARGS__)
+
 #define yOMM2_DEFINE(NS, NAME, ARGS, ...)                                      \
     namespace {                                                                \
     namespace NS {                                                             \
@@ -114,7 +115,7 @@
             ARGS;                                                              \
     };                                                                         \
     INLINE NS::method_type::next_type CONTAINER<                               \
-        boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>>(ARGS)>::next; \
+        boost::mp11::mp_first<boost::mp11::mp_list<__VA_ARGS__>> ARGS>::next; \
     namespace {                                                                \
     namespace NS {                                                             \
     INLINE method_type::override_fn<CONTAINER<                                 \