Refactor parse.y so it can be used with older versions of Bison