minor macro improvements
Merge branch 'master' of https://github.com/synkarius/dragonfly-grammars