Adapt updated go yacc results