Small fix in yield detection in macros
Fixed if-elsif-else-end not parsing well in macros