First try
Change global ::Grammar variables

Missed these vars first time around.
Fix test failures.

I left a few needed lines out in the refactoring.