Resolved issues with macro prototype parsing and macro AIF directive