More fixes to the grammar.
Fixed mixinOperator productions.