CParser.y: change the formatting style for easier navigation

Change this:

rule
  : a b
  : c d
  ;

into this:

rule:
    a n
  | c d
  ;

While the first is arguably more readable, the second form allows us
to search for rule names much easier.
tmp: CParser.y: removing the conflicts
tmp: CParser.y: a cleaner way to remove the same conflicts