Make conflict accounting more bison compatible.
Remove TODOs.