Ongoing grammar refactor
Ongoing grammar refactor: indirect statement