Delegate functions calls instead of using macros

This is semi-breaking change as the behaviour should stay the same, but
the calling form will be different, from macros to functions.