Implemented alternative support in nonTerminalDefinitionInlining

TODO:
- support in Grammar

LATER:
- fix ExpandDefault
Implement product of gMap / gSet
Safe part of the change
Introduce some more changes...
BUMP
Fix stupid bugs