Fixing the bison/C++ interface