Got tests passing.
Removed var args macro.