Upgrade first-mate to return Disposable from GrammarRegistry::addGrammar