First pass at simplifying & correcting the expression & statement
grammars