Fixes for regenerating grammar files.