Re-introduce macro for overloaded functions