Rewrap syntax to fit 80 chars width
Update export to respect lexical production naming