New version of the grammar, now hopefully with fewer bugs, but still with s/r conflicts