Fix nested macro calls and multiple parameters