Reformat the rest of grammar definition in core.y