--- ast/agrampar.h.orig	2015-11-24 22:16:58.000000000 -0600
+++ ast/agrampar.h	2015-11-24 22:28:29.000000000 -0600
@@ -13,7 +13,7 @@
 // name of extra parameter to yyparse (i.e. the context in
 // which the parser operates, instead of that being stored
 // in some collection of globals)
-#define YYPARSE_PARAM parseParam
+//#define YYPARSE_PARAM parseParam
 
 // type of thing extra param points at
 struct ASTParseParams {
@@ -30,8 +30,8 @@
 // caller interface to Bison-generated parser; starts parsing
 // (whatever stream lexer is reading) and returns 0 for success and
 // 1 for error; the extra parameter is available to actions to use
-#define YYPARSE_PARAM parseParam
-int agrampar_yyparse(void *YYPARSE_PARAM);
+//#define YYPARSE_PARAM parseParam
+int agrampar_yyparse(void *parseParam);
 
 // when this is set to true, bison parser emits info about
 // actions as it's taking them
@@ -53,12 +53,12 @@
 
 // error routine
 void agrampar_yyerror(char const *msg, void *parseParam);
-#define yyerror(m) agrampar_yyerror(m, YYPARSE_PARAM)
+#define yyerror agrampar_yyerror
 
 // parser's view of the lexer
 int agrampar_yylex(union YYSTYPE *lvalp, void *parseParam);
 #define yylex agrampar_yylex
-#define YYLEX_PARAM parseParam
+//#define YYLEX_PARAM parseParam
 
 // classify token codes
 bool isAGramlexEmbed(int code);