Move Grammar into main closure