adds space between modifiers and field/constant name
adds NestedGeneric to grammar