Merge from transition
Make flex parsing reentrant