Re-add changes to grammar
Merge branch 'master' of github.com:ianj/temporal-aam