Introduced parameters for macro invocation, so we can save a lot of redudant code with macros. Furthermore, the function to invoke by the macro is now declared in the corresponding source file, not the macro code.