Refactor FOR IN & FOR OF STATEMENT rule in grammar