Improved the generics for Grammar
2 files changed