Change grammar to work with Bison 2.4.2 (msys windows version)