wip - fix macro calls.