Flex and Bison tweaks.