Ongoing grammar refactor: lots of work on Forms tests