Still 70/70

Refactored expr production to remove hacky error productions
Now, the error productions live in their various sub-productions