Fixed some issues with the preprocessor macros for variadic templates

g++ proved to be very helpful