Regenerated lex/parse code

following merge cleanup