Changes to lexer and bison stuff