Convert over to the new way of handling lex/bison checked into cvs