Fix to allow simpler YACC compilations