Add a proper top-level form for the Grammar
Remove redundant local