Update grammar helpers

This release updates to use the Grammar::macro() to define the additional grammar helpers, avoiding possible collisions with similar packages.