With the new API introduced int d1c4457f, we next need to port all plug-ins using the argument macros to functions. This will allow us to remove the macros as part of the 3.0 API clean-up.