Fix shift/reduce conflicts 