Reworked the expr grammar, reduced shift/reduce conflicts