Got rid of all the C++ types from grammar.bison since Scala-Bison was complaining about them.